metainspector 1.17.1 → 1.17.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca50a3bad8a3a8f98f2dcdd6c5e5223ef78b8066
-  data.tar.gz: 5e3b651a1fd60fa5a63929a22880f87c28fe515b
+  metadata.gz: 6d1795a40750fba9db895d1ab321f54d94349a38
+  data.tar.gz: 0648ba0471516d9a6e33a9439972619d51580ff7
 SHA512:
-  metadata.gz: 804bba1881a89677070abb29f98b0a516a80390d85a451e47178840093b3f8c98696f41edffe54811a1ffa26dc44d7e1e3448410612750385f2d20f35b1faf61
-  data.tar.gz: 60b8073a5062ea856dcfa38e23913a69dd654f2e4f23ae651912b07b61bc4c27a451bee586e6de29472ef5a786f61d08f33563479c71a185318ed10be1fb93db
+  metadata.gz: a4c8859c52e9f424cf08c72b8f3515dede0f678ac87bcc2331a8e543fa1a839912c0fd85f2b5c56069990cd270dd5db8c2761ac2a3dce6d5929ba906b3692856
+  data.tar.gz: 61217d3d51e81e892f6750f8d24379ea75a80d9e7d07c2408d6c762786e5c088a14996674ed2cb070a5e532c9286e406e55832398c5bb842f4bd51497fcc1674

data/lib/meta_inspector/parser.rb

@@ -121,7 +121,7 @@ module MetaInspector
       unless @data.meta
         @data.meta!.name!
         @data.meta!.property!
-        parsed.xpath("//meta").each do |element|
+        parsed_search("//meta").each do |element|
           get_meta_name_or_property(element)
         end
       end
@@ -139,20 +139,20 @@ module MetaInspector
 
     # Look for the first <p> block with 120 characters or more
     def secondary_description
-      first_long_paragraph = parsed.search('//p[string-length() >= 120]').first
+      first_long_paragraph = parsed_search('//p[string-length() >= 120]').first
       first_long_paragraph ? first_long_paragraph.text : ''
     end
 
     def parsed_links
-      @parsed_links ||= cleanup_nokogiri_values(parsed.search("//a/@href"))
+      @parsed_links ||= cleanup_nokogiri_values(parsed_search("//a/@href"))
     end
 
     def parsed_images
-      @parsed_images ||= cleanup_nokogiri_values(parsed.search('//img/@src'))
+      @parsed_images ||= cleanup_nokogiri_values(parsed_search('//img/@src'))
     end
 
     def parsed_feed(format)
-      feed = parsed.search("//link[@type='application/#{format}+xml']").first
+      feed = parsed_search("//link[@type='application/#{format}+xml']").first
       feed ? URL.absolutify(feed.attributes['href'].value, base_url) : nil
     end
 
@@ -172,12 +172,17 @@ module MetaInspector
 
     # Returns the value of the href attribute on the <base /> tag, if it exists
     def base_href
-      parsed.search('base').first.attributes['href'].value rescue nil
+      parsed_search('base').first.attributes['href'].value rescue nil
     end
 
     # Takes a nokogiri search result, strips the values, rejects the empty ones, and removes duplicates
     def cleanup_nokogiri_values(results)
       results.map { |a| a.value.strip }.reject { |s| s.empty? }.uniq
     end
+
+    # Searches the parsed document for the selector, if the parsed document is searchable
+    def parsed_search(selector)
+      parsed.respond_to?(:search) ? parsed.search(selector) : []
+    end
   end
 end

data/lib/meta_inspector/request.rb

@@ -35,7 +35,7 @@ module MetaInspector
     def response
       Timeout::timeout(@timeout) { @response ||= fetch }
 
-      rescue TimeoutError, SocketError => e
+      rescue TimeoutError, SocketError, RuntimeError => e
         @exception_log << e
         nil
     end

data/lib/meta_inspector/version.rb

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

data/meta_inspector.gemspec

