twitter-stream 0.1.12 → 0.1.13

data/.gitignore

@@ -0,0 +1,10 @@
+*.sw?
+.rake_tasks~
+.DS_Store
+coverage
+rdoc
+pkg
+Gemfile.lock
+coverage/*
+.yardoc/*
+doc/*

data/.rspec

@@ -0,0 +1,2 @@
+--colour
+--format doc

data/Gemfile

@@ -0,0 +1,2 @@
+source :rubygems
+gemspec

data/Rakefile

@@ -1,28 +1,12 @@
 require 'rubygems'
 
+require 'bundler'
+Bundler::GemHelper.install_tasks
+
 gem 'rspec', '>= 2.5.0'
 require 'rspec/core/rake_task'
 
 desc "Run all specs"
-RSpec::Core::RakeTask.new(:spec) do |t|
-  # t.spec_files = FileList['spec/**/*.rb']
-  t.rspec_opts = %w(-fs --color)
-end
+RSpec::Core::RakeTask.new(:spec)
 task :default => :spec
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gemspec|
-    gemspec.name = "twitter-stream"
-    gemspec.summary = "Twitter realtime API client"
-    gemspec.description = "Simple Ruby client library for twitter streaming API. Uses EventMachine for connection handling. Adheres to twitter's reconnection guidline. JSON format only."
-    gemspec.email = "voloko@gmail.com"
-    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
-  puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
-end
+task :test => :spec

data/lib/twitter/json_stream.rb

@@ -1,7 +1,7 @@
 require 'eventmachine'
 require 'em/buftok'
 require 'uri'
-require 'roauth'
+require 'simple_oauth'
 
 module Twitter
   class JSONStream < EventMachine::Connection
@@ -284,8 +284,19 @@ module Twitter
     #   :access_secret   => [access secret]
     # }
     def oauth_header
-      uri = uri_base + @options[:path]
-      ::ROAuth.header(@options[:oauth], uri, params, @options[:method])
+      uri = uri_base + @options[:path].to_s
+
+      # The hash SimpleOAuth accepts is slightly different from that of
+      # ROAuth.  To preserve backward compatability, fix the cache here
+      # so that the arguments passed in don't need to change.
+      oauth = {
+        :consumer_key => @options[:oauth][:consumer_key],
+        :consumer_secret => @options[:oauth][:consumer_secret],
+        :token => @options[:oauth][:access_key],
+        :token_secret => @options[:oauth][:access_secret]
+      }
+
+      SimpleOAuth::Header.new(@options[:method], uri, params, oauth)
     end
 
     # Scheme (https if ssl, http otherwise) and host part of URL

data/spec/twitter/json_stream_spec.rb

@@ -21,15 +21,33 @@ end
 
 
 describe JSONStream do
-  
+
+  context "authentication" do
+    it "should connect with basic auth credentials" do
+      connect_stream :auth => "username:password"
+      $recieved_data.should include('Authorization: Basic')
+    end
+
+    it "should connect with oauth credentials" do
+      oauth = {
+        :consumer_key => '1234567890',
+        :consumer_secret => 'abcdefghijklmnopqrstuvwxyz',
+        :access_key => 'ohai',
+        :access_secret => 'ohno'
+      }
+      connect_stream :oauth => oauth
+      $recieved_data.should include('Authorization: OAuth')
+    end
+  end
+
   context "on create" do
-    
+
     it "should return stream" do
       EM.should_receive(:connect).and_return('TEST INSTANCE')
       stream = JSONStream.connect {}
       stream.should == 'TEST INSTANCE'
     end
-    
+
     it "should define default properties" do
       EM.should_receive(:connect).with do |host, port, handler, opts|
         host.should == 'stream.twitter.com'
@@ -39,7 +57,7 @@ describe JSONStream do
       end
       stream = JSONStream.connect {}
     end
-    
+
     it "should connect to the proxy if provided" do
       EM.should_receive(:connect).with do |host, port, handler, opts|
         host.should == 'my-proxy'
@@ -50,8 +68,9 @@ describe JSONStream do
       end
       stream = JSONStream.connect(:proxy => "http://my-proxy:8080") {}
     end
+
   end
-  
+
   context "on valid stream" do
     attr_reader :stream
     before :each do
@@ -59,34 +78,34 @@ describe JSONStream do
       $recieved_data = ''
       $close_connection = false
     end
-    
+
     it "should add no params" do
       connect_stream
       $recieved_data.should include('/1/statuses/filter.json HTTP')
     end
-    
+
     it "should add custom params" do
       connect_stream :params => {:name => 'test'}
       $recieved_data.should include('?name=test')
     end
-    
+
     it "should parse headers" do
       connect_stream
       stream.code.should == 200
       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')
     end
-    
+
     it "should extract records" do
       connect_stream :user_agent => 'TEST_USER_AGENT'
       $recieved_data.upcase.should include('USER-AGENT: TEST_USER_AGENT')
     end
-    
+
     it "should send correct user agent" do
       connect_stream
     end
@@ -98,27 +117,27 @@ describe JSONStream do
         stream.should_receive(:reconnect)
       end
     end
