open_uri_redirections 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
----
-SHA1:
-  metadata.gz: 700a295a62e1dcaa24dbb77e2c73cdfb99b25f26
-  data.tar.gz: 9e4e1ce91c9443fbb229ee34b6de90bdc9aba6b5
-SHA512:
-  metadata.gz: 60ceb82cdbded3b4af61108efa78342a8e9971bcebc2a3ddc718769e5abe2b653c846c1759a740c35a633ffab84d54049d95b1890338ef83d0363b2142801567
-  data.tar.gz: d166c07b860618625f4dd0a67aeb251d9cf4f73bbe54642553c56cda007a2d6b3381f31b98342ab4316aa8dda4908373864e01018d58403d63464f1dc2179eef
+--- 
+SHA512: 
+  metadata.gz: 3188333a58a356a9c6453a60c85883c795ba37cc892593b53dd4745d924ad1cd826cc71801feee15f9a6a76eff7474dbbeea9f9eb843936ec5625dd7c097caac
+  data.tar.gz: db5c9b8b959cc73bb0d9dd30c510d372362580dcf4204f3a6f85354b8c1a8a74e9812a6c759bf9ef4c2b7cc2999e57090bc8c0e379e67377e94fa0bf4df2ec91
+SHA1: 
+  metadata.gz: 98bd6a10771e7d458abebd244f18b8ea03a34199
+  data.tar.gz: c9b7c6ca9b4caef0449827d936b7688bc3fae1a1

data/lib/open-uri/redirections_patch.rb

@@ -17,12 +17,7 @@ module OpenURI
     alias_method :redirectable_cautious?, :redirectable?
 
     def redirectable?(uri1, uri2)
-      allow_redirections = Thread.current[:__open_uri_redirections__]
-
-      # clear to prevent leaking (e.g. to block)
-      Thread.current[:__open_uri_redirections__] = nil
-
-      case allow_redirections
+      case Thread.current[:__open_uri_redirections__]
       when :safe
         redirectable_safe? uri1, uri2
       when :all
@@ -51,10 +46,14 @@ module OpenURI
     allow_redirections = options.delete :allow_redirections if options
     Thread.current[:__open_uri_redirections__] = allow_redirections
 
+    block2 = lambda { |io|
+      Thread.current[:__open_uri_redirections__] = nil
+      block[io]
+    }
+
     begin
-      self.open_uri_original name, *rest, &block
+      self.open_uri_original name, *rest, &(block ? block2 : nil)
     ensure
-      # clear (redirectable? might not be called due to an exception)
       Thread.current[:__open_uri_redirections__] = nil
     end
   end

data/lib/open_uri_redirections/version.rb

@@ -1,3 +1,3 @@
 module OpenUriRedirections
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/spec/redirections_spec.rb

@@ -41,6 +41,12 @@ describe "OpenURI" do
         ).to eq("Hello, this is Safe.")
       end
 
+      it "should follow safe double redirections" do
+        expect(
+          open("http://safe2.com", :allow_redirections => :safe).read
+        ).to eq("Hello, this is Safe.")
+      end
+
       it "should follow safe redirections with block" do
         expect { |b|
           open("http://safe.com", :allow_redirections => :safe, &b)
@@ -107,7 +113,7 @@ describe "OpenURI" do
     end
 
     describe "threads" do
-      it "works" do
+      it "seems to work (could be false positive)" do
         allow(OpenURI).to receive(:open_uri_original) { |*a,&b| sleep rand; OpenURI.open_uri_original__ *a, &b }
         ts = []
         Thread.abort_on_exception = true

data/spec/samples/http_safe2.response

@@ -0,0 +1,9 @@
+HTTP/1.1 301 Moved Permanently
+Server: nginx
+Date: Mon, 03 Dec 2012 11:36:17 GMT
+Content-Type: text/html
+Content-Length: 178
+Connection: close
+Location: http://safe.com/
+
+Redirecting to http://safe.com/

data/spec/spec_helper.rb

@@ -15,5 +15,7 @@ $samples_dir = File.dirname(__FILE__) + '/samples'
 FakeWeb.register_uri(:get, "http://safe.com/",    :response => open("#{$samples_dir}/http_safe.response").read)
 FakeWeb.register_uri(:get, "https://safe.com/",   :response => open("#{$samples_dir}/https_safe.response").read)
 
+FakeWeb.register_uri(:get, "http://safe2.com/",   :response => open("#{$samples_dir}/http_safe2.response").read)
+
 FakeWeb.register_uri(:get, "https://unsafe.com/", :response => open("#{$samples_dir}/https_unsafe.response").read)
 FakeWeb.register_uri(:get, "http://unsafe.com/",  :response => open("#{$samples_dir}/http_unsafe.response").read)

metadata

@@ -1,68 +1,60 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: open_uri_redirections
-version: !ruby/object:Gem::Version
-  version: 0.2.0
+version: !ruby/object:Gem::Version 
+  version: 0.2.1
 platform: ruby
-authors:
+authors: 
 - Jaime Iniesta
 - Gabriel Cebrian
 - Felix C. Stegerman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-24 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2014-11-26 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.1.0
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
         version: 3.1.0
-- !ruby/object:Gem::Dependency
-  name: fakeweb
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.3.0
   type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: fakeweb
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
         version: 1.3.0
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 10.3.2
   type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rake
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
         version: 10.3.2
+  type: :development
+  version_requirements: *id003
 description: OpenURI patch to allow redirections between HTTP and HTTPS
-email:
+email: 
 - jaimeiniesta@gmail.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
-- ".gitignore"
-- ".travis.yml"
+
+files: 
+- .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -73,37 +65,41 @@ files:
 - open_uri_redirections.gemspec
 - spec/redirections_spec.rb
 - spec/samples/http_safe.response
+- spec/samples/http_safe2.response
 - spec/samples/http_unsafe.response
 - spec/samples/https_safe.response
 - spec/samples/https_unsafe.response
 - spec/spec_helper.rb
 homepage: https://github.com/jaimeiniesta/open_uri_redirections
-licenses:
+licenses: 
 - MIT
 metadata: {}
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - ">="
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - ">="
-    - !ruby/object:Gem::Version
-      version: '0'
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - &id004 
+    - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - *id004
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: OpenURI patch to allow redirections between HTTP and HTTPS
-test_files:
+test_files: 
 - spec/redirections_spec.rb
 - spec/samples/http_safe.response
+- spec/samples/http_safe2.response
 - spec/samples/http_unsafe.response
 - spec/samples/https_safe.response
 - spec/samples/https_unsafe.response