tweetstream 1.1.5 → 2.0.0

data/spec/tweetstream/site_stream_client_spec.rb

@@ -0,0 +1,232 @@
+require 'spec_helper'
+
+describe TweetStream::SiteStreamClient do
+  before do
+    @keys = TweetStream::Configuration::OAUTH_OPTIONS_KEYS
+  end
+
+  describe 'initialization' do
+    context 'with module configuration' do
+
+      before do
+        TweetStream.configure do |config|
+          @keys.each do |key|
+            config.send("#{key}=", key)
+          end
+        end
+      end
+
+      after do
+        TweetStream.reset
+      end
+
+      it "should inherit module configuration" do
+        api = TweetStream::SiteStreamClient.new('/config_uri')
+        @keys.each do |key|
+          api.send(key).should == key
+        end
+      end
+    end
+
+    context 'with class configuration' do
+      before do
+        @configuration = {
+          :consumer_key => 'CK',
+          :consumer_secret => 'CS',
+          :oauth_token => 'AT',
+          :oauth_token_secret => 'AS'
+        }
+      end
+
+      context "during initialization" do
+        it "should override module configuration" do
+          api = TweetStream::SiteStreamClient.new('/config_uri', @configuration)
+          @keys.each do |key|
+            api.send(key).should == @configuration[key]
+          end
+        end
+      end
+
+      context "after initilization" do
+        it "should override module configuration after initialization" do
+          api = TweetStream::SiteStreamClient.new('/config_uri')
+          @configuration.each do |key, value|
+            api.send("#{key}=", value)
+          end
+          @keys.each do |key|
+            api.send(key).should == @configuration[key]
+          end
+        end
+      end
+    end
+  end
+
+  describe '#on_error' do
+    it 'stores the on_error proc' do
+      @client = TweetStream::SiteStreamClient.new('/config_uri')
+      @client.on_error { puts 'hi' }
+      @client.on_error.should 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").
+          to_return(:status => 200, :body => fixture('info.json'), :headers => {})
+        stream_info = nil
+
+        EM.run_block do
+          @client.info { |info| stream_info = info}
+        end
+        stream_info.should be_kind_of(Hash)
+      end
+    end
+
+    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").
+          to_return(:status => 401, :body => '', :headers => {})
+        called = false
+
+        EM.run_block do
+          @client.on_error { called = true }
+          @client.info { |info| info }
+        end
+        called.should be_true
+      end
+    end
+  end
+
+  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").
+          to_return(:status => 200, :body => '', :headers => {})
+        called = false
+
+        EM.run_block do
+          @client.add_user(12345) { called = true }
+        end
+        called.should be_true
+      end
+    end
+
+    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").
+          to_return(:status => 401, :body => '', :headers => {})
+        called = false
+
+        EM.run_block do
+          @client.on_error { called = true }
+          @client.add_user(12345) { |info| info }
+        end
+        called.should 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' }).
+        and_return(FakeHttp.new)
+      @client.stub(:connection) { conn }
+      @client.add_user(['1234','5678'])
+    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").
+          to_return(:status => 200, :body => '', :headers => {})
+        called = false
+
+        EM.run_block do
+          @client.remove_user(12345) { called = true }
+        end
+        called.should be_true
+      end
+    end
+
+    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").
+          to_return(:status => 401, :body => '', :headers => {})
+        called = false
+
+        EM.run_block do
+          @client.on_error { called = true }
+          @client.remove_user(12345) { |info| info }
+        end
+        called.should 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' }).
+        and_return(FakeHttp.new)
+      @client.stub(:connection) { conn }
+      @client.remove_user(['1234','5678'])
+    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").
+          to_return(:status => 200, :body => fixture('ids.json'), :headers => {})
+        stream_info = nil
+
+        EM.run_block do
+          @client.friends_ids(12345) { |info| stream_info = info }
+        end
+        stream_info.should be_kind_of(Hash)
+      end
+    end
+
+    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").
+          to_return(:status => 401, :body => '', :headers => {})
+        called = false
+
+        EM.run_block do
+          @client.on_error { called = true }
+          @client.friends_ids(12345) { |info| info }
+        end
+        called.should be_true
+      end
+    end
+  end
+
+end

data/spec/tweetstream_spec.rb

@@ -7,23 +7,24 @@ describe TweetStream do
 
   context "when delegating to a client" do
     before do
-      @stream = stub("Twitter::JSONStream",
+      @stream = stub("EM::Twitter::Client",
         :connect => true,
         :unbind => true,
         :each_item => true,
         :on_error => true,
         :on_max_reconnects => true,
         :on_reconnect => true,
-        :connection_completed => true
+        :connection_completed => true,
+        :on_no_data_received => true
       )
       EM.stub!(:run).and_yield
-      Twitter::JSONStream.stub!(:connect).and_return(@stream)
+      EM::Twitter::Client.stub!(:connect).and_return(@stream)
     end
 
     it "should return the same results as a client" do
       MultiJson.should_receive(:decode).and_return({})
-      @stream.should_receive(:each_item).and_yield(sample_tweets[0].to_json)
-      TweetStream.track('abc','def').should == TweetStream::Client.new.track('abc','def')
+      @stream.should_receive(:each).and_yield(sample_tweets[0].to_json)
+      TweetStream.track('abc','def')
     end
   end
 
@@ -39,19 +40,6 @@ describe TweetStream do
     end
   end
 
-  describe ".parser" do
-    it "should return the default parser" do
-      TweetStream.parser.should == TweetStream::Configuration::DEFAULT_PARSER
-    end
-  end
-
-  describe ".parser=" do
-    it "should set the adapter" do
-      TweetStream.parser = :yajl
-      TweetStream.parser.should == :yajl
-    end
-  end
-
   describe ".username" do
     it "should return the default username" do
       TweetStream.username.should == TweetStream::Configuration::DEFAULT_USERNAME
@@ -115,4 +103,16 @@ describe TweetStream do
     end
   end
 
+  describe '.options' do
+    it 'returns the configuration as a hash' do
+      TweetStream.options.should be_kind_of(Hash)
+    end
+  end
+
+  describe '.oauth_options' do
+    it 'returns the oauth configuration as a hash' do
+      TweetStream.oauth_options.should be_kind_of(Hash)
+    end
+  end
+
 end

data/tweetstream.gemspec

@@ -11,18 +11,22 @@ Gem::Specification.new do |s|
   s.summary     = %q{TweetStream is a simple wrapper for consuming the Twitter Streaming API.}
   s.homepage    = 'http://github.com/intridea/tweetstream'
 
-  s.add_dependency 'twitter-stream', ['>= 0.1.14', '< 1']
+  s.add_dependency 'em-twitter', '~> 0.1'
+  s.add_dependency 'twitter', '~> 2.2'
   s.add_dependency 'daemons', '~> 1.1'
   s.add_dependency 'multi_json', '~> 1.3'
+  s.add_dependency 'em-http-request', '~> 1.0.2'
 
+  s.add_development_dependency 'guard-rspec'
+  s.add_development_dependency 'json'
+  s.add_development_dependency 'pry'
   s.add_development_dependency 'rake'
-  s.add_development_dependency 'simplecov'
-  s.add_development_dependency 'yard'
   s.add_development_dependency 'rdiscount'
   s.add_development_dependency 'rspec'
+  s.add_development_dependency 'simplecov'
+  s.add_development_dependency 'webmock'
   s.add_development_dependency 'yajl-ruby'
-  s.add_development_dependency 'json'
-  s.add_development_dependency 'guard-rspec'
+  s.add_development_dependency 'yard'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tweetstream
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 2.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,49 +10,44 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-30 00:00:00.000000000 Z
+date: 2012-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: twitter-stream
-  requirement: !ruby/object:Gem::Requirement
+  name: em-twitter
+  requirement: &70257167536020 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.1.14
-    - - <
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '0.1'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.1.14
-    - - <
-      - !ruby/object:Gem::Version
-        version: '1'
+  version_requirements: *70257167536020
 - !ruby/object:Gem::Dependency
-  name: daemons
-  requirement: !ruby/object:Gem::Requirement
+  name: twitter
+  requirement: &70257167535420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.2'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  version_requirements: *70257167535420
+- !ruby/object:Gem::Dependency
+  name: daemons
+  requirement: &70257167534760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70257167534760
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70257167534140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -60,15 +55,21 @@ dependencies:
         version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  version_requirements: *70257167534140
+- !ruby/object:Gem::Dependency
+  name: em-http-request
+  requirement: &70257167533360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 1.0.2
+  type: :runtime
+  prerelease: false
+  version_requirements: *70257167533360
 - !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
+  name: guard-rspec
+  requirement: &70257167532700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,15 +77,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70257167532700
 - !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
+  name: json
+  requirement: &70257167538780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -92,15 +88,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70257167538780
 - !ruby/object:Gem::Dependency
-  name: yard
-  requirement: !ruby/object:Gem::Requirement
+  name: pry
+  requirement: &70257167515140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -108,15 +99,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  version_requirements: *70257167515140
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70257167514640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70257167514640
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70257167514040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -124,15 +121,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70257167514040
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70257167513580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -140,15 +132,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70257167513580
 - !ruby/object:Gem::Dependency
-  name: yajl-ruby
-  requirement: !ruby/object:Gem::Requirement
+  name: simplecov
+  requirement: &70257167513160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -156,15 +143,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70257167513160
 - !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
+  name: webmock
+  requirement: &70257167512660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -172,15 +154,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70257167512660
 - !ruby/object:Gem::Dependency
-  name: guard-rspec
-  requirement: !ruby/object:Gem::Requirement
+  name: yajl-ruby
+  requirement: &70257167512080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -188,12 +165,18 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  version_requirements: *70257167512080
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: &70257167511540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70257167511540
 description: TweetStream allows you to easily consume the Twitter Streaming API utilizing
   the YAJL Ruby gem.
 email:
@@ -217,26 +200,23 @@ files:
 - Rakefile
 - examples/growl_daemon.rb
 - examples/oauth.rb
+- examples/sitestream.rb
 - examples/userstream.rb
 - lib/tweetstream.rb
 - lib/tweetstream/client.rb
 - lib/tweetstream/configuration.rb
 - lib/tweetstream/daemon.rb
-- lib/tweetstream/direct_message.rb
 - lib/tweetstream/error.rb
-- lib/tweetstream/hash.rb
-- lib/tweetstream/status.rb
-- lib/tweetstream/user.rb
+- lib/tweetstream/site_stream_client.rb
 - lib/tweetstream/version.rb
 - spec/data/direct_messages.json
 - spec/data/statuses.json
+- spec/fixtures/ids.json
+- spec/fixtures/info.json
 - spec/spec_helper.rb
 - spec/tweetstream/client_spec.rb
 - spec/tweetstream/daemon_spec.rb
-- spec/tweetstream/direct_message_spec.rb
-- spec/tweetstream/hash_spec.rb
-- spec/tweetstream/parser_spec.rb
-- spec/tweetstream/status_spec.rb
+- spec/tweetstream/site_stream_client_spec.rb
 - spec/tweetstream_spec.rb
 - tweetstream.gemspec
 homepage: http://github.com/intridea/tweetstream
@@ -259,19 +239,18 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.16
 signing_key: 
 specification_version: 3
 summary: TweetStream is a simple wrapper for consuming the Twitter Streaming API.
 test_files:
 - spec/data/direct_messages.json
 - spec/data/statuses.json
+- spec/fixtures/ids.json
+- spec/fixtures/info.json
 - spec/spec_helper.rb
 - spec/tweetstream/client_spec.rb
 - spec/tweetstream/daemon_spec.rb
-- spec/tweetstream/direct_message_spec.rb
-- spec/tweetstream/hash_spec.rb
-- spec/tweetstream/parser_spec.rb
-- spec/tweetstream/status_spec.rb
+- spec/tweetstream/site_stream_client_spec.rb
 - spec/tweetstream_spec.rb
 has_rdoc: