plumnailer 0.1.0 → 0.1.1

data/Rakefile

@@ -7,11 +7,18 @@ begin
     gemspec.email = 'matthewm@boedicker.org'
     gemspec.homepage = 'http://github.com/mmb/plumnailer'
     gemspec.authors = ['Matthew M. Boedicker']
+    gemspec.license = 'MIT'
 
     %w{
+      net-http-persistent ~> 1.0
       nokogiri >= 1.4.3.1
       rmagick >= 1.15.14
       }.each_slice(3) { |g,o,v| gemspec.add_dependency(g, "#{o} #{v}") }
+    %w{
+      sinatra >= 1.1.0
+      }.each_slice(3) do |g,o,v|
+      gemspec.add_development_dependency(g, "#{o} #{v}")
+    end
   end
 rescue LoadError
   puts "Jeweler not available. Install it with: gem install jeweler"

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/lib/plumnailer/fetcher.rb

@@ -1,17 +1,37 @@
-require 'open-uri'
+require 'net/http/persistent'
 
 module Plumnailer
 
   # Fetch the contents of a url.
   class Fetcher
 
+    # User agent to send with requests.
     UserAgent = 'plumnailer (http://github.com/mmb/plumnailer)'
 
+    # Follow this many chained HTTP redirects at most.
+    RedirectLimit = 3
+
     # Fetch the contents of a url.
-    def fetch(url)
+    #
+    # * url - url to fetch, can be string or URI
+    # * orig_url - passed in from redirects
+    # * redirect_count - the number of redirects so far
+    def fetch(url, orig_url=nil, redirect_count=0)
+      if redirect_count > RedirectLimit
+        raise ArgumentError,
+          "too many redirects (#{redirect_count}) for #{orig_url}"
+      end
+
       uri = url.is_a?(URI) ? url : URI(url)
       if uri.is_a?(URI::HTTP)
-        open(uri, 'User-Agent' => UserAgent) { |f| f.read }
+        http = Net::HTTP::Persistent.new('plumnailer')
+        resp = http.request(uri)
+        case resp
+          when Net::HTTPSuccess; resp.body
+          when Net::HTTPRedirection; fetch(resp['location'], orig_url || url,
+            redirect_count + 1)
+          else resp.error!
+        end
       end
     end
 

data/lib/plumnailer/img_parser.rb

@@ -28,12 +28,14 @@ module Plumnailer
     # Fetch image data from a url, load into Magick::ImageList and set some
     # additional fields.
     def parse_one(img_url)
-      img_data = fetcher.fetch(img_url)
-      unless not img_data or img_data.empty?
+      begin
+        img_data = fetcher.fetch(img_url)
         img = Magick::ImageList.new.from_blob(img_data).extend(
           Plumnailer::WebImage)
         img.source_url = img_url
         img
+      rescue Exception
+        nil
       end
     end
 

data/plumnailer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{plumnailer}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matthew M. Boedicker"]
-  s.date = %q{2010-11-21}
+  s.date = %q{2010-12-08}
   s.description = %q{Choose the most representative image on an HTML page for use as a thumbnail}
   s.email = %q{matthewm@boedicker.org}
   s.extra_rdoc_files = [
@@ -34,6 +34,7 @@ Gem::Specification.new do |s|
     "test.rb"
   ]
   s.homepage = %q{http://github.com/mmb/plumnailer}
+  s.licenses = ["MIT"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Choose the most representative image on an HTML page}
@@ -43,15 +44,21 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<net-http-persistent>, ["~> 1.0"])
       s.add_runtime_dependency(%q<nokogiri>, [">= 1.4.3.1"])
       s.add_runtime_dependency(%q<rmagick>, [">= 1.15.14"])
+      s.add_development_dependency(%q<sinatra>, [">= 1.1.0"])
     else
+      s.add_dependency(%q<net-http-persistent>, ["~> 1.0"])
       s.add_dependency(%q<nokogiri>, [">= 1.4.3.1"])
       s.add_dependency(%q<rmagick>, [">= 1.15.14"])
+      s.add_dependency(%q<sinatra>, [">= 1.1.0"])
     end
   else
+    s.add_dependency(%q<net-http-persistent>, ["~> 1.0"])
     s.add_dependency(%q<nokogiri>, [">= 1.4.3.1"])
     s.add_dependency(%q<rmagick>, [">= 1.15.14"])
+    s.add_dependency(%q<sinatra>, [">= 1.1.0"])
   end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: plumnailer
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Matthew M. Boedicker
@@ -15,13 +15,28 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-21 00:00:00 -05:00
+date: 2010-12-08 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: nokogiri
+  name: net-http-persistent
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 0
+        version: "1.0"
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: nokogiri
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -34,11 +49,11 @@ dependencies:
         - 1
         version: 1.4.3.1
   type: :runtime
-  version_requirements: *id001
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rmagick
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -50,7 +65,23 @@ dependencies:
         - 14
         version: 1.15.14
   type: :runtime
-  version_requirements: *id002
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: sinatra
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 1
+        - 1
+        - 0
+        version: 1.1.0
+  type: :development
+  version_requirements: *id004
 description: Choose the most representative image on an HTML page for use as a thumbnail
 email: matthewm@boedicker.org
 executables: []
@@ -78,8 +109,8 @@ files:
 - test.rb
 has_rdoc: true
 homepage: http://github.com/mmb/plumnailer
-licenses: []
-
+licenses: 
+- MIT
 post_install_message: 
 rdoc_options: []