open_uri_redirections 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc4b17aba7d8dceb5ba1ddc29af49955c6e91b58
-  data.tar.gz: 236a88b135504f1d26594073b0749f2ff7a3a825
+  metadata.gz: 700a295a62e1dcaa24dbb77e2c73cdfb99b25f26
+  data.tar.gz: 9e4e1ce91c9443fbb229ee34b6de90bdc9aba6b5
 SHA512:
-  metadata.gz: fa7c16dfd95c36a7ac291a2b6505eb7f576b8bf0610616352866507bf8fd51b591bbd7eb71475ab9b058db2799c996884a3744ea96619e8b6fa1f71bb90e9a58
-  data.tar.gz: 1b2ea3d8b764a3b16610417f3e55bc4cad8e00dd43d51fc9f3f3976229187f78eba3bd8b814dc040bd6ce11768061db1e53b67c9f146c5d4502ed74f8b35c775
+  metadata.gz: 60ceb82cdbded3b4af61108efa78342a8e9971bcebc2a3ddc718769e5abe2b653c846c1759a740c35a633ffab84d54049d95b1890338ef83d0363b2142801567
+  data.tar.gz: d166c07b860618625f4dd0a67aeb251d9cf4f73bbe54642553c56cda007a2d6b3381f31b98342ab4316aa8dda4908373864e01018d58403d63464f1dc2179eef

data/.travis.yml

@@ -1,5 +1,15 @@
+language: ruby
 rvm:
-  - 1.8.7
-  - 1.9.2
-  - 1.9.3
-  - 2.0.0
+- 1.8.7
+- 1.9.2
+- 1.9.3
+- 2.0.0
+- 2.1.0
+- 2.1.1
+- 2.1.2
+- 2.1.3
+- 2.1.4
+- 2.1.5
+- ruby-head
+- rbx-2
+- jruby

data/LICENSE.txt

@@ -1,4 +1,5 @@
-Copyright (c) 2012 Jaime Iniesta
+Copyright (c) 2012-2014 Jaime Iniesta
+Copyright (c) 2014 Felix C. Stegerman
 
 MIT License
 

data/README.md

@@ -2,25 +2,29 @@
 
 This gem applies a patch to OpenURI to optionally allow redirections from HTTP to HTTPS, or from HTTPS to HTTP.
 