@@ -15,13 +15,13 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = MetaInspector::VERSION
 
-  gem.add_dependency 'nokogiri', '~> 1.5'
+  gem.add_dependency 'nokogiri', '~> 1.6'
   gem.add_dependency 'rash', '~> 0.4.0'
-  gem.add_dependency 'open_uri_redirections', '~> 0.1.0'
-  gem.add_dependency 'addressable', '~> 2.3.4'
+  gem.add_dependency 'open_uri_redirections', '~> 0.1.4'
+  gem.add_dependency 'addressable', '~> 2.3.5'
 
-  gem.add_development_dependency 'rspec', '2.13.0'
+  gem.add_development_dependency 'rspec', '2.14.1'
   gem.add_development_dependency 'fakeweb', '1.3.0'
-  gem.add_development_dependency 'awesome_print', '1.1.0'
-  gem.add_development_dependency 'rake', '~> 10.0.3'
+  gem.add_development_dependency 'awesome_print', '~> 1.2.0'
+  gem.add_development_dependency 'rake', '~> 10.1.0'
 end

data/spec/redirections_spec.rb

@@ -7,20 +7,20 @@ describe MetaInspector do
     describe "safe redirections (HTTP to HTTPS)" do
       it "disallows safe redirections by default" do
         m = MetaInspector.new("http://facebook.com")
-        m.title.should be_nil
+        m.to_hash
         m.should_not be_ok
         m.exceptions.first.message.should == "redirection forbidden: http://facebook.com/ -> https://www.facebook.com/"
       end
 
       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.to_hash
         m.should be_ok
       end
 
       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.to_hash
         m.should be_ok
       end
     end
@@ -28,21 +28,21 @@ describe MetaInspector do
     describe "unsafe redirections (HTTPS to HTTP)" do
       it "disallows unsafe redirections by default" do
         m = MetaInspector.new("https://unsafe-facebook.com")
-        m.title.should be_nil
+        m.to_hash
         m.should_not be_ok
         m.exceptions.first.message.should == "redirection forbidden: https://unsafe-facebook.com/ -> http://unsafe-facebook.com/"
       end
 
       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.to_hash
         m.should_not be_ok
         m.exceptions.first.message.should == "redirection forbidden: https://unsafe-facebook.com/ -> http://unsafe-facebook.com/"
       end
 
       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.to_hash
         m.should be_ok
       end
     end
@@ -50,15 +50,13 @@ describe MetaInspector do
     describe "Redirections should update the base_uri" do
       it "updates the base_uri on safe redirections" do
         m = MetaInspector.new("http://facebook.com", :allow_redirections => :safe) 
-        # Check for the title to make sure the request happens
-        m.title.should == "Hello From Facebook"
+        m.to_hash
         m.url.should == "https://www.facebook.com/"
       end
 
       it "updates the base_uri on all redirections" do
         m = MetaInspector.new("http://facebook.com", :allow_redirections => :all)
-        # Check for the title to make sure the request happens
-        m.title.should == "Hello From Facebook"
+        m.to_hash
 
         m.url.should == "https://www.facebook.com/"
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metainspector
 version: !ruby/object:Gem::Version
-  version: 1.17.1
+  version: 1.17.2
 platform: ruby
 authors:
 - Jaime Iniesta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-19 00:00:00.000000000 Z
+date: 2013-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rash
   requirement: !ruby/object:Gem::Requirement
@@ -44,42 +44,42 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.1.4
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.3.4
+        version: 2.3.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.3.4
+        version: 2.3.5
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: 2.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: 2.14.1
 - !ruby/object:Gem::Dependency
   name: fakeweb
   requirement: !ruby/object:Gem::Requirement
@@ -98,30 +98,30 @@ dependencies:
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 10.0.3
+        version: 10.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 10.0.3
+        version: 10.1.0
 description: MetaInspector lets you scrape a web page and get its title, charset,
   link and meta tags
 email: