bhauman-twroute 0.1.10 → 0.1.13

data/README.rdoc

@@ -1,6 +1,7 @@
 = Twroute - Route Twitter status updates over http to your web app
 
 Twroute uses the {Twitter Stream API}[http://apiwiki.twitter.com/Streaming-API-Documentation] 
+or the more stable {Twitter Search API}[http://apiwiki.twitter.com/Twitter-Search-API-Method%3A-search] 
 to watch status updates and convert them to HTTP post requests.
 
 Twoute uses {Delayed Job}[http://github.com/tobi/delayed_job/tree/master] 
@@ -65,8 +66,10 @@ at +tweetrecorder+.+com+, the config would look like:
 ==== Twitter section
 
 This is where you specify the username and password for the twitter
-account that is requesting the Twitter Stream and making the replies
-to the senders.
+account that is making the requests to the Twitter Stream or Rest Search 
+API and also authoring the replies to the senders.
+
+===== Twitter Stream Api Configuration
 
 This section also specifies which Twitter stream api to use.  Most
 likely +spritzer+, +follow+ or +track+ unless you are privileged.
@@ -86,6 +89,25 @@ tweets that have the word +shoot+ in them.
     stream_api_args:  
       track: shoot
 
+===== Twitter Search API Configuration
+
+See the {Twitter Search API}[http://apiwiki.twitter.com/Twitter-Search-API-Method%3A-search] 
+for more information.
+
+This section the post query parameters that you want to
+send to the Twitter +search+ api call. 
+
+The following is an example configuration if you want to see all the
+tweets that have the word +shoot+ in them.
+
+  twitter:
+    user:            example_account_name
+    password:        example_password
+    search_params:
+      q: 'shoot'  # search for updates with the text 'shoot'
+      rpp: '99'     # return 99 results on one page : limit is 100
+
+
 ==== Database section
 
 This section should be ready to go as is.  If you want to use MySQL
@@ -264,6 +286,7 @@ the routes are ignored.
 When a route is finally selected and a path is chosen three hashes get
 posted to the selected url: 
 
+
 ==== The Parsed Hash
 
 In our example this will be:
@@ -272,7 +295,19 @@ In our example this will be:
    parsed[who_got_shot]:  johnny
    parsed[shot_where]:    wild
 
-==== The Twitter Tweet Hash
+==== The Twitter Tweet Hash - for Search API
+
+  tweet[id]:                       3317086732
+  tweet[source]:                web
+  tweet[profile_image_url]:     http://s.twimg.com/a/1252620925/images/default_profile_normal.png
+  tweet[to_user_id]: 
+  tweet[from_user]:             dailydid_dev
+  tweet[iso_language_code]:     en
+  tweet[text]:                  #test 123 #dailydid
+  tweet[from_user_id]:          50354397
+  tweet[created_at]:            Fri, 04 Sep 2009 17:03:56 +0000
+
+==== The Twitter Tweet Hash - for Stream API
 
 For example:
 
@@ -286,7 +321,7 @@ For example:
   tweet[in_reply_to_status_id]: 
   tweet[text]:                     shoot @johnny in the wild 
 
-==== The Twitter User Hash
+==== The Twitter User Hash - for Stream API only
 
 We pull this out of the tweet[:user] and post it as the sender[] hash:
 

data/VERSION

@@ -1 +1 @@
-0.1.10
+0.1.13

data/bin/twroute_runner

@@ -8,7 +8,14 @@ Daemons.run_proc('twroute_runner.rb', :dir_mode => :normal, :dir => 'log') do
   ActiveRecord::Base.logger = Logger.new(File.open(File.join(::Twroute::Application.root_dir, 'log/database.log'), 'a'))
   Twroute::Application.logger = Logger.new(File.open(File.join(::Twroute::Application.root_dir, 'log/twroute.log'), 'a'))
   loop do
-    Twroute::Application.run
+    begin
+      Twroute::Application.run
+    rescue => e
+      puts e.to_s
+      Twroute::Application.logger.info e.to_s
+      Twroute::Application.logger.info "Application Error sleeping 30 seconds before restart"      
+      sleep 30
+    end
   end
 end
 

data/lib/twroute/polling_search.rb

@@ -1,7 +1,6 @@
-require 'yajl'
-require 'yajl/http_stream'
 require 'observer'
 require 'uri'
+require 'grackle'
 
 module Twroute
   class PollingSearch
@@ -12,21 +11,21 @@ module Twroute
       @user = user
       @password = password
       @post_arg_hash = post_arg_hash
+      @grackle_client = Grackle::Client.new(:auth=>{:type=>:basic,:username=>@user,:password=>@password})
     end
 
-    def twitter_search_uri
-      URI.parse("http://#{@user}:#{@password}@search.twitter.com/search.json?#{self.query_string}")     
+    def query_hash
+      @post_arg_hash['since_id'] = @since_id if @since_id
+      @post_arg_hash
     end
 
-    def query_string
-      @post_arg_hash['since_id'] = @since_id if @since_id
-      @post_arg_hash.keys.collect do |key|
-        "#{key}=#{URI.escape(@post_arg_hash[key].to_s)}"
-      end.sort_by { |x| x }.join('&')
+    def grack_to_hash(grack)
+      res = grack.marshal_dump
+      res[:id] = grack.id
+      res
     end
     
     def start
-      puts twitter_search_uri.to_s
       loop do
         send_query
         sleep 30
@@ -34,15 +33,14 @@ module Twroute
     end
 
     def send_query
-      results = Yajl::HttpStream.get( twitter_search_uri,
-                                      :symbolize_keys => true)
-      results = results[:results] || []
+      results = @grackle_client[:search].search? query_hash
+      results = results.results || []
       results.reverse!
       return if results.empty?      
-      @since_id = results.last[:id]
+      @since_id = results.last.id 
       results.each do |tweet|
         changed
-        notify_observers( tweet )        
+        notify_observers( grack_to_hash tweet )        
       end
     end
     

data/test/polling_search_test.rb

@@ -29,13 +29,6 @@ class PollingSearchTest < Test::Unit::TestCase
                                             { :q => 'twitter', :rpp => 20 })
     end
     
-    should "be able to create query string" do
-      @tweeter.query_string.should == 'q=twitter&rpp=20' 
-    end 
-    
-    should "be able to create a twitter search url" do
-      @tweeter.twitter_search_uri.to_s.should == 'http://bhauman:watertank@search.twitter.com/search.json?q=twitter&rpp=20'      
-    end
 
     should "be able to send query and get results" do
       @listen = TestObserver.new
@@ -46,7 +39,7 @@ class PollingSearchTest < Test::Unit::TestCase
 
       @tweeter.since_id.should_not be_nil
       @tweeter.since_id.should == @listen.results.last[:id]      
-      @tweeter.twitter_search_uri.to_s.should == "http://bhauman:watertank@search.twitter.com/search.json?q=twitter&rpp=20&since_id=#{@listen.results.last[:id]}"      
+      @listen.results.first[:id].should_not be_nil
       
       @listen.results.first[:id].should <= @listen.results.last[:id]      
       

data/twroute.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{twroute}
-  s.version = "0.1.10"
+  s.version = "0.1.13"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["bhauman"]
-  s.date = %q{2009-09-11}
+  s.date = %q{2009-09-16}
   s.description = %q{Twroute listens for Twitter updates and redirects them to HTTP post requests}
   s.email = %q{bhauman@gmail.com}
   s.executables = ["twroute", "twroute_runner", "twroute_worker"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bhauman-twroute
 version: !ruby/object:Gem::Version 
-  version: 0.1.10
+  version: 0.1.13
 platform: ruby
 authors: 
 - bhauman
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-11 00:00:00 -07:00
+date: 2009-09-16 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency