firering 1.0.2 → 1.0.3

data/README.rdoc

@@ -1,6 +1,6 @@
 = firering
 
-Campfire API interface powered by EventMachine and Yajl.
+Campfire API interface powered by eventmachine, em-http-request and yajl-ruby.
 
   require 'firering'
 

data/firering.gemspec

@@ -4,12 +4,12 @@ Gem::Specification.new do |s|
   s.rubygems_version = '1.3.5'
 
   s.name              = 'firering'
-  s.version           = '1.0.2'
-  s.date              = '2010-10-01'
+  s.version           = '1.0.3'
+  s.date              = '2010-10-12'
   s.rubyforge_project = 'firering'
 
-  s.summary     = "Campfire API interface powered by EventMachine and Yajl."
-  s.description = "Campfire API interface powered by EventMachine and Yajl."
+  s.summary     = "Campfire API interface powered by eventmachine em-http-request and yajl-ruby."
+  s.description = "Campfire API interface powered by eventmachine em-http-request and yajl-ruby."
 
   s.authors  = ["Emmanuel Oga"]
   s.email    = 'EmmanuelOga@gmail.com'

data/lib/firering/connection.rb

@@ -77,14 +77,14 @@ module Firering
     # The Streaming API allows you to monitor a room in real time. The
     # authenticated user must already have joined the room in order to use this
     # API.
-    def stream(room_id, &callback)
+    def stream(room, &callback)
       parser = Yajl::Parser.new(:symbolize_keys => true)
 
       parser.on_parse_complete = proc do |data|
         callback.call(Firering::Message.instantiate(self, data)) if callback
       end
 
-      uri = streaming_host.join("/room/#{room_id}/live.json")
+      uri = streaming_host.join("/room/#{room.id}/live.json")
       logger.info("performing streaming request to #{uri.to_s}")
       http = EventMachine::HttpRequest.new(uri).get(parameters)
 
@@ -93,7 +93,7 @@ module Firering
           parser << chunk; reset_retries_counter
         rescue Yajl::ParseError
           perform_retry(http) do
-            stream(room_id, &callback)
+            room.stream(&callback)
           end
         end
       end
@@ -104,7 +104,7 @@ module Firering
       # few seconds before trying to reconnect.  Formats
       http.errback do
         perform_retry(http) do
-          stream(room_id, &callback)
+          room.stream(&callback)
         end
       end
 

data/lib/firering/data/room.rb

@@ -8,7 +8,7 @@ class Firering::Room < Firering::Data
   alias_method :open_to_guests?, :open_to_guests
 
   def stream(&callback)
-    join { |data, http| connection.stream(id, &callback) }
+    join { |data, http| connection.stream(self, &callback) }
   end
 
   # we perform a request each time so

data/lib/firering/data.rb

@@ -29,7 +29,7 @@ module Firering
     def initialize_attributes(data, base_key = nil)
       @_attributes = data.is_a?(Hash) ? data : Yajl::Parser.parse(data, :symbolize_keys => true)
       @_attributes = @_attributes[base_key] if base_key
-
+      @_attributes ||= Hash.new
       @_attributes.each do |key, val|
         @_attributes[key] = Date.parse(val) rescue val if key.to_s =~ /(_at|_on)$/
       end

data/lib/firering.rb

@@ -5,7 +5,7 @@ require 'yajl'
 require 'em-http'
 
 module Firering
-  VERSION = '1.0.2'
+  VERSION = '1.0.3'
 
   class Error < StandardError; end
 

data/spec/firering/connection_spec.rb

@@ -13,7 +13,7 @@ describe Firering::Connection do
 
   it "stream messages" do
     EM.run {
-      conn.stream(304355) do |message|
+      conn.stream(Firering::Room.instantiate(conn, :id => 304355)) do |message|
         message.should be_an_instance_of(Firering::Message)
       end
 
@@ -29,7 +29,7 @@ describe Firering::Connection do
     messages = []
 
     EM.run {
-      conn.stream(304355) do |message|
+      conn.stream(Firering::Room.instantiate(conn, :id => 304355)) do |message|
         messages << message
       end
       EM.add_timer(conn.max_retries * conn.retry_delay + 1) do
@@ -47,7 +47,7 @@ describe Firering::Connection do
 
     begin
       EM.run {
-        conn.stream(304355) { |message| messages << message }
+        conn.stream(Firering::Room.instantiate(conn, :id => 304355)) { |message| messages << message }
 
         EM.add_timer(conn.max_retries * conn.retry_delay + 1) { EM.stop }
       }

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: firering
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 1
   - 0
-  - 2
-  version: 1.0.2
+  - 3
+  version: 1.0.3
 platform: ruby
 authors: 
 - Emmanuel Oga
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-01 00:00:00 -03:00
+date: 2010-10-12 00:00:00 -03:00
 default_executable: campf-notify
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -98,7 +98,7 @@ dependencies:
         version: 1.0.0
   type: :development
   version_requirements: *id005
-description: Campfire API interface powered by EventMachine and Yajl.
+description: Campfire API interface powered by eventmachine em-http-request and yajl-ruby.
 email: EmmanuelOga@gmail.com
 executables: 
 - campf-notify
@@ -204,7 +204,7 @@ rubyforge_project: firering
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 2
-summary: Campfire API interface powered by EventMachine and Yajl.
+summary: Campfire API interface powered by eventmachine em-http-request and yajl-ruby.
 test_files: 
 - spec/firering/connection_spec.rb
 - spec/firering/data/message_spec.rb