em-twitter 0.1.2 → 0.1.3

data/lib/em-twitter/connection.rb

@@ -110,6 +110,7 @@ module EventMachine
       end
 
       def stalled?
+        @last_response ||= Response.new
         @last_response.older_than?(STALL_TIMEOUT)
       end
 

data/lib/em-twitter/request.rb

@@ -19,15 +19,12 @@ module EventMachine
         data << "#{request_method} #{request_uri} HTTP/1.1"
         data << "Host: #{@options[:host]}"
 
-        data << 'Accept: */*'
-
-        # TODO: Complete gzip support
-        # if gzip?
-        #   data << 'Connection: Keep-Alive'
-        #   data << 'Accept-Encoding: deflate'
-        # else
-        #   data << 'Accept: */*'
-        # end
+        if gzip?
+          data << 'Connection: Keep-Alive'
+          data << 'Accept-Encoding: deflate, gzip'
+        else
+          data << 'Accept: */*'
+        end
 
         data << "User-Agent: #{@options[:user_agent]}" if @options[:user_agent]
         if put_or_post?

data/lib/em-twitter/version.rb

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

data/spec/em-twitter/connection_spec.rb

@@ -92,13 +92,13 @@ describe EM::Twitter::Connection do
     describe 'stall handling' do
       before do
         Mockingbird.setup(test_options) do
-          wait(100)
+          wait(10)
         end
       end
 
       after { Mockingbird.teardown }
 
-      it 'invokes a no-data callback when no data is received' do
+      it 'invokes a no-data callback when stalled' do
         called = false
         EM.run do
           client = EM::Twitter::Client.connect(default_options)
@@ -111,6 +111,27 @@ describe EM::Twitter::Connection do
 
         called.should be_true
       end
+
+      it 'invokes a no-data callback when stalled without a response' do
+        called = false
+        EM.run do
+          client = EM::Twitter::Client.connect(default_options)
+          # 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
+            resp = client.connection.instance_variable_get(:@last_response)
+            client.connection.instance_variable_set(:@last_response, nil) if resp.timestamp.nil?
+            false
+          end
+          client.on_no_data_received do
+            called = true
+            EM.stop
+          end
+        end
+
+        called.should be_true
+      end
     end
   end
 

data/spec/em-twitter/request_spec.rb

@@ -60,6 +60,20 @@ describe EM::Twitter::Request do
       end
     end
 
+    context 'gzip encoding' do
+      before do
+        @request = EM::Twitter::Request.new(default_options.merge(:encoding => 'gzip'))
+      end
+
+      it 'sets a keep-alive header' do
+        @request.to_s.should include('Connection: Keep-Alive')
+      end
+
+      it 'sets the accept-enconding header' do
+        @request.to_s.should include('Accept-Encoding: deflate, gzip')
+      end
+    end
+
     it 'adds a POST body' do
       @request = EM::Twitter::Request.new(default_options)
       @request.to_s.should include('track=nfl')
@@ -75,6 +89,11 @@ describe EM::Twitter::Request do
       @request.to_s.should include('User-Agent: EM::Twitter Test Suite')
     end
 
+    it 'adds an accept header' do
+      @request = EM::Twitter::Request.new(default_options)
+      @request.to_s.should include('Accept: */*')
+    end
+
     it 'adds custom headers' do
       @request = EM::Twitter::Request.new(default_options.merge(:headers => { 'foo' => 'bar'}))
       @request.to_s.should include('foo: bar')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: em-twitter
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-23 00:00:00.000000000Z
+date: 2012-06-09 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &70315157830960 !ruby/object:Gem::Requirement
+  requirement: &70145432188720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.0.0.beta.4
   type: :runtime
   prerelease: false
-  version_requirements: *70315157830960
+  version_requirements: *70145432188720
 - !ruby/object:Gem::Dependency
   name: http_parser.rb
-  requirement: &70315157830160 !ruby/object:Gem::Requirement
+  requirement: &70145432188220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '0.5'
   type: :runtime
   prerelease: false
-  version_requirements: *70315157830160
+  version_requirements: *70145432188220
 - !ruby/object:Gem::Dependency
   name: simple_oauth
-  requirement: &70315157829460 !ruby/object:Gem::Requirement
+  requirement: &70145432187760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '0.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70315157829460
+  version_requirements: *70145432187760
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70315157828960 !ruby/object:Gem::Requirement
+  requirement: &70145432187380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70315157828960
+  version_requirements: *70145432187380
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &70315157828420 !ruby/object:Gem::Requirement
+  requirement: &70145432186920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70315157828420
+  version_requirements: *70145432186920
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70315157827960 !ruby/object:Gem::Requirement
+  requirement: &70145432186500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70315157827960
+  version_requirements: *70145432186500
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70315157827220 !ruby/object:Gem::Requirement
+  requirement: &70145432186080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70315157827220
+  version_requirements: *70145432186080
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70315157826560 !ruby/object:Gem::Requirement
+  requirement: &70145432178720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70315157826560
+  version_requirements: *70145432178720
 - !ruby/object:Gem::Dependency
   name: mockingbird
-  requirement: &70315157825840 !ruby/object:Gem::Requirement
+  requirement: &70145432177960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: 0.1.1
   type: :development
   prerelease: false
-  version_requirements: *70315157825840
+  version_requirements: *70145432177960
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70315157825120 !ruby/object:Gem::Requirement
+  requirement: &70145432177460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +120,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70315157825120
+  version_requirements: *70145432177460
 description: Twitter Streaming API client for EventMachine
 email: steve.agalloco@gmail.com
 executables: []