tweetstream 2.3.0 → 2.4.0

data/.rspec

@@ -1 +1,3 @@
 --color
+--fail-fast
+--order random

data/.travis.yml

@@ -1,10 +1,16 @@
+bundler_args: --without development
 language: ruby
 matrix:
   allow_failures:
     - rvm: ruby-head
 rvm:
-  - rbx-19mode
   - 1.8.7
   - 1.9.2
   - 1.9.3
   - ruby-head
+gemfile:
+  - Gemfile
+  - gemfiles/twitter4_0.gemfile
+  - gemfiles/twitter4_1.gemfile
+  - gemfiles/twitter4_2.gemfile
+  - gemfiles/twitter4_3.gemfile

data/.yardopts

@@ -1,4 +1,6 @@
 --markup markdown
 -
-RELEASE_NOTES.md
+CHANGELOG.md
+CONTRIBUTING.md
 LICENSE.md
+README.md

data/CHANGELOG.md

@@ -1,12 +1,30 @@
-Version 2.0.1
+Version 2.4.0
+=============
+* Revert "use extract_options! from the Twitter gem"
+* Reorganize development and test dependencies
+
+Version 2.3.0
+=============
+* Added support for Site Stream friends list
+* Update paths for API 1.1
+* Added stall warning handling
+
+Version 2.2.0
 =============
+* Change method to request_method
 
+Version 2.1.0
+=============
+* Disable identity map to reduce memory usage
+* Added options support to UserStreams
+
+Version 2.0.1
+=============
 * Fixed Twitter gem objects
 * Added on_unauthorized callback method (koenpunt)
 
 Version 2.0.0
 =============
-
 * Added Site Stream support
 * Switched to [em-twitter](https://github.com/spagalloco/em-twitter) for underlying streaming lib
 * Switched to Twitter gem objects instead of custom hashes, see [47e5cd3d21a9562b3d959bc231009af460b37567](https://github.com/intridea/tweetstream/commit/47e5cd3d21a9562b3d959bc231009af460b37567) for details (sferik)
@@ -16,36 +34,30 @@ Version 2.0.0
 
 Version 1.1.5
 =============
-
 * Added support for the scrub_geo response (augustj)
 * Update multi_json and twitter-stream version dependencies
 
 Version 1.1.4
 =============
-
 * Added Client#connect to start streaming inside an EM reactor (pelle)
 * Added shutdown_stream to cleanly stop the stream (lud)
 * Loosened multi_json dependency for Rails 3.2 compatibiltiy
 
 Version 1.1.3
 =============
-
 * Added on_reconnect callback method
 
 Version 1.1.2
 =============
-
 * Added support for statuses/links
 * Client now checks that specified json_parser can be loaded during initialization
 
 Version 1.1.1
 =============
-
 * Fix for 1.8.6 compatibility
 
 Version 1.1.0
 =============
-
 * OAuth authentication
 * User Stream support
 * Removed swappable JSON backend support for MultiJson
@@ -55,12 +67,10 @@ Version 1.1.0
 
 Version 1.0.5
 =============
-
 * Force SSL to comply with
 
 Version 1.0.0
 =============
-
 * Swappable JSON backend support
 * Switches to use EventMachine instead of Yajl for the HTTP Stream
 * Support reconnect and on_error

data/Gemfile

@@ -1,3 +1,12 @@
-source 'https://rubygems.org'
+source :rubygems
+
+gem 'rake'
+gem 'yard'
+gem 'json', :platforms => :ruby_18
+
+group :test do
+  gem 'rspec'
+  gem 'webmock'
+end
 
 gemspec

data/Rakefile

@@ -7,13 +7,5 @@ RSpec::Core::RakeTask.new(:spec)
 task :test => :spec
 task :default => :spec
 
-namespace :doc do
-  require 'yard'
-  YARD::Rake::YardocTask.new do |task|
-    task.files   = ['RELEASE_NOTES.md', 'LICENSE.md', 'lib/**/*.rb']
-    task.options = [
-      '--output-dir', 'doc/yard',
-      '--markup', 'markdown',
-    ]
-  end
-end
+require 'yard'
+YARD::Rake::YardocTask.new

data/examples/oauth.rb

@@ -1,4 +1,3 @@
-require 'yajl'
 require 'tweetstream'
 
 TweetStream.configure do |config|

data/examples/sitestream.rb

@@ -1,4 +1,3 @@
-require 'yajl'
 require 'tweetstream'
 
 TweetStream.configure do |config|

data/examples/userstream.rb

@@ -1,4 +1,3 @@
-require 'yajl'
 require 'tweetstream'
 
 TweetStream.configure do |config|

data/gemfiles/twitter4_0.gemfile

@@ -0,0 +1,13 @@
+source :rubygems
+
+gem 'twitter', '~> 4.0.0'
+gem 'rake'
+gem 'yard'
+gem 'json', :platforms => :ruby_18
+
+group :test do
+  gem 'rspec'
+  gem 'webmock'
+end
+
+gemspec :path => '..'

data/gemfiles/twitter4_1.gemfile

@@ -0,0 +1,13 @@
+source :rubygems
+
+gem 'twitter', '~> 4.1.0'
+gem 'rake'
+gem 'yard'
+gem 'json', :platforms => :ruby_18
+
+group :test do
+  gem 'rspec'
+  gem 'webmock'
+end
+
+gemspec :path => '..'

data/gemfiles/twitter4_2.gemfile

@@ -0,0 +1,13 @@
+source :rubygems
+
+gem 'twitter', '~> 4.2.0'
+gem 'rake'
+gem 'yard'
+gem 'json', :platforms => :ruby_18
+
+group :test do
+  gem 'rspec'
+  gem 'webmock'
+end
+
+gemspec :path => '..'

data/gemfiles/twitter4_3.gemfile

@@ -0,0 +1,13 @@
+source :rubygems
+
+gem 'twitter', '~> 4.3.0'
+gem 'rake'
+gem 'yard'
+gem 'json', :platforms => :ruby_18
+
+group :test do
+  gem 'rspec'
+  gem 'webmock'
+end
+
+gemspec :path => '..'

data/lib/tweetstream/client.rb

@@ -1,7 +1,7 @@
 require 'em-twitter'
 require 'eventmachine'
-require 'multi_json'
 require 'twitter'
+require 'yajl'
 
 module TweetStream
   # Provides simple access to the Twitter Streaming API (https://dev.twitter.com/docs/streaming-api)
@@ -93,7 +93,8 @@ module TweetStream
     # Keywords containing punctuation will only exact match tokens.
     # Query parameters may be passed as the last argument.
     def track(*keywords, &block)
-      query_params = keywords.extract_options!
+      query_params = keywords.pop if keywords.last.is_a?(::Hash)
+      query_params ||= {}
       filter(query_params.merge(:track => keywords), &block)
     end
 
@@ -102,7 +103,8 @@ module TweetStream
     # pressing the reply "swoosh") are not matched. Requires integer user
     # IDs, not screen names. Query parameters may be passed as the last argument.
     def follow(*user_ids, &block)
-      query_params = user_ids.extract_options!
+      query_params = user_ids.pop if user_ids.last.is_a?(::Hash)
+      query_params ||= {}
       filter(query_params.merge(:follow => user_ids), &block)
     end
 
@@ -115,7 +117,8 @@ module TweetStream
     # the first pair denoting the southwest corner of the box
     # longitude/latitude pairs, separated by commas. The first pair specifies the southwest corner of the box.
     def locations(*locations_map, &block)
-      query_params = locations_map.extract_options!
+      query_params = locations_map.pop if locations_map.last.is_a?(::Hash)
+      query_params ||= {}
       filter(query_params.merge(:locations => locations_map), &block)
     end
 
@@ -395,9 +398,9 @@ module TweetStream
       @stream = EM::Twitter::Client.connect(stream_parameters)
       @stream.each do |item|
         begin
-          hash = MultiJson.decode(item, :symbolize_keys => true)
-        rescue MultiJson::DecodeError
-          invoke_callback(callbacks['error'], "MultiJson::DecodeError occured in stream: #{item}")
+          hash = Yajl::Parser.parse(item, :symbolize_keys => true)
+        rescue Yajl::ParseError
+          invoke_callback(callbacks['error'], "Yajl::ParseError occured in stream: #{item}")
           next
         end
 

data/lib/tweetstream/configuration.rb

@@ -1,4 +1,3 @@
-require 'multi_json'
 require 'tweetstream/version'
 
 module TweetStream
@@ -22,9 +21,6 @@ module TweetStream
       :oauth_token,
       :oauth_token_secret].freeze
 
-    # The parser that will be used to connect if none is set
-    DEFAULT_PARSER = MultiJson.default_engine
-
     # By default, don't set a username
     DEFAULT_USERNAME = nil
 

data/lib/tweetstream/version.rb

@@ -1,3 +1,3 @@
 module TweetStream
-  VERSION = '2.3.0' unless defined?(TweetStream::VERSION)
+  VERSION = '2.4.0' unless defined?(TweetStream::VERSION)
 end

data/spec/spec_helper.rb

@@ -8,10 +8,16 @@ end
 
 require 'tweetstream'
 require 'tweetstream/site_stream_client'
+require 'json'
 require 'rspec'
 require 'webmock/rspec'
 require 'yajl'
-require 'json'
+
+RSpec.configure do |config|
+  config.expect_with :rspec do |c|
+    c.syntax = :expect
+  end
+end
 
 def samples(fixture)
   samples = []
@@ -42,4 +48,4 @@ end
 FakeHttp = Class.new do
   def callback; end
   def errback; end
-end
+end

data/spec/tweetstream/client_authentication_spec.rb

@@ -29,7 +29,7 @@ describe TweetStream::Client do
       @client = TweetStream::Client.new
     end
 
-    it 'should try to connect via a JSON stream with basic auth' do
+    it "tries to connect via a JSON stream with basic auth" do
       EM::Twitter::Client.should_receive(:connect).with(
         :path => '/1.1/statuses/filter.json',
         :method => 'POST',
@@ -59,7 +59,7 @@ describe TweetStream::Client do
       @client = TweetStream::Client.new
     end
 
-    it 'should try to connect via a JSON stream with oauth' do
+    it "tries to connect via a JSON stream with oauth" do
       EM::Twitter::Client.should_receive(:connect).with(
         :path => '/1.1/statuses/filter.json',
         :method => 'POST',

data/spec/tweetstream/client_site_stream_spec.rb

@@ -38,27 +38,27 @@ describe TweetStream::Client do
         @client.sitestream
       end
 
-      it 'supports "with followings" when followings set as a boolean' do
+      it "supports :followings => true" do
         @client.should_receive(:start).once.with('/1.1/site.json', hash_including(:with => 'followings')).and_return(@stream)
         @client.sitestream(['115192457'], :followings => true)
       end
 
-      it 'supports "with followings" when followings set as an option' do
+      it "supports :with => 'followings'" do
         @client.should_receive(:start).once.with('/1.1/site.json', hash_including(:with => 'followings')).and_return(@stream)
         @client.sitestream(['115192457'], :with => 'followings')
       end
 
-      it 'supports "with user"' do
+      it "supports :with => 'user'" do
         @client.should_receive(:start).once.with('/1.1/site.json', hash_including(:with => 'user')).and_return(@stream)
         @client.sitestream(['115192457'], :with => 'user')
       end
 
-      it 'supports "replies all"' do
+      it "supports :replies => 'all'" do
         @client.should_receive(:start).once.with('/1.1/site.json', hash_including(:replies => 'all')).and_return(@stream)
         @client.sitestream(['115192457'], :replies => 'all')
       end
 
-      describe 'control management' do
+      describe "control management" do
         before do
           @control_response = {"control" =>
             {
@@ -66,18 +66,18 @@ describe TweetStream::Client do
             }
           }
         end
-        it 'assigns the control_uri' do
+        it "assigns the control_uri" do
           @stream.should_receive(:each).and_yield(@control_response.to_json)
           @client.sitestream
 
-          @client.control_uri.should eq("/1.1/site/c/01_225167_334389048B872A533002B34D73F8C29FD09EFC50")
+          expect(@client.control_uri).to eq("/1.1/site/c/01_225167_334389048B872A533002B34D73F8C29FD09EFC50")
         end
 
-        it 'instantiates a SiteStreamClient' do
+        it "instantiates a SiteStreamClient" do
           @stream.should_receive(:each).and_yield(@control_response.to_json)
           @client.sitestream
 
-          @client.control.should be_kind_of(TweetStream::SiteStreamClient)
+          expect(@client.control).to be_kind_of(TweetStream::SiteStreamClient)
         end
 
         it "passes the client's on_error to the SiteStreamClient" do
@@ -88,44 +88,44 @@ describe TweetStream::Client do
 
           @client.control.on_error.call
 
-          called.should be_true
+          expect(called).to be_true
         end
       end
 
-      describe 'data handling' do
-        context 'messages' do
+      describe "data handling" do
+        context "messages" do
           before do
             @ss_message = {'for_user' => '12345', 'message' => {'id' => 123, 'user' => {'screen_name' => 'monkey'}, 'text' => 'Oo oo aa aa'}}
           end
 
-          it 'yields a site stream message' do
+          it "yields a site stream message" do
             @stream.should_receive(:each).and_yield(@ss_message.to_json)
             yielded_status = nil
             @client.sitestream do |message|
               yielded_status = message
             end
-            yielded_status.should_not be_nil
-            yielded_status[:for_user].should == '12345'
-            yielded_status[:message][:user][:screen_name].should == 'monkey'
-            yielded_status[:message][:text].should == 'Oo oo aa aa'
+            expect(yielded_status).not_to be_nil
+            expect(yielded_status[:for_user]).to eq('12345')
+            expect(yielded_status[:message][:user][:screen_name]).to eq('monkey')
+            expect(yielded_status[:message][:text]).to eq('Oo oo aa aa')
           end
-          it 'yields itself if block has an arity of 2' do
+          it "yields itself if block has an arity of 2" do
             @stream.should_receive(:each).and_yield(@ss_message.to_json)
             yielded_client = nil
             @client.sitestream do |_, client|
               yielded_client = client
             end
-            yielded_client.should_not be_nil
-            yielded_client.should == @client
+            expect(yielded_client).not_to be_nil
+            expect(yielded_client).to eq(@client)
           end
         end
 
-        context 'friends list' do
+        context "friends list" do
           before do
             @friends_list = { 'friends' => [123, 456] }
          end
 
-          it 'yields a friends list array' do
+          it "yields a friends list array" do
             @stream.should_receive(:each).and_yield(@friends_list.to_json)
             yielded_list = nil
             @client.on_friends do |friends|
@@ -133,9 +133,9 @@ describe TweetStream::Client do
             end
             @client.sitestream
 
-            yielded_list.should_not be_nil
-            yielded_list.should be_an(Array)
-            yielded_list.first.should eq(123)
+            expect(yielded_list).not_to be_nil
+            expect(yielded_list).to be_an(Array)
+            expect(yielded_list.first).to eq(123)
           end
         end
       end