metainspector 1.15.3 → 1.15.4

data/.gitignore

@@ -1,6 +1,8 @@
 *.gem
 .bundle
 .rvmrc
+.ruby-version
+.ruby-gemset
 .rspec
 Gemfile.lock
 pkg/*

data/.travis.yml

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

data/README.md

@@ -11,12 +11,12 @@ You can try MetaInspector live at this little demo: [https://metainspectordemo.h
 Install the gem from RubyGems:
 
     gem install metainspector
-    
+
 If you're using it on a Rails application, just add it to your Gemfile and run `bundle install`
 
     gem 'metainspector'
 
-This gem is tested on Ruby versions 1.8.7, 1.9.2 and 1.9.3.
+This gem is tested on Ruby versions 1.9.2 and 1.9.3.
 
 ## Usage
 
@@ -81,7 +81,7 @@ The original document is accessible from:
 And the full scraped document is accessible from:
 
     page.parsed_document  # Nokogiri doc that you can use it to get any element from the page
-    
+
 ## Options
 
 ### Timeout
@@ -99,7 +99,7 @@ However, you can tell MetaInspector to allow these redirections with the option
 
      # 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)
 
@@ -119,7 +119,7 @@ This is useful when using MetaInspector on web spidering. Although on the initia
     page = MetaInspector.new('http://example.com/image.png', :html_content_only => true)
     page.title         # returns nil
     page.content_type  # "image/png"
-    page.ok?           # false 
+    page.ok?           # false
     page.errors.first  # "Scraping exception: The url provided contains image/png content instead of text/html content"
 
 ## Error handling
@@ -143,28 +143,28 @@ You can find some sample scripts on the samples folder, including a basic scrapi
     $ irb
     >> require 'metainspector'
     => true
-  
+
     >> page = MetaInspector.new('http://markupvalidator.com')
     => #<MetaInspector:0x11330c0 @url="http://markupvalidator.com">
-  
+
     >> page.title
     => "MarkupValidator :: site-wide markup validation tool"
-  
+
     >> page.meta_description
     => "Site-wide markup validation tool. Validate the markup of your whole site with just one click."
-  
+
     >> page.meta_keywords
     => "html, markup, validation, validator, tool, w3c, development, standards, free"
-  
+
     >> page.links.size
     => 15
-  
+
     >> page.links[4]
     => "/plans-and-pricing"
-  
+
     >> page.document.class
     => String
-  
+
     >> page.parsed_document.class
     => Nokogiri::HTML::Document
 

data/lib/meta_inspector/scraper.rb

@@ -234,7 +234,7 @@ module MetaInspector
       if uri =~ /^\w*\:/i
         normalize_url(uri)
       else
-        URI.parse(@url).merge(normalize_url(uri)).to_s
+        Addressable::URI.join(@url, uri).normalize.to_s
       end
     rescue URI::InvalidURIError, Addressable::URI::InvalidURIError => e
       add_fatal_error "Link parsing exception: #{e.message}" and nil
@@ -266,4 +266,4 @@ module MetaInspector
       parsed_document.css("meta[http-equiv='Content-Type']")[0].attributes['content'].value.split(";")[1].split("=")[1] rescue nil
     end
   end
-end
+end

data/lib/meta_inspector/version.rb

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

data/meta_inspector.gemspec

@@ -15,11 +15,11 @@ Gem::Specification.new do |gem|
   gem.version       = MetaInspector::VERSION
 
   gem.add_dependency 'nokogiri', '~> 1.5'
-  gem.add_dependency 'rash', '0.3.2'
+  gem.add_dependency 'rash', '~> 0.4.0'
   gem.add_dependency 'open_uri_redirections', '~> 0.1.0'
-  gem.add_dependency 'addressable', '~> 2.3.2'
+  gem.add_dependency 'addressable', '~> 2.3.4'
 
-  gem.add_development_dependency 'rspec', '2.12.0'
+  gem.add_development_dependency 'rspec', '2.13.0'
   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'

data/spec/fixtures/relative_links.response

@@ -16,5 +16,6 @@ Accept-Ranges: bytes
 <body>
   <p>Relative links</p>
   <a href="about">About</a>
+  <a href="../sitemap">Sitemap</a>
 </body>
-</html>
+</html>

data/spec/metainspector_spec.rb

@@ -234,20 +234,9 @@ describe MetaInspector do
       end
     end
 
-    it "should avoid links that contain invalid links as href value" do
+    it "should not crash with links that have weird href values" do
       m = MetaInspector.new('http://example.com/invalid_href')
-      m.links.should == [ "skype:joeuser?call",
-                          "telnet://telnet.cdrom.com"]
-    end
-
-    it "should store errors when links contain invalid href values" do
-      m = MetaInspector.new('http://example.com/invalid_href')
-
-      expect {
-        links = m.links
-      }.to change { m.errors.size }.from(0).to(1)
-
-      m.errors.first.should == "Link parsing exception: bad URI(is not URI?): %3Cp%3Eftp://ftp.cdrom.com"
+      m.links.should == ["%3Cp%3Eftp://ftp.cdrom.com", "skype:joeuser?call", "telnet://telnet.cdrom.com"]
     end
   end
 
@@ -258,7 +247,7 @@ describe MetaInspector do
       end
 
       it 'should get the relative links' do
-        @m.internal_links.should == ['http://relative.com/about']
+        @m.internal_links.should == ['http://relative.com/about', 'http://relative.com/sitemap']
       end
     end
 
@@ -268,7 +257,7 @@ describe MetaInspector do
       end
 
       it 'should get the relative links' do
-        @m.internal_links.should == ['http://relative.com/about']
+        @m.internal_links.should == ['http://relative.com/about', 'http://relative.com/sitemap']
       end
     end
 
@@ -278,7 +267,7 @@ describe MetaInspector do
       end
 
       it 'should get the relative links' do
-        @m.internal_links.should == ['http://relative.com/company/about']
+        @m.internal_links.should == ['http://relative.com/company/about', 'http://relative.com/sitemap']
       end
     end
   end
@@ -524,4 +513,4 @@ describe MetaInspector do
       good.content_type.should == "text/html"
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metainspector
 version: !ruby/object:Gem::Version
-  version: 1.15.3
+  version: 1.15.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-16 00:00:00.000000000 Z
+date: 2013-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -32,17 +32,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: open_uri_redirections
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.3.2
+        version: 2.3.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.3.2
+        version: 2.3.4
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -82,7 +82,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: 2.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +90,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: 2.13.0
 - !ruby/object:Gem::Dependency
   name: fakeweb
   requirement: !ruby/object:Gem::Requirement
@@ -204,7 +204,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2034097177309150262
+      hash: -4602043206768445405
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -213,7 +213,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2034097177309150262
+      hash: -4602043206768445405
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25