open_uri_redirections 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea3e4adff1b7ed0c420f7cbd8e61a8436926c2aa
-  data.tar.gz: d2779b83b92d12f3ec00c7a3b10f16a6277bb43a
+  metadata.gz: dc4b17aba7d8dceb5ba1ddc29af49955c6e91b58
+  data.tar.gz: 236a88b135504f1d26594073b0749f2ff7a3a825
 SHA512:
-  metadata.gz: ae764d193dd401fa0a01bc38f9527088f89be18b43d5a006f1fb411272657c2e7a2cec25b22cd15fc9a9c5d66490714ac998122b9ce0ba972cb417667a7ec9af
-  data.tar.gz: 19c26ce3fc06f9b4a4653a374313b906689bd2d8fc8aa6c5b9b4cfc3e02a03b696a659c9c334324281d8830916720c314485330006530ebf143f4998c4d960cc
+  metadata.gz: fa7c16dfd95c36a7ac291a2b6505eb7f576b8bf0610616352866507bf8fd51b591bbd7eb71475ab9b058db2799c996884a3744ea96619e8b6fa1f71bb90e9a58
+  data.tar.gz: 1b2ea3d8b764a3b16610417f3e55bc4cad8e00dd43d51fc9f3f3976229187f78eba3bd8b814dc040bd6ce11768061db1e53b67c9f146c5d4502ed74f8b35c775

data/LICENSE.txt

@@ -19,4 +19,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -8,7 +8,7 @@ Here is the problem it tries to solve:
 
     $ irb
     1.9.2p320 :001 > require 'open-uri'
-    => true 
+    => true
     1.9.2p320 :002 > open('http://github.com')
     RuntimeError: redirection forbidden: http://github.com -> https://github.com/
 
@@ -16,9 +16,9 @@ And here is how you can use this patch to follow the redirections:
 
     $ irb
     1.9.2p320 :001 > require 'open-uri'
-    => true 
+    => true
     > require 'open_uri_redirections'
-    => true 
+    => true
     1.9.2p320 :002 > open('http://github.com', :allow_redirections => :safe)
     => #<File:/var/folders/...>
 

data/lib/open-uri/redirections_patch.rb

@@ -27,11 +27,8 @@ module OpenURI
   # :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, *rest, &block)
-    mode, _, rest = OpenURI.scan_open_optional_arguments(*rest)
-    options = rest.first if !rest.empty? && Hash === rest.first
+    options = self.first_hash_argument(rest)
 
     allow_redirections = options.delete :allow_redirections if options
     case allow_redirections
@@ -54,4 +51,15 @@ module OpenURI
 
     self.open_uri_original name, *rest, &block
   end
+
+  private
+
+  # OpenURI::open can receive different kinds of arguments, like a string for the mode
+  # or an integer for the permissions, and then a hash with options like UserAgent, etc.
+  #
+  # This method helps us find this options hash, as it is where our :allow_redirections
+  # option will reside.
+  def self.first_hash_argument(arguments)
+    arguments.select {|arg| Hash === arg}.first
+  end
 end

data/lib/open_uri_redirections/version.rb

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

data/spec/redirections_spec.rb

@@ -36,7 +36,7 @@ describe "OpenURI" do
       end
 
       it "should follow safe redirections with block" do
-        expect { |b| 
+        expect { |b|
           open("http://safe.com", :allow_redirections => :safe, &b)
         }.to yield_control
       end
@@ -64,30 +64,36 @@ describe "OpenURI" do
       end
 
       it "should follow safe redirections with block" do
-        expect { |b| 
+        expect { |b|
           open("http://safe.com", :allow_redirections => :all, &b)
         }.to yield_control
       end
 
       it "should follow unsafe redirections with block" do
-        expect { |b| 
+        expect { |b|
           open("https://unsafe.com", :allow_redirections => :all, &b)
         }.to yield_control
       end
     end
 
-    describe "with mode argument" do
+    describe "passing arguments down the stack" do
       it "should disallow HTTP => HTTPS redirections" do
         expect {
-          open("http://safe.com", 'r')
+          open("http://safe.com", 'r', 0444, "User-Agent" => "Mozilla/5.0")
         }.to raise_error(RuntimeError, "redirection forbidden: http://safe.com -> https://safe.com/")
       end
 
       it "should allow HTTP => HTTPS redirections" do
         expect {
-          open("http://safe.com", 'r', :allow_redirections => :safe)
+          open("http://safe.com", 'r', 0444, "User-Agent" => "Mozilla/5.0", :allow_redirections => :safe)
         }.to_not raise_error
       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" })
+
+        open("http://safe.com", 'r', 0444, "User-Agent" => "Mozilla/5.0", :allow_redirections => :safe)
+      end
     end
   end
 end

data/spec/samples/https_unsafe.response

@@ -6,4 +6,4 @@ Content-Length: 178
 Connection: close
 Location: http://unsafe.com/
 
-Redirecting to http://unsafe.com.
+Redirecting to http://unsafe.com.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: open_uri_redirections
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Jaime Iniesta