Skip to content

Commit

Permalink
Maintain compatibility with Ruby 2.2
Browse files Browse the repository at this point in the history
  • Loading branch information
macumber committed Jul 31, 2020
1 parent 495148b commit d23b504
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 23 deletions.
2 changes: 2 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,6 @@ source 'http://rubygems.org'

gem 'rake'

gem 'ffi', "1.12.2"

gem 'rest-client'
5 changes: 3 additions & 2 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,9 @@ task :build do

if md = /<script\s*src=\"(.*?)\"><\/script>/.match(line)
url = md[1].gsub('https', 'http')
request = RestClient::Resource.new(url)
response = request.get
#request = RestClient::Resource.new(url)
#response = request.get
response = RestClient::Request.execute(:method => :head, :url => url, :verify_ssl => OpenSSL::SSL::VERIFY_NONE)
line = "<script>#{response}</script>\n"
end

Expand Down
16 changes: 8 additions & 8 deletions ViewData/measure.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<schema_version>3.0</schema_version>
<name>view_data</name>
<uid>18cf0de7-48b8-48dc-ab68-0dd29f0b8bd0</uid>
<version_id>8f275e37-fc42-46c2-af50-2e48834d73b6</version_id>
<version_modified>20200526T042251Z</version_modified>
<version_id>9c623e1e-b79b-473b-aaa5-748ec117c7fe</version_id>
<version_modified>20200731T033040Z</version_modified>
<xml_checksum>2C8A3EEF</xml_checksum>
<class_name>ViewData</class_name>
<display_name>ViewData</display_name>
Expand Down Expand Up @@ -113,12 +113,6 @@
<usage_type>resource</usage_type>
<checksum>7557DEA6</checksum>
</file>
<file>
<filename>report.html.in</filename>
<filetype>in</filetype>
<usage_type>resource</usage_type>
<checksum>61B6B47E</checksum>
</file>
<file>
<filename>ViewData_Test.rb</filename>
<filetype>rb</filetype>
Expand All @@ -136,5 +130,11 @@
<usage_type>script</usage_type>
<checksum>8BCF7932</checksum>
</file>
<file>
<filename>report.html.in</filename>
<filetype>in</filetype>
<usage_type>resource</usage_type>
<checksum>9617ECC5</checksum>
</file>
</files>
</measure>
26 changes: 13 additions & 13 deletions ViewModel/measure.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<schema_version>3.0</schema_version>
<name>view_model</name>
<uid>f4669f10-fda5-489d-8e1c-7ca3c2d40378</uid>
<version_id>344a94f9-eef7-44c9-88c5-90f5656d8dc0</version_id>
<version_modified>20200526T042251Z</version_modified>
<version_id>388d6498-104f-4050-b2c5-6d7a00a552ce</version_id>
<version_modified>20200731T033040Z</version_modified>
<xml_checksum>1E1F8B97</xml_checksum>
<class_name>ViewModel</class_name>
<display_name>ViewModel</display_name>
Expand Down Expand Up @@ -46,18 +46,18 @@
<usage_type>resource</usage_type>
<checksum>7557DEA6</checksum>
</file>
<file>
<filename>report.html.in</filename>
<filetype>in</filetype>
<usage_type>resource</usage_type>
<checksum>61B6B47E</checksum>
</file>
<file>
<filename>RotationTest.osm</filename>
<filetype>osm</filetype>
<usage_type>test</usage_type>
<checksum>B313B958</checksum>
</file>
<file>
<filename>ViewModel_Test.rb</filename>
<filetype>rb</filetype>
<usage_type>test</usage_type>
<checksum>71B0E6EF</checksum>
</file>
<file>
<version>
<software_program>OpenStudio</software_program>
Expand All @@ -67,13 +67,13 @@
<filename>measure.rb</filename>
<filetype>rb</filetype>
<usage_type>script</usage_type>
<checksum>CD1AD835</checksum>
<checksum>14E46693</checksum>
</file>
<file>
<filename>ViewModel_Test.rb</filename>
<filetype>rb</filetype>
<usage_type>test</usage_type>
<checksum>71B0E6EF</checksum>
<filename>report.html.in</filename>
<filetype>in</filetype>
<usage_type>resource</usage_type>
<checksum>9617ECC5</checksum>
</file>
</files>
</measure>

0 comments on commit d23b504

Please sign in to comment.