jsl-feedzirra 0.0.12.9 → 0.0.12.10

data/README.rdoc

@@ -3,8 +3,8 @@
 == 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 
+{taf2-curb}[http://github.com/taf2/curb/tree/master] gem for faster http gets, and libxml through 
+{nokogiri}[http://github.com/tenderlove/nokogiri/tree/master] and {sax-machine}[http://github.com/pauldix/sax-machine/tree/master] for 
 faster parsing.
 
 It allows for easy customization of feed parsing options through the definition of custom parsing classes, and allows you to take as little or as 
@@ -15,7 +15,7 @@ access to many different types of stores depending on your requirements.
 == 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 
+{libcurl}[http://curl.haxx.se/] and {libxml}[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, 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
@@ -36,8 +36,7 @@ The Reader object can take a single URL or a list of URLs followed by a Hash of
 allows configuration of the backend store, as well as fetching options for the list of urls.  Following is 
 an example of configuration with the Memcache store connected to Tokyo Tyrant (the front-end for Tokyo Cabinet):
 
-	reader = Feedzirra::Reader.new('http://www.pauldix.net/atom.xml', :backend => 
-		{ :moneta_klass => Moneta::Memcache, :port => 1978, :server => 'localhost' })
+	reader = Feedzirra::Reader.new('http://www.pauldix.net/atom.xml', :backend => { :moneta_klass => 'Moneta::Memcache', :server => 'localhost:1978' })
 
 Other options that may be put in the options hash follow the original API described below.
 
@@ -105,7 +104,7 @@ I'd like feedback on the api and any bugs encountered on feeds in the wild. I've
 == Troubleshooting Installation
 
 *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.
+Ruby Forge. You have to get the {taf2-curb}[http://github.com/taf2/curb/tree/master] fork installed.
 
 If you see this error when doing a require: 
 
@@ -127,7 +126,7 @@ If you're on Debian or Ubuntu and getting errors while trying to install the taf
 
 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.
+If you're still having issues, please let me know on the mailing list. Also, {Todd Fisher (taf2)}[http://github.com/taf2] is working on fixing the gem install. Please send him a full error report.
 
 == TODO
 
@@ -141,10 +140,8 @@ Here are some more specific TODOs.
 * 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
 
-This library is provided under the MIT License.  See {the complete LICENSE}[link:files/LICENSE_rdoc.html] for details.
+This library is provided under the MIT License.  See the complete LICENSE in LICENSE.rdoc for details.

data/lib/feedzirra.rb

@@ -8,6 +8,8 @@ require 'sax-machine'
 require 'dryopteris'
 require 'uri'
 
+require 'md5'
+
 require 'active_support/basic_object'
 require 'active_support/core_ext/object'
 require 'active_support/core_ext/time'
@@ -40,5 +42,5 @@ require 'feedzirra/parser/atom_feed_burner'
 
 module Feedzirra
   USER_AGENT = "feedzirra http://github.com/jsl/feedzirra/tree/master"
-  VERSION = "0.0.12.9"
+  VERSION = "0.0.12.10"
 end

data/lib/feedzirra/http_multi.rb

@@ -29,6 +29,8 @@ module Feedzirra
       @multi.perform
     end
 
+    private 
+    
     # Breaks the urls into chunks of 30 because of weird errors encountered on 
     # entering more items.  As one finishes it pops another off the queue.
     def prepare
@@ -46,7 +48,7 @@ module Feedzirra
         url = retrievable.feed_url
       else
         url = retrievable
-        retrievable = @backend[url]  # Try to fetch the last retrieval from backend
+        retrievable = @backend[key_for(url)]  # Try to fetch the last retrieval from backend
       end
 
       easy = build_curl_easy(url, retrievable, retrievable_queue)
@@ -100,7 +102,7 @@ module Feedzirra
           set_updated_feed_entries!(retrievable, updated_feed)
         end
 
-        @backend[url] = updated_feed
+        @backend[key_for(url)] = updated_feed
 
         responses[url] = updated_feed
         @options[:on_success].call(retrievable) if @options.has_key?(:on_success)
@@ -118,6 +120,10 @@ module Feedzirra
       @options[:on_failure].call(retrievable, curl.response_code, curl.header_str, curl.body_str) if options.has_key?(:on_failure)
     end
 
+    def key_for(url)
+      ['url', MD5.hexdigest(url)].join('-')
+    end
+
     # Determines the etag from the request headers.
     # 
     # === Parameters

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jsl-feedzirra
 version: !ruby/object:Gem::Version 
-  version: 0.0.12.9
+  version: 0.0.12.10
 platform: ruby
 authors: 
 - Paul Dix