tweetstream 0.1.8 → 0.1.9

data/VERSION

@@ -1 +1 @@
-0.1.8
+0.1.9

data/lib/tweetstream/client.rb

@@ -91,7 +91,7 @@ module TweetStream
           query_params[param] = query_params[param].to_s
         end
       end
-      start('statuses/filter', query_params, &block)
+      start('statuses/filter', query_params.merge(:method => :post), &block)
     end
 
     # Set a Proc to be run when a deletion notice is received
@@ -137,12 +137,17 @@ module TweetStream
     end
     
     def start(path, query_parameters = {}, &block) #:nodoc:
+      method = query_parameters.delete(:method) || :get
       delete_proc = query_parameters.delete(:delete) || self.on_delete
       limit_proc = query_parameters.delete(:limit) || self.on_limit
       
-      uri = build_uri(path, query_parameters)
-            
-      Yajl::HttpStream.get(uri, :symbolize_keys => true) do |hash|
+      uri = method == :get ? build_uri(path, query_parameters) : build_uri(path)
+      
+      args = [uri]
+      args << build_post_body(query_parameters) if method == :post
+      args << {:symbolize_keys => true}
+      
+      Yajl::HttpStream.send(method, *args) do |hash|
         if hash[:delete] && hash[:delete][:status]
           delete_proc.call(hash[:delete][:status][:id], hash[:delete][:status][:user_id]) if delete_proc.is_a?(Proc)
         elsif hash[:limit] && hash[:limit][:track]
@@ -169,7 +174,11 @@ module TweetStream
       URI.parse("http://#{URI.encode self.username}:#{URI.encode self.password}@stream.twitter.com/1/#{path}.json#{build_query_parameters(query_parameters)}")
     end
 
-    def build_query_parameters(query) #:nodoc:
+    def build_query_parameters(query)
+      query.size > 0 ? "?#{build_post_body(query)}" : ''
+    end
+    
+    def build_post_body(query) #:nodoc:
       return '' unless query && query.is_a?(::Hash) && query.size > 0
       pairs = []
       
@@ -177,7 +186,7 @@ module TweetStream
         pairs << "#{k.to_s}=#{CGI.escape(v.to_s)}"
       end
 
-      "?#{pairs.join('&')}"
+      pairs.join('&')
     end
   end
 end

data/spec/tweetstream/client_spec.rb

@@ -30,29 +30,29 @@ describe TweetStream::Client do
     end
   end
 
-  describe '#build_query_parameters' do
+  describe '#build_post_body' do
     before do
       @client = TweetStream::Client.new('abc','def')
     end
   
     it 'should return a blank string if passed a nil value' do
-      @client.send(:build_query_parameters, nil).should == ''
+      @client.send(:build_post_body, nil).should == ''
     end
 
     it 'should return a blank string if passed an empty hash' do
-      @client.send(:build_query_parameters, {}).should == ''
+      @client.send(:build_post_body, {}).should == ''
     end
 
     it 'should add a query parameter for a key' do
-      @client.send(:build_query_parameters, {:query => 'abc'}).should == '?query=abc'
+      @client.send(:build_post_body, {:query => 'abc'}).should == 'query=abc'
     end
 
     it 'should escape characters in the value' do
-      @client.send(:build_query_parameters, {:query => 'awesome guy'}).should == '?query=awesome+guy'
+      @client.send(:build_post_body, {:query => 'awesome guy'}).should == 'query=awesome+guy'
     end
 
     it 'should join multiple pairs together' do
-      ['?a=b&c=d','?c=d&a=b'].include?(@client.send(:build_query_parameters, {:a => 'b', :c => 'd'})).should be_true
+      ['a=b&c=d','c=d&a=b'].include?(@client.send(:build_post_body, {:a => 'b', :c => 'd'})).should be_true
     end
   end
 
@@ -67,7 +67,7 @@ describe TweetStream::Client do
     end
 
     it 'should yield a TwitterStream::Status for each update' do
-      Yajl::HttpStream.should_receive(:get).once.with(URI.parse('http://abc:def@stream.twitter.com/1/statuses/filter.json?track=musicmonday'), :symbolize_keys => true).and_yield(sample_tweets[0])
+      Yajl::HttpStream.should_receive(:post).once.with(URI.parse('http://abc:def@stream.twitter.com/1/statuses/filter.json'), 'track=musicmonday', :symbolize_keys => true).and_yield(sample_tweets[0])
       @client.track('musicmonday') do |status|
         status.is_a?(TweetStream::Status).should be_true
         @yielded = true
@@ -88,7 +88,7 @@ describe TweetStream::Client do
         @called = false
         @proc = Proc.new{|*args| @called = true }
         @client.send("on_#{special_method}", &@proc)
-        Yajl::HttpStream.should_receive(:get).once.with(URI.parse('http://abc:def@stream.twitter.com/1/statuses/filter.json?track=musicmonday'), :symbolize_keys => true).and_yield(special_object)
+        Yajl::HttpStream.should_receive(:post).once.with(URI.parse('http://abc:def@stream.twitter.com/1/statuses/filter.json'), "track=musicmonday", :symbolize_keys => true).and_yield(special_object)
         @client.track('musicmonday')
         @called.should == true
       end
@@ -96,7 +96,7 @@ describe TweetStream::Client do
       it "should accept a proc on a :#{special_method} option if a #{special_method} object is given" do
         @called = false
         @proc = Proc.new{|*args| @called = true }
-        Yajl::HttpStream.should_receive(:get).once.with(URI.parse('http://abc:def@stream.twitter.com/1/statuses/filter.json?track=musicmonday'), :symbolize_keys => true).and_yield(special_object)
+        Yajl::HttpStream.should_receive(:post).once.with(URI.parse('http://abc:def@stream.twitter.com/1/statuses/filter.json'), "track=musicmonday", :symbolize_keys => true).and_yield(special_object)
         @client.track('musicmonday', special_method => @proc)
         @called.should == true
       end
@@ -116,27 +116,27 @@ describe TweetStream::Client do
     end
     
     it '#track should make a call to start with "statuses/filter" and a track query parameter' do
-      @client.should_receive(:start).once.with('statuses/filter', :track => 'test')
+      @client.should_receive(:start).once.with('statuses/filter', :track => 'test', :method => :post)
       @client.track('test')
     end
     
     it '#track should comma-join multiple arguments' do
-      @client.should_receive(:start).once.with('statuses/filter', :track => 'foo,bar,baz')
+      @client.should_receive(:start).once.with('statuses/filter', :track => 'foo,bar,baz', :method => :post)
       @client.track('foo', 'bar', 'baz')
     end
     
     it '#follow should make a call to start with "statuses/filter" and a follow query parameter' do
-      @client.should_receive(:start).once.with('statuses/filter', :follow => '123')
+      @client.should_receive(:start).once.with('statuses/filter', :follow => '123', :method => :post)
       @client.follow(123)
     end
     
     it '#follow should comma-join multiple arguments' do
-      @client.should_receive(:start).once.with('statuses/filter', :follow => '123,456')
+      @client.should_receive(:start).once.with('statuses/filter', :follow => '123,456', :method => :post)
       @client.follow(123, 456)
     end
     
     it '#filter should make a call to "statuses/filter" with the query params provided' do
-      @client.should_receive(:start).once.with('statuses/filter', :follow => '123')
+      @client.should_receive(:start).once.with('statuses/filter', :follow => '123', :method => :post)
       @client.filter(:follow => 123)
     end
   end
@@ -161,7 +161,7 @@ describe TweetStream::Client do
     end
 
     it 'should call #start with "statuses/filter" and the provided queries' do
-      @client.should_receive(:start).once.with('statuses/filter', :track => 'rock')
+      @client.should_receive(:start).once.with('statuses/filter', :track => 'rock', :method => :post)
       @client.track('rock')
     end
   end
@@ -174,7 +174,7 @@ describe TweetStream::Client do
     it 'should not cause a TweetStream to crash with a real exception' do
       @client = TweetStream::Client.new('abc','def')
       @statuses = []
-      Yajl::HttpStream.should_receive(:get).once.with(URI.parse('http://abc:def@stream.twitter.com/1/statuses/filter.json?track=musicmonday'), :symbolize_keys => true).and_yield(sample_tweets[0])
+      Yajl::HttpStream.should_receive(:post).once.with(URI.parse('http://abc:def@stream.twitter.com/1/statuses/filter.json'), 'track=musicmonday', :symbolize_keys => true).and_yield(sample_tweets[0])
       @client.track('musicmonday') do |status|
         @statuses << status
         TweetStream::Client.stop

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tweetstream
 version: !ruby/object:Gem::Version 
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors: 
 - Michael Bleigh