jsl-feedtosis 0.0.3.2 → 0.0.3.4

data/feedtosis.gemspec

@@ -1,14 +1,14 @@
 Gem::Specification.new do |s|
   s.name = %q{feedtosis}
-  s.version = "0.0.3.2"
+  s.version = "0.0.3.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin Leitgeb"]
-  s.date = %q{2009-05-22}
+  s.date = %q{2009-07-15}
   s.description = %q{Feedtosis finds new information in feeds quickly using smart fetching and matching of previously read entries}
   s.email = %q{justin@phq.org}
   
-  s.files = ["lib/extensions/core/array.rb", "lib/extensions/core/hash.rb", 
+  s.files = ["lib/extensions/core/hash.rb", 
     "lib/extensions/feed_normalizer/feed_instance_methods.rb", 
     "lib/feedtosis/result.rb",
     "lib/feedtosis/client.rb", "lib/feedtosis.rb", "LICENSE", 

data/lib/feedtosis/client.rb

@@ -24,14 +24,14 @@ module Feedtosis
     } unless defined?(DEFAULTS)
 
     # Initializes a new feedtosis library.  It must be initialized with a valid URL as the first argument.
-    # A following Hash, if given, may have the following keys:
+    # A following optional +options+ Hash may take the arguments: 
     #   * backend: a key-value store to be used for summary structures of feeds fetched.  Moneta backends work well, but any object acting like a Hash is valid.
     #   * retained_digest_size: an Integer specifying the number of previous MD5 sets of entries to keep, used for new feed detection    
-    def initialize(*args)
-      @url      = args.first
+    def initialize(url, options = { })
+      @url      = url
       
-      @options  = args.extract_options!
-      @options  = @options.reverse_merge(DEFAULTS)
+      raise ArgumentError, "Feedtosis::Client options must be in Hash form if provided" unless options.is_a?(Hash)
+      @options  = options.reverse_merge(DEFAULTS)
 
       @backend  = @options[:backend]
       
@@ -94,7 +94,7 @@ module Feedtosis
     # Sets options for the Curl::Easy object, including parameters for HTTP 
     # conditional GET.
     def build_curl_easy
-      curl = new_curl_easy(url)
+      curl = new_curl_easy(@url)
 
       # Many feeds have a 302 redirect to another URL.  For more recent versions 
       # of Curl, we need to specify this.

data/spec/feedtosis/client_spec.rb

@@ -26,6 +26,12 @@ describe Feedtosis::Client do
       end
     end
     
+    it "should raise ArgumentError if options is not a Hash" do
+      lambda {
+        Feedtosis::Client.new('http://www.example.com', Object.new)
+      }.should raise_error(ArgumentError)
+    end
+    
     it "should set the If-None-Match and If-Modified-Since headers to the value of the summary hash" do
       curl_headers = mock('headers')
       curl_headers.expects(:[]=).with('If-None-Match', '42ab')
@@ -90,6 +96,18 @@ describe Feedtosis::Client do
       @fr.fetch
     end
     
+    describe "when called more than once" do
+      it "should call new_curl_easy with #{@url}" do
+        mock_curl = mock('curl')
+        mock_curl.expects(:follow_location=).with(true).twice
+        mock_curl.expects(:perform).twice
+        mock_curl.expects(:response_code).twice
+        @fr.expects(:new_curl_easy).with(@url).twice.returns(mock_curl)
+        @fr.fetch
+        @fr.fetch
+      end
+    end
+    
     describe "when the response code is not 200" do
       it "should return nil for feed methods such as #title and #author" do
         curl = mock('curl', :perform => true, :response_code => 304)
@@ -140,4 +158,5 @@ describe Feedtosis::Client do
       end
     end
   end  
+  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jsl-feedtosis
 version: !ruby/object:Gem::Version 
-  version: 0.0.3.2
+  version: 0.0.3.4
 platform: ruby
 authors: 
 - Justin Leitgeb
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-22 00:00:00 -07:00
+date: 2009-07-15 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -61,7 +61,6 @@ extensions: []
 extra_rdoc_files: 
 - README.rdoc
 files: 
-- lib/extensions/core/array.rb
 - lib/extensions/core/hash.rb
 - lib/extensions/feed_normalizer/feed_instance_methods.rb
 - lib/feedtosis/result.rb

data/lib/extensions/core/array.rb

@@ -1,8 +0,0 @@
-class Array
-    
-  # From Rails' ActiveSupport library
-  def extract_options!
-    last.is_a?(::Hash) ? pop : {}
-  end
-
-end