remote_partial 0.7.1 → 0.7.2

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZGRkMzFiMGIyMmIzZWQ3YWU5NGJmMmE3ZjIxMzhmYmZiMTIyNGUxZQ==
+  data.tar.gz: !binary |-
+    YTdlMWYzYzM5NTJlZWFjNDcyZWJlMTlhZDNjNGFkZWFmOTFkYWUyNw==
+SHA512:
+  metadata.gz: !binary |-
+    YWE2ZjNmZTU2YjMwYzA4NzUwN2YxYWI1ZDJiNDE2OTU1ODM3ZjNkYThhYzRi
+    ZDQzYzIxZTVjMmYxMWQwNGZlNjMwZTI2NTJjMjIyYjQzMDMzNmNhMTdkOTNk
+    NGQ0MTUyZjc4ZTZhM2UyZjA5NThhOTA0OGFhYzE2NjdhNjg2MjY=
+  data.tar.gz: !binary |-
+    NTVkZGNiZTgxZDRhNTA1MWRkNjlkZmUxZDJlN2E4ZWU2NzU1M2M3MTA5NGQw
+    NjgzMjc1ODhjNjVkNmZhOTM2MmMzYzBlZTVjNDRjNDZkNTM3YWI4YzM4NDE2
+    N2QyMTA1ODhjZWMzMTY1ZGNjYzhkN2RiNzVkY2VlYTcxMWEyNzk=

data/README.rdoc

@@ -1,4 +1,5 @@
 {<img src="https://codeclimate.com/github/warwickshire/remote_partial.png" />}[https://codeclimate.com/github/warwickshire/remote_partial]
+{<img src="https://badge.fury.io/rb/remote_partial.png" alt="Gem Version" />}[http://badge.fury.io/rb/remote_partial]
 = RemotePartial
 
 Remote Partial allows partials to be created from remote content.
@@ -129,6 +130,13 @@ of the stale_at time:
 
     rake remote_partial:force_update
 
+== Connection via a proxy
+
+RemotePartial can be modified to connect to the remote source via a proxy. To
+do this set the environment variable http_proxy to the proxy url:
+
+    ENV['http_proxy'] = "http://proxy.example.com:8080"
+
 == Problems grabbing content
 
 If remote partial is unable to retrieve remote content, the problem will be

data/lib/remote_partial/partial.rb

@@ -4,11 +4,6 @@ module RemotePartial
 
     attr_accessor :stale_at, :repeat_period
 
-    def self.create(hash)
-      super
-
-    end
-
     def output_file_name
       [partial_folder, file_name].join("/")
     end

data/lib/remote_partial/resource_manager.rb

@@ -12,7 +12,7 @@ module RemotePartial
 
     def self.get_raw(url)
       response = get_response(url)
-      
+
       case response.code.to_i
       when ok_response_codes
         return response.body
@@ -27,7 +27,8 @@ module RemotePartial
 
     def self.get_response(url)
       uri = URI.parse(url)
-      http = Net::HTTP.new(uri.host, uri.port)
+
+      http = Net::HTTP.new(*connection_settings(uri))
 
       if uri.port == 443
         http.use_ssl = true
@@ -38,6 +39,10 @@ module RemotePartial
       http.request(request)
     end
 
+    def self.connection_settings(uri)
+      [uri.host, uri.port] + proxy_settings
+    end
+
     def initialize(url, criteria = nil, &output_modifier)
       @url = url
       @criteria = criteria
@@ -56,6 +61,7 @@ module RemotePartial
     end
 
     private
+
     def get_whole_page
       self.class.get_raw(@url).force_encoding(encoding).gsub(windows_bom_text, "")
     end
@@ -93,5 +99,12 @@ module RemotePartial
       300..399
     end
 
+    def self.proxy_settings
+      return [] unless ENV['http_proxy']
+      proxy = URI.parse(ENV['http_proxy'])
+      [proxy.host, proxy.port, proxy.user, proxy.password]
+    end
+
+
   end
 end

data/lib/remote_partial/version.rb

@@ -1,10 +1,14 @@
 module RemotePartial
-  VERSION = "0.7.1"
+  VERSION = "0.7.2"
 end
 
 # History
 # =======
 #
+# 0.7.2 Adds facility to direct HTTP through proxy
+# ------------------------------------------------
+#
+#
 # 0.7.1 Ensures code works in standalone mode
 # -------------------------------------------
 # An additional require statement to load all the required libraries when not

data/test/log/test.log

@@ -69,3 +69,67 @@ I, [2013-08-27T14:59:07.213269 #5477]  INFO -- : Preparing to test logging via a
 W, [2013-08-27T14:59:07.222037 #5477]  WARN -- : Unable to retrieve remote partial at http://www.warwickshire.gov.uk: #<Net::HTTPBadRequest 400  readbody=true>
 I, [2013-08-27T14:59:07.238897 #5477]  INFO -- : Preparing to test logging via assert_log_entry_added
 W, [2013-08-27T14:59:07.244542 #5477]  WARN -- : Unable to retrieve remote partial at http://www.warwickshire.gov.uk: #<Net::HTTPBadRequest 400  readbody=true>
+I, [2013-11-25T15:55:13.694737 #12223]  INFO -- : Preparing to test logging via assert_log_entry_added
+W, [2013-11-25T15:55:13.715204 #12223]  WARN -- : Unable to retrieve remote partial at http://www.warwickshire.gov.uk: #<Net::HTTPBadRequest 400  readbody=true>
+I, [2013-11-25T15:55:13.730608 #12223]  INFO -- : Preparing to test logging via assert_log_entry_added
+W, [2013-11-25T15:55:13.740418 #12223]  WARN -- : Unable to retrieve remote partial at http://www.warwickshire.gov.uk: #<Net::HTTPBadRequest 400  readbody=true>
+I, [2013-11-25T15:56:19.302859 #12229]  INFO -- : Preparing to test logging via assert_log_entry_added
+W, [2013-11-25T15:56:19.324652 #12229]  WARN -- : Unable to retrieve remote partial at http://www.warwickshire.gov.uk: #<Net::HTTPBadRequest 400  readbody=true>
+I, [2013-11-25T15:56:19.333622 #12229]  INFO -- : Preparing to test logging via assert_log_entry_added
+W, [2013-11-25T15:56:19.344817 #12229]  WARN -- : Unable to retrieve remote partial at http://www.warwickshire.gov.uk: #<Net::HTTPBadRequest 400  readbody=true>
+I, [2013-11-25T16:02:55.740992 #12342]  INFO -- : Preparing to test logging via assert_log_entry_added
+W, [2013-11-25T16:02:55.747786 #12342]  WARN -- : Unable to retrieve remote partial at http://www.warwickshire.gov.uk: #<Net::HTTPBadRequest 400  readbody=true>
+I, [2013-11-25T16:02:55.752866 #12342]  INFO -- : Preparing to test logging via assert_log_entry_added
+W, [2013-11-25T16:02:55.762047 #12342]  WARN -- : Unable to retrieve remote partial at http://www.warwickshire.gov.uk: #<Net::HTTPBadRequest 400  readbody=true>
+I, [2013-11-25T16:03:38.466504 #12348]  INFO -- : Preparing to test logging via assert_log_entry_added
+W, [2013-11-25T16:03:38.483789 #12348]  WARN -- : Unable to retrieve remote partial at http://www.warwickshire.gov.uk: #<Net::HTTPBadRequest 400  readbody=true>
+I, [2013-11-25T16:03:38.546129 #12348]  INFO -- : Preparing to test logging via assert_log_entry_added
+W, [2013-11-25T16:03:38.554017 #12348]  WARN -- : Unable to retrieve remote partial at http://www.warwickshire.gov.uk: #<Net::HTTPBadRequest 400  readbody=true>
+I, [2013-11-25T16:14:54.344239 #12475]  INFO -- : Preparing to test logging via assert_log_entry_added
+W, [2013-11-25T16:14:54.354949 #12475]  WARN -- : Unable to retrieve remote partial at http://www.warwickshire.gov.uk: #<Net::HTTPBadRequest 400  readbody=true>
+I, [2013-11-25T16:14:54.359362 #12475]  INFO -- : Preparing to test logging via assert_log_entry_added
+W, [2013-11-25T16:14:54.365191 #12475]  WARN -- : Unable to retrieve remote partial at http://www.warwickshire.gov.uk: #<Net::HTTPBadRequest 400  readbody=true>
+W, [2013-11-25T16:23:49.503888 #12497]  WARN -- : Unable to retrieve remote partial at http://www.warwickshire.gov.uk: #<NoMethodError: undefined method `empty?' for nil:NilClass>
+I, [2013-11-25T16:23:49.549467 #12497]  INFO -- : Preparing to test logging via assert_log_entry_added
+W, [2013-11-25T16:23:49.553579 #12497]  WARN -- : Unable to retrieve remote partial at http://www.warwickshire.gov.uk: #<NoMethodError: undefined method `empty?' for nil:NilClass>
+W, [2013-11-25T16:23:49.563744 #12497]  WARN -- : Unable to retrieve remote partial at http://www.warwickshire.gov.uk: #<NoMethodError: undefined method `empty?' for nil:NilClass>
+W, [2013-11-25T16:23:49.574069 #12497]  WARN -- : Unable to retrieve remote partial at http://www.warwickshire.gov.uk: #<NoMethodError: undefined method `empty?' for nil:NilClass>
+I, [2013-11-25T16:23:49.598483 #12497]  INFO -- : Preparing to test logging via assert_log_entry_added
+W, [2013-11-25T16:23:49.603408 #12497]  WARN -- : Unable to retrieve remote partial at http://www.warwickshire.gov.uk: #<NoMethodError: undefined method `empty?' for nil:NilClass>
+I, [2013-11-25T16:24:33.065466 #12503]  INFO -- : Preparing to test logging via assert_log_entry_added
+W, [2013-11-25T16:24:33.073027 #12503]  WARN -- : Unable to retrieve remote partial at http://www.warwickshire.gov.uk: #<Net::HTTPBadRequest 400  readbody=true>
+I, [2013-11-25T16:24:33.101628 #12503]  INFO -- : Preparing to test logging via assert_log_entry_added
+W, [2013-11-25T16:24:33.107203 #12503]  WARN -- : Unable to retrieve remote partial at http://www.warwickshire.gov.uk: #<Net::HTTPBadRequest 400  readbody=true>
+I, [2013-11-25T16:26:42.668122 #12511]  INFO -- : Preparing to test logging via assert_log_entry_added
+W, [2013-11-25T16:26:42.678779 #12511]  WARN -- : Unable to retrieve remote partial at http://www.warwickshire.gov.uk: #<Net::HTTPBadRequest 400  readbody=true>
+I, [2013-11-25T16:26:42.737853 #12511]  INFO -- : Preparing to test logging via assert_log_entry_added
+W, [2013-11-25T16:26:42.743935 #12511]  WARN -- : Unable to retrieve remote partial at http://www.warwickshire.gov.uk: #<Net::HTTPBadRequest 400  readbody=true>
+I, [2013-11-25T16:31:23.698494 #12521]  INFO -- : Preparing to test logging via assert_log_entry_added
+W, [2013-11-25T16:31:23.718245 #12521]  WARN -- : Unable to retrieve remote partial at http://www.warwickshire.gov.uk: #<Net::HTTPBadRequest 400  readbody=true>
+I, [2013-11-25T16:31:23.788483 #12521]  INFO -- : Preparing to test logging via assert_log_entry_added
+W, [2013-11-25T16:31:23.794937 #12521]  WARN -- : Unable to retrieve remote partial at http://www.warwickshire.gov.uk: #<Net::HTTPBadRequest 400  readbody=true>
+I, [2013-11-25T16:31:36.780488 #12533]  INFO -- : Preparing to test logging via assert_log_entry_added
+W, [2013-11-25T16:31:36.797683 #12533]  WARN -- : Unable to retrieve remote partial at http://www.warwickshire.gov.uk: #<Net::HTTPBadRequest 400  readbody=true>
+I, [2013-11-25T16:31:36.823695 #12533]  INFO -- : Preparing to test logging via assert_log_entry_added
+W, [2013-11-25T16:31:36.829005 #12533]  WARN -- : Unable to retrieve remote partial at http://www.warwickshire.gov.uk: #<Net::HTTPBadRequest 400  readbody=true>
+I, [2013-11-25T16:36:16.478166 #12590]  INFO -- : Preparing to test logging via assert_log_entry_added
+W, [2013-11-25T16:36:16.490172 #12590]  WARN -- : Unable to retrieve remote partial at http://www.warwickshire.gov.uk: #<TypeError: can't convert nil into Array>
+I, [2013-11-25T16:36:16.521695 #12590]  INFO -- : Preparing to test logging via assert_log_entry_added
+W, [2013-11-25T16:36:16.528342 #12590]  WARN -- : Unable to retrieve remote partial at http://www.warwickshire.gov.uk: #<TypeError: can't convert nil into Array>
+W, [2013-11-25T16:36:16.536018 #12590]  WARN -- : Unable to retrieve remote partial at http://www.warwickshire.gov.uk: #<TypeError: can't convert nil into Array>
+W, [2013-11-25T16:36:16.547377 #12590]  WARN -- : Unable to retrieve remote partial at http://www.warwickshire.gov.uk: #<TypeError: can't convert nil into Array>
+W, [2013-11-25T16:36:16.558226 #12590]  WARN -- : Unable to retrieve remote partial at http://www.warwickshire.gov.uk: #<TypeError: can't convert nil into Array>
+W, [2013-11-25T16:36:16.739345 #12590]  WARN -- : Unable to retrieve remote partial at http://www.warwickshire.gov.uk: #<TypeError: can't convert nil into Array>
+W, [2013-11-25T16:36:16.743663 #12590]  WARN -- : Unable to retrieve remote partial at http://www.warwickshire.gov.uk: #<TypeError: can't convert nil into Array>
+I, [2013-11-25T16:37:06.900239 #12596]  INFO -- : Preparing to test logging via assert_log_entry_added
+W, [2013-11-25T16:37:06.917849 #12596]  WARN -- : Unable to retrieve remote partial at http://www.warwickshire.gov.uk: #<Net::HTTPBadRequest 400  readbody=true>
+I, [2013-11-25T16:37:06.966460 #12596]  INFO -- : Preparing to test logging via assert_log_entry_added
+W, [2013-11-25T16:37:06.972528 #12596]  WARN -- : Unable to retrieve remote partial at http://www.warwickshire.gov.uk: #<Net::HTTPBadRequest 400  readbody=true>
+I, [2013-11-25T16:37:37.683340 #12603]  INFO -- : Preparing to test logging via assert_log_entry_added
+W, [2013-11-25T16:37:37.694820 #12603]  WARN -- : Unable to retrieve remote partial at http://www.warwickshire.gov.uk: #<Net::HTTPBadRequest 400  readbody=true>
+I, [2013-11-25T16:37:37.716183 #12603]  INFO -- : Preparing to test logging via assert_log_entry_added
+W, [2013-11-25T16:37:37.722940 #12603]  WARN -- : Unable to retrieve remote partial at http://www.warwickshire.gov.uk: #<Net::HTTPBadRequest 400  readbody=true>
+I, [2013-11-26T08:04:39.077014 #3428]  INFO -- : Preparing to test logging via assert_log_entry_added
+W, [2013-11-26T08:04:39.115809 #3428]  WARN -- : Unable to retrieve remote partial at http://www.warwickshire.gov.uk: #<Net::HTTPBadRequest 400  readbody=true>
+I, [2013-11-26T08:04:39.198116 #3428]  INFO -- : Preparing to test logging via assert_log_entry_added
+W, [2013-11-26T08:04:39.207608 #3428]  WARN -- : Unable to retrieve remote partial at http://www.warwickshire.gov.uk: #<Net::HTTPBadRequest 400  readbody=true>

data/test/test_helper.rb

@@ -1,3 +1,4 @@
+require 'pathname'
 require 'minitest/unit'
 require 'webmock'
 require 'webmock/minitest'
@@ -92,4 +93,4 @@ class MiniTest::Unit::TestCase
     remove_file @partial.output_file_name
   end
 
-end
+end

data/test/unit/remote_partial/resource_manager_test.rb

@@ -69,7 +69,7 @@ module RemotePartial
       assert_equal_ignoring_cr(@body, File.read(@path))
     end
 
-    def test_connection_failure    
+    def test_connection_failure
       enable_mock_connection_failure @url
       assert_raises RemotePartialRetrivalError do
         ResourceManager.new(@url, 'body').html
@@ -83,6 +83,27 @@ module RemotePartial
       end
     end
 
+    def test_http_proxy_environment_variable_not_set
+      ENV.delete('http_proxy')
+      uri = URI.parse @url
+      settings = ResourceManager.connection_settings(uri)
+      assert_equal([uri.host, uri.port], settings)
+    end
+
+    def test_http_proxy_environment_variable_without_credentials
+      ENV['http_proxy'] = "http://10.10.10.254:8080"
+      uri = URI.parse @url
+      settings = ResourceManager.connection_settings(uri)
+      assert_equal([uri.host, uri.port, '10.10.10.254', 8080, nil, nil], settings)
+    end
+
+    def test_http_proxy_environment_variable_with_credentials
+      ENV['http_proxy'] = "http://fred:daphne@10.10.10.254:8080"
+      uri = URI.parse @url
+      settings = ResourceManager.connection_settings(uri)
+      assert_equal([uri.host, uri.port, '10.10.10.254', 8080, 'fred', 'daphne'], settings)
+    end
+
     def raw_content
       Net::HTTP.get(URI(@url))
     end
@@ -91,7 +112,5 @@ module RemotePartial
       Nokogiri::HTML(raw_content)
     end
 
-
-
   end
 end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: remote_partial
 version: !ruby/object:Gem::Version
-  version: 0.7.1
-  prerelease: 
+  version: 0.7.2
 platform: ruby
 authors:
 - Rob Nichols
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-27 00:00:00.000000000 Z
+date: 2013-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,14 +34,13 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: ! "RemotePartial comprises:\n  a system to grab content from a remote
   page and copy that content into partials;\n  a process to allow content to be regularly
-  updated;\n  a helper method to ease inclusion of the partial with a view\"\n"
+  updated.\"\n"
 email:
 - rob@undervale.co.uk
 executables: []
@@ -76,27 +71,26 @@ files:
 homepage: https://github.com/warwickshire/remote_partial
 licenses:
 - MIT-LICENSE
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.1.10
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: RemotePartial adds the facility to grab content from remote sites and add
   them as partials to the host app.
 test_files: