bhauman-twroute 0.1.7 → 0.1.8

data/VERSION

@@ -1 +1 @@
-0.1.7
+0.1.8

data/bin/twroute_runner

@@ -6,7 +6,9 @@ require 'twroute/application'
 
 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'))          
-  Twroute::Application.run
+  Twroute::Application.logger = Logger.new(File.open(File.join(::Twroute::Application.root_dir, 'log/twroute.log'), 'a'))
+  loop do
+    Twroute::Application.run
+  end
 end
 

data/lib/twroute.rb

@@ -1,5 +1,6 @@
 require 'rubygems'
 require 'twroute/tweeter'
+require 'twroute/polling_search'
 require 'twroute/routes'
 require 'twroute/dispatcher'
 require 'twroute/tweet_route'

data/lib/twroute/application/twrouter.rb

@@ -11,10 +11,16 @@ module Twroute
         setup
       end
       def setup
-        @tweeter = ::Twroute::Tweeter.new(config.twitter.user,
-                                         config.twitter.password,
-                                         config.twitter.stream_api,
-                                         config.twitter.stream_api_args.marshal_dump)
+        if self.config.twitter.search_params
+          @tweeter = ::Twroute::PollingSearch.new(config.twitter.user,
+                                                  config.twitter.password,
+                                                  config.twitter.search_params.marshal_dump)
+        else
+          @tweeter = ::Twroute::Tweeter.new(config.twitter.user,
+                                           config.twitter.password,
+                                           config.twitter.stream_api,
+                                           config.twitter.stream_api_args.marshal_dump)
+        end
         @dispatcher = ::Twroute::Dispatcher.new( config.submit_to.marshal_dump,
                                                  *::Twroute::Routes.routes )
         @requester  = ::Twroute::Requester::Delayed.new

data/lib/twroute/polling_search.rb

@@ -0,0 +1,48 @@
+require 'yajl'
+require 'yajl/http_stream'
+require 'observer'
+require 'uri'
+
+module Twroute
+  class PollingSearch
+    include Observable
+    attr_accessor :since_id
+    
+    def initialize(user, password, post_arg_hash = {})
+      @user = user
+      @password = password
+      @post_arg_hash = post_arg_hash
+    end
+
+    def twitter_search_uri
+      URI.parse("http://#{@user}:#{@password}@search.twitter.com/search.json?#{self.query_string}")     
+    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('&')
+    end
+    
+    def start
+      puts twitter_search_uri.to_s
+      loop do
+        send_query
+        sleep 30
+      end
+    end
+
+    def send_query
+      results = Yajl::HttpStream.get( twitter_search_uri,
+                                      :symbolize_keys => true)
+      @since_id = results[:results].last[:id]
+      results[:results].each do |tweet|
+        changed
+        notify_observers( tweet )        
+      end
+    end
+    
+  end
+end
+

data/lib/twroute/tweet_route.rb

@@ -8,8 +8,8 @@ module Twroute
     
     def tweet(tweet_hash)
       reset
-      @tweet_hash = tweet_hash
-      @sender_hash = tweet_hash[:user]
+      @tweet_hash = tweet_hash || { }
+      @sender_hash = tweet_hash[:user] || { }
       parse_tweet(tweet_hash[:text])
     end
 

data/test/polling_search_test.rb

@@ -0,0 +1,50 @@
+require 'test_helper.rb'
+require 'twroute/polling_search'
+
+class TestObserver
+  attr_accessor :results
+  def update(tweet_hash)
+    @results ||= []
+    @results << tweet_hash
+  end
+end
+
+
+class PollingSearchTest < Test::Unit::TestCase
+  def setup
+  end
+
+  def teardown
+  end
+  
+  context "with tweeter" do
+    setup do
+      @tweeter = Twroute::PollingSearch.new('bhauman',
+                                            'watertank',
+                                            { :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
+      @tweeter.add_observer @listen
+      @tweeter.send_query
+
+      @listen.results.length.should == 20
+
+      @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]}"      
+      
+    end
+    
+  end
+  
+end

data/test/test_helper.rb

@@ -7,7 +7,7 @@ require 'stump'
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
-require 'twroute'
+require 'twroute.rb'
 
 class Test::Unit::TestCase
 end

data/test/tweet_route_test.rb

@@ -5,6 +5,8 @@ class TweetRouteTest < Test::Unit::TestCase
       @tweet_route = Twroute::TweetRoute.new(Twroute::Parser::Tags.new, '/user/:tweet[sender]/tags/:tags')
       @tweet_str = "#this #is cool #too"
       @tweet = {:source=>"<a href=\"http://twitterfox.net/\">TwitterFox</a>", :user=>{:url=>"http://rosed1st.multiply.com/", :friends_count=>275, :time_zone=>"Central Time (US & Canada)", :screen_name=>"RoseD1st", :notifications=>nil, :utc_offset=>-21600, :profile_image_url=>"http://s3.amazonaws.com/twitter_production/profile_images/352932267/twitterProfilePhoto_normal.jpg", :protected=>false, :verified=>false, :profile_text_color=>"000000", :name=>"RoseD1st", :profile_sidebar_border_color=>"D5D39E", :statuses_count=>625, :profile_link_color=>"B4C67C", :location=>"Mad as Hell!", :following=>nil, :profile_background_image_url=>"http://s3.amazonaws.com/twitter_production/profile_background_images/2475770/background.png", :description=>"A conservatve whos had it with Obamas lies!I'm a proud \342\200\234Birther\342\200\235 and only those who haven't looked at the facts think there's no problem", :followers_count=>211, :created_at=>"Thu May 01 02:11:28 +0000 2008", :profile_background_tile=>true, :id=>14609143, :profile_background_color=>"9ae4e8", :profile_sidebar_fill_color=>"778F5F", :favourites_count=>19}, :text=>"this is a #test #tweet", :favorited=>false, :in_reply_to_screen_name=>nil, :in_reply_to_status_id=>nil, :created_at=>"Sun Aug 09 00:25:46 +0000 2009", :id=>3199928174, :in_reply_to_user_id=>nil, :truncated=>false}
+
+      @search_tweet = {:profile_image_url=>"http://a1.twimg.com/profile_images/49018042/Tom_Icon_64x64_normal.png", :source=>"&lt;a href=&quot;http://twitter.com/&quot;&gt;web&lt;/a&gt;", :text=>"this is a #test #tweet", :created_at=>"Fri, 11 Sep 2009 20:28:32 +0000", :to_user_id=>nil, :from_user=>"tmornini", :from_user_id=>168963, :iso_language_code=>"en", :id=>3918907432}
     end
 
     should "be able to determine if the required hash keys have been met" do
@@ -26,6 +28,17 @@ class TweetRouteTest < Test::Unit::TestCase
 
       post_args['tweet[user]'].should == nil      
     end
+
+    should "be able to handle search result tweet" do
+      @tweet_route.tweet(@search_tweet)
+      post_args = @tweet_route.get_post_args
+      post_args['tweet[from_user]'].should == 'tmornini'
+      post_args['tweet[text]'].should == 'this is a #test #tweet'
+      post_args['parsed[tags]'].should == 'test-tweet'
+
+      post_args['sender'].should == nil
+      @tweet_route.fill_in_url_pattern.should == "/user/:tweet[sender]/tags/test-tweet"
+    end    
     
   end
   

data/twroute.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{twroute}
-  s.version = "0.1.7"
+  s.version = "0.1.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["bhauman"]
-  s.date = %q{2009-08-25}
+  s.date = %q{2009-09-11}
   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"]
@@ -42,6 +42,7 @@ Gem::Specification.new do |s|
      "lib/twroute/parser/regex.rb",
      "lib/twroute/parser/tags.rb",
      "lib/twroute/parser/users.rb",
+     "lib/twroute/polling_search.rb",
      "lib/twroute/requester/basic.rb",
      "lib/twroute/requester/delayed.rb",
      "lib/twroute/requester/delayed/create_delayed_jobs.rb",
@@ -58,6 +59,7 @@ Gem::Specification.new do |s|
      "test/fixtures/non_twitter_response.yaml",
      "test/fixtures/twitter_response.yaml",
      "test/fixtures/twitter_response_bad_status.yaml",
+     "test/polling_search_test.rb",
      "test/reqex_parser_test.rb",
      "test/routes_test.rb",
      "test/tags_parser_test.rb",
@@ -80,6 +82,7 @@ Gem::Specification.new do |s|
     "test/config_test.rb",
      "test/delayed_request_test.rb",
      "test/dispatcher_test.rb",
+     "test/polling_search_test.rb",
      "test/reqex_parser_test.rb",
      "test/routes_test.rb",
      "test/tags_parser_test.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bhauman-twroute
 version: !ruby/object:Gem::Version 
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors: 
 - bhauman
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-25 00:00:00 -07:00
+date: 2009-09-11 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -141,6 +141,7 @@ files:
 - lib/twroute/parser/regex.rb
 - lib/twroute/parser/tags.rb
 - lib/twroute/parser/users.rb
+- lib/twroute/polling_search.rb
 - lib/twroute/requester/basic.rb
 - lib/twroute/requester/delayed.rb
 - lib/twroute/requester/delayed/create_delayed_jobs.rb
@@ -157,6 +158,7 @@ files:
 - test/fixtures/non_twitter_response.yaml
 - test/fixtures/twitter_response.yaml
 - test/fixtures/twitter_response_bad_status.yaml
+- test/polling_search_test.rb
 - test/reqex_parser_test.rb
 - test/routes_test.rb
 - test/tags_parser_test.rb
@@ -199,6 +201,7 @@ test_files:
 - test/config_test.rb
 - test/delayed_request_test.rb
 - test/dispatcher_test.rb
+- test/polling_search_test.rb
 - test/reqex_parser_test.rb
 - test/routes_test.rb
 - test/tags_parser_test.rb