twitter-stream 0.1.7 → 0.1.8

data/VERSION

@@ -1 +1 @@
-0.1.7
+0.1.8

data/lib/twitter/json_stream.rb

@@ -6,19 +6,19 @@ require 'roauth'
 module Twitter
   class JSONStream < EventMachine::Connection
     MAX_LINE_LENGTH = 1024*1024
-    
+
     # network failure reconnections
-    NF_RECONNECT_START = 0.25 
+    NF_RECONNECT_START = 0.25
     NF_RECONNECT_ADD   = 0.25
     NF_RECONNECT_MAX   = 16
-    
+
     # app failure reconnections
     AF_RECONNECT_START = 10
     AF_RECONNECT_MUL   = 2
-    
+
     RECONNECT_MAX   = 320
     RETRIES_MAX     = 10
-    
+
     DEFAULT_OPTIONS = {
       :method       => 'GET',
       :path         => '/',
@@ -42,7 +42,7 @@ module Twitter
     attr_accessor :af_last_reconnect
     attr_accessor :reconnect_retries
     attr_accessor :proxy
-    
+
     def self.connect options = {}
       options[:port] = 443 if options[:ssl] && !options.has_key?(:port)
       options = DEFAULT_OPTIONS.merge(options)
@@ -74,15 +74,15 @@ module Twitter
     def each_item &block
       @each_item_callback = block
     end
-    
+
     def on_error &block
       @error_callback = block
     end
-    
+
     def on_reconnect &block
       @reconnect_callback = block
     end
-    
+
     def on_max_reconnects &block
       @max_reconnects_callback = block
     end
@@ -97,7 +97,7 @@ module Twitter
       @gracefully_closed = false
       close_connection
     end
-    
+
     def unbind
       receive_line(@buffer.flush) unless @buffer.empty?
       schedule_reconnect unless @gracefully_closed
@@ -114,26 +114,26 @@ module Twitter
         return
       end
     end
-    
+
     def connection_completed
       send_request
     end
-    
+
     def post_init
       reset_state
     end
-    
+
   protected
     def schedule_reconnect
       timeout = reconnect_timeout
       @reconnect_retries += 1
       if timeout <= RECONNECT_MAX && @reconnect_retries <= RETRIES_MAX
-        reconnect_after(timeout) 
+        reconnect_after(timeout)
       else
         @max_reconnects_callback.call(timeout, @reconnect_retries) if @max_reconnects_callback
       end
     end
-    
+
     def reconnect_after timeout
       @reconnect_callback.call(timeout, @reconnect_retries) if @reconnect_callback
 
@@ -145,13 +145,13 @@ module Twitter
         end
       end
     end
-    
+
     def reconnect_timeout
       if @immediate_reconnect
         @immediate_reconnect = false
         return 0
       end
-      
+
       if (@code == 0) # network failure
         if @nf_last_reconnect
           @nf_last_reconnect += NF_RECONNECT_ADD
@@ -168,7 +168,7 @@ module Twitter
         @af_last_reconnect
       end
     end
-  
+
     def reset_state
       set_comm_inactivity_timeout @options[:timeout] if @options[:timeout] > 0
       @code    = 0
@@ -180,32 +180,33 @@ 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}"
+          request_uri << "?#{query}"
         else
-          content = filter_list
+          content = query
         end
       end
-      
+
       data << "#{@options[:method]} #{request_uri} HTTP/1.1"
       data << "Host: #{@options[:host]}"
+      data << 'Accept: */*'
       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
@@ -214,7 +215,7 @@ module Twitter
         data << "Content-length: #{content.length}"
       end
       data << "\r\n"
-      
+
       send_data data.join("\r\n") << content
     end
 
@@ -262,12 +263,12 @@ module Twitter
         close_connection
       end
     end
-    
+
     def reset_timeouts
       @nf_last_reconnect = @af_last_reconnect = nil
       @reconnect_retries = 0
     end
-    
+
     # :filters => %w(miama lebron jesus)
     # :oauth => {
     #   :consumer_key    => [key],
@@ -277,17 +278,21 @@ module Twitter
     # }
     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(',')}"
+
+    # Normalized query hash of escaped string keys and escaped string values
+    # nil values are skipped
+    def params
+      { 'track' => escape(@options[:filters].join(",")) }
     end
 
-  end  
+    def query
+      params.map{|pair| pair.join("=")}.sort.join("&")
+    end
+
+    def escape str
+      URI.escape(str.to_s, /[^a-zA-Z0-9\-\.\_\~]/)
+    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.7"
+  s.version = "0.1.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Vladimir Kolesnikov"]
-  s.date = %q{2010-08-02}
+  s.date = %q{2010-08-13}
   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 = [
@@ -30,7 +30,7 @@ Gem::Specification.new do |s|
   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.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Twitter realtime API client}
   s.test_files = [
     "spec/spec_helper.rb",
@@ -42,7 +42,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    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"])

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: twitter-stream
 version: !ruby/object:Gem::Version 
+  hash: 11
   prerelease: false
   segments: 
   - 0
   - 1
-  - 7
-  version: 0.1.7
+  - 8
+  version: 0.1.8
 platform: ruby
 authors: 
 - Vladimir Kolesnikov
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-02 00:00:00 +04:00
+date: 2010-08-13 00:00:00 +04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: eventmachine
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 63
         segments: 
         - 0
         - 12
@@ -35,9 +38,11 @@ dependencies:
   name: roauth
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 27
         segments: 
         - 0
         - 0
@@ -49,9 +54,11 @@ dependencies:
   name: rspec
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
         - 1
         - 2
@@ -88,23 +95,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Twitter realtime API client