em-twitter 0.2.2 → 0.3.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 2faa76054df9c4e28303d85150d33ed50b315aa5
+  data.tar.gz: 6595037bb4b9d0c4d5d782ba6023bcf4fc3e60d3
+SHA512:
+  metadata.gz: 01a1887b81e5855f5f79ea161772ff30ab924c78703e996fd7cbbbfd5727f0b929e8e98faa2ad482a4bc2d4dbd6ef4edc0dff4f8f2831cea9eb55267abc37da7
+  data.tar.gz: 2b483b9d83d4acf3b451ee028130ead5cdb36202e74c842c0612d0688a126ec6d6979de0580bf89ad75fd405e73ba6ccdfd2a04bf03bd65686a417b2cb781307

data/em-twitter.gemspec

@@ -15,8 +15,8 @@ Gem::Specification.new do |spec|
   spec.summary     = spec.description
 
   spec.add_dependency 'eventmachine', '~> 1.0'
-  spec.add_dependency 'http_parser.rb', '~> 0.5'
-  spec.add_dependency 'simple_oauth', '~> 0.1'
+  spec.add_dependency 'http_parser.rb', ['>= 0.6.0.beta.2', '< 0.7']
+  spec.add_dependency 'simple_oauth', '~> 0.2'
 
   spec.add_development_dependency 'bundler', '~> 1.0'
 

data/lib/em-twitter/connection.rb

@@ -137,7 +137,7 @@ module EventMachine
       protected
 
       def handle_stream(data)
-        @last_response << @decoder.decode(data)
+        @last_response << (@decoder ||= BaseDecoder.new).decode(data)
 
         if @last_response.complete?
           invoke_callback(@client.each_item_callback, @last_response.body)
@@ -149,8 +149,7 @@ module EventMachine
         @response_code  = @parser.status_code
         @headers        = headers
 
-        @decoder = BaseDecoder.new
-
+        # @decoder = BaseDecoder.new
         # TODO: Complete gzip support
         # detect gzip encoding and use a decoder for response bodies
         # gzip needs to be detected with the Content-Encoding header
@@ -299,14 +298,16 @@ module EventMachine
       # Resets the internals of the connection on initial connection and
       # on reconnections.  Clears the response buffer and resets internal state
       def reset_connection
-        @buffer               = BufferedTokenizer.new("\r", MAX_LINE_LENGTH)
-        @parser               = Http::Parser.new(self)
-        @last_response        = Response.new
-        @response_code        = 0
-
-        @gracefully_closed    = false
-        @immediate_reconnect  = false
-        @auto_reconnect       = @options[:auto_reconnect]
+        @buffer                     = BufferedTokenizer.new("\r", MAX_LINE_LENGTH)
+        @parser                     = Http::Parser.new(self)
+        @parser.on_body             = method(:on_body)
+        @parser.on_headers_complete = method(:on_headers_complete)
+        @last_response              = Response.new
+        @response_code              = 0
+
+        @gracefully_closed          = false
+        @immediate_reconnect        = false
+        @auto_reconnect             = @options[:auto_reconnect]
       end
 
     end

data/lib/em-twitter/version.rb

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

data/spec/em-twitter/client_spec.rb

@@ -13,13 +13,13 @@ describe EM::Twitter::Client do
 
   describe ".connect" do
     before do
-      conn = stub('EventMachine::Connection')
-      conn.stub(:start_tls).and_return(nil)
-      EM.stub(:connect).and_return(conn)
+      conn = double('EventMachine::Connection')
+      allow(conn).to receive(:start_tls).and_return(nil)
+      allow(EM).to receive(:connect).and_return(conn)
     end
 
     it "connects to the configured host/port" do
-      EventMachine.should_receive(:connect).with(
+      expect(EventMachine).to receive(:connect).with(
         test_options[:host],
         test_options[:port],
         EventMachine::Twitter::Connection,
@@ -31,7 +31,7 @@ describe EM::Twitter::Client do
 
     context "when using a proxy" do
       it "connects to the proxy server" do
-        EventMachine.should_receive(:connect).with(
+        expect(EventMachine).to receive(:connect).with(
           "my-proxy",
           8080,
           EventMachine::Twitter::Connection,
@@ -43,9 +43,9 @@ describe EM::Twitter::Client do
     end
 
     it "doesn't trigger SSL until connection is established" do
-      connection = stub('EventMachine::Connection')
-      EM.should_receive(:connect).and_return(connection)
-      EM.should_not_receive(:start_tls)
+      connection = double('EventMachine::Connection')
+      expect(EM).to receive(:connect).and_return(connection)
+      expect(EM).not_to receive(:start_tls)
       client = EM::Twitter::Client.connect(:ssl => { :key => "/path/to/key.pem", :cert => "/path/to/cert.pem" })
     end
   end

data/spec/em-twitter/connection_reconnect_spec.rb

@@ -32,7 +32,7 @@ describe "EM::Twitter::Connection reconnections" do
       after { Mockingbird.teardown }
 
       it "resets the network failure reconnector" do
-        Reconnectors::NetworkFailure.any_instance.should_receive(:reset)
+        expect_any_instance_of(Reconnectors::NetworkFailure).to receive(:reset)
         EM.run do
           EM::Timer.new(1) { EM.stop }
           client = Client.connect(default_options)
@@ -40,7 +40,7 @@ describe "EM::Twitter::Connection reconnections" do
       end
 
       it "resets the application failure reconnector" do
-        Reconnectors::ApplicationFailure.any_instance.should_receive(:reset)
+        expect_any_instance_of(Reconnectors::ApplicationFailure).to receive(:reset)
         EM.run do
           EM::Timer.new(1) { EM.stop }
           client = Client.connect(default_options)
@@ -120,7 +120,7 @@ describe "EM::Twitter::Connection reconnections" 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)
+        expect(client).not_to receive(:reconnect)
         client.on_close { EM.stop }
       end
     end
@@ -152,7 +152,7 @@ describe "EM::Twitter::Connection reconnections" do
     it "reconnects the current connection" do
       EM.run_block do
         client = Client.connect(default_options)
-        client.connection.should_receive(:reconnect).once
+        expect(client.connection).to receive(:reconnect).once
         client.reconnect
       end
     end

data/spec/em-twitter/connection_spec.rb

@@ -14,7 +14,7 @@ describe EM::Twitter::Connection do
     end
 
     it "sets the inactivity timeout" do
-      EM.should_receive(:set_comm_inactivity_timeout)
+      expect(EM).to receive(:set_comm_inactivity_timeout)
       EM.run_block do
         client = EM::Twitter::Client.connect(default_options.merge(:timeout => 2))
       end
@@ -109,7 +109,7 @@ describe EM::Twitter::Connection do
         called = false
         EM.run do
           client = EM::Twitter::Client.connect(default_options)
-          client.connection.stub(:stalled?).and_return(true)
+          allow(client.connection).to receive(:stalled?).and_return(true)
           client.on_no_data_received do
             called = true
             EM.stop
@@ -123,8 +123,8 @@ describe EM::Twitter::Connection do
         called = false
         EM.run do
           client = EM::Twitter::Client.connect(default_options)
-          client.connection.should_receive(:close_connection).once
-          client.connection.stub(:stalled?).and_return(true)
+          expect(client.connection).to receive(:close_connection).once
+          allow(client.connection).to receive(:stalled?).and_return(true)
           client.on_no_data_received do
             called = true
             EM.stop
@@ -141,7 +141,7 @@ describe EM::Twitter::Connection do
           # this is kind of sneaky, using a stub on gracefully_closed?
           # to set a nil response the first time around to mimic a null
           # response object
-          client.connection.stub(:gracefully_closed?) do
+          allow(client.connection).to receive(:gracefully_closed?) do
             resp = client.connection.instance_variable_get(:@last_response)
             client.connection.instance_variable_set(:@last_response, nil) if resp.timestamp.nil?
             false
@@ -174,7 +174,7 @@ describe EM::Twitter::Connection do
     it "closes the connection" do
       EM.run_block do
         client = EM::Twitter::Client.connect(default_options)
-        client.connection.should_receive(:close_connection).once
+        expect(client.connection).to receive(:close_connection).once
         client.stop
       end
     end
@@ -210,7 +210,7 @@ describe EM::Twitter::Connection 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.update(:params => {:track => 'rangers'})
         expect(client.connection.options[:params]).to eq({:track => 'rangers'})
       end
     end
@@ -218,18 +218,18 @@ describe EM::Twitter::Connection do
     it "reconnects after updating" do
       EM.run_block do
         client = EM::Twitter::Client.connect(default_options)
-        client.connection.should_receive(:immediate_reconnect).once
-        client.connection.update(:params => { :track => 'rangers' })
+        expect(client.connection).to receive(:immediate_reconnect).once
+        client.connection.update(:params => {:track => 'rangers'})
       end
     end
 
     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|
+        expect(client.connection).to receive(:send_data) do |request|
           expect(request.to_s).to include('track=rangers')
         end
-        client.connection.update(:params => { :track => 'rangers' })
+        client.connection.update(:params => {:track => 'rangers'})
       end
     end
   end

data/spec/em-twitter/request_spec.rb

@@ -17,7 +17,7 @@ describe EM::Twitter::Request do
     it 'passes params on POST requests' do
       options = default_options.merge(:method => 'POST', :host => 'stream.twitter.com', :port => 443)
       req = EM::Twitter::Request.new(options)
-      SimpleOAuth::Header.should_receive(:new).
+      expect(SimpleOAuth::Header).to receive(:new).
         with('POST', "http://stream.twitter.com/1/statuses/filter.json", {"track"=>"nfl"}, kind_of(Hash))
 
       req.send(:oauth_header)
@@ -26,7 +26,7 @@ describe EM::Twitter::Request do
     it 'passes params on the querystring for GET requests' do
       options = default_options.merge(:method => 'GET', :host => 'stream.twitter.com', :port => 443)
       req = EM::Twitter::Request.new(options)
-      SimpleOAuth::Header.should_receive(:new).
+      expect(SimpleOAuth::Header).to receive(:new).
         with('GET', "http://stream.twitter.com/1/statuses/filter.json?track=nfl", {}, kind_of(Hash))
 
       req.send(:oauth_header)

data/spec/spec_helper.rb

@@ -4,6 +4,7 @@ unless ENV['CI']
   SimpleCov.start do
     add_group 'EM-Twitter', 'lib/em-twitter'
     add_group 'Specs', 'spec'
+    add_filter '.bundle'
   end
 end
 

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: em-twitter
 version: !ruby/object:Gem::Version
-  version: 0.2.2
-  prerelease: 
+  version: 0.3.0
 platform: ruby
 authors:
 - Steve Agalloco
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-24 00:00:00.000000000 Z
+date: 2013-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,39 +27,40 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: http_parser.rb
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.6.0.beta.2
+    - - <
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.6.0.beta.2
+    - - <
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: simple_oauth
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,7 +68,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -116,33 +113,26 @@ files:
 homepage: https://github.com/spagalloco/em-twitter
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -324934599838712109
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -324934599838712109
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Twitter Streaming API client for EventMachine
 test_files: []
 has_rdoc: