www-favicon 0.0.5 → 0.0.6

data/Rakefile

@@ -58,6 +58,8 @@ spec = Gem::Specification.new do |s|
 	s.test_files        = Dir["test/test_*.rb"]
 
 	s.add_dependency('hpricot', '>= 0')
+	s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
+	s.add_development_dependency(%q<fakeweb>, [">= 1.2.7"])
 	#s.required_ruby_version = '>= 1.8.2'
 
 	s.files = %w(README.rdoc ChangeLog Rakefile) +
@@ -103,3 +105,15 @@ desc 'Show information about the gem.'
 task :debug_gem do
   puts spec.to_ruby
 end
+
+desc 'Test against the provided URL'
+task :try do
+  url = ENV['URL']
+  raise "URL is required." unless url
+
+  require 'rubygems'
+  require 'www/favicon'
+
+  favicon_url = WWW::Favicon.new.find(url)
+  puts "Favicon URL for #{url} is #{favicon_url.inspect}"
+end

data/lib/www/favicon.rb

@@ -5,11 +5,11 @@ require 'hpricot'
 
 module WWW
   class Favicon
-    VERSION = '0.0.5'
+    VERSION = '0.0.6'
 
     def find(url)
-      html = request(url).body
-      find_from_html(html, url)
+      response = request(url)
+      find_from_html(response.body, response.request_url)
     end
 
     def find_from_html(html, url)
@@ -20,20 +20,14 @@ module WWW
       favicon_url
     end
 
-    def valid_favicon_url?(url, limit = 10)
-      return false if limit == 0
-
+    def valid_favicon_url?(url)
       response = request(url)
 
-      if response.kind_of?(Net::HTTPRedirection)
-        valid_favicon_url?(response['Location'], limit - 1)
-      else
-        (
-          response.code =~ /\A2/ &&
-          response.body.to_s != '' &&
-          response.content_type =~ /image/i
-          ) ? true : false
-      end
+      (
+        response.code =~ /\A2/ &&
+        response.body.to_s != '' &&
+        response.content_type =~ /image/i
+      ) ? true : false
     end
 
     private
@@ -66,7 +60,10 @@ module WWW
       uri.to_s
     end
 
-    def request(url, method = 'get')
+    def request(url, options = {})
+      method = options[:method] || :get
+      redirection_limit = options[:redirection_limit] || 10
+
       uri = URI(url)
       http = Net::HTTP.new(uri.host, uri.port)
 
@@ -75,12 +72,20 @@ module WWW
         http.verify_mode = OpenSSL::SSL::VERIFY_NONE
       end
 
-      http.start do |http|
+      response = http.start do |http|
         path =
           (uri.path.empty? ? '/' : uri.path) +
           (uri.query       ? '?' + uri.query : '') +
           (uri.fragment    ? '#' + uri.fragment : '')
-        response = http.send(method, path)
+        http.send(method, path)
+      end
+
+      if response.kind_of?(Net::HTTPRedirection) && redirection_limit > 0
+        request(response['Location'], :redirection_limit => redirection_limit - 1)
+      else
+        response.instance_variable_set('@request_url', url)
+        def response.request_url; @request_url; end
+        response
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: www-favicon
 version: !ruby/object:Gem::Version 
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors: 
 - youpy
@@ -9,7 +9,7 @@ autorequire: ""
 bindir: bin
 cert_chain: []
 
-date: 2009-11-07 00:00:00 +09:00
+date: 2009-11-16 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,6 +22,26 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.2.9
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: fakeweb
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.2.7
+    version: 
 description: find favicon url
 email: youpy@buycheapviagraonlinenow.com
 executables: []