metainspector 1.12.1 → 1.13.0

data/lib/meta_inspector.rb

@@ -1,7 +1,6 @@
 # -*- encoding: utf-8 -*-
 
 require File.expand_path(File.join(File.dirname(__FILE__), 'meta_inspector/scraper'))
-require File.expand_path(File.join(File.dirname(__FILE__), 'meta_inspector/open_uri'))
 
 module MetaInspector
   extend self

data/lib/meta_inspector/scraper.rb

@@ -1,6 +1,7 @@
 # -*- encoding: utf-8 -*-
 
 require 'open-uri'
+require 'open_uri_redirections'
 require 'nokogiri'
 require 'hashie/rash'
 require 'timeout'

data/lib/meta_inspector/version.rb

@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
 
 module MetaInspector
-  VERSION = "1.12.1"
+  VERSION = "1.13.0"
 end

data/meta_inspector.gemspec

@@ -16,6 +16,7 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency 'nokogiri', '~> 1.5'
   gem.add_dependency 'rash', '0.3.2'
+  gem.add_dependency 'open_uri_redirections', '0.0.1'
 
   gem.add_development_dependency 'rspec', '2.12.0'
   gem.add_development_dependency 'fakeweb', '1.3.0'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: metainspector
 version: !ruby/object:Gem::Version 
-  hash: 37
+  hash: 35
   prerelease: 
   segments: 
   - 1
-  - 12
-  - 1
-  version: 1.12.1
+  - 13
+  - 0
+  version: 1.13.0
 platform: ruby
 authors: 
 - Jaime Iniesta
@@ -49,9 +49,25 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: open_uri_redirections
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 29
+        segments: 
+        - 0
+        - 0
+        - 1
+        version: 0.0.1
+  type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -63,11 +79,11 @@ dependencies:
         - 0
         version: 2.12.0
   type: :development
-  version_requirements: *id003
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: fakeweb
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -79,11 +95,11 @@ dependencies:
         - 0
         version: 1.3.0
   type: :development
-  version_requirements: *id004
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: awesome_print
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -95,11 +111,11 @@ dependencies:
         - 0
         version: 1.1.0
   type: :development
-  version_requirements: *id005
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: rake
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -111,7 +127,7 @@ dependencies:
         - 2
         version: 10.0.2
   type: :development
-  version_requirements: *id006
+  version_requirements: *id007
 description: MetaInspector lets you scrape a web page and get its title, charset, link and meta tags
 email: 
 - jaimeiniesta@gmail.com
@@ -130,7 +146,6 @@ files:
 - README.md
 - Rakefile
 - lib/meta_inspector.rb
-- lib/meta_inspector/open_uri.rb
 - lib/meta_inspector/scraper.rb
 - lib/meta_inspector/version.rb
 - lib/metainspector.rb

data/lib/meta_inspector/open_uri.rb

@@ -1,50 +0,0 @@
-# Patch to allow open-uri to follow safe (http to https) and unsafe redirects (https to http).
-# Original gist URL:
-# https://gist.github.com/1271420
-#
-# Relevant issue:
-# http://redmine.ruby-lang.org/issues/3719
-#
-# Source here:
-# https://github.com/ruby/ruby/blob/trunk/lib/open-uri.rb
-
-module OpenURI
-  class <<self
-    alias_method :open_uri_original, :open_uri
-    alias_method :redirectable_cautious?, :redirectable?
-
-    def redirectable_safe?(uri1, uri2)
-      uri1.scheme.downcase == uri2.scheme.downcase || (uri1.scheme.downcase == "http" && uri2.scheme.downcase == "https")
-    end
-
-    def redirectable_unsafe?(uri1, uri2)
-      !redirectable_safe?(uri1, uri2)
-    end
-  end
-
-  # 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
-
-    if redirectable_unsafe
-      class <<self
-        remove_method :redirectable?
-        alias_method :redirectable?, :redirectable_unsafe?
-      end
-    elsif redirectable_safe
-      class <<self
-        remove_method :redirectable?
-        alias_method :redirectable?, :redirectable_safe?
-      end
-    else
-      class <<self
-        remove_method :redirectable?
-        alias_method :redirectable?, :redirectable_cautious?
-      end
-    end
-
-    self.open_uri_original name, options
-  end
-end