-This is based on [this patch](http://bugs.ruby-lang.org/issues/859), and modified to allow redirections in both directions.
+This is based on [this patch](http://bugs.ruby-lang.org/issues/859) and [this gem](https://github.com/obfusk/open_uri_w_redirect_to_https), and modified to allow redirections in both directions.
 
 Here is the problem it tries to solve:
 
-    $ irb
-    1.9.2p320 :001 > require 'open-uri'
-    => true
-    1.9.2p320 :002 > open('http://github.com')
-    RuntimeError: redirection forbidden: http://github.com -> https://github.com/
+```sh
+$ irb
+1.9.2p320 :001 > require 'open-uri'
+=> true
+1.9.2p320 :002 > open('http://github.com')
+RuntimeError: redirection forbidden: http://github.com -> https://github.com/
+```
 
 And here is how you can use this patch to follow the redirections:
 
-    $ irb
-    1.9.2p320 :001 > require 'open-uri'
-    => true
-    > require 'open_uri_redirections'
-    => true
-    1.9.2p320 :002 > open('http://github.com', :allow_redirections => :safe)
-    => #<File:/var/folders/...>
+```sh
+$ irb
+1.9.2p320 :001 > require 'open-uri'
+=> true
+> require 'open_uri_redirections'
+=> true
+1.9.2p320 :002 > open('http://github.com', :allow_redirections => :safe)
+=> #<File:/var/folders/...>
+```
 
 The patch contained in this gem adds the :allow_redirections option to `OpenURI#open`:
 
@@ -35,11 +39,14 @@ Before using this gem, read this:
 [https://gist.github.com/1271420](https://gist.github.com/1271420)
 
 ### Relevant issue:
-[http://redmine.ruby-lang.org/issues/3719](http://redmine.ruby-lang.org/issues/3719)
+[https://bugs.ruby-lang.org/issues/3719](https://bugs.ruby-lang.org/issues/3719)
 
 ### Source here:
 [https://github.com/ruby/ruby/blob/trunk/lib/open-uri.rb](https://github.com/ruby/ruby/blob/trunk/lib/open-uri.rb)
 
+### Thread-safe implementation adapted from this gem:
+[https://github.com/obfusk/open_uri_w_redirect_to_https](https://github.com/obfusk/open_uri_w_redirect_to_https)
+
 Use it at your own risk!
 
 ## Installation
@@ -50,11 +57,15 @@ Add this line to your application's Gemfile:
 
 And then execute:
 
-    $ bundle install
+```sh
+$ bundle install
+```
 
 Or install it yourself as:
 
-    $ gem install open_uri_redirections
+```sh
+$ gem install open_uri_redirections
+```
 
 ## Contributing
 

data/lib/open-uri/redirections_patch.rb

@@ -7,14 +7,33 @@
 #
 # Source here:
 # https://github.com/ruby/ruby/blob/trunk/lib/open-uri.rb
+#
+# Thread-safe implementation adapted from:
+# https://github.com/obfusk/open_uri_w_redirect_to_https
 
 module OpenURI
   class <<self
     alias_method :open_uri_original, :open_uri
     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
+      when :safe
+        redirectable_safe? uri1, uri2
+      when :all
+        redirectable_all? uri1, uri2
+      else
+        redirectable_cautious? uri1, uri2
+      end
+    end
+
     def redirectable_safe?(uri1, uri2)
-      uri1.scheme.downcase == uri2.scheme.downcase || (uri1.scheme.downcase == "http" && uri2.scheme.downcase == "https")
+      redirectable_cautious?(uri1, uri2) || (uri1.scheme.downcase == "http" && uri2.scheme.downcase == "https")
     end
 
     def redirectable_all?(uri1, uri2)
@@ -29,27 +48,15 @@ module OpenURI
   #
   def self.open_uri(name, *rest, &block)
     options = self.first_hash_argument(rest)
-
     allow_redirections = options.delete :allow_redirections if options
-    case allow_redirections
-    when :safe
-      class << self
-        remove_method :redirectable?
-        alias_method  :redirectable?, :redirectable_safe?
-      end
-    when :all
-      class << self
-        remove_method :redirectable?
-        alias_method  :redirectable?, :redirectable_all?
-      end
-    else
-      class << self
-        remove_method :redirectable?
-        alias_method  :redirectable?, :redirectable_cautious?
-      end
-    end
+    Thread.current[:__open_uri_redirections__] = allow_redirections
 
-    self.open_uri_original name, *rest, &block
+    begin
+      self.open_uri_original name, *rest, &block
+    ensure
+      # clear (redirectable? might not be called due to an exception)
+      Thread.current[:__open_uri_redirections__] = nil
+    end
   end
 
   private

data/lib/open_uri_redirections/version.rb

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

data/open_uri_redirections.gemspec

@@ -6,7 +6,7 @@ require 'open_uri_redirections/version'
 Gem::Specification.new do |gem|
   gem.name          = "open_uri_redirections"
   gem.version       = OpenUriRedirections::VERSION
-  gem.authors       = ["Jaime Iniesta", "Gabriel Cebrian"]
+  gem.authors       = ["Jaime Iniesta", "Gabriel Cebrian", "Felix C. Stegerman"]
   gem.email         = ["jaimeiniesta@gmail.com"]
   gem.description   = %q{OpenURI patch to allow redirections between HTTP and HTTPS}
   gem.summary       = %q{OpenURI patch to allow redirections between HTTP and HTTPS}
@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(spec)/})
   gem.require_paths = ["lib"]
 
-  gem.add_development_dependency 'rspec',   '~> 2.13.0'
+  gem.add_development_dependency 'rspec',   '~> 3.1.0'
   gem.add_development_dependency 'fakeweb', '~> 1.3.0'
-  gem.add_development_dependency 'rake',    '~> 10.0.3'
+  gem.add_development_dependency 'rake',    '~> 10.3.2'
 end

data/spec/redirections_spec.rb

@@ -2,6 +2,10 @@
 
 require File.join(File.dirname(__FILE__), "/spec_helper")
 
+class << OpenURI
+  alias_method :open_uri_original__, :open_uri_original
+end
+
 describe "OpenURI" do
   describe "#open" do
     describe "Default settings" do
@@ -32,7 +36,9 @@ describe "OpenURI" do
       end
 
       it "should follow safe redirections" do
-        open("http://safe.com", :allow_redirections => :safe).read.should == "Hello, this is Safe."
+        expect(
+          open("http://safe.com", :allow_redirections => :safe).read
+        ).to eq("Hello, this is Safe.")
       end
 
       it "should follow safe redirections with block" do
@@ -56,11 +62,15 @@ describe "OpenURI" do
       end
 
       it "should follow safe redirections" do
-        open("http://safe.com", :allow_redirections => :all).read.should == "Hello, this is Safe."
+        expect(
+          open("http://safe.com", :allow_redirections => :all).read
+        ).to eq("Hello, this is Safe.")
       end
 
       it "should follow unsafe redirections" do
-        open("https://unsafe.com", :allow_redirections => :all).read.should == "Hello, this is Unsafe."
+        expect(
+          open("https://unsafe.com", :allow_redirections => :all).read
+        ).to eq("Hello, this is Unsafe.")
       end
 
       it "should follow safe redirections with block" do
@@ -90,10 +100,44 @@ describe "OpenURI" do
       end
 
       it "should pass the arguments down the stack" do
-        OpenURI.should_receive(:open_uri_original).with(an_instance_of(URI::HTTP), "r", 0444, { "User-Agent" => "Mozilla/5.0" })
+        expect(OpenURI).to receive(:open_uri_original).with(an_instance_of(URI::HTTP), "r", 0444, { "User-Agent" => "Mozilla/5.0" })
 
         open("http://safe.com", 'r', 0444, "User-Agent" => "Mozilla/5.0", :allow_redirections => :safe)
       end
     end
+
+    describe "threads" do
+      it "works" do
+        allow(OpenURI).to receive(:open_uri_original) { |*a,&b| sleep rand; OpenURI.open_uri_original__ *a, &b }
+        ts = []
+        Thread.abort_on_exception = true
+        begin
+          100.times {
+            ts << Thread.new {
+              expect {
+                open("http://safe.com")
+              }.to raise_error(RuntimeError, "redirection forbidden: http://safe.com -> https://safe.com/")
+            }
+            ts << Thread.new {
+              expect {
+                open("http://safe.com", :allow_redirections => :safe)
+              }.to_not raise_error
+            }
+            ts << Thread.new {
+              expect {
+                open("https://unsafe.com")
+              }.to raise_error(RuntimeError, "redirection forbidden: https://unsafe.com -> http://unsafe.com/")
+            }
+            ts << Thread.new {
+              expect {
+                open("https://unsafe.com", :allow_redirections => :safe)
+              }.to raise_error(RuntimeError, "redirection forbidden: https://unsafe.com -> http://unsafe.com/")
+            }
+          }
+        ensure
+          ts.each(&:join)
+        end
+      end
+    end
   end
 end

metadata

@@ -1,58 +1,59 @@
 --- !ruby/object:Gem::Specification
 name: open_uri_redirections
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - Jaime Iniesta
 - Gabriel Cebrian
+- Felix C. Stegerman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-19 00:00:00.000000000 Z
+date: 2014-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: 3.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        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
   prerelease: false
   version_requirements: !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.0.3
+        version: 10.3.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.0.3
+        version: 10.3.2
 description: OpenURI patch to allow redirections between HTTP and HTTPS
 email:
 - jaimeiniesta@gmail.com
@@ -60,8 +61,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -86,17 +87,17 @@ 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'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: OpenURI patch to allow redirections between HTTP and HTTPS