-    
+
     it "should reconnect with 0.25 at base" do
       connect_stream do
         stream.should_receive(:reconnect_after).with(0.25)
       end
     end
-    
+
     it "should reconnect with linear timeout" do
       connect_stream do
         stream.nf_last_reconnect = 1
         stream.should_receive(:reconnect_after).with(1.25)
       end
     end
-    
+
     it "should stop reconnecting after 100 times" do
       connect_stream do
         stream.reconnect_retries = 100
         stream.should_not_receive(:reconnect_after)
       end
     end
-    
+
     it "should notify after reconnect limit is reached" do
       timeout, retries = nil, nil
       connect_stream do
@@ -129,66 +148,66 @@ describe JSONStream do
       end
       timeout.should == 0.25
       retries.should == 101
-    end    
+    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)        
+        stream.should_receive(:reconnect)
       end
-    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 
+
+    # 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  
-  
+  end
+
   context "on application failure" do
     attr_reader :stream
     before :each do
       $data_to_send = 'HTTP/1.1 401 Unauthorized\r\nWWW-Authenticate: Basic realm="Firehose"\r\n\r\n1'
       $close_connection = true
     end
-    
+
     it "should reconnect on application failure 10 at base" do
       connect_stream do
         stream.should_receive(:reconnect_after).with(10)
       end
     end
-    
+
     it "should reconnect with exponential timeout" do
       connect_stream do
         stream.af_last_reconnect = 160
         stream.should_receive(:reconnect_after).with(320)
       end
     end
-    
+
     it "should not try to reconnect after limit is reached" do
       connect_stream do
         stream.af_last_reconnect = 320
         stream.should_not_receive(:reconnect_after)
       end
     end
-  end  
+  end
 end

data/twitter-stream.gemspec

@@ -1,60 +1,31 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{twitter-stream}
-  s.version = "0.1.10"
+  s.version = "0.1.13"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Vladimir Kolesnikov"]
   s.date = %q{2010-10-05}
   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 = [
-    "README.markdown"
-  ]
-  s.files = [
-    ".gitignore",
-     "README.markdown",
-     "Rakefile",
-     "VERSION",
-     "examples/reader.rb",
-     "fixtures/twitter/basic_http.txt",
-     "lib/twitter/json_stream.rb",
-     "spec/spec_helper.rb",
-     "spec/twitter/json_stream.rb",
-     "twitter-stream.gemspec"
-  ]
+  s.summary = %q{Twitter realtime API client}
   s.homepage = %q{http://github.com/voloko/twitter-stream}
+  s.email = %q{voloko@gmail.com}
+
+  s.platform                  = Gem::Platform::RUBY
+  s.rubygems_version          = %q{1.3.6}
+  s.required_rubygems_version = Gem::Requirement.new(">= 1.3.6") if s.respond_to? :required_rubygems_version=
+
   s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Twitter realtime API client}
-  s.test_files = [
-    "spec/spec_helper.rb",
-     "spec/twitter/json_stream.rb",
-     "examples/reader.rb"
-  ]
+  s.extra_rdoc_files = ["README.markdown"]
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+  s.add_runtime_dependency('eventmachine', "~> 0.12.8")
+  s.add_runtime_dependency('simple_oauth', '~> 0.1.4')
+  s.add_development_dependency('rspec', "~> 2.5.0")
 
-    if Gem::Version.new(Gem::VERSION) >= 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
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: twitter-stream
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 0
   - 1
-  - 12
-  version: 0.1.12
+  - 13
+  version: 0.1.13
 platform: ruby
 authors: 
 - Vladimir Kolesnikov
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-14 00:00:00 -07:00
-default_executable: 
+date: 2010-10-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: eventmachine
@@ -24,7 +23,7 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: 63
         segments: 
@@ -35,19 +34,19 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: roauth
+  name: simple_oauth
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 19
         segments: 
         - 0
-        - 0
-        - 2
-        version: 0.0.2
+        - 1
+        - 4
+        version: 0.1.4
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -56,14 +55,14 @@ dependencies:
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 27
         segments: 
-        - 1
         - 2
-        - 8
-        version: 1.2.8
+        - 5
+        - 0
+        version: 2.5.0
   type: :development
   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.
@@ -75,6 +74,10 @@ extensions: []
 extra_rdoc_files: 
 - README.markdown
 files: 
+- .gemtest
+- .gitignore
+- .rspec
+- Gemfile
 - README.markdown
 - Rakefile
 - VERSION
@@ -84,13 +87,12 @@ files:
 - spec/spec_helper.rb
 - spec/twitter/json_stream_spec.rb
 - twitter-stream.gemspec
-has_rdoc: true
 homepage: http://github.com/voloko/twitter-stream
 licenses: []
 
 post_install_message: 
-rdoc_options: []
-
+rdoc_options: 
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -107,18 +109,19 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 23
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 6
+      version: 1.3.6
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: Twitter realtime API client
 test_files: 
-- examples/reader.rb
 - spec/spec_helper.rb
 - spec/twitter/json_stream_spec.rb