em-twitter 0.2.1 → 0.2.2

data/LICENSE.md

@@ -1,4 +1,4 @@
-Copyright (c) 2011 Steve Agalloco
+Copyright (c) 2011-2013 Steve Agalloco
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -17,4 +17,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,14 +1,16 @@
 # EM-Twitter
+[![Gem Version](https://badge.fury.io/rb/em-twitter.png)][gem]
 [![Build Status](https://secure.travis-ci.org/spagalloco/em-twitter.png?branch=master)][travis]
 [![Dependency Status](https://gemnasium.com/spagalloco/em-twitter.png?travis)][gemnasium]
-[![Code Climate](https://codeclimate.com/badge.png)][codeclimate]
-
-EM-Twitter is an EventMachine-based ruby client for the [Twitter Streaming API](https://dev.twitter.com/docs/streaming-api).
+[![Code Climate](https://codeclimate.com/github/spagalloco/em-twitter.png)][codeclimate]
 
+[gem]: https://rubygems.org/gems/em-twitter
 [travis]: http://travis-ci.org/spagalloco/em-twitter
 [gemnasium]: https://gemnasium.com/spagalloco/em-twitter
 [codeclimate]: https://codeclimate.com/github/spagalloco/em-twitter
 
+EM-Twitter is an EventMachine-based ruby client for the [Twitter Streaming API](https://dev.twitter.com/docs/streaming-api).
+
 ## Usage
 
 ```ruby
@@ -127,4 +129,4 @@ Testing with EM can be a challenge, but was made incredibly easy through the use
 
 ## Copyright
 
-Copyright (c) 2012 Steve Agalloco. See [LICENSE](https://github.com/spagalloco/em-twitter/blob/master/LICENSE.md) for details.
+Copyright (c) 2011-2013 Steve Agalloco. See [LICENSE](LICENSE.md) for details.

data/em-twitter.gemspec

@@ -1,31 +1,28 @@
-# encoding: utf-8
-require File.expand_path('../lib/em-twitter/version', __FILE__)
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'em-twitter/version'
 
-Gem::Specification.new do |gem|
-  gem.name        = 'em-twitter'
-  gem.version     = EventMachine::Twitter::VERSION
-  gem.homepage    = 'https://github.com/spagalloco/em-twitter'
+Gem::Specification.new do |spec|
+  spec.name        = 'em-twitter'
+  spec.version     = EventMachine::Twitter::VERSION
+  spec.homepage    = 'https://github.com/spagalloco/em-twitter'
+  spec.licenses    = ['MIT']
 
-  gem.author      = "Steve Agalloco"
-  gem.email       = 'steve.agalloco@gmail.com'
-  gem.description = %q{Twitter Streaming API client for EventMachine}
-  gem.summary     = %q{Twitter Streaming API client for EventMachine}
+  spec.authors     = ["Steve Agalloco"]
+  spec.email       = ['steve.agalloco@gmail.com']
+  spec.description = %q{Twitter Streaming API client for EventMachine}
+  spec.summary     = spec.description
 
-  gem.add_dependency 'eventmachine', '~> 1.0'
-  gem.add_dependency 'http_parser.rb', '~> 0.5'
-  gem.add_dependency 'simple_oauth', '~> 0.1'
+  spec.add_dependency 'eventmachine', '~> 1.0'
+  spec.add_dependency 'http_parser.rb', '~> 0.5'
+  spec.add_dependency 'simple_oauth', '~> 0.1'
 
-  gem.add_development_dependency 'rake'
-  gem.add_development_dependency 'rdiscount'
-  gem.add_development_dependency 'rspec', '>= 2.11'
-  gem.add_development_dependency 'simplecov'
-  gem.add_development_dependency 'yard'
-  gem.add_development_dependency 'mockingbird', '>= 0.2'
-  gem.add_development_dependency 'guard-rspec'
+  spec.add_development_dependency 'bundler', '~> 1.0'
 
-  gem.executables = `git ls-files -- bin/*`.split("\n").map{|f| File.basename(f)}
-  gem.files       = `git ls-files`.split("\n")
-  gem.test_files  = `git ls-files -- {test,spec,features}/*`.split("\n")
+  spec.files = %w(.yardopts CONTRIBUTING.md LICENSE.md README.md Rakefile em-twitter.gemspec)
+  spec.files += Dir.glob("lib/**/*.rb")
+  spec.files += Dir.glob("spec/**/*")
 
-  gem.require_paths = ['lib']
+  spec.require_paths = ['lib']
 end

data/lib/em-twitter/decoders/gzip_decoder.rb

@@ -11,4 +11,4 @@ module EventMachine
 
     end
   end
-end
+end

data/lib/em-twitter/proxy.rb

@@ -22,4 +22,4 @@ module EventMachine
 
     end
   end
-end
+end

data/lib/em-twitter/reconnectors/application_failure.rb

@@ -47,4 +47,4 @@ module EventMachine
       end
     end
   end
-end
+end

data/lib/em-twitter/reconnectors/network_failure.rb

@@ -47,4 +47,4 @@ module EventMachine
       end
     end
   end
-end
+end

data/lib/em-twitter/request.rb

@@ -96,7 +96,11 @@ module EventMachine
       end
 
       def oauth_header
-        SimpleOAuth::Header.new(@options[:method], full_uri, params, @options[:oauth])
+        if get?
+          SimpleOAuth::Header.new(@options[:method], full_uri, {}, @options[:oauth])
+        else
+          SimpleOAuth::Header.new(@options[:method], full_uri, params, @options[:oauth])
+        end
       end
 
       def basic_auth?
@@ -134,4 +138,4 @@ module EventMachine
 
     end
   end
-end
+end

data/lib/em-twitter/response.rb

@@ -57,4 +57,4 @@ module EventMachine
 
     end
   end
-end
+end

data/lib/em-twitter/version.rb

@@ -1,5 +1,5 @@
 module EventMachine
   module Twitter
-    VERSION = "0.2.1" unless defined?(EventMachine::Twitter::VERSION)
+    VERSION = "0.2.2" unless defined?(EventMachine::Twitter::VERSION)
   end
 end

data/lib/em_twitter.rb

@@ -1 +1 @@
-require 'em-twitter'
+require 'em-twitter'

data/spec/em-twitter/client_spec.rb

@@ -2,23 +2,23 @@ require 'spec_helper'
 
 describe EM::Twitter::Client do
 
-  describe 'initialization' do
-    it 'raises a ConfigurationError if both oauth and basic are used' do
+  describe "initialization" do
+    it "raises a ConfigurationError if both oauth and basic are used" do
       opts = default_options.merge(:basic => { :username => 'Steve', :password => 'Agalloco' })
-      lambda {
+      expect{
         EM::Twitter::Client.new(opts)
-      }.should raise_error(EM::Twitter::ConfigurationError)
+      }.to raise_error(EM::Twitter::ConfigurationError)
     end
   end
 
-  describe '.connect' do
+  describe ".connect" do
     before do
       conn = stub('EventMachine::Connection')
       conn.stub(:start_tls).and_return(nil)
       EM.stub(:connect).and_return(conn)
     end
 
-    it 'connects to the configured host/port' do
+    it "connects to the configured host/port" do
       EventMachine.should_receive(:connect).with(
         test_options[:host],
         test_options[:port],
@@ -29,8 +29,8 @@ describe EM::Twitter::Client do
       EM::Twitter::Client.connect(default_options)
     end
 
-    context 'when using a proxy' do
-      it 'connects to the proxy server' do
+    context "when using a proxy" do
+      it "connects to the proxy server" do
         EventMachine.should_receive(:connect).with(
           "my-proxy",
           8080,
@@ -50,11 +50,11 @@ describe EM::Twitter::Client do
     end
   end
 
-  describe '#respond_to?' do
-    it 'delegate to the connection' do
+  describe "#respond_to?" do
+    it "delegate to the connection" do
       EM.run_block do
         client = EM::Twitter::Client.connect(default_options)
-        client.respond_to?(:immediate_reconnect).should be_true
+        expect(client.respond_to?(:immediate_reconnect)).to be_true
       end
     end
   end

data/spec/em-twitter/connection_error_handling_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'EM::Twitter::Connection error handling' do
+describe "EM::Twitter::Connection error handling" do
   error_callback_invoked('on_unauthorized', 401, 'Unauthorized')
   error_callback_invoked('on_forbidden', 403, 'Forbidden')
   error_callback_invoked('on_not_found', 404, 'Not Found')

data/spec/em-twitter/connection_reconnect_spec.rb

@@ -2,10 +2,10 @@ require 'spec_helper'
 
 include EM::Twitter
 
-describe 'EM::Twitter::Connection reconnections' do
+describe "EM::Twitter::Connection reconnections" do
 
-  describe 'reconnector setting' do
-    context 'on connect' do
+  describe "reconnector setting" do
+    context "on connect" do
       before do
         Mockingbird.setup(test_options) do
           status 200, 'Success'
@@ -14,15 +14,15 @@ describe 'EM::Twitter::Connection reconnections' do
 
       after { Mockingbird.teardown }
 
-      it 'uses the network failure reconnector' do
+      it "uses the network failure reconnector" do
         EM.run_block do
           client = Client.connect(default_options)
-          client.connection.reconnector.should be_kind_of(Reconnectors::NetworkFailure)
+          expect(client.connection.reconnector).to be_kind_of(Reconnectors::NetworkFailure)
         end
       end
     end
 
-    context 'after successful connect' do
+    context "after successful connect" do
       before do
         Mockingbird.setup(test_options) do
           status 200, 'Success'
@@ -31,7 +31,7 @@ describe 'EM::Twitter::Connection reconnections' do
 
       after { Mockingbird.teardown }
 
-      it 'resets the network failure reconnector' do
+      it "resets the network failure reconnector" do
         Reconnectors::NetworkFailure.any_instance.should_receive(:reset)
         EM.run do
           EM::Timer.new(1) { EM.stop }
@@ -39,7 +39,7 @@ describe 'EM::Twitter::Connection reconnections' do
         end
       end
 
-      it 'resets the application failure reconnector' do
+      it "resets the application failure reconnector" do
         Reconnectors::ApplicationFailure.any_instance.should_receive(:reset)
         EM.run do
           EM::Timer.new(1) { EM.stop }
@@ -49,7 +49,7 @@ describe 'EM::Twitter::Connection reconnections' do
       end
     end
 
-    context 'on 4xx responses' do
+    context "on 4xx responses" do
       before do
         Mockingbird.setup(test_options) do
           status 401, 'Unauthorized'
@@ -58,18 +58,18 @@ describe 'EM::Twitter::Connection reconnections' do
 
       after { Mockingbird.teardown }
 
-      it 'uses the application failure reconnector' do
+      it "uses the application failure reconnector" do
         EM.run do
           client = Client.connect(default_options)
           EM::Timer.new(1) do
-            client.connection.reconnector.should be_kind_of(Reconnectors::ApplicationFailure)
+            expect(client.connection.reconnector).to be_kind_of(Reconnectors::ApplicationFailure)
             EM.stop
           end
         end
       end
     end
 
-    context 'on reconnects' do
+    context "on reconnects" do
       before do
         Mockingbird.setup(test_options) do
           on_connection(1) do
@@ -83,11 +83,11 @@ describe 'EM::Twitter::Connection reconnections' do
 
       after { Mockingbird.teardown }
 
-      it 'set the reconnector to the network failure reconnector' do
+      it "set the reconnector to the network failure reconnector" do
         EM.run do
           client = Client.connect(default_options)
           EM::Timer.new(1) do
-            client.connection.reconnector.should be_kind_of(Reconnectors::NetworkFailure)
+            expect(client.connection.reconnector).to be_kind_of(Reconnectors::NetworkFailure)
             EM.stop
           end
         end
@@ -95,7 +95,7 @@ describe 'EM::Twitter::Connection reconnections' do
     end
   end
 
-  describe '#reconnect' do
+  describe "#reconnect" do
     before do
       Mockingbird.setup(test_options) do
         on_connection(1) do
@@ -106,7 +106,7 @@ describe 'EM::Twitter::Connection reconnections' do
 
     after { Mockingbird.teardown }
 
-    it 'calls the on_reconnect callback on reconnects' do
+    it "calls the on_reconnect callback on reconnects" do
       called = false
 
       EM.run do
@@ -114,10 +114,10 @@ describe 'EM::Twitter::Connection reconnections' do
         client.on_reconnect { called = true; EM.stop }
       end
 
-      called.should be_true
+      expect(called).to be_true
     end
 
-    it 'does not reconnect when auto_reconnect is false' do
+    it "does not reconnect when auto_reconnect is false" do
       EM.run do
         client = Client.connect(default_options.merge(:auto_reconnect => false))
         client.should_not_receive(:reconnect)
@@ -126,7 +126,7 @@ describe 'EM::Twitter::Connection reconnections' do
     end
   end
 
-  describe '#immediate_reconnect' do
+  describe "#immediate_reconnect" do
     before do
       Mockingbird.setup(test_options) do
         100.times do
@@ -137,7 +137,7 @@ describe 'EM::Twitter::Connection reconnections' do
 
     after { Mockingbird.teardown }
 
-    it 'reconnects immediately' do
+    it "reconnects immediately" do
       called = false
 
       EM.run_block do
@@ -146,10 +146,10 @@ describe 'EM::Twitter::Connection reconnections' do
         client.immediate_reconnect
       end
 
-      called.should be_true
+      expect(called).to be_true
     end
 
-    it 'reconnects the current connection' do
+    it "reconnects the current connection" do
       EM.run_block do
         client = Client.connect(default_options)
         client.connection.should_receive(:reconnect).once
@@ -158,8 +158,8 @@ describe 'EM::Twitter::Connection reconnections' do
     end
   end
 
-  describe '#on_max_reconnects' do
-    context 'application failure' do
+  describe "#on_max_reconnects" do
+    context "application failure" do
       before do
         Mockingbird.setup(test_options) do
           status 200, "Success"
@@ -172,7 +172,7 @@ describe 'EM::Twitter::Connection reconnections' do
 
       after { Mockingbird.teardown }
 
-      it "should notify after reconnect limit is reached" do
+      it "notifies after reconnect limit is reached" do
         timeout, retries = nil, nil
 
         EM.run do
@@ -188,12 +188,12 @@ describe 'EM::Twitter::Connection reconnections' do
           client.connection.reconnector = Reconnectors::ApplicationFailure.new(:reconnect_count => 320)
         end
 
-        timeout.should eq(10)
-        retries.should eq(320)
+        expect(timeout).to eq(10)
+        expect(retries).to eq(320)
       end
     end
 
-    context 'network failure' do
+    context "network failure" do
       before do
         Mockingbird.setup(test_options) do
           status 200, "Success"
@@ -206,7 +206,7 @@ describe 'EM::Twitter::Connection reconnections' do
 
       after { Mockingbird.teardown }
 
-      it "should notify after reconnect limit is reached" do
+      it "notifies after reconnect limit is reached" do
         timeout, retries = nil, nil
 
         EM.run do
@@ -222,8 +222,8 @@ describe 'EM::Twitter::Connection reconnections' do
           client.connection.reconnector = Reconnectors::NetworkFailure.new(:reconnect_count => 320)
         end
 
-        timeout.should eq(0.25)
-        retries.should eq(320)
+        expect(timeout).to eq(0.25)
+        expect(retries).to eq(320)
       end
     end
   end

data/spec/em-twitter/connection_spec.rb

@@ -2,18 +2,18 @@ require 'spec_helper'
 
 describe EM::Twitter::Connection do
 
-  describe '#post_init' do
-    it 'calls the on_inited callback' do
+  describe "#post_init" do
+    it "calls the on_inited callback" do
       called = false
 
       EM.run_block do
         client = EM::Twitter::Client.connect(default_options.merge(:on_inited => lambda { called = true}))
       end
 
-      called.should be_true
+      expect(called).to be_true
     end
 
-    it 'sets the inactivity timeout' do
+    it "sets the inactivity timeout" do
       EM.should_receive(:set_comm_inactivity_timeout)
       EM.run_block do
         client = EM::Twitter::Client.connect(default_options.merge(:timeout => 2))
@@ -21,8 +21,8 @@ describe EM::Twitter::Connection do
     end
   end
 
-  describe 'streaming' do
-    describe '#each with partial responses' do
+  describe "streaming" do
+    describe "#each with partial responses" do
       before do
         Mockingbird.setup(test_options) do
           status '200', 'Success'
@@ -39,7 +39,7 @@ describe EM::Twitter::Connection do
 
       after { Mockingbird.teardown }
 
-      it 'converts response data into complete buffers' do
+      it "converts response data into complete buffers" do
         count = 0
 
         EM.run do
@@ -55,11 +55,11 @@ describe EM::Twitter::Connection do
           EM::Timer.new(10) { EM.stop }
         end
 
-        count.should >= 100
+        expect(count).to be >= 100
       end
     end
 
-    describe '#each with full responses' do
+    describe "#each with full responses" do
       before do
         Mockingbird.setup(test_options) do
           status '200', 'Success'
@@ -75,7 +75,7 @@ describe EM::Twitter::Connection do
 
       after { Mockingbird.teardown }
 
-      it 'emits each complete response chunk' do
+      it "emits each complete response chunk" do
         responses = []
 
         EM.run do
@@ -88,12 +88,12 @@ describe EM::Twitter::Connection do
           EM::Timer.new(10) { EM.stop }
         end
 
-        responses.size.should >= 100
-        responses.last.should eq('{"foo":"bar"}')
+        expect(responses.size).to be >= 100
+        expect(responses.last).to eq('{"foo":"bar"}')
       end
     end
 
-    describe 'stall handling' do
+    describe "stall handling" do
       before do
         stub_const("EM::Twitter::Connection::STALL_TIMEOUT", 5)
         stub_const("EM::Twitter::Connection::STALL_TIMER", 1)
@@ -105,7 +105,7 @@ describe EM::Twitter::Connection do
 
       after { Mockingbird.teardown }
 
-      it 'invokes a no-data callback when stalled' do
+      it "invokes a no-data callback when stalled" do
         called = false
         EM.run do
           client = EM::Twitter::Client.connect(default_options)
@@ -116,10 +116,10 @@ describe EM::Twitter::Connection do
           end
         end
 
-        called.should be_true
+        expect(called).to be_true
       end
 
-      it 'closes the connection when stalled to prompt a reconnect' do
+      it "closes the connection when stalled to prompt a reconnect" do
         called = false
         EM.run do
           client = EM::Twitter::Client.connect(default_options)
@@ -131,10 +131,10 @@ describe EM::Twitter::Connection do
           end
         end
 
-        called.should be_true
+        expect(called).to be_true
       end
 
-      it 'invokes a no-data callback when stalled without a response' do
+      it "invokes a no-data callback when stalled without a response" do
         stalled = false
         EM.run do
           client = EM::Twitter::Client.connect(default_options)
@@ -152,7 +152,7 @@ describe EM::Twitter::Connection do
           end
         end
 
-        stalled.should be_true
+        expect(stalled).to be_true
       end
     end
   end
@@ -166,12 +166,12 @@ describe EM::Twitter::Connection do
         client.on_close { called = true }
       end
 
-      called.should be_true
+      expect(called).to be_true
     end
   end
 
-  describe '#stop' do
-    it 'closes the connection' do
+  describe "#stop" do
+    it "closes the connection" do
       EM.run_block do
         client = EM::Twitter::Client.connect(default_options)
         client.connection.should_receive(:close_connection).once
@@ -179,11 +179,11 @@ describe EM::Twitter::Connection do
       end
     end
 
-    it 'gracefully closes' do
+    it "gracefully closes" do
       EM.run_block do
         client = EM::Twitter::Client.connect(default_options)
         client.stop
-        client.should be_gracefully_closed
+        expect(client).to be_gracefully_closed
       end
     end
 
@@ -191,12 +191,12 @@ describe EM::Twitter::Connection do
       EM.run_block do
         client = EM::Twitter::Client.connect(default_options)
         client.stop
-        client.connection.auto_reconnect?.should be_false
+        expect(client.connection.auto_reconnect?).to be_false
       end
     end
   end
 
-  describe '#update' do
+  describe "#update" do
     before do
       Mockingbird.setup(test_options) do
         100.times do
@@ -207,15 +207,15 @@ describe EM::Twitter::Connection do
 
     after { Mockingbird.teardown }
 
-    it 'updates the options hash' do
+    it "updates the options hash" do
       EM.run_block do
         client = EM::Twitter::Client.connect(default_options)
         client.connection.update(:params => { :track => 'rangers' })
-        client.connection.options[:params].should eq({:track => 'rangers'})
+        expect(client.connection.options[:params]).to eq({:track => 'rangers'})
       end
     end
 
-    it 'reconnects after updating' do
+    it "reconnects after updating" do
       EM.run_block do
         client = EM::Twitter::Client.connect(default_options)
         client.connection.should_receive(:immediate_reconnect).once
@@ -223,18 +223,18 @@ describe EM::Twitter::Connection do
       end
     end
 
-    it 'uses the new options when reconnecting' do
+    it "uses the new options when reconnecting" do
       EM.run_block do
         client = EM::Twitter::Client.connect(default_options)
         client.connection.should_receive(:send_data) do |request|
-          request.to_s.should include('track=rangers')
+          expect(request.to_s).to include('track=rangers')
         end
         client.connection.update(:params => { :track => 'rangers' })
       end
     end
   end
 
-  describe '#auto_reconnect?' do
+  describe "#auto_reconnect?" do
     before do
       Mockingbird.setup(test_options) do
         100.times do
@@ -245,21 +245,21 @@ describe EM::Twitter::Connection do
 
     after { Mockingbird.teardown }
 
-    it 'indicates the auto_reconnect setting' do
+    it "indicates the auto_reconnect setting" do
       EM.run do
         client = EM::Twitter::Client.connect(default_options)
         EM::Timer.new(1) do
-          client.auto_reconnect?.should be_true
+          expect(client.auto_reconnect?).to be_true
           EM.stop
         end
       end
     end
 
-    it 'indicates the auto_reconnect setting when false' do
+    it "indicates the auto_reconnect setting when false" do
       EM.run do
         client = EM::Twitter::Client.connect(default_options.merge(:auto_reconnect => false))
         EM::Timer.new(1) do
-          client.auto_reconnect?.should be_false
+          expect(client.auto_reconnect?).to be_false
           EM.stop
         end
       end