open_uri_redirections 0.0.1 → 0.1.0

data/.travis.yml

@@ -0,0 +1,4 @@
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3

data/README.md

@@ -1,7 +1,9 @@
-# OpenUriRedirections
+# OpenUriRedirections [![Build Status](https://secure.travis-ci.org/jaimeiniesta/open_uri_redirections.png)](http://travis-ci.org/jaimeiniesta/open_uri_redirections) [![Dependency Status](https://gemnasium.com/jaimeiniesta/open_uri_redirections.png)](https://gemnasium.com/jaimeiniesta/open_uri_redirections)
 
 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.
+
 Here is the problem it tries to solve:
 
     $ irb
@@ -17,13 +19,13 @@ And here is how you can use this patch to follow the redirections:
     => true 
     > require 'open_uri_redirections'
     => true 
-    1.9.2p320 :002 > open('http://github.com', :allow_safe_redirections => true)
+    1.9.2p320 :002 > open('http://github.com', :allow_redirections => :safe)
     => #<File:/var/folders/...>
 
-The patch contained in this gem adds two options to `OpenURI#open`:
+The patch contained in this gem adds the :allow_redirections option to `OpenURI#open`:
 
-* `:allow_safe_redirections` When set to true, it will allow HTTP => HTTPS redirections.
-* `:allow_unsafe_redirections` When set to true, it will allow HTTPS => HTTP redirections.
+* `:allow_redirections => :safe` will allow HTTP => HTTPS redirections.
+* `:allow_redirections => :all`  will allow HTTP => HTTPS redirections and HTTPS => HTTP redirections.
 
 ## Understand what you're doing
 
@@ -48,7 +50,7 @@ Add this line to your application's Gemfile:
 
 And then execute:
 
-    $ bundle
+    $ bundle install
 
 Or install it yourself as:
 

data/Rakefile

@@ -1 +1,7 @@
-require "bundler/gem_tasks"
+require 'bundler'
+require 'rspec/core/rake_task'
+
+Bundler::GemHelper.install_tasks
+RSpec::Core::RakeTask.new :spec
+
+task :default  => :spec

data/lib/open-uri/redirections_patch.rb

@@ -17,31 +17,36 @@ module OpenURI
       uri1.scheme.downcase == uri2.scheme.downcase || (uri1.scheme.downcase == "http" && uri2.scheme.downcase == "https")
     end
 
-    def redirectable_unsafe?(uri1, uri2)
-      !redirectable_safe?(uri1, uri2)
+    def redirectable_all?(uri1, uri2)
+      redirectable_safe?(uri1, uri2) || (uri1.scheme.downcase == "https" && uri2.scheme.downcase == "http")
     end
   end
 
+  # Patches the original open_uri method to accept the :allow_redirections option
+  #
+  # :allow_redirections => :safe will allow HTTP => HTTPS redirections.
+  # :allow_redirections => :all  will allow HTTP => HTTPS and HTTPS => HTTP redirections.
+  #
   # The original open_uri takes *args but then doesn't do anything with them.
   # Assume we can only handle a hash.
   def self.open_uri(name, options = {})
-    redirectable_unsafe = options.delete :allow_unsafe_redirections
-    redirectable_safe   = options.delete :allow_safe_redirections
+    allow_redirections = options.delete :allow_redirections
 
-    if redirectable_unsafe
+    case allow_redirections
+    when :safe
       class <<self
         remove_method :redirectable?
-        alias_method :redirectable?, :redirectable_unsafe?
+        alias_method  :redirectable?, :redirectable_safe?
       end
-    elsif redirectable_safe
+    when :all
       class <<self
         remove_method :redirectable?
-        alias_method :redirectable?, :redirectable_safe?
+        alias_method  :redirectable?, :redirectable_all?
       end
     else
       class <<self
         remove_method :redirectable?
-        alias_method :redirectable?, :redirectable_cautious?
+        alias_method  :redirectable?, :redirectable_cautious?
       end
     end
 

data/lib/open_uri_redirections/version.rb

@@ -1,3 +1,3 @@
 module OpenUriRedirections
-  VERSION = "0.0.1"
+  VERSION = "0.1.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 Cebrián"]
+  gem.authors       = ["Jaime Iniesta", "Gabriel Cebrian"]
   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}
@@ -16,6 +16,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(spec)/})
   gem.require_paths = ["lib"]
 
-  gem.add_development_dependency 'rspec', '2.12.0'
-  gem.add_development_dependency 'fakeweb', '1.3.0'
+  gem.add_development_dependency 'rspec',   '~> 2.12.0'
+  gem.add_development_dependency 'fakeweb', '~> 1.3.0'
+  gem.add_development_dependency 'rake',    '~> 10.0.3'
 end

data/spec/redirections_spec.rb

@@ -4,51 +4,57 @@ require File.join(File.dirname(__FILE__), "/spec_helper")
 
 describe "OpenURI" do
   describe "#open" do
-    describe ":allow_safe_redirections" do
-      it "should allow HTTP => HTTPS redirections when true" do
+    describe "Default settings" do
+      it "should disallow HTTP => HTTPS redirections" do
         expect {
-          open("http://safe.com", :allow_safe_redirections => true)
-        }.to_not raise_error
+          open("http://safe.com")
+        }.to raise_error(RuntimeError, "redirection forbidden: http://safe.com -> https://safe.com/")
       end
 
-      it "should disallow HTTP => HTTPS redirections when false" do
+      it "should disallow HTTPS => HTTP redirections" do
         expect {
-          open("http://safe.com", :allow_safe_redirections => false)
-        }.to raise_error(RuntimeError, "redirection forbidden: http://safe.com -> https://safe.com/")
+          open("https://unsafe.com")
+        }.to raise_error(RuntimeError, "redirection forbidden: https://unsafe.com -> http://unsafe.com/")
       end
+    end
 
-      it "should disallow HTTP => HTTPS redirections by default" do
+    describe ":allow_redirections => :safe" do
+      it "should allow HTTP => HTTPS redirections" do
         expect {
-          open("http://safe.com")
-        }.to raise_error(RuntimeError, "redirection forbidden: http://safe.com -> https://safe.com/")
+          open("http://safe.com", :allow_redirections => :safe)
+        }.to_not raise_error
       end
 
-      it "should follow safe redirection when true" do
-        open("http://safe.com", :allow_safe_redirections => true).read.should == "Hello, this is Safe."
+      it "should disallow HTTPS => HTTP redirections" do
+        expect {
+          open("https://unsafe.com", :allow_redirections => :safe)
+        }.to raise_error(RuntimeError, "redirection forbidden: https://unsafe.com -> http://unsafe.com/")
+      end
+
+      it "should follow safe redirections" do
+        open("http://safe.com", :allow_redirections => :safe).read.should == "Hello, this is Safe."
       end
     end
 
-    describe ":allow_unsafe_redirections" do
-      it "should allow HTTPS => HTTP redirections when true" do
+    describe ":allow_redirections => :all" do
+      it "should allow HTTP => HTTPS redirections" do
         expect {
-          open("https://unsafe.com", :allow_unsafe_redirections => true)
+          open("http://safe.com", :allow_redirections => :all)
         }.to_not raise_error
       end
 
-      it "should disallow HTTPS => HTTP redirections when false" do
+      it "should allow HTTPS => HTTP redirections" do
         expect {
-          open("https://unsafe.com", :allow_unsafe_redirections => false)
-        }.to raise_error(RuntimeError, "redirection forbidden: https://unsafe.com -> http://unsafe.com/")
+          open("https://unsafe.com", :allow_redirections => :all)
+        }.to_not raise_error
       end
 
-      it "should disallow HTTPS => HTTP redirections by default" do
-        expect {
-          open("https://unsafe.com")
-        }.to raise_error(RuntimeError, "redirection forbidden: https://unsafe.com -> http://unsafe.com/")
+      it "should follow safe redirections" do
+        open("http://safe.com", :allow_redirections => :all).read.should == "Hello, this is Safe."
       end
 
-      it "should follow unsafe redirection when true" do
-        open("https://unsafe.com", :allow_unsafe_redirections => true).read.should == "Hello, this is Unsafe."
+      it "should follow unsafe redirections" do
+        open("https://unsafe.com", :allow_redirections => :all).read.should == "Hello, this is Unsafe."
       end
     end
   end

metadata

@@ -1,22 +1,22 @@
 --- !ruby/object:Gem::Specification 
 name: open_uri_redirections
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
-  - 0
   - 1
-  version: 0.0.1
+  - 0
+  version: 0.1.0
 platform: ruby
 authors: 
 - Jaime Iniesta
-- "Gabriel Cebri\xC3\xA1n"
+- Gabriel Cebrian
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2012-12-03 00:00:00 Z
+date: 2013-01-19 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -24,7 +24,7 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: 63
         segments: 
@@ -40,7 +40,7 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: 27
         segments: 
@@ -50,6 +50,22 @@ dependencies:
         version: 1.3.0
   type: :development
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 73
+        segments: 
+        - 10
+        - 0
+        - 3
+        version: 10.0.3
+  type: :development
+  version_requirements: *id003
 description: OpenURI patch to allow redirections between HTTP and HTTPS
 email: 
 - jaimeiniesta@gmail.com
@@ -61,6 +77,7 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md