feedzirra 0.0.24 → 0.0.30

data/.rspec

@@ -0,0 +1 @@
+--color

data/README.rdoc

@@ -0,0 +1,207 @@
+== Feedzirra
+
+I'd like feedback on the api and any bugs encountered on feeds in the wild. I've set up a {google group here}[http://groups.google.com/group/feedzirra].
+
+=== Description
+
+Feedzirra is a feed library that is designed to get and update many feeds as quickly as possible. This includes using libcurl-multi through the taf2-curb[link:http://github.com/taf2/curb/tree/master] gem for faster http gets, and libxml through nokogiri[link:http://github.com/tenderlove/nokogiri/tree/master] and sax-machine[link:http://github.com/pauldix/sax-machine/tree/master] for faster parsing.
+
+Once you have fetched feeds using Feedzirra, they can be updated using the feed objects. Feedzirra automatically inserts etag and last-modified information from the http response headers to lower bandwidth usage, eliminate unnecessary parsing, and make things speedier in general.
+
+Another feature present in Feedzirra is the ability to create callback functions that get called "on success" and "on failure" when getting a feed. This makes it easy to do things like log errors or update data stores.
+
+The fetching and parsing logic have been decoupled so that either of them can be used in isolation if you'd prefer not to use everything that Feedzirra offers. However, the code examples below use helper methods in the Feed class that put everything together to make things as simple as possible.
+
+The final feature of Feedzirra is the ability to define custom parsing classes. In truth, Feedzirra could be used to parse much more than feeds. Microformats, page scraping, and almost anything else are fair game.
+
+=== Installation
+
+For now Feedzirra exists only on github. It also has a few gem requirements that are only on github. Before you start you need to have libcurl[link:http://curl.haxx.se/] and libxml[link:http://xmlsoft.org/] installed. If you're on Leopard you have both. Otherwise, you'll need to grab them. Once you've got those libraries, these are the gems that get used: nokogiri, pauldix-sax-machine, taf2-curb (note that this is a fork that lives on github and not the Ruby Forge version of curb), and pauldix-feedzirra. The feedzirra gemspec has all the dependencies so you should be able to get up and running with the standard github gem install routine:
+
+    gem sources -a http://gems.github.com # if you haven't already
+    gem install pauldix-feedzirra
+
+*NOTE:*Some people have been reporting a few issues related to installation. First, the Ruby Forge version of curb is not what you want. It will not work. Nor will the curl-multi gem that lives on Ruby Forge. You have to get the taf2-curb[link:http://github.com/taf2/curb/tree/master] fork installed.
+
+If you see this error when doing a require: 
+
+    /Library/Ruby/Site/1.8/rubygems/custom_require.rb:31:in `gem_original_require': no such file to load -- curb_core (LoadError)
+
+It means that the taf2-curb gem didn't build correctly. To resolve this you can do a git clone git://github.com/taf2/curb.git then run rake gem in the curb directory, then sudo gem install pkg/curb-0.2.4.0.gem. After that you should be good.
+
+If you see something like this when trying to run it:
+
+    NoMethodError: undefined method `on_success' for #<Curl::Easy:0x1182724>
+        from ./lib/feedzirra/feed.rb:88:in `add_url_to_multi'
+
+This means that you are requiring curl-multi or the Ruby Forge version of Curb somewhere. You can't use those and need to get the taf2 version up and running.
+
+If you're on Debian or Ubuntu and getting errors while trying to install the taf2-curb gem, it could be because you don't have the latest version of libcurl installed. Do this to fix:
+
+    sudo apt-get install libcurl4-gnutls-dev
+
+Another problem could be if you are running Mac Ports and you have libcurl installed through there. You need to uninstall it for curb to work! The version in Mac Ports is old and doesn't play nice with curb. If you're running Leopard, you can just uninstall and you should be golden. If you're on an older version of OS X, you'll then need to {download curl}[http://curl.haxx.se/download.html] and build from source. Then you'll have to install the taf2-curb gem again. You might have to perform the step above.
+
+If you're still having issues, please let me know on the mailing list. Also, {Todd Fisher (taf2)}[link:http://github.com/taf2] is working on fixing the gem install. Please send him a full error report.
+
+=== Speedup date parsing
+
+In MRI the date parsing code is written in ruby and is optimized for readability over speed, to speed up this part you can install the {home_run}[https://github.com/jeremyevans/home_run] gem to replace it with an optimized C version.
+
+=== Usage
+
+{A gist of the following code}[link:http://gist.github.com/57285]
+
+    require 'feedzirra'
+
+    # fetching a single feed
+    feed = Feedzirra::Feed.fetch_and_parse("http://feeds.feedburner.com/PaulDixExplainsNothing")
+
+    # feed and entries accessors
+    feed.title          # => "Paul Dix Explains Nothing"
+    feed.url            # => "http://www.pauldix.net"
+    feed.feed_url       # => "http://feeds.feedburner.com/PaulDixExplainsNothing"
+    feed.etag           # => "GunxqnEP4NeYhrqq9TyVKTuDnh0"
+    feed.last_modified  # => Sat Jan 31 17:58:16 -0500 2009 # it's a Time object
+
+    entry = feed.entries.first
+    entry.title      # => "Ruby Http Client Library Performance"
+    entry.url        # => "http://www.pauldix.net/2009/01/ruby-http-client-library-performance.html"
+    entry.author     # => "Paul Dix"
+    entry.summary    # => "..."
+    entry.content    # => "..."
+    entry.published  # => Thu Jan 29 17:00:19 UTC 2009 # it's a Time object
+    entry.categories # => ["...", "..."]
+
+    # sanitizing an entry's content
+    entry.title.sanitize   # => returns the title with harmful stuff escaped
+    entry.author.sanitize  # => returns the author with harmful stuff escaped
+    entry.content.sanitize # => returns the content with harmful stuff escaped
+    entry.content.sanitize! # => returns content with harmful stuff escaped and replaces original (also exists for author and title)
+    entry.sanitize!         # => sanitizes the entry's title, author, and content in place (as in, it changes the value to clean versions)
+    feed.sanitize_entries!  # => sanitizes all entries in place
+
+    # updating a single feed
+    updated_feed = Feedzirra::Feed.update(feed)
+
+    # an updated feed has the following extra accessors
+    updated_feed.updated?     # returns true if any of the feed attributes have been modified. will return false if only new entries
+    updated_feed.new_entries  # a collection of the entry objects that are newer than the latest in the feed before update
+
+    # fetching multiple feeds
+    feed_urls = ["http://feeds.feedburner.com/PaulDixExplainsNothing", "http://feeds.feedburner.com/trottercashion"]
+    feeds = Feedzirra::Feed.fetch_and_parse(feed_urls)
+
+    # feeds is now a hash with the feed_urls as keys and the parsed feed objects as values. If an error was thrown
+    # there will be a Fixnum of the http response code instead of a feed object
+
+    # updating multiple feeds. it expects a collection of feed objects
+    updated_feeds = Feedzirra::Feed.update(feeds.values)
+
+    # defining custom behavior on failure or success. note that a return status of 304 (not updated) will call the on_success handler
+    feed = Feedzirra::Feed.fetch_and_parse("http://feeds.feedburner.com/PaulDixExplainsNothing",
+        :on_success => lambda {|url, feed| puts feed.title },
+        :on_failure => lambda {|url, response_code, response_header, response_body| puts response_body })
+    # if a collection was passed into fetch_and_parse, the handlers will be called for each one
+
+    # the behavior for the handlers when using Feedzirra::Feed.update is slightly different. The feed passed into on_success will be
+    # the updated feed with the standard updated accessors. on failure it will be the original feed object passed into update
+
+    # fetching a feed via a proxy (optional)
+    feed = Feedzirra::Feed.fetch_and_parse("http://feeds.feedburner.com/PaulDixExplainsNothing", {:proxy_url => '10.0.0.1', :proxy_port => 3084})
+
+=== Extending
+
+==== Adding a feed parsing class
+
+    # Adds a new feed parsing class, this class will be used first
+    Feedzirra::Feed.add_feed_class MyFeedClass
+
+==== Adding attributes to all feeds types / all entries types
+
+    # Add the generator attribute to all feed types
+    Feedzirra::Feed.add_common_feed_element('generator')
+    Feedzirra::Feed.fetch_and_parse("href="http://www.pauldix.net/atom.xml").generator # => 'TypePad'
+
+    # Add some GeoRss information
+    Feedzirra::Feed.add_common_feed_entry_element('geo:lat', :as => :lat)
+    Feedzirra::Feed.fetch_and_parse("http://www.earthpublisher.com/georss.php").entries.each do |e|
+        p "lat: #{e.lat}, long: #{e.long}"
+    end
+
+==== Adding attributes to only one class
+
+If you want to add attributes for only on class you simply have to declare them in the class
+
+    # Add some GeoRss information
+    require 'lib/feedzirra/parser/rss_entry'
+
+    class Feedzirra::Parser::RSSEntry
+        element 'geo:lat', :as => :lat
+        element 'geo:long', :as => :long
+    end
+
+    # Fetch a feed containing GeoRss info and print them
+    Feedzirra::Feed.fetch_and_parse("http://www.earthpublisher.com/georss.php").entries.each do |e|
+        p "lat: #{e.lat}, long: #{e.long}"
+    end
+
+=== Benchmarks
+
+One of the goals of Feedzirra is speed. This includes not only parsing, but fetching multiple feeds as quickly as possible. I ran a benchmark getting 20 feeds 10 times using Feedzirra, rFeedParser, and FeedNormalizer. For more details the {benchmark code can be found in the project in spec/benchmarks/feedzirra_benchmarks.rb}[http://github.com/pauldix/feedzirra/blob/7fb5634c5c16e9c6ec971767b462c6518cd55f5d/spec/benchmarks/feedzirra_benchmarks.rb]
+
+    feedzirra          5.170000   1.290000   6.460000 ( 18.917796)
+    rfeedparser      104.260000  12.220000 116.480000 (244.799063)
+    feed-normalizer   66.250000   4.010000  70.260000 (191.589862)
+
+The result of that benchmark is a bit sketchy because of the network variability. Running 10 times against the same 20 feeds was meant to smooth some of that out. However, there is also a {benchmark comparing parsing speed in spec/benchmarks/parsing_benchmark.rb}[http://github.com/pauldix/feedzirra/blob/7fb5634c5c16e9c6ec971767b462c6518cd55f5d/spec/benchmarks/parsing_benchmark.rb] on an atom feed.
+
+    feedzirra        0.500000   0.030000   0.530000 (  0.658744)
+    rfeedparser      8.400000   1.110000   9.510000 ( 11.839827)
+    feed-normalizer  5.980000   0.160000   6.140000 (  7.576140)
+
+There's also a {benchmark that shows the results of using Feedzirra to perform updates on feeds}[http://github.com/pauldix/feedzirra/blob/45d64319544c61a4c9eb9f7f825c73b9f9030cb3/spec/benchmarks/updating_benchmarks.rb] you've already pulled in. I tested against 179 feeds. The first is the initial pull and the second is an update 65 seconds later. I'm not sure how many of them support etag and last-modified, so performance may be better or worse depending on what feeds you're requesting.
+
+    feedzirra fetch and parse  4.010000   0.710000   4.720000 ( 15.110101)
+    feedzirra update           0.660000   0.280000   0.940000 (  5.152709)
+
+=== TODO
+
+This thing needs to hammer on many different feeds in the wild. I'm sure there will be bugs. I want to find them and crush them. I didn't bother using the test suite for feedparser. i wanted to start fresh.
+
+Here are some more specific TODOs.
+* Make a feedzirra-rails gem to integrate feedzirra seamlessly with Rails and ActiveRecord.
+* Add support for authenticated feeds.
+* Create a super sweet DSL for defining new parsers.
+* Test against Ruby 1.9.1 and fix any bugs.
+* I'm not keeping track of modified on entries. Should I add this?
+* Clean up the fetching code inside feed.rb so it doesn't suck so hard.
+* Make the feed_spec actually mock stuff out so it doesn't hit the net.
+* Readdress how feeds determine if they can parse a document. Maybe I should use namespaces instead?
+
+=== LICENSE
+
+(The MIT License)
+ 
+Copyright (c) 2009:
+ 
+{Paul Dix}[http://pauldix.net]
+ 
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+'Software'), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+ 
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+ 
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Rakefile

@@ -1,9 +1,14 @@
-require "spec"
-require "spec/rake/spectask"
-require 'rake/rdoctask'
-require 'lib/feedzirra.rb'
+require 'bundler'
+Bundler.setup
+
+require 'rake'
+require 'rdoc/task'
+require 'rspec'
+require 'rspec/core/rake_task'
+
+$LOAD_PATH.unshift File.expand_path('../lib', __FILE__)
+require 'feedzirra/version'
 
-# Grab recently touched specs
 def recent_specs(touched_since)
   recent_specs = FileList['app/**/*'].map do |path|
 
@@ -20,37 +25,27 @@ def recent_specs(touched_since)
   recent_specs.uniq
 end
 
-desc "Run all the tests"
-task :default => :spec
-
-# Tasks
-Spec::Rake::SpecTask.new do |t|
-  t.spec_opts = ['--options', "\"#{File.dirname(__FILE__)}/spec/spec.opts\""]
-  t.spec_files = FileList['spec/**/*_spec.rb']
+RSpec::Core::RakeTask.new do |t|
+  t.pattern = FileList['spec/**/*_spec.rb']
 end
 
 desc 'Run recent specs'
-Spec::Rake::SpecTask.new("spec:recent") do |t|
-  t.spec_opts = ["--format","specdoc","--color"]
-  t.spec_files = recent_specs(Time.now - 600) # 10 min.
+RSpec::Core::RakeTask.new("spec:recent") do |t|
+  t.pattern = recent_specs(Time.now - 600) # 10 min.
 end
 
-Spec::Rake::SpecTask.new('spec:rcov') do |t|
-  t.spec_opts = ['--options', "\"#{File.dirname(__FILE__)}/spec/spec.opts\""]
-  t.spec_files = FileList['spec/**/*_spec.rb']
+RSpec::Core::RakeTask.new('spec:rcov') do |t|
+  t.pattern = FileList['spec/**/*_spec.rb']
   t.rcov = true
   t.rcov_opts = ['--exclude', 'spec,/usr/lib/ruby,/usr/local,/var/lib,/Library', '--text-report']
 end
 
-Rake::RDocTask.new do |rd|
+RDoc::Task.new do |rd|
   rd.title    = 'Feedzirra'
   rd.rdoc_dir = 'rdoc'
   rd.rdoc_files.include('README.rdoc', 'lib/feedzirra.rb', 'lib/feedzirra/**/*.rb')
   rd.options = ["--quiet", "--opname", "index.html", "--line-numbers", "--inline-source", '--main', 'README.rdoc']
 end
 
-task :install do
-  rm_rf "*.gem"
-  puts `gem build feedzirra.gemspec`
-  puts `sudo gem install feedzirra-#{Feedzirra::VERSION}.gem`
-end
+desc "Run all the tests"
+task :default => :spec

data/lib/feedzirra.rb

@@ -1,41 +1,20 @@
-$LOAD_PATH.unshift(File.dirname(__FILE__)) unless $LOAD_PATH.include?(File.dirname(__FILE__))
-
 require 'zlib'
 require 'curb'
 require 'sax-machine'
 require 'loofah'
 require 'uri'
 
-require 'active_support/version'
 require 'active_support/basic_object'
 require 'active_support/core_ext/module'
 require 'active_support/core_ext/kernel'
 require 'active_support/core_ext/object'
+require 'active_support/time'
 
-if ActiveSupport::VERSION::MAJOR >= 3
-  require 'active_support/time'
-else
-  require 'active_support/core_ext/time'
-end
-
-require 'core_ext/date'
-require 'core_ext/string'
-
-require 'feedzirra/feed_utilities'
-require 'feedzirra/feed_entry_utilities'
-require 'feedzirra/feed'
-
-require 'feedzirra/parser/rss_entry'
-require 'feedzirra/parser/itunes_rss_owner'
-require 'feedzirra/parser/itunes_rss_item'
-require 'feedzirra/parser/atom_entry'
-require 'feedzirra/parser/atom_feed_burner_entry'
-
-require 'feedzirra/parser/rss'
-require 'feedzirra/parser/itunes_rss'
-require 'feedzirra/parser/atom'
-require 'feedzirra/parser/atom_feed_burner'
+require 'feedzirra/core_ext'
 
 module Feedzirra
-  VERSION = "0.0.24"
-end
+  autoload :FeedEntryUtilities, 'feedzirra/feed_entry_utilities'
+  autoload :FeedUtilities,      'feedzirra/feed_utilities'
+  autoload :Feed,               'feedzirra/feed'
+  autoload :Parser,             'feedzirra/parser'
+end

data/lib/feedzirra/core_ext.rb

@@ -0,0 +1,3 @@
+Dir["#{File.dirname(__FILE__)}/core_ext/*.rb"].sort.each do |path|
+  require "feedzirra/core_ext/#{File.basename(path, '.rb')}"
+end

data/lib/{core_ext → feedzirra/core_ext}/date.rb

@@ -1,4 +1,4 @@
-# Date code pulled from:
+# Date code pulled and adapted from:
 # Ruby Cookbook by Lucas Carlson and Leonard Richardson
 # Published by O'Reilly
 # ISBN: 0-596-52369-6
@@ -13,9 +13,7 @@ class Date
 
   private
   def feed_utils_to_time(dest, method)
-    #Convert a fraction of a day to a number of microseconds
-    usec = (dest.sec_fraction * 60 * 60 * 24 * (10**6)).to_i
     Time.send(method, dest.year, dest.month, dest.day, dest.hour, dest.min,
-              dest.sec, usec)
+              dest.sec, dest.zone)
   end
 end

data/lib/feedzirra/feed.rb

@@ -5,16 +5,16 @@ module Feedzirra
     USER_AGENT = "feedzirra http://github.com/pauldix/feedzirra/tree/master"
     
     # Takes a raw XML feed and attempts to parse it. If no parser is available a Feedzirra::NoParserAvailable exception is raised.
-    #
+    # You can pass a block to be called when there's an error during the parsing.
     # === Parameters
     # [xml<String>] The XML that you would like parsed.
     # === Returns
     # An instance of the determined feed type. By default a Feedzirra::Atom, Feedzirra::AtomFeedBurner, Feedzirra::RDF, or Feedzirra::RSS object.
     # === Raises
     # Feedzirra::NoParserAvailable : If no valid parser classes could be found for the feed.
-    def self.parse(xml)
+    def self.parse(xml, &block)
       if parser = determine_feed_parser_for_xml(xml)
-        parser.parse(xml)
+        parser.parse(xml, block)
       else
         raise NoParserAvailable.new("No valid parser for XML.")
       end
@@ -49,30 +49,100 @@ module Feedzirra
       @feed_classes ||= [Feedzirra::Parser::RSS, Feedzirra::Parser::AtomFeedBurner, Feedzirra::Parser::Atom]
     end
     
-    # Makes all entry types look for the passed in element to parse. This is actually just a call to 
-    # element (a SAXMachine call) in the class
+    # Makes all registered feeds types look for the passed in element to parse.
+    # This is actually just a call to element (a SAXMachine call) in the class.
+    #
+    # === Parameters
+    # [element_tag<String>] The element tag
+    # [options<Hash>] Valid keys are same as with SAXMachine
+    def self.add_common_feed_element(element_tag, options = {})
+      feed_classes.each do |k|
+        k.element element_tag, options
+      end
+    end
+
+    # Makes all registered feeds types look for the passed in elements to parse.
+    # This is actually just a call to elements (a SAXMachine call) in the class.
+    #
+    # === Parameters
+    # [element_tag<String>] The element tag
+    # [options<Hash>] Valid keys are same as with SAXMachine
+    def self.add_common_feed_elements(element_tag, options = {})
+      feed_classes.each do |k|
+        k.elements element_tag, options
+      end
+    end
+
+    # Makes all registered entry types look for the passed in element to parse.
+    # This is actually just a call to element (a SAXMachine call) in the class.
     #
     # === Parameters
     # [element_tag<String>]
     # [options<Hash>] Valid keys are same as with SAXMachine
     def self.add_common_feed_entry_element(element_tag, options = {})
-      # need to think of a better way to do this. will break for people who want this behavior
-      # across their added classes
-      feed_classes.map{|k| eval("#{k}Entry") }.each do |klass|
-        klass.send(:element, element_tag, options)
-      end
+      call_on_each_feed_entry :element, element_tag, options
     end
     
+    # Makes all registered entry types look for the passed in elements to parse.
+    # This is actually just a call to element (a SAXMachine call) in the class.
+    #
+    # === Parameters
+    # [element_tag<String>]
+    # [options<Hash>] Valid keys are same as with SAXMachine
+    def self.add_common_feed_entry_elements(element_tag, options = {})
+      call_on_each_feed_entry :elements, element_tag, options
+    end
+
+    # Call a method on all feed entries classes.
+    #
+    # === Parameters
+    # [method<Symbol>] The method name
+    # [parameters<Array>] The method parameters
+    def self.call_on_each_feed_entry(method, *parameters)
+      feed_classes.each do |k|
+        # iterate on the collections defined in the sax collection
+        k.sax_config.collection_elements.each_value do |vl|
+          # vl is a list of CollectionConfig mapped to an attribute name
+          # we'll look for the one set as 'entries' and add the new element
+          vl.find_all{|v| (v.accessor == 'entries') && (v.data_class.class == Class)}.each do |v|
+              v.data_class.send(method, *parameters)
+          end
+        end
+      end
+    end
+
+    # Setup curl from options.
+    # Possible parameters:
+    # * :user_agent          - overrides the default user agent.
+    # * :compress            - any value to enable compression
+    # * :http_authentication - array containing http authentication parameters
+    # * :proxy_url           - proxy url
+    # * :proxy_port          - proxy port
+    # * :max_redirects       - max number of redirections
+    # * :timeout             - timeout
+    def self.setup_easy curl, options
+      curl.headers["Accept-encoding"]   = 'gzip, deflate' if options.has_key?(:compress)
+      curl.headers["User-Agent"]        = (options[:user_agent] || USER_AGENT)
+
+      curl.userpwd = options[:http_authentication].join(':') if options.has_key?(:http_authentication)
+      curl.proxy_url = options[:proxy_url] if options.has_key?(:proxy_url)
+      curl.proxy_port = options[:proxy_port] if options.has_key?(:proxy_port)
+      curl.max_redirects = options[:max_redirects] if options[:max_redirects]
+      curl.timeout = options[:timeout] if options[:timeout]
+
+      curl.follow_location = true
+    end
+
     # Fetches and returns the raw XML for each URL provided.
     #
     # === Parameters
     # [urls<String> or <Array>] A single feed URL, or an array of feed URLs.
     # [options<Hash>] Valid keys for this argument as as followed:
-    #                 :user_agent - String that overrides the default user agent.
     #                 :if_modified_since - Time object representing when the feed was last updated.
     #                 :if_none_match - String that's normally an etag for the request that was stored previously.
     #                 :on_success - Block that gets executed after a successful request.
     #                 :on_failure - Block that gets executed after a failed request.
+    #                 * all parameters defined in setup_easy
     # === Returns
     # A String of XML if a single URL is passed.
     # 
@@ -83,15 +153,10 @@ module Feedzirra
       responses = {}
       url_queue.each do |url|
         easy = Curl::Easy.new(url) do |curl|
-          curl.headers["User-Agent"]        = (options[:user_agent] || USER_AGENT)
+          setup_easy curl, options
+
           curl.headers["If-Modified-Since"] = options[:if_modified_since].httpdate if options.has_key?(:if_modified_since)
           curl.headers["If-None-Match"]     = options[:if_none_match] if options.has_key?(:if_none_match)
-          curl.headers["Accept-encoding"]   = 'gzip, deflate' if options.has_key?(:compress)
-          curl.follow_location = true
-          curl.userpwd = options[:http_authentication].join(':') if options.has_key?(:http_authentication)
-          
-          curl.max_redirects = options[:max_redirects] if options[:max_redirects]
-          curl.timeout = options[:timeout] if options[:timeout]
 
           curl.on_success do |c|
             responses[url] = decode_content(c)
@@ -143,7 +208,7 @@ module Feedzirra
     # === Returns
     # A decoded string of XML.
     def self.decode_content(c)
-      if c.header_str.match(/Content-Encoding: gzip/)
+      if c.header_str.match(/Content-Encoding: gzip/i)
         begin
           gz =  Zlib::GzipReader.new(StringIO.new(c.body_str))
           xml = gz.read
@@ -152,7 +217,7 @@ module Feedzirra
           # Maybe this is not gzipped?
           xml = c.body_str
         end
-      elsif c.header_str.match(/Content-Encoding: deflate/)
+      elsif c.header_str.match(/Content-Encoding: deflate/i)
         xml = Zlib::Inflate.inflate(c.body_str)
       else
         xml = c.body_str
@@ -166,9 +231,9 @@ module Feedzirra
     # === Parameters
     # [feeds<Feed> or <Array>] A single feed object, or an array of feed objects.
     # [options<Hash>] Valid keys for this argument as as followed:
-    #                 * :user_agent - String that overrides the default user agent.
     #                 * :on_success - Block that gets executed after a successful request.
     #                 * :on_failure - Block that gets executed after a failed request.
+    #                 * all parameters defined in setup_easy
     # === Returns
     # A updated Feed object if a single URL is passed.
     #
@@ -195,23 +260,17 @@ module Feedzirra
     # [responses<Hash>] Existing responses that you want the response from the request added to.
     # [feeds<String> or <Array>] A single feed object, or an array of feed objects.
     # [options<Hash>] Valid keys for this argument as as followed:
-    #                 * :user_agent - String that overrides the default user agent.
     #                 * :on_success - Block that gets executed after a successful request.
     #                 * :on_failure - Block that gets executed after a failed request.
+    #                 * all parameters defined in setup_easy
     # === Returns
     # The updated Curl::Multi object with the request details added to it's stack.
     def self.add_url_to_multi(multi, url, url_queue, responses, options)
       easy = Curl::Easy.new(url) do |curl|
-        curl.headers["User-Agent"]        = (options[:user_agent] || USER_AGENT)
+        setup_easy curl, options
         curl.headers["If-Modified-Since"] = options[:if_modified_since].httpdate if options.has_key?(:if_modified_since)
         curl.headers["If-None-Match"]     = options[:if_none_match] if options.has_key?(:if_none_match)
-        curl.headers["Accept-encoding"]   = 'gzip, deflate' if options.has_key?(:compress)
-        curl.follow_location = true
-        curl.userpwd = options[:http_authentication].join(':') if options.has_key?(:http_authentication)
 
-        curl.max_redirects = options[:max_redirects] if options[:max_redirects]
-        curl.timeout = options[:timeout] if options[:timeout]
-        
         curl.on_success do |c|
           add_url_to_multi(multi, url_queue.shift, url_queue, responses, options) unless url_queue.empty?
           xml = decode_content(c)
@@ -219,7 +278,7 @@ module Feedzirra
           
           if klass
             begin
-              feed = klass.parse(xml)
+              feed = klass.parse(xml, Proc.new{|message| puts "Error while parsing [#{url}] #{message}" })
               feed.feed_url = c.last_effective_url
               feed.etag = etag_from_header(c.header_str)
               feed.last_modified = last_modified_from_header(c.header_str)
@@ -230,7 +289,7 @@ module Feedzirra
             end
           else
             # puts "Error determining parser for #{url} - #{c.last_effective_url}"
-            # raise NoParserAvailable.new("no valid parser for content.") (this would unfirtunately fail the whole 'multi', so it's not really useable)
+            # raise NoParserAvailable.new("no valid parser for content.") (this would unfortunately fail the whole 'multi', so it's not really usable)
             options[:on_failure].call(url, c.response_code, c.header_str, c.body_str) if options.has_key?(:on_failure)
           end
         end
@@ -238,12 +297,16 @@ module Feedzirra
         curl.on_failure do |c, err|
           add_url_to_multi(multi, url_queue.shift, url_queue, responses, options) unless url_queue.empty?
           responses[url] = c.response_code
-          options[:on_failure].call(url, c.response_code, c.header_str, c.body_str) if options.has_key?(:on_failure)
+          if c.response_code == 304 # it's not modified. this isn't an error condition
+            options[:on_success].call(url, nil) if options.has_key?(:on_success)
+          else
+            options[:on_failure].call(url, c.response_code, c.header_str, c.body_str) if options.has_key?(:on_failure)
+          end
         end
       end
       multi.add(easy)
     end
-    
+
     # An abstraction for adding a feed by a Feed object to the passed Curb::multi stack.
     #
     # === Parameters
@@ -253,26 +316,21 @@ module Feedzirra
     # [responses<Hash>] Existing responses that you want the response from the request added to.
     # [feeds<String>] or <Array> A single feed object, or an array of feed objects.
     # [options<Hash>] Valid keys for this argument as as followed:
-    #                 * :user_agent - String that overrides the default user agent.
     #                 * :on_success - Block that gets executed after a successful request.
     #                 * :on_failure - Block that gets executed after a failed request.
+    #                 * all parameters defined in setup_easy
     # === Returns
     # The updated Curl::Multi object with the request details added to it's stack.
     def self.add_feed_to_multi(multi, feed, feed_queue, responses, options) 
       easy = Curl::Easy.new(feed.feed_url) do |curl|
-        curl.headers["User-Agent"]        = (options[:user_agent] || USER_AGENT)
+        setup_easy curl, options
         curl.headers["If-Modified-Since"] = feed.last_modified.httpdate if feed.last_modified
         curl.headers["If-None-Match"]     = feed.etag if feed.etag
-        curl.userpwd = options[:http_authentication].join(':') if options.has_key?(:http_authentication)
-        curl.follow_location = true
-
-        curl.max_redirects = options[:max_redirects] if options[:max_redirects]
-        curl.timeout = options[:timeout] if options[:timeout]
 
         curl.on_success do |c|
           begin
             add_feed_to_multi(multi, feed_queue.shift, feed_queue, responses, options) unless feed_queue.empty?
-            updated_feed = Feed.parse(c.body_str)
+            updated_feed = Feed.parse(c.body_str){ |message| puts "Error while parsing [#{feed.feed_url}] #{message}" }
             updated_feed.feed_url = c.last_effective_url
             updated_feed.etag = etag_from_header(c.header_str)
             updated_feed.last_modified = last_modified_from_header(c.header_str)