twitter-stream 0.1.8 → 0.1.9

data/VERSION

@@ -1 +1 @@
-0.1.8
+0.1.9

data/lib/twitter/json_stream.rb

@@ -33,7 +33,8 @@ module Twitter
       :proxy        => ENV['HTTP_PROXY'],
       :auth         => nil,
       :oauth        => {},
-      :filters      => []
+      :filters      => [],
+      :params       => {},
     }
 
     attr_accessor :code
@@ -183,16 +184,16 @@ module Twitter
 
       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}"
+        request_uri = "#{uri_base}:#{@options[:port]}#{request_uri}"
       end
 
       content = @options[:content]
 
-      if !@options[:filters].empty?
+      unless q = query.empty?
         if @options[:method].to_s.upcase == 'GET'
-          request_uri << "?#{query}"
+          request_uri << "?#{q}"
         else
-          content = query
+          content = q
         end
       end
 
@@ -269,6 +270,10 @@ module Twitter
       @reconnect_retries = 0
     end
 
+    #
+    # URL and request components
+    #
+
     # :filters => %w(miama lebron jesus)
     # :oauth => {
     #   :consumer_key    => [key],
@@ -277,14 +282,25 @@ module Twitter
     #   :access_secret   => [access secret]
     # }
     def oauth_header
-      uri = "http://#{@options[:host]}#{@options[:path]}"
+      uri = uri_base + @options[:path]
       ::ROAuth.header(@options[:oauth], uri, params, @options[:method])
     end
 
+    # Scheme (https if ssl, http otherwise) and host part of URL
+    def uri_base
+      "http#{'s' if @options[:ssl]}://#{@options[:host]}"
+    end
+
     # Normalized query hash of escaped string keys and escaped string values
     # nil values are skipped
     def params
-      { 'track' => escape(@options[:filters].join(",")) }
+      flat = {}
+      @options[:params].merge( :track => @options[:filters] ).each do |param, val|
+        next if val.empty?
+        val = val.join(",") if val.respond_to?(:join)
+        flat[escape(param)] = escape(val)
+      end
+      flat
     end
 
     def query

data/spec/twitter/json_stream.rb

@@ -4,6 +4,22 @@ require 'twitter/json_stream'
 
 include Twitter
 
+Host = "127.0.0.1"
+Port = 9550
+
+class JSONServer < EM::Connection
+  attr_accessor :data
+  def receive_data data
+    $recieved_data = data
+    send_data $data_to_send
+    EventMachine.next_tick {
+      close_connection if $close_connection
+    }
+  end
+end
+
+
+
 describe JSONStream do
   
   context "on create" do
@@ -36,20 +52,6 @@ describe JSONStream do
     end
   end
   
-  Host = "127.0.0.1"
-  Port = 9550
-  
-  class JSONServer < EM::Connection
-    attr_accessor :data
-    def receive_data data
-      $recieved_data = data
-      send_data $data_to_send
-      EventMachine.next_tick {
-        close_connection if $close_connection
-      }
-    end
-  end
-  
   context "on valid stream" do
     attr_reader :stream
     before :each do

data/twitter-stream.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# 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.8"
+  s.version = "0.1.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Vladimir Kolesnikov"]
-  s.date = %q{2010-08-13}
+  s.date = %q{2010-09-30}
   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 = [
@@ -27,10 +27,11 @@ Gem::Specification.new do |s|
      "spec/twitter/json_stream.rb",
      "twitter-stream.gemspec"
   ]
+  s.has_rdoc = true
   s.homepage = %q{http://github.com/voloko/twitter-stream}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.3.1}
   s.summary = %q{Twitter realtime API client}
   s.test_files = [
     "spec/spec_helper.rb",
@@ -40,9 +41,12 @@ Gem::Specification.new do |s|
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+    s.specification_version = 2
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+    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"])
       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"])
@@ -50,11 +54,17 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<eventmachine>, [">= 0.12.8"])
       s.add_dependency(%q<roauth>, [">= 0.0.2"])
       s.add_dependency(%q<rspec>, [">= 1.2.8"])
+      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"])
+    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

@@ -1,13 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: twitter-stream
 version: !ruby/object:Gem::Version 
-  hash: 11
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 8
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors: 
 - Vladimir Kolesnikov
@@ -15,57 +9,69 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-13 00:00:00 +04:00
+date: 2010-09-30 00:00:00 +04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: eventmachine
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 63
-        segments: 
-        - 0
-        - 12
-        - 8
         version: 0.12.8
-  type: :runtime
-  version_requirements: *id001
+    version: 
 - !ruby/object:Gem::Dependency 
   name: roauth
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 0
-        - 0
-        - 2
         version: 0.0.2
-  type: :runtime
-  version_requirements: *id002
+    version: 
 - !ruby/object:Gem::Dependency 
   name: rspec
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 2
-        - 8
         version: 1.2.8
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: eventmachine
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.12.8
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: roauth
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.0.2
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: rspec
   type: :development
-  version_requirements: *id003
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.2.8
+    version: 
 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: []
@@ -87,37 +93,29 @@ files:
 - twitter-stream.gemspec
 has_rdoc: true
 homepage: http://github.com/voloko/twitter-stream
-licenses: []
-
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
+  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
+  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.3.1
 signing_key: 
-specification_version: 3
+specification_version: 2
 summary: Twitter realtime API client
 test_files: 
 - spec/spec_helper.rb