pork_sandwich 0.4.13 → 0.4.14

data/VERSION

@@ -1 +1 @@
-0.4.13
+0.4.14

data/lib/pork_sandwich/search.rb

@@ -29,21 +29,18 @@ module Pork
           @tweets_pulled = @return_data.results
           @tweets_pulled.each do |tweet|
             tweet.status_id = tweet.id   
+            if reached_desired_count? or reached_since_id?(tweet.status_id)
+              break
+            end
             @db_ids_created << $SAVER.save(tweet, &TWEET_SAVE).id
             # $CRAWLER.append(tweet.from_user) if @collect_users
             @current_count += 1
-            if reached_desired_count? 
-              break
-            end
           end
-          if reached_desired_count? or @search_params.query[:max_id] == @tweets_pulled.last.id
+          if reached_desired_count? or @search_params.query[:max_id] == @tweets_pulled.last.id or reached_since_id?(@tweets_pulled.last.id)
             break
           else
             @search_params.query[:max_id] = @tweets_pulled.last.id
           end
-          if reached_since_id?
-            break
-          end
           manage_pull_rate(time_at_start)
         end
       rescue Twitter::Unavailable
@@ -112,9 +109,9 @@ module Pork
       end
     end
     
-    def reached_since_id?
+    def reached_since_id?(id)
       if @since_id
-        return @search_params.query[:max_id] <= @since_id
+        return id <= @since_id
       else
         return false
       end

data/test/search_test.rb

@@ -48,10 +48,10 @@ class SearchTest < Test::Unit::TestCase
       setup do 
         @search = Pork::Search.new('test', {:since_id => 5624809937})
       end
-      should "be able to do an historical pull for only 2 tweets (because the second tweet id will = 5624809937)" do
+      should "be able to do an historical pull for only 1 tweet (because the second tweet id will = 5624809937)" do
         result = @search.historical_pull
         assert_equal true, result
-        assert_equal 2, @search.current_count
+        assert_equal 1, @search.current_count
       end
     end
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 13
-  version: 0.4.13
+  - 14
+  version: 0.4.14
 platform: ruby
 authors: 
 - Sam Gilbert
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-09 00:00:00 -05:00
+date: 2010-03-10 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency