iconoclasm 1.0.7 → 1.0.8

data/lib/iconoclasm/downloader.rb

@@ -1,9 +1,7 @@
-require 'typhoeus'
-
 module Iconoclasm
   module Downloader
 
-    @@user_agent = 'Mozilla/4.0 (compatible; MSIE 5.5; Windows NT)'
+    @@user_agent = %Q{Mozilla/5.0 (compatible; Iconoclasm/#{Iconoclasm.version}; +http://github.com/sander6/iconoclasm)}
     
     def self.user_agent=(agent)
       @@user_agent = agent
@@ -18,11 +16,25 @@ module Iconoclasm
     end
     
     def get(url)
-      Typhoeus::Request.get(url, :user_agent => user_agent, :follow_location => true, :timeout => Iconoclasm.timeout||=1000)
+      c = curl(url)
+      c.http_get
+      c
     end
     
     def head(url)
-      Typhoeus::Request.head(url, :user_agent => user_agent, :timeout => Iconoclasm.timeout||=1000)
+      c = curl(url)
+      c.http_head
+      c
+    end
+    
+    private
+    
+    def curl(url)
+      Curl::Easy.new(url) do |curl|
+        curl.useragent        = user_agent
+        curl.follow_location  = true
+        curl.timeout          = Iconoclasm.timeout || 1000
+      end
     end
   end
 end

data/lib/iconoclasm/extractor.rb

@@ -33,20 +33,20 @@ module Iconoclasm
         Nokogiri::XML(content)
       else
         response = get(url)
-        Nokogiri::XML(response.body) if response.code == 200
+        Nokogiri::XML(response.body_str) if response.response_code == 200
       end
     end
     
     def extract_favicon_from_naive_guess(base_url)
       naive_url = "#{base_url}/favicon.ico"
       response  = get(naive_url)
-      headers   = Iconoclasm::Headers.new(response.headers)
-      if response.code == 200
+      headers   = Iconoclasm::Headers.new(response.header_str)
+      if response.response_code == 200
         throw(:done, {
           :url            => naive_url,
           :content_length => headers.content_length,
           :content_type   => headers.content_type,
-          :data           => response.body
+          :data           => response.body_str
         })
       end
     end

data/lib/iconoclasm.rb

@@ -1,3 +1,12 @@
+require 'rubygems'
+require 'curb'
+
+module Iconoclasm
+  def self.version
+    "1.0.8"
+  end
+end
+
 $:.unshift(File.dirname(__FILE__))
 require 'iconoclasm/downloader'
 require 'iconoclasm/errors'
@@ -23,4 +32,4 @@ class String
   def lines
     Enumerable::Enumerator.new(self.split("\n"))
   end
-end unless ''.respond_to?(:lines)
+end unless ''.respond_to?(:lines)

data/spec/iconoclasm/downloader_spec.rb

@@ -10,31 +10,45 @@ describe Iconoclasm::Downloader do
   end
   
   describe "GETting a url" do
-    it "should GET the url using Typheous" do
-      Typhoeus::Request.expects(:get).with(@url, instance_of(Hash))
+    it "should GET the url using Curl" do
+      @thing.expects(:curl).with(@url).returns(@curl)
+      @curl.expects(:http_get)
       @thing.get(@url)
-    end
-    
-    it "should set the user agent to the default user agent" do
-      Typhoeus::Request.expects(:get).with(instance_of(String), has_entry(:user_agent => Iconoclasm::Downloader.user_agent))
-      @thing.get(@url)
-    end
-    
-    it "should follow redirects" do
-      Typhoeus::Request.expects(:get).with(instance_of(String), has_entry(:follow_location => true))
-      @thing.get(@url)
-    end
+    end    
   end
   
   describe "HEADing a url" do
-    it "should HEAD the url using Typhoeus" do
-      Typhoeus::Request.expects(:head).with(@url, instance_of(Hash))
+    it "should HEAD the url using Curl" do
+      @thing.expects(:curl).with(@url).returns(@curl)
+      @curl.expects(:http_head)
       @thing.head(@url)
+    end    
+  end
+  
+  describe "building the Curl object" do
+    before do
+      Curl::Easy.expects(:new).with(@url).yields(@curl)
     end
     
     it "should set the user agent to the default user agent" do
-      Typhoeus::Request.expects(:head).with(instance_of(String), has_entry(:user_agent => Iconoclasm::Downloader.user_agent))
-      @thing.head(@url)
+      @curl.stubs(:follow_location=)
+      @curl.stubs(:timeout=)
+      @curl.expects(:useragent=).with(Iconoclasm::Downloader.user_agent)
+      @thing.__send__(:curl, @url)
+    end
+    
+    it "should follow location" do
+      @curl.expects(:follow_location=).with(true)
+      @curl.stubs(:timeout=)
+      @curl.stubs(:useragent=)
+      @thing.__send__(:curl, @url)
+    end
+    
+    it "should set the timeout to 1 second" do
+      @curl.stubs(:follow_location=)
+      @curl.expects(:timeout=).with(1000)
+      @curl.stubs(:useragent=)
+      @thing.__send__(:curl, @url)
     end
   end
 end

data/spec/iconoclasm/extractor_spec.rb

@@ -69,7 +69,7 @@ describe Iconoclasm::Extractor do
     
     describe "when content isn't already provided" do
       before do
-        @response = mock('http response', :code => 200, :body => "")
+        @response = mock('http response', :response_code => 200, :body_str => "")
       end
       
       it "should go get the content" do

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: iconoclasm
 version: !ruby/object:Gem::Version 
-  version: 1.0.7
+  prerelease: false
+  segments: 
+  - 1
+  - 0
+  - 8
+  version: 1.0.8
 platform: ruby
 authors: 
 - Sander Hartlage
@@ -14,24 +19,30 @@ default_executable:
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: addressable
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: typhoeus
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: curb
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id002
 description: Finds favorites icons for web pages on the world wide internets by checking the HTML head or the standard favicon location. Then, do with them what you will.
 email: sander.hartlage@gmail.com
 executables: []
@@ -71,21 +82,25 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Finds favicons and DESTROYS THEM (well, not really, but it will download and save them)