metainspector 1.14.0 → 1.15.0

data/README.md

@@ -93,13 +93,15 @@ You can set a different timeout with a second parameter, like this:
 
 ### Redirections
 
-MetaInspector allows safe redirects from http to https (for example, [http://github.com](http://github.com) => [https://github.com](https://github.com)) by default. With the option `:allow_safe_redirections => false`, it will throw exceptions on such redirects.
+By default, redirections from HTTP to HTTPS, and from HTTPS to HTTP are disallowed.
 
-    page = MetaInspector.new('facebook.com', :allow_safe_redirections => false)
+However, you can tell MetaInspector to allow these redirections with the option `:allow_redirections`, like this:
 
-To enable unsafe redirects from https to http (like, [https://example.com](https://example.com) => [http://example.com](http://example.com)) you can pass the option `:allow_unsafe_redirections => true`. If this option is not specified or is false an exception is thrown on such redirects.
-
-    page = MetaInspector.new('facebook.com', :allow_unsafe_redirections => true)
+     # This will allow HTTP => HTTPS redirections
+     page = MetaInspector.new('facebook.com', :allow_redirections => :safe)
+     
+     # And this will allow HTTP => HTTPS ("safe") and HTTPS => HTTP ("unsafe") redirections
+     page = MetaInspector.new('facebook.com', :allow_redirections => :all)
 
 ### HTML Content Only
 

data/lib/meta_inspector/scraper.rb

@@ -10,14 +10,13 @@ require 'timeout'
 module MetaInspector
   class Scraper
     attr_reader :url, :scheme, :host, :root_url, :errors, :content_type, :timeout, :html_content_only
-    attr_reader :allow_safe_redirections, :allow_unsafe_redirections, :verbose
+    attr_reader :allow_redirections, :verbose
 
     # Initializes a new instance of MetaInspector, setting the URL to the one given
     # Options:
     # => timeout: defaults to 20 seconds
     # => html_content_type_only: if an exception should be raised if request content-type is not text/html. Defaults to false
-    # => allow_safe_redirections: if redirects from http to https sites on the same domain should be allowed or not
-    # => allow_unsafe_redirections: if redirects from https to http sites on the same domain should be allowed or not
+    # => allow_redirections: when :safe, allows HTTP => HTTPS redirections. When :all, it also allows HTTPS => HTTP
     # => document: the html of the url as a string
     # => verbose: if the errors should be logged to the screen
     def initialize(url, options = {})
@@ -30,11 +29,10 @@ module MetaInspector
       @timeout  = options[:timeout]
       @data     = Hashie::Rash.new
       @errors   = []
-      @html_content_only          = options[:html_content_only]
-      @allow_safe_redirections    = options[:allow_safe_redirections]
-      @allow_unsafe_redirections  = options[:allow_unsafe_redirections]
-      @verbose                    = options[:verbose]
-      @document                   = options[:document]
+      @html_content_only  = options[:html_content_only]
+      @allow_redirections = options[:allow_redirections]
+      @verbose            = options[:verbose]
+      @document           = options[:document]
     end
 
     # Returns the parsed document title, from the content of the <title> tag.
@@ -139,8 +137,6 @@ module MetaInspector
       {
         :timeout                    => 20,
         :html_content_only          => false,
-        :allow_safe_redirections    => true,
-        :allow_unsafe_redirections  => false,
         :verbose                    => false
       }
     end
@@ -167,7 +163,7 @@ module MetaInspector
 
     # Makes the request to the server
     def request
-      Timeout::timeout(timeout) { @request ||= open(url, {:allow_safe_redirections => allow_safe_redirections, :allow_unsafe_redirections => allow_unsafe_redirections}) }
+      Timeout::timeout(timeout) { @request ||= open(url, {:allow_redirections => allow_redirections}) }
 
       rescue TimeoutError
         add_fatal_error 'Timeout!!!'

data/lib/meta_inspector/version.rb

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

data/meta_inspector.gemspec

@@ -16,7 +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_dependency 'open_uri_redirections', '~> 0.1.0'
 
   gem.add_development_dependency 'rspec', '2.12.0'
   gem.add_development_dependency 'fakeweb', '1.3.0'

data/spec/redirections_spec.rb

@@ -5,23 +5,23 @@ require File.join(File.dirname(__FILE__), "/spec_helper")
 describe MetaInspector do
   describe "redirections" do
     describe "safe redirections (HTTP to HTTPS)" do
-      it "allows safe redirections by default" do
+      it "disallows safe redirections by default" do
         m = MetaInspector.new("http://facebook.com")
-        m.title.should == "Hello From Facebook"
-        m.should be_ok
+        m.title.should be_nil
+        m.should_not be_ok
+        m.errors.first.should == "Scraping exception: redirection forbidden: http://facebook.com -> https://www.facebook.com/"
       end
 
-      it "allows safe redirections when specifically set to true" do
-        m = MetaInspector.new("http://facebook.com", :allow_safe_redirections => true)
+      it "allows safe redirections when :allow_redirections => :safe" do
+        m = MetaInspector.new("http://facebook.com", :allow_redirections => :safe)
         m.title.should == "Hello From Facebook"
         m.should be_ok
       end
 
-      it "disallows safe redirections if set to false" do
-        m = MetaInspector.new("http://facebook.com", :allow_safe_redirections => false)
-        m.title.should be_nil
-        m.should_not be_ok
-        m.errors.first.should == "Scraping exception: redirection forbidden: http://facebook.com -> https://www.facebook.com/"
+      it "allows safe redirections when :allow_redirections => :all" do
+        m = MetaInspector.new("http://facebook.com", :allow_redirections => :all)
+        m.title.should == "Hello From Facebook"
+        m.should be_ok
       end
     end
 
@@ -33,15 +33,15 @@ describe MetaInspector do
         m.errors.first.should == "Scraping exception: redirection forbidden: https://unsafe-facebook.com -> http://unsafe-facebook.com/"
       end
 
-      it "disallows unsafe redirections when specifically set to false" do
-        m = MetaInspector.new("https://unsafe-facebook.com", :allow_unsafe_redirections => false)
+      it "disallows unsafe redirections when :allow_redirections => :safe" do
+        m = MetaInspector.new("https://unsafe-facebook.com", :allow_redirections => :safe)
         m.title.should be_nil
         m.should_not be_ok
         m.errors.first.should == "Scraping exception: redirection forbidden: https://unsafe-facebook.com -> http://unsafe-facebook.com/"
       end
 
-      it "allows unsafe redirections if set to true" do
-        m = MetaInspector.new("https://unsafe-facebook.com", :allow_unsafe_redirections => true)
+      it "allows unsafe redirections when :allow_redirections => :all" do
+        m = MetaInspector.new("https://unsafe-facebook.com", :allow_redirections => :all)
         m.title.should == "Hello From Unsafe Facebook"
         m.should be_ok
       end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: metainspector
 version: !ruby/object:Gem::Version 
-  hash: 47
+  hash: 43
   prerelease: 
   segments: 
   - 1
-  - 14
+  - 15
   - 0
-  version: 1.14.0
+  version: 1.15.0
 platform: ruby
 authors: 
 - Jaime Iniesta
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-01-14 00:00:00 Z
+date: 2013-01-19 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: nokogiri
@@ -54,14 +54,14 @@ dependencies:
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 29
+        hash: 27
         segments: 
         - 0
-        - 0
         - 1
-        version: 0.0.1
+        - 0
+        version: 0.1.0
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency