tweetstream 2.5.0 → 2.6.0

data/spec/tweetstream/client_userstream_spec.rb

@@ -10,7 +10,7 @@ describe TweetStream::Client do
     end
     @client = TweetStream::Client.new
 
-    @stream = stub("EM::Twitter::Client",
+    @stream = double("EM::Twitter::Client",
       :connect => true,
       :unbind => true,
       :each => true,
@@ -22,45 +22,45 @@ describe TweetStream::Client do
       :on_unauthorized => true,
       :on_enhance_your_calm => true
     )
-    EM.stub!(:run).and_yield
-    EM::Twitter::Client.stub!(:connect).and_return(@stream)
+    allow(EM).to receive(:run).and_yield
+    allow(EM::Twitter::Client).to receive(:connect).and_return(@stream)
   end
 
   describe "User Stream support" do
     context "when calling #userstream" do
       it "sends the userstream host" do
-        EM::Twitter::Client.should_receive(:connect).with(hash_including(:host => "userstream.twitter.com")).and_return(@stream)
+        expect(EM::Twitter::Client).to receive(:connect).with(hash_including(:host => "userstream.twitter.com")).and_return(@stream)
         @client.userstream
       end
 
       it "uses the userstream uri" do
-        @client.should_receive(:start).once.with("/1.1/user.json", an_instance_of(Hash)).and_return(@stream)
+        expect(@client).to receive(:start).once.with("/1.1/user.json", an_instance_of(Hash)).and_return(@stream)
         @client.userstream
       end
 
       it "supports :replies => 'all'" do
-        @client.should_receive(:start).once.with("/1.1/user.json", hash_including(:replies => 'all')).and_return(@stream)
+        expect(@client).to receive(:start).once.with("/1.1/user.json", hash_including(:replies => 'all')).and_return(@stream)
         @client.userstream(:replies => 'all')
       end
 
       it "supports :stall_warnings => 'true'" do
-        @client.should_receive(:start).once.with("/1.1/user.json", hash_including(:stall_warnings => 'true')).and_return(@stream)
+        expect(@client).to receive(:start).once.with("/1.1/user.json", hash_including(:stall_warnings => 'true')).and_return(@stream)
         @client.userstream(:stall_warnings => 'true')
       end
 
       it "supports :with => 'followings'" do
-        @client.should_receive(:start).once.with("/1.1/user.json", hash_including(:with => 'followings')).and_return(@stream)
+        expect(@client).to receive(:start).once.with("/1.1/user.json", hash_including(:with => 'followings')).and_return(@stream)
         @client.userstream(:with => 'followings')
       end
 
       it "supports :with => 'user'" do
-        @client.should_receive(:start).once.with("/1.1/user.json", hash_including(:with => 'user')).and_return(@stream)
+        expect(@client).to receive(:start).once.with("/1.1/user.json", hash_including(:with => 'user')).and_return(@stream)
         @client.userstream(:with => 'user')
       end
 
       it "supports event callbacks" do
         event = nil
-        @stream.should_receive(:each).and_yield(fixture('favorite.json'))
+        expect(@stream).to receive(:each).and_yield(fixture('favorite.json'))
         @client.on_event(:favorite) do |e|
           event = e
         end.userstream

data/spec/tweetstream/daemon_spec.rb

@@ -22,7 +22,7 @@ describe TweetStream::Daemon do
   describe "#start" do
     it "starts the daemon" do
       client = TweetStream::Daemon.new
-      Daemons.should_receive(:run_proc).once
+      expect(Daemons).to receive(:run_proc).once
       client.track('intridea')
     end
   end

data/spec/tweetstream/site_stream_client_spec.rb

@@ -1,16 +1,16 @@
 require 'helper'
 
 describe TweetStream::SiteStreamClient do
-  before do
-    @keys = TweetStream::Configuration::OAUTH_OPTIONS_KEYS
-  end
+  let(:keys)       { TweetStream::Configuration::OAUTH_OPTIONS_KEYS }
+  let(:config_uri) { '/2b/site/c/1_1_54e345d655ee3e8df359ac033648530bfbe26c5g' }
+  let(:client)     { TweetStream::SiteStreamClient.new(config_uri) }
 
   describe "initialization" do
     context "with module configuration" do
 
       before do
         TweetStream.configure do |config|
-          @keys.each do |key|
+          keys.each do |key|
             config.send("#{key}=", key)
           end
         end
@@ -22,15 +22,15 @@ describe TweetStream::SiteStreamClient do
 
       it "inherits module configuration" do
         api = TweetStream::SiteStreamClient.new('/config_uri')
-        @keys.each do |key|
+        keys.each do |key|
           expect(api.send(key)).to eq(key)
         end
       end
     end
 
     context "with class configuration" do
-      before do
-        @configuration = {
+      let(:configuration) do
+        {
           :consumer_key => 'CK',
           :consumer_secret => 'CS',
           :oauth_token => 'AT',
@@ -40,9 +40,9 @@ describe TweetStream::SiteStreamClient do
 
       context "during initialization" do
         it "overrides module configuration" do
-          api = TweetStream::SiteStreamClient.new('/config_uri', @configuration)
-          @keys.each do |key|
-            expect(api.send(key)).to eq(@configuration[key])
+          api = TweetStream::SiteStreamClient.new('/config_uri', configuration)
+          keys.each do |key|
+            expect(api.send(key)).to eq(configuration[key])
           end
         end
       end
@@ -50,11 +50,11 @@ describe TweetStream::SiteStreamClient do
       context "after initilization" do
         it "overrides module configuration after initialization" do
           api = TweetStream::SiteStreamClient.new('/config_uri')
-          @configuration.each do |key, value|
+          configuration.each do |key, value|
             api.send("#{key}=", value)
           end
-          @keys.each do |key|
-            expect(api.send(key)).to eq(@configuration[key])
+          keys.each do |key|
+            expect(api.send(key)).to eq(configuration[key])
           end
         end
       end
@@ -63,24 +63,21 @@ describe TweetStream::SiteStreamClient do
 
   describe "#on_error" do
     it "stores the on_error proc" do
-      @client = TweetStream::SiteStreamClient.new('/config_uri')
-      @client.on_error { puts 'hi' }
-      expect(@client.on_error).to be_kind_of(Proc)
+      client = TweetStream::SiteStreamClient.new('/config_uri')
+      client.on_error { puts 'hi' }
+      expect(client.on_error).to be_kind_of(Proc)
     end
   end
 
   describe "#info" do
     context "success" do
       it "returns the information hash" do
-        @config_uri = '/2b/site/c/1_1_54e345d655ee3e8df359ac033648530bfbe26c5f'
-        @client = TweetStream::SiteStreamClient.new(@config_uri)
-
-        stub_request(:get, "https://sitestream.twitter.com#{@config_uri}/info.json").
+        stub_request(:get, "https://sitestream.twitter.com#{config_uri}/info.json").
           to_return(:status => 200, :body => fixture('info.json'), :headers => {})
         stream_info = nil
 
         EM.run_block do
-          @client.info { |info| stream_info = info}
+          client.info { |info| stream_info = info}
         end
         expect(stream_info).to be_kind_of(Hash)
       end
@@ -88,16 +85,13 @@ describe TweetStream::SiteStreamClient do
 
     context "failure" do
       it "invokes the on_error callback" do
-        @config_uri = '/2b/site/c/1_1_54e345d655ee3e8df359ac033648530bfbe26c5g'
-        @client = TweetStream::SiteStreamClient.new(@config_uri)
-
-        stub_request(:get, "https://sitestream.twitter.com#{@config_uri}/info.json").
+        stub_request(:get, "https://sitestream.twitter.com#{config_uri}/info.json").
           to_return(:status => 401, :body => '', :headers => {})
         called = false
 
         EM.run_block do
-          @client.on_error { called = true }
-          @client.info { |info| info }
+          client.on_error { called = true }
+          client.info { |info| info }
         end
         expect(called).to be_true
       end
@@ -108,15 +102,12 @@ describe TweetStream::SiteStreamClient do
   describe "#add_user" do
     context "success" do
       it "calls a block (if passed one)" do
-        @config_uri = '/2b/site/c/1_1_54e345d655ee3e8df359ac033648530bfbe26c5f'
-        @client = TweetStream::SiteStreamClient.new(@config_uri)
-
-        stub_request(:post, "https://sitestream.twitter.com#{@config_uri}/add_user.json").
+        stub_request(:post, "https://sitestream.twitter.com#{config_uri}/add_user.json").
           to_return(:status => 200, :body => '', :headers => {})
         called = false
 
         EM.run_block do
-          @client.add_user(12345) { called = true }
+          client.add_user(12345) { called = true }
         end
         expect(called).to be_true
       end
@@ -124,44 +115,56 @@ describe TweetStream::SiteStreamClient do
 
     context "failure" do
       it "invokes the on_error callback" do
-        @config_uri = '/2b/site/c/1_1_54e345d655ee3e8df359ac033648530bfbe26c5g'
-        @client = TweetStream::SiteStreamClient.new(@config_uri)
-
-        stub_request(:post, "https://sitestream.twitter.com#{@config_uri}/add_user.json").
+        stub_request(:post, "https://sitestream.twitter.com#{config_uri}/add_user.json").
           to_return(:status => 401, :body => '', :headers => {})
         called = false
 
         EM.run_block do
-          @client.on_error { called = true }
-          @client.add_user(12345) { |info| info }
+          client.on_error { called = true }
+          client.add_user(12345) { |info| info }
         end
         expect(called).to be_true
       end
     end
 
     it "accepts an array of user_ids" do
-      @client = TweetStream::SiteStreamClient.new('/config_uri')
-      conn = stub('Connection')
-      conn.should_receive(:post).
-        with(:path => '/config_uri/add_user.json', :body => { 'user_id' => '1234,5678' }).
+      conn = double('Connection')
+      expect(conn).to receive(:post).
+        with(:path => "#{config_uri}/add_user.json", :body => { 'user_id' => '1234,5678' }).
         and_return(FakeHttp.new)
-      @client.stub(:connection) { conn }
-      @client.add_user(['1234','5678'])
+      allow(client).to receive(:connection) { conn }
+      client.add_user(['1234','5678'])
+    end
+
+    describe "accepts a single user_id as" do
+      before :each do
+        conn = double('Connection')
+        expect(conn).to receive(:post).
+          with(:path => "#{config_uri}/add_user.json", :body => { 'user_id' => '1234' }).
+          and_return(FakeHttp.new)
+        allow(client).to receive(:connection) { conn }
+      end
+
+      it "a string" do
+        client.add_user('1234')
+      end
+
+      it "an integer" do
+        client.add_user(1234)
+      end
     end
+
   end
 
   describe "#remove_user" do
     context "success" do
       it "calls a block (if passed one)" do
-        @config_uri = '/2b/site/c/1_1_54e345d655ee3e8df359ac033648530bfbe26c5f'
-        @client = TweetStream::SiteStreamClient.new(@config_uri)
-
-        stub_request(:post, "https://sitestream.twitter.com#{@config_uri}/remove_user.json").
+        stub_request(:post, "https://sitestream.twitter.com#{config_uri}/remove_user.json").
           to_return(:status => 200, :body => '', :headers => {})
         called = false
 
         EM.run_block do
-          @client.remove_user(12345) { called = true }
+          client.remove_user(12345) { called = true }
         end
         expect(called).to be_true
       end
@@ -169,44 +172,55 @@ describe TweetStream::SiteStreamClient do
 
     context "failure" do
       it "invokes the on_error callback" do
-        @config_uri = '/2b/site/c/1_1_54e345d655ee3e8df359ac033648530bfbe26c5g'
-        @client = TweetStream::SiteStreamClient.new(@config_uri)
-
-        stub_request(:post, "https://sitestream.twitter.com#{@config_uri}/remove_user.json").
+        stub_request(:post, "https://sitestream.twitter.com#{config_uri}/remove_user.json").
           to_return(:status => 401, :body => '', :headers => {})
         called = false
 
         EM.run_block do
-          @client.on_error { called = true }
-          @client.remove_user(12345) { |info| info }
+          client.on_error { called = true }
+          client.remove_user(12345) { |info| info }
         end
         expect(called).to be_true
       end
     end
 
     it "accepts an array of user_ids" do
-      @client = TweetStream::SiteStreamClient.new('/config_uri')
-      conn = stub('Connection')
-      conn.should_receive(:post).
-        with(:path => '/config_uri/remove_user.json', :body => { 'user_id' => '1234,5678' }).
+      conn = double('Connection')
+      expect(conn).to receive(:post).
+        with(:path => "#{config_uri}/remove_user.json", :body => { 'user_id' => '1234,5678' }).
         and_return(FakeHttp.new)
-      @client.stub(:connection) { conn }
-      @client.remove_user(['1234','5678'])
+      allow(client).to receive(:connection) { conn }
+      client.remove_user(['1234','5678'])
+    end
+
+    describe "accepts a single user_id as" do
+      before :each do
+        conn = double('Connection')
+        expect(conn).to receive(:post).
+          with(:path => "#{config_uri}/remove_user.json", :body => { 'user_id' => '1234' }).
+          and_return(FakeHttp.new)
+        allow(client).to receive(:connection) { conn }
+      end
+
+      it "a string" do
+        client.remove_user('1234')
+      end
+
+      it "an integer" do
+        client.remove_user(1234)
+      end
     end
   end
 
   describe "#friends_ids" do
     context "success" do
       it "returns the information hash" do
-        @config_uri = '/2b/site/c/1_1_54e345d655ee3e8df359ac033648530bfbe26c5f'
-        @client = TweetStream::SiteStreamClient.new(@config_uri)
-
-        stub_request(:post, "https://sitestream.twitter.com#{@config_uri}/friends/ids.json").
+        stub_request(:post, "https://sitestream.twitter.com#{config_uri}/friends/ids.json").
           to_return(:status => 200, :body => fixture('ids.json'), :headers => {})
         stream_info = nil
 
         EM.run_block do
-          @client.friends_ids(12345) { |info| stream_info = info }
+          client.friends_ids(12345) { |info| stream_info = info }
         end
         expect(stream_info).to be_kind_of(Hash)
       end
@@ -214,16 +228,13 @@ describe TweetStream::SiteStreamClient do
 
     context "failure" do
       it "invokes the on_error callback" do
-        @config_uri = '/2b/site/c/1_1_54e345d655ee3e8df359ac033648530bfbe26c5g'
-        @client = TweetStream::SiteStreamClient.new(@config_uri)
-
-        stub_request(:post, "https://sitestream.twitter.com#{@config_uri}/friends/ids.json").
+        stub_request(:post, "https://sitestream.twitter.com#{config_uri}/friends/ids.json").
           to_return(:status => 401, :body => '', :headers => {})
         called = false
 
         EM.run_block do
-          @client.on_error { called = true }
-          @client.friends_ids(12345) { |info| info }
+          client.on_error { called = true }
+          client.friends_ids(12345) { |info| info }
         end
         expect(called).to be_true
       end

data/spec/tweetstream_spec.rb

@@ -4,7 +4,7 @@ describe TweetStream do
 
   context "when delegating to a client" do
     before do
-      @stream = stub("EM::Twitter::Client",
+      @stream = double("EM::Twitter::Client",
         :connect => true,
         :unbind => true,
         :each_item => true,
@@ -16,13 +16,13 @@ describe TweetStream do
         :on_unauthorized => true,
         :on_enhance_your_calm => true
       )
-      EM.stub!(:run).and_yield
-      EM::Twitter::Client.stub!(:connect).and_return(@stream)
+      allow(EM).to receive(:run).and_yield
+      allow(EM::Twitter::Client).to receive(:connect).and_return(@stream)
     end
 
     it "returns the same results as a client" do
-      Yajl::Parser.should_receive(:parse).twice.and_return({})
-      @stream.should_receive(:each).and_yield(sample_tweets[0].to_json)
+      expect(MultiJson).to receive(:decode).and_return({})
+      expect(@stream).to receive(:each).and_yield(sample_tweets[0].to_json)
       TweetStream.track('abc','def')
     end
   end

data/tweetstream.gemspec

@@ -11,14 +11,14 @@ Gem::Specification.new do |spec|
   spec.email       = ['michael@intridea.com', 'steve.agalloco@gmail.com']
   spec.description = %q{TweetStream is a simple wrapper for consuming the Twitter Streaming API.}
   spec.summary     = spec.description
-  spec.homepage    = 'http://github.com/intridea/tweetstream'
+  spec.homepage    = 'https://github.com/tweetstream/tweetstream'
   spec.licenses    = ['MIT']
 
   spec.add_dependency 'daemons', '~> 1.1'
-  spec.add_dependency 'em-twitter', '~> 0.2'
-  spec.add_dependency 'em-http-request', '~> 1.0.2'
-  spec.add_dependency 'twitter', '~> 4.5'
-  spec.add_dependency 'yajl-ruby', '~> 1.1'
+  spec.add_dependency 'em-http-request', '>= 1.1.1'
+  spec.add_dependency 'em-twitter', '~> 0.3'
+  spec.add_dependency 'twitter', '~> 4.8'
+  spec.add_dependency 'multi_json', '~> 1.3'
   spec.add_development_dependency 'bundler', '~> 1.0'
 
   spec.files = %w(.yardopts CHANGELOG.md CONTRIBUTING.md LICENSE.md README.md Rakefile tweetstream.gemspec)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tweetstream
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.6.0
 platform: ruby
 authors:
 - Michael Bleigh
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-24 00:00:00.000000000 Z
+date: 2013-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: daemons
@@ -26,61 +26,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: em-twitter
+  name: em-http-request
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: 1.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: 1.1.1
 - !ruby/object:Gem::Dependency
-  name: em-http-request
+  name: em-twitter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: twitter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '4.5'
+        version: '4.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '4.5'
+        version: '4.8'
 - !ruby/object:Gem::Dependency
-  name: yajl-ruby
+  name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -110,10 +110,15 @@ files:
 - README.md
 - Rakefile
 - tweetstream.gemspec
+- lib/tweetstream/arguments.rb
+- lib/tweetstream/callback.rb
 - lib/tweetstream/client.rb
 - lib/tweetstream/configuration.rb
 - lib/tweetstream/daemon.rb
+- lib/tweetstream/middleware/builder.rb
+- lib/tweetstream/middleware/runner.rb
 - lib/tweetstream/site_stream_client.rb
+- lib/tweetstream/util/parameter.rb
 - lib/tweetstream/version.rb
 - lib/tweetstream.rb
 - spec/fixtures/delete.json
@@ -135,7 +140,7 @@ files:
 - spec/tweetstream/daemon_spec.rb
 - spec/tweetstream/site_stream_client_spec.rb
 - spec/tweetstream_spec.rb
-homepage: http://github.com/intridea/tweetstream
+homepage: https://github.com/tweetstream/tweetstream
 licenses:
 - MIT
 metadata: {}
@@ -155,7 +160,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: TweetStream is a simple wrapper for consuming the Twitter Streaming API.