pork_sandwich 0.4.11 → 0.4.12

data/VERSION

@@ -1 +1 @@
-0.4.11
+0.4.12

data/lib/pork_sandwich/search.rb

@@ -6,10 +6,11 @@ module Pork
       @query = query
       @desired_count = options[:desired_count] #if nil, will pull as far back as the Search API allows
       @current_count = 0
+      @since_id = options[:since_id]
       @from_user = options[:from_user] 
       @db_ids_created = []
       @collect_users = options[:collect_users]
-      @pulls_per_hour = options[:pulls_per_hour]? options[:pulls_per_hour] : 1500
+      @pulls_per_hour = options[:pulls_per_hour]? options[:pulls_per_hour] : 2000
     end
     
     def historical_pull
@@ -35,12 +36,14 @@ module Pork
               break
             end
           end
- 
           if reached_desired_count? or @search_params.query[:max_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
@@ -109,5 +112,13 @@ module Pork
       end
     end
     
+    def reached_since_id?
+      if @since_id
+        return @search_params.query[:max_id] <= @since_id
+      else
+        return false
+      end
+    end
+    
   end
 end

data/test/fakewebs.rb

@@ -7,7 +7,7 @@ FakeWeb.allow_net_connect = false
 # SEARCH METHOD 
 FakeWeb.register_uri(:any, "http://search.twitter.com/search.json?rpp=100&q=test", :body => '{"results":[{"profile_image_url":"http://a3.twimg.com/profile_images/521281029/DSC01483_-_Kopia_-_Kopia_normal.JPG","created_at":"Wed, 11 Nov 2009 17:52:11 +0000","from_user":"SamIsMarth","to_user_id":10186853,"text":"@sage2526 cool. I have to study to my german test... Have a nice evening ^^","id":5624810553,"from_user_id":72123474,"to_user":"sage2526","geo":null,"iso_language_code":"en","source":"<a href="http://twitter.com/">web</a>"},{"profile_image_url":"http://a3.twimg.com/profile_images/56115537/Andrew_-_small_normal.jpg","created_at":"Wed, 11 Nov 2009 17:52:09 +0000","from_user":"MarthIsGreat","to_user_id":null,"text":"Gearing up yo fail this calculus III test. Wish me luck!","id":5624809937,"from_user_id":842449,"geo":null,"iso_language_code":"en","source":"<a href="http://help.twitter.com/index.php?pg=kb.page&id=75" rel="nofollow">txt</a>"}],"max_id":5624810553,"since_id":0,"refresh_url":"?since_id=5624810553&q=test","next_page":"?page=2&max_id=5624810553&q=test","results_per_page":15,"page":1,"completed_in":0.040758,"query":"test"}')
 
-FakeWeb.register_uri(:any, "http://search.twitter.com/search.json?max_id=5624809937&rpp=100&q=test", :body => '{"results":[{"profile_image_url":"http://a3.twimg.com/profile_images/521281029/DSC01483_-_Kopia_-_Kopia_normal.JPG","created_at":"Wed, 11 Nov 2009 17:52:11 +0000","from_user":"EvanIsLucas","to_user_id":10186853,"text":"@sage2526 cool. I have to study to my german test... Have a nice evening ^^","id":5624810553,"from_user_id":72123474,"to_user":"sage2526","geo":null,"iso_language_code":"en","source":"<a href="http://twitter.com/">web</a>"},{"profile_image_url":"http://a3.twimg.com/profile_images/56115537/Andrew_-_small_normal.jpg","created_at":"Wed, 11 Nov 2009 17:52:09 +0000","from_user":"LucasIsCheap","to_user_id":null,"text":"Gearing up yo fail this calculus III test. Wish me luck!","id":5555,"from_user_id":842449,"geo":null,"iso_language_code":"en","source":"<a href="http://help.twitter.com/index.php?pg=kb.page&id=75" rel="nofollow">txt</a>"}],"max_id":5624810553,"since_id":0,"refresh_url":"?since_id=5624810553&q=test","next_page":"?page=2&max_id=5624810553&q=test","results_per_page":15,"page":1,"completed_in":0.040758,"query":"test"}')
+FakeWeb.register_uri(:any, "http://search.twitter.com/search.json?max_id=5624809937&rpp=100&q=test", :body => '{"results":[{"profile_image_url":"http://a3.twimg.com/profile_images/521281029/DSC01483_-_Kopia_-_Kopia_normal.JPG","created_at":"Wed, 11 Nov 2009 17:52:11 +0000","from_user":"EvanIsLucas","to_user_id":10186853,"text":"@sage2526 cool. I have to study to my german test... Have a nice evening ^^","id":1234567,"from_user_id":72123474,"to_user":"sage2526","geo":null,"iso_language_code":"en","source":"<a href="http://twitter.com/">web</a>"},{"profile_image_url":"http://a3.twimg.com/profile_images/56115537/Andrew_-_small_normal.jpg","created_at":"Wed, 11 Nov 2009 17:52:09 +0000","from_user":"LucasIsCheap","to_user_id":null,"text":"Gearing up yo fail this calculus III test. Wish me luck!","id":5555,"from_user_id":842449,"geo":null,"iso_language_code":"en","source":"<a href="http://help.twitter.com/index.php?pg=kb.page&id=75" rel="nofollow">txt</a>"}],"max_id":5624810553,"since_id":0,"refresh_url":"?since_id=5624810553&q=test","next_page":"?page=2&max_id=5624810553&q=test","results_per_page":15,"page":1,"completed_in":0.040758,"query":"test"}')
 
 FakeWeb.register_uri(:any, "http://search.twitter.com/search.json?max_id=5555&rpp=100&q=test", :body => '{"results":[{"profile_image_url":"http://a3.twimg.com/profile_images/56115537/Andrew_-_small_normal.jpg","created_at":"Wed, 11 Nov 2009 17:52:09 +0000","from_user":"LucasIsCheap","to_user_id":null,"text":"Gearing up yo fail this calculus III test. Wish me luck!","id":5555,"from_user_id":842449,"geo":null,"iso_language_code":"en","source":"<a href="http://help.twitter.com/index.php?pg=kb.page&id=75" rel="nofollow">txt</a>"}],"max_id":5624810553,"since_id":0,"refresh_url":"?since_id=5624810553&q=test","next_page":"?page=2&max_id=5624810553&q=test","results_per_page":15,"page":1,"completed_in":0.040758,"query":"test"}')
  

data/test/search_test.rb

@@ -44,7 +44,16 @@ class SearchTest < Test::Unit::TestCase
         assert_equal 4, @search.current_count
       end
     end
-    
+    context "and since_id = 5624809937" do 
+      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
+        result = @search.historical_pull
+        assert_equal true, result
+        assert_equal 2, @search.current_count
+      end
+    end
   end
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: pork_sandwich
 version: !ruby/object:Gem::Version 
-  version: 0.4.11
+  version: 0.4.12
 platform: ruby
 authors: 
 - Sam Gilbert
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-17 00:00:00 -05:00
+date: 2010-03-07 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency