twitter-stream 0.1.6 → 0.1.7

data/Rakefile

@@ -1,5 +1,6 @@
 require 'rubygems'
-gem 'rspec'
+
+gem 'rspec', '= 1.3.0'
 require 'spec/rake/spectask'
 
 desc "Run all specs"
@@ -19,6 +20,7 @@ begin
     gemspec.homepage = "http://github.com/voloko/twitter-stream"
     gemspec.authors = ["Vladimir Kolesnikov"]
     gemspec.add_dependency("eventmachine", [">= 0.12.8"])
+    gemspec.add_dependency("roauth", [">= 0.0.2"])
     gemspec.add_development_dependency("rspec", [">= 1.2.8"])
   end
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.1.6
+0.1.7

data/lib/twitter/json_stream.rb

@@ -1,6 +1,7 @@
 require 'eventmachine'
 require 'em/buftok'
 require 'uri'
+require 'roauth'
 
 module Twitter
   class JSONStream < EventMachine::Connection
@@ -27,10 +28,12 @@ module Twitter
       :host         => 'stream.twitter.com',
       :port         => 80,
       :ssl          => false,
-      :auth         => 'test:test',
       :user_agent   => 'TwitterStream',
       :timeout      => 0,
-      :proxy        => ENV['HTTP_PROXY']
+      :proxy        => ENV['HTTP_PROXY'],
+      :auth         => nil,
+      :oauth        => {},
+      :filters      => []
     }
 
     attr_accessor :code
@@ -52,7 +55,7 @@ module Twitter
         host = proxy_uri.host
         port = proxy_uri.port
       end
-      
+
       connection = EventMachine.connect host, port, self, options
       connection.start_tls if options[:ssl]
       connection
@@ -113,10 +116,13 @@ module Twitter
     end
     
     def connection_completed
-      reset_state
       send_request
     end
     
+    def post_init
+      reset_state
+    end
+    
   protected
     def schedule_reconnect
       timeout = reconnect_timeout
@@ -174,23 +180,42 @@ module Twitter
     def send_request
       data = []
       request_uri = @options[:path]
+      
       if @proxy
         # proxies need the request to be for the full url
         request_uri = "http#{'s' if @options[:ssl]}://#{@options[:host]}:#{@options[:port]}#{request_uri}"
       end
+      
+      content = @options[:content]
+      
+      if !@options[:filters].empty?
+        if @options[:method].to_s.upcase == 'GET'
+          request_uri << "?#{filter_list}"
+        else
+          content = filter_list
+        end
+      end
+      
       data << "#{@options[:method]} #{request_uri} HTTP/1.1"
       data << "Host: #{@options[:host]}"
-      data << "User-agent: #{@options[:user_agent]}" if @options[:user_agent]
-      data << "Authorization: Basic " + [@options[:auth]].pack('m').delete("\r\n")
+      data << "User-Agent: #{@options[:user_agent]}" if @options[:user_agent]
+      
+      if @options[:auth]
+        data << "Authorization: Basic #{[@options[:auth]].pack('m').delete("\r\n")}"
+      elsif @options[:oauth]
+        data << "Authorization: #{oauth_header}"
+      end
+      
       if @proxy && @proxy.user
         data << "Proxy-Authorization: Basic " + ["#{@proxy.user}:#{@proxy.password}"].pack('m').delete("\r\n")
       end
       if @options[:method] == 'POST'
         data << "Content-type: #{@options[:content_type]}"
-        data << "Content-length: #{@options[:content].length}"
+        data << "Content-length: #{content.length}"
       end
       data << "\r\n"
-      send_data data.join("\r\n") + @options[:content]
+      
+      send_data data.join("\r\n") << content
     end
 
     def receive_line ln
@@ -242,6 +267,27 @@ module Twitter
       @nf_last_reconnect = @af_last_reconnect = nil
       @reconnect_retries = 0
     end
+    
+    # :filters => %w(miama lebron jesus)
+    # :oauth => {
+    #   :consumer_key    => [key],
+    #   :consumer_secret => [token],
+    #   :access_key      => [access key],
+    #   :access_secret   => [access secret]
+    # }
+    def oauth_header
+      uri = "http://#{@options[:host]}#{@options[:path]}"
+      
+      params = {
+        'track' => @options[:filters].join(',')
+      }
+      
+      ::ROAuth.header(@options[:oauth], uri, params, @options[:method])
+    end
+    
+    def filter_list
+      "track=#{@options[:filters].join(',')}"
+    end
 
   end  
 end

data/spec/spec_helper.rb

@@ -1,11 +1,12 @@
 require 'rubygems'
-lib_path = File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift lib_path unless $LOAD_PATH.include?(lib_path)
+$:.unshift File.expand_path("../../lib", __FILE__)
 
-gem 'rspec'
+gem 'rspec', '= 1.3.0'
 require 'spec'
 require 'spec/mocks'
 
+require 'twitter/json_stream'
+
 def fixture_path(path)
   File.join(File.dirname(__FILE__), '..', 'fixtures', path)
 end
@@ -18,7 +19,9 @@ def connect_stream(opts={}, &blk)
   EM.run {
     opts.merge!(:host => Host, :port => Port)
     stop_in = opts.delete(:stop_in) || 0.5
-    EM.start_server Host, Port, JSONServer
+    unless opts[:start_server] == false
+      EM.start_server Host, Port, JSONServer
+    end
     @stream = JSONStream.connect(opts)
     blk.call if blk
     EM.add_timer(stop_in){ EM.stop }

data/spec/twitter/json_stream.rb

@@ -61,13 +61,13 @@ describe JSONStream do
     it "should parse headers" do
       connect_stream
       stream.code.should == 200
-      stream.headers[0].downcase.should include 'content-type'
+      stream.headers[0].downcase.should include('content-type')
     end
     
     it "should parse headers even after connection close" do
       connect_stream
       stream.code.should == 200
-      stream.headers[0].downcase.should include 'content-type'
+      stream.headers[0].downcase.should include('content-type')
     end
     
     it "should extract records" do
@@ -79,20 +79,8 @@ describe JSONStream do
       connect_stream
     end
   end
-  
-  context "on network failure" do
-    attr_reader :stream
-    before :each do
-      $data_to_send = ''
-      $close_connection = true
-    end
-    
-    it "should timeout on inactivity" do
-      connect_stream :stop_in => 1.5 do
-        stream.should_receive(:reconnect)        
-      end
-    end    
-    
+
+  shared_examples_for "network failure" do
     it "should reconnect on network failure" do
       connect_stream do
         stream.should_receive(:reconnect)
@@ -129,9 +117,41 @@ describe JSONStream do
       end
       timeout.should == 0.25
       retries.should == 101
+    end    
+  end
+  
+  context "on network failure" do
+    attr_reader :stream
+    before :each do
+      $data_to_send = ''
+      $close_connection = true
     end
+    
+    it "should timeout on inactivity" do
+      connect_stream :stop_in => 1.5 do
+        stream.should_receive(:reconnect)        
+      end
+    end    
+    
+    it_should_behave_like "network failure"
   end
   
+  context "on server unavailable" do
+    
+    attr_reader :stream
+    
+    # This is to make it so the network failure specs which call connect_stream  
+    # can be reused. This way calls to connect_stream won't actually create a 
+    # server to listen in.
+    def connect_stream_without_server(opts={},&block)
+      connect_stream_default(opts.merge(:start_server=>false),&block)
+    end
+    alias_method :connect_stream_default, :connect_stream
+    alias_method :connect_stream, :connect_stream_without_server
+    
+    it_should_behave_like "network failure"
+  end  
+  
   context "on application failure" do
     attr_reader :stream
     before :each do
@@ -159,4 +179,4 @@ describe JSONStream do
       end
     end
   end  
-end
+end

data/twitter-stream.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{twitter-stream}
-  s.version = "0.1.6"
+  s.version = "0.1.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Vladimir Kolesnikov"]
-  s.date = %q{2010-05-19}
+  s.date = %q{2010-08-02}
   s.description = %q{Simple Ruby client library for twitter streaming API. Uses EventMachine for connection handling. Adheres to twitter's reconnection guidline. JSON format only.}
   s.email = %q{voloko@gmail.com}
   s.extra_rdoc_files = [
@@ -44,13 +44,16 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<eventmachine>, [">= 0.12.8"])
+      s.add_runtime_dependency(%q<roauth>, [">= 0.0.2"])
       s.add_development_dependency(%q<rspec>, [">= 1.2.8"])
     else
       s.add_dependency(%q<eventmachine>, [">= 0.12.8"])
+      s.add_dependency(%q<roauth>, [">= 0.0.2"])
       s.add_dependency(%q<rspec>, [">= 1.2.8"])
     end
   else
     s.add_dependency(%q<eventmachine>, [">= 0.12.8"])
+    s.add_dependency(%q<roauth>, [">= 0.0.2"])
     s.add_dependency(%q<rspec>, [">= 1.2.8"])
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 6
-  version: 0.1.6
+  - 7
+  version: 0.1.7
 platform: ruby
 authors: 
 - Vladimir Kolesnikov
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-19 00:00:00 +04:00
+date: 2010-08-02 00:00:00 +04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,9 +32,23 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: roauth
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 0
+        - 2
+        version: 0.0.2
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -44,7 +58,7 @@ dependencies:
         - 8
         version: 1.2.8
   type: :development
-  version_requirements: *id002
+  version_requirements: *id003
 description: Simple Ruby client library for twitter streaming API. Uses EventMachine for connection handling. Adheres to twitter's reconnection guidline. JSON format only.
 email: voloko@gmail.com
 executables: []