benburkert-hosebird 0.1.0 → 0.1.1

data/Rakefile

@@ -9,7 +9,7 @@ begin
     gem.email = "ben@benburkert.com"
     gem.homepage = "http://github.com/benburkert/hosebird"
     gem.authors = ["Ben Burkert"]
-    gem.requirements = %w[aikidoka eventmachine extlib json twitter]
+    gem.requirements = %w[flyingmachine-aikidoka eventmachine extlib json twitter]
   end
 
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/hosebird.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{hosebird}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ben Burkert"]
-  s.date = %q{2009-05-18}
+  s.date = %q{2009-05-19}
   s.email = %q{ben@benburkert.com}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -37,7 +37,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/benburkert/hosebird}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.requirements = ["aikidoka", "eventmachine", "extlib", "json", "twitter"]
+  s.requirements = ["flyingmachine-aikidoka", "eventmachine", "extlib", "json", "twitter"]
   s.rubygems_version = %q{1.3.3}
   s.summary = %q{A libary for Twitter's new Streaming API codename Hosebird.}
   s.test_files = [

data/lib/hosebird/autoload/twitter.rb

@@ -1,2 +1,3 @@
+gem 'flyingmachine-aikidoka'
 require 'aikidoka'
 Aikidoka.rename("Mash" => "Twitter::Mash") { require 'twitter' }

data/lib/hosebird/stream.rb

@@ -4,12 +4,20 @@ module Hosebird
 
     HOST        = 'stream.twitter.com'
     PORT        = 80
-    KEEP_ALIVE  = /\A[0-F]{3}\Z/
+    KEEP_ALIVE  = /\A3[\r][\n][\n][\r][\n]/
+    DECHUNKER   = /\A[0-F]+[\r][\n]/
     NEWLINE     = /[\n]/
     CRLF        = /[\r][\n]/
     EOF         = /[\r][\n]\Z/
-    JSON_START  = /\A[{]/
-    JSON_END    = /[}]\Z/
+
+    # %r{\AHTTP/1.1[\s]200[\s]OK[\r][\n](?:[a-zA-Z0-9/\\\:(.\-) ]+[\r][\n])+[\r][\n]}
+    RESPONSE_HEADER = <<-HTTP.gsub(NEWLINE, "\r\n")
+HTTP/1.1 200 OK
+Content-Type: application/json
+Transfer-Encoding: chunked
+Server: Jetty(6.1.14)
+
+HTTP
 
     class_inheritable_accessor :url
 
@@ -55,7 +63,12 @@ module Hosebird
     end
 
     def extract_json(lines)
-      lines.map {|line| JSON.parse(line).to_mash if line =~ JSON_START && line =~ JSON_END}.compact
+      # lines.map {|line| Yajl::Stream.parse(StringIO.new(line)).to_mash rescue nil }.compact
+      lines.map {|line| JSON.parse(line).to_mash rescue nil }.compact
+    end
+
+    def keep_alive?(data)
+      data =~ KEEP_ALIVE
     end
 
     def post_init
@@ -64,17 +77,21 @@ module Hosebird
     end
 
     def receive_data(data)
-      @buffer << data
+      data.gsub!(RESPONSE_HEADER, '')
 
-      if @buffer =~ EOF
-        lines = @buffer.split(CRLF)
-        @buffer = ''
-      else
-        lines = @buffer.split(CRLF)
-        @buffer = lines.pop
-      end
+      unless keep_alive?(data)
+        @buffer << unchunk(data)
+
+        if @buffer =~ EOF
+          lines = @buffer.split(CRLF)
+          @buffer = ''
+        else
+          lines = @buffer.split(CRLF)
+          @buffer = lines.pop
+        end
 
-      extract_json(lines).each {|line| callback(line)}
+        extract_json(lines).each {|line| callback(line)}
+      end
     end
 
     def unbind
@@ -82,5 +99,10 @@ module Hosebird
       reconnect HOST, PORT
       post_init
     end
+
+    def unchunk(data)
+      data.gsub!(DECHUNKER, '')
+      data
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: benburkert-hosebird
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Ben Burkert
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-18 00:00:00 -07:00
+date: 2009-05-19 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -63,7 +63,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: "0"
   version: 
 requirements: 
-- aikidoka
+- flyingmachine-aikidoka
 - eventmachine
 - extlib
 - json