firering 1.0.3 → 1.0.4

data/README.rdoc

@@ -78,6 +78,10 @@ For more details take a look at spec/fixtures/load_server.rb file.
   (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
 * Send me a pull request. Bonus points for topic branches.
 
+== Contributors
+
+* indirect (Andre Arko), https://github.com/EmmanuelOga/firering/pull/1
+
 == Copyright
 
 Copyright (c) 2010 Emmanuel Oga. See LICENSE for details.

data/Rakefile

@@ -43,17 +43,11 @@ end
 #
 #############################################################################
 
-require 'spec/rake/spectask'
+require 'rspec/core/rake_task'
 
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
-end
-
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.ruby_opts = '-I lib'
   spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
 end
 
 task :default => :spec

data/firering.gemspec

@@ -4,8 +4,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = '1.3.5'
 
   s.name              = 'firering'
-  s.version           = '1.0.3'
-  s.date              = '2010-10-12'
+  s.version           = '1.0.4'
+  s.date              = '2011-02-24'
   s.rubyforge_project = 'firering'
 
   s.summary     = "Campfire API interface powered by eventmachine em-http-request and yajl-ruby."
@@ -23,12 +23,12 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.extra_rdoc_files = %w[README.rdoc LICENSE]
 
-  s.add_dependency('eventmachine', [">= 0.12.10"])
-  s.add_dependency('em-http-request', [">= 0.2.10"])
-  s.add_dependency('yajl-ruby', [">= 0.7.6"])
+  s.add_dependency('eventmachine', ["~> 0.12.10"])
+  s.add_dependency('em-http-request', ["~> 0.3.0"])
+  s.add_dependency('yajl-ruby', ["~> 0.7.6"])
 
-  s.add_development_dependency('rspec', [">= 1.3.0"])
-  s.add_development_dependency('sinatra', [">= 1.0.0"])
+  s.add_development_dependency('rspec', ["~> 2.1.0"])
+  s.add_development_dependency('rack', [">= 1.2.0"])
 
   # = MANIFEST =
   s.files = %w[
@@ -44,11 +44,11 @@ Gem::Specification.new do |s|
     firering.gemspec
     lib/firering.rb
     lib/firering/connection.rb
-    lib/firering/data.rb
     lib/firering/data/message.rb
     lib/firering/data/room.rb
     lib/firering/data/upload.rb
     lib/firering/data/user.rb
+    lib/firering/instantiator.rb
     lib/firering/requests.rb
     log/.gitignore
     spec/firering/connection_spec.rb

data/lib/firering/connection.rb

@@ -101,7 +101,7 @@ module Firering
       # Campfire servers will try to hold the streaming connections open indefinitely.
       # However, API clients must be able to handle occasional timeouts or
       # disruptions. Upon unexpected disconnection, API clients should wait for a
-      # few seconds before trying to reconnect.  Formats
+      # few seconds before trying to reconnect.
       http.errback do
         perform_retry(http) do
           room.stream(&callback)

data/lib/firering/data/message.rb

@@ -1,49 +1,52 @@
-class Firering::Message < Firering::Data
-
-  data_attributes :id, :room_id, :user_id, :body, :created_at, :type
-
-  MESSAGE_TYPES = %w[
-    TextMessage PasteMessage SoundMessage AdvertisementMessage
-    AllowGuestsMessage DisallowGuestsMessage IdleMessage KickMessage
-    LeaveMessage SystemMessage TimestampMessage TopicChangeMessage
-    UnidleMessage UnlockMessage UploadMessage
-  ]
-
-  # txs activesupport
-  underscore = proc do |word|
-    w = word.to_s.gsub(/::/, '/')
-    w = w.gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2')
-    w = w.gsub(/([a-z\d])([A-Z])/,'\1_\2')
-    w.tr("-", "_").downcase
-  end
+module Firering
+  Message = Struct.new(:connection, :id, :room_id, :user_id, :body, :created_at, :type)
+
+  class Message
+    extend Instantiator
+
+    MESSAGE_TYPES = %w[
+      TextMessage PasteMessage SoundMessage AdvertisementMessage
+      AllowGuestsMessage DisallowGuestsMessage IdleMessage KickMessage
+      LeaveMessage SystemMessage TimestampMessage TopicChangeMessage
+      UnidleMessage UnlockMessage UploadMessage
+    ]
+
+    # txs activesupport
+    underscore = proc do |word|
+      w = word.to_s.gsub(/::/, '/')
+      w = w.gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2')
+      w = w.gsub(/([a-z\d])([A-Z])/,'\1_\2')
+      w.tr("-", "_").downcase
+    end
 
-  MESSAGE_TYPES.each do |message_type|
-    current_type = (message_type =~ /(.+)Message/) && $1
-    define_method("#{underscore[current_type]}?") do
-      type == message_type
+    MESSAGE_TYPES.each do |message_type|
+      current_type = (message_type =~ /(.+)Message/) && $1
+      define_method("#{underscore[current_type]}?") do
+        type == message_type
+      end
     end
-  end
 
-  def from_user?
-    !user_id.nil? && (!user_id.instance_of?(String) || user_id !~ /^\s*$/)
-  end
+    def from_user?
+      !user_id.nil? && (!user_id.instance_of?(String) || user_id !~ /^\s*$/)
+    end
 
-  # Highlights a message / Removes a message highlight.
-  def star(id, yes_or_no = true, &callback)
-    connection.star_message(id, yes_or_no, &callback)
-  end
+    # Highlights a message / Removes a message highlight.
+    def star(id, yes_or_no = true, &callback)
+      connection.star_message(id, yes_or_no, &callback)
+    end
 
-  def room(&callback)
-    connection.room(room_id, &callback)
-  end
+    def room(&callback)
+      connection.room(room_id, &callback)
+    end
 
-  def user(&callback)
-    if from_user?
-      connection.user(user_id, &callback)
-    else
-      callback.call(nil, connection)
+    def user(&callback)
+      if from_user?
+        connection.user(user_id, &callback)
+      else
+        callback.call(nil, connection)
+      end
     end
-  end
 
-  alias_method :to_s, :body
+    alias_method :to_s, :body
+  end
 end

data/lib/firering/data/room.rb

@@ -1,120 +1,122 @@
-class Firering::Room < Firering::Data
+module Firering
+  Room = Struct.new(:connection, :id, :name, :topic, :membership_limit, :full, :open_to_guests, :active_token_value, :updated_at, :created_at, :users, :locked)
 
-  data_attributes :id, :name, :topic, :membership_limit, :full, :open_to_guests,
-    :active_token_value, :updated_at, :created_at, :users, :locked
+  class Room
+    extend Instantiator
 
-  alias_method :locked?, :locked
-  alias_method :full?, :full
-  alias_method :open_to_guests?, :open_to_guests
+    alias_method :locked?, :locked
+    alias_method :full?, :full
+    alias_method :open_to_guests?, :open_to_guests
 
-  def stream(&callback)
-    join { |data, http| connection.stream(self, &callback) }
-  end
+    def stream(&callback)
+      join { |data, http| connection.stream(self, &callback) }
+    end
 
-  # we perform a request each time so
-  # 1) we always are are up to date with the users currently on the room (even if some left)
-  # 2) we make sure the users are here even if the room was instantiated from a
-  # /rooms request
-  def users(&callback)
-    connection.http(:get, "/room/#{id}.json") do |data, http| # data can be blank on locked rooms
-      callback.call(data ? data[:room][:users].map { |user| Firering::User.instantiate(self, user) } : Array.new) if callback
+    # we perform a request each time so
+    # 1) we always are are up to date with the users currently on the room (even if some left)
+    # 2) we make sure the users are here even if the room was instantiated from a
+    # /rooms request
+    def users(&callback)
+      connection.http(:get, "/room/#{id}.json") do |data, http| # data can be blank on locked rooms
+        callback.call(data ? data[:room][:users].map { |user| Firering::User.instantiate(self, user) } : Array.new) if callback
+      end
     end
-  end
 
-  # Updates an existing room. Only admins can rename a room, although any
-  # user (except guests) may set the topic. Omitting either key results in
-  # that attribute being ignored. To remove a room topic, simply provide an
-  # empty topic key.
-  #
-  # update "name" => "Name", "topic" => "Topic"
-  def update(data, &callback)
-    connection.http(:put, "/room/#{id}.json", { :room => data }, &callback)
-  end
+    # Updates an existing room. Only admins can rename a room, although any
+    # user (except guests) may set the topic. Omitting either key results in
+    # that attribute being ignored. To remove a room topic, simply provide an
+    # empty topic key.
+    #
+    # update "name" => "Name", "topic" => "Topic"
+    def update(data, &callback)
+      connection.http(:put, "/room/#{id}.json", { :room => data }, &callback)
+    end
 
-  # Returns a collection of upto 100 recent messages in the room. Accepts an
-  # additional optional parameter ‘limit’ to restrict the number of messages
-  # returned.
-  def recent_messages(limit = nil, &callback)
-    connection.http(:get, "/room/#{id}/recent.json", (limit ? { :limit => limit } : nil)) do |data, http|
-      callback.call(data[:messages].map { |msg| Firering::Message.instantiate(connection, msg) }) if callback
+    # Returns a collection of upto 100 recent messages in the room. Accepts an
+    # additional optional parameter ‘limit’ to restrict the number of messages
+    # returned.
+    def recent_messages(limit = nil, &callback)
+      connection.http(:get, "/room/#{id}/recent.json", (limit ? { :limit => limit } : nil)) do |data, http|
+        callback.call(data[:messages].map { |msg| Firering::Message.instantiate(connection, msg) }) if callback
+      end
     end
-  end
 
-  # Returns all the messages sent today to a room.
-  def today_transcript(&callback)
-    connection.http(:get, "/room/#{id}/transcript.json") do |data, http|
-      callback.call(data[:messages].map { |msg| Firering::Message.instantiate(connection, msg) }) if callback
+    # Returns all the messages sent today to a room.
+    def today_transcript(&callback)
+      connection.http(:get, "/room/#{id}/transcript.json") do |data, http|
+        callback.call(data[:messages].map { |msg| Firering::Message.instantiate(connection, msg) }) if callback
+      end
     end
-  end
 
-  # Returns all the messages sent on a specific date to a room.
-  def transcript(year, month, day, &callback)
-    connection.http(:get, "/room/#{id}/transcript/#{year}/#{month}/#{day}.json") do |data, http|
-      callback.call(data[:messages].map { |msg| Firering::Message.instantiate(connection, msg) }) if callback
+    # Returns all the messages sent on a specific date to a room.
+    def transcript(year, month, day, &callback)
+      connection.http(:get, "/room/#{id}/transcript/#{year}/#{month}/#{day}.json") do |data, http|
+        callback.call(data[:messages].map { |msg| Firering::Message.instantiate(connection, msg) }) if callback
+      end
     end
-  end
 
-  # Join a room.
-  def join(&callback)
-    connection.http(:post, "/room/#{id}/join.json", &callback)
-  end
+    # Join a room.
+    def join(&callback)
+      connection.http(:post, "/room/#{id}/join.json", &callback)
+    end
 
-  # Leave a room.
-  def leave(&callback)
-    connection.http(:post, "/room/#{id}/leave.json", &callback)
-  end
+    # Leave a room.
+    def leave(&callback)
+      connection.http(:post, "/room/#{id}/leave.json", &callback)
+    end
 
-  # Locks a room.
-  def lock(&callback)
-    connection.http(:post, "/room/#{id}/lock.json", &callback)
-  end
+    # Locks a room.
+    def lock(&callback)
+      connection.http(:post, "/room/#{id}/lock.json", &callback)
+    end
 
-  # Unlocks a room.
-  def unlock(&callback)
-    connection.http(:post, "/room/#{id}/unlock.json", &callback)
-  end
+    # Unlocks a room.
+    def unlock(&callback)
+      connection.http(:post, "/room/#{id}/unlock.json", &callback)
+    end
 
-  # Sends a new message with the currently authenticated user as the sender.
-  # The XML for the new message is returned on a successful request.
-  #
-  # The valid types are:
-  #
-  # * TextMessage  (regular chat message)
-  # * PasteMessage (pre-formatted message, rendered in a fixed-width font)
-  # * SoundMessage (plays a sound as determined by the message, which can be either “rimshot”, “crickets”, or “trombone”)
-  # * TweetMessage (a Twitter status URL to be fetched and inserted into the chat)
-  #
-  # If an explicit type is omitted, it will be inferred from the content (e.g.,
-  # if the message contains new line characters, it will be considered a paste).
-  #
-  # :type => "TextMessage",  :body => "Hello"
-  def speak(data, &callback)
-    connection.http(:post, "/room/#{id}/speak.json", "message" => data) do |data, http| # Response Status: 201 Created
-      callback.call(Firering::Message.instantiate(connection, data))
+    # Sends a new message with the currently authenticated user as the sender.
+    # The XML for the new message is returned on a successful request.
+    #
+    # The valid types are:
+    #
+    # * TextMessage  (regular chat message)
+    # * PasteMessage (pre-formatted message, rendered in a fixed-width font)
+    # * SoundMessage (plays a sound as determined by the message, which can be either “rimshot”, “crickets”, or “trombone”)
+    # * TweetMessage (a Twitter status URL to be fetched and inserted into the chat)
+    #
+    # If an explicit type is omitted, it will be inferred from the content (e.g.,
+    # if the message contains new line characters, it will be considered a paste).
+    #
+    # :type => "TextMessage",  :body => "Hello"
+    def speak(data, &callback)
+      connection.http(:post, "/room/#{id}/speak.json", "message" => data) do |data, http| # Response Status: 201 Created
+        callback.call(Firering::Message.instantiate(connection, data, "message"))
+      end
     end
-  end
 
-  def text(text, &callback)
-    speak({:type => "TextMessage", :body => text}, &callback)
-  end
+    def text(text, &callback)
+      speak({:type => "TextMessage", :body => text}, &callback)
+    end
 
-  def paste(paste, &callback)
-    speak({:type => "PasteMessage", :body => paste}, &callback)
-  end
+    def paste(paste, &callback)
+      speak({:type => "PasteMessage", :body => paste}, &callback)
+    end
 
-  def rimshot(&callback)
-    speak({:type => "SoundMessage", :body => "rimshot"}, &callback)
-  end
+    def rimshot(&callback)
+      speak({:type => "SoundMessage", :body => "rimshot"}, &callback)
+    end
 
-  def crickets(&callback)
-    speak({:type => "SoundMessage", :body => "crickets"}, &callback)
-  end
+    def crickets(&callback)
+      speak({:type => "SoundMessage", :body => "crickets"}, &callback)
+    end
 
-  def trombone(&callback)
-    speak({:type => "SoundMessage", :body => "trombone"}, &callback)
-  end
+    def trombone(&callback)
+      speak({:type => "SoundMessage", :body => "trombone"}, &callback)
+    end
 
-  def tweet(tweet_url, &callback)
-    speak({:type => "TweetMessage", :body => tweet_url}, &callback)
+    def tweet(tweet_url, &callback)
+      speak({:type => "TweetMessage", :body => tweet_url}, &callback)
+    end
   end
 end

data/lib/firering/data/upload.rb

@@ -1,6 +1,7 @@
-class Firering::Upload < Firering::Data
-
-  data_attributes :id, :name, :room_id, :user_id, :byte_size, :content_type,
-    :full_url, :created_at
+module Firering
+  Upload = Struct.new(:connection, :id, :name, :room_id, :user_id, :byte_size, :content_type, :full_url, :created_at)
 
+  class Upload
+    extend Instantiator
+  end
 end

data/lib/firering/data/user.rb

@@ -1,18 +1,20 @@
-class Firering::User < Firering::Data
+module Firering
+  User = Struct.new(:connection, :id, :name, :email_address, :admin, :created_at, :type, :api_auth_token)
 
-  data_attributes :id, :name, :email_address, :admin, :created_at, :type,
-    :api_auth_token
+  class User
+    extend Instantiator
 
-  alias_method :token, :api_auth_token
-  alias_method :admin?, :admin
+    alias_method :token, :api_auth_token
+    alias_method :admin?, :admin
 
-  def member?
-    type == "Member"
-  end
+    def member?
+      type == "Member"
+    end
 
-  def gest?
-    type == "Guest"
-  end
+    def gest?
+      type == "Guest"
+    end
 
-  alias_method :to_s, :name
+    alias_method :to_s, :name
+  end
 end

data/lib/firering/instantiator.rb

@@ -0,0 +1,22 @@
+module Firering
+  module Instantiator
+
+    def instantiate(conn, data, base_key = nil, &callback)
+      instance = new
+      instance.connection = conn
+
+      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|
+        value = ( key.to_s =~ /(_at|_on)$/ ) ? (Time.parse(val) rescue val) : val
+        instance.send("#{key}=", value)
+      end
+
+      callback.call(instance) if callback
+      instance
+    end
+
+  end
+end

data/lib/firering.rb

@@ -5,16 +5,16 @@ require 'yajl'
 require 'em-http'
 
 module Firering
-  VERSION = '1.0.3'
+  VERSION = '1.0.4'
 
-  class Error < StandardError; end
+  Error = Class.new(StandardError)
 
-  autoload :Requests   , "firering/requests"
-  autoload :Connection , "firering/connection"
+  autoload :Requests     , "firering/requests"
+  autoload :Connection   , "firering/connection"
 
-  autoload :Data       , "firering/data"
-  autoload :User       , "firering/data/user"
-  autoload :Message    , "firering/data/message"
-  autoload :Room       , "firering/data/room"
-  autoload :Upload     , "firering/data/upload"
+  autoload :Instantiator , "firering/instantiator"
+  autoload :User         , "firering/data/user"
+  autoload :Message      , "firering/data/message"
+  autoload :Room         , "firering/data/room"
+  autoload :Upload       , "firering/data/upload"
 end

data/spec/firering/data/message_spec.rb

@@ -14,7 +14,7 @@ describe Firering::Message do
           message = messages.first
           message.should be_timestamp
           message.room_id.should == 304355
-          message.created_at.should == Date.parse("2010/05/29 22:05:00 +0000")
+          message.created_at.should == Time.parse("2010/05/29 22:05:00 +0000")
           message.body.should be_nil
           message.id.should == 224587718
           message.user_id.should be_nil
@@ -38,8 +38,8 @@ describe Firering::Message do
         message = messages.last
         message.should be_text
         message.room_id.should == 177718
-        message.created_at.should == Date.parse("2009/06/02 21:20:32 +0000")
-        message.body.should == "q: should i add :case_sensitive =\u003E false to the validation of title name? Looks harmless but who knows..."
+        message.created_at.should == Time.parse("2009/06/02 21:20:32 +0000")
+        message.body.should == "q: should i add :case_sensitive => false to the validation of title name? Looks harmless but who knows..."
         message.id.should == 134405854
         message.user_id.should == 415731
 

data/spec/firering/data/room_spec.rb

@@ -7,8 +7,8 @@ describe Firering::Room do
       conn.room(304355) do |room|
 
         room.name.should == "test2"
-        room.created_at.should == Date.parse("2010/05/29 21:38:02 +0000")
-        room.updated_at.should == Date.parse("2010/05/29 21:38:02 +0000")
+        room.created_at.should == Time.parse("2010/05/29 21:38:02 +0000")
+        room.updated_at.should == Time.parse("2010/05/29 21:38:02 +0000")
         room.topic.should == "this and the test room should be deleted by a campfire admin."
         room.should_not be_full
         room.id.should == 304355
@@ -66,7 +66,7 @@ describe Firering::Room do
 
           message.should be_paste
           message.room_id.should == 304355
-          message.created_at.should == Date.parse("2010/05/29 22:41:34 +0000")
+          message.created_at.should == Time.parse("2010/05/29 22:41:34 +0000")
           message.body.should == "paste\ntext"
           message.id.should == 224590114
           message.user_id.should == 415731
@@ -92,7 +92,7 @@ describe Firering::Room do
 
           message.should be_paste
           message.room_id.should == 304355
-          message.created_at.should == Date.parse("2010/05/29 22:41:34 +0000")
+          message.created_at.should == Time.parse("2010/05/29 22:41:34 +0000")
           message.body.should == "paste\ntext"
           message.id.should == 224590114
           message.user_id.should == 415731

data/spec/firering/data/user_spec.rb

@@ -7,7 +7,7 @@ describe Firering::User do
       conn.user(415731) do |user|
 
         user.type.should == "Member"
-        user.created_at.should == Date.parse("2009/01/27 19:54:36 +0000")
+        user.created_at.should == Time.parse("2009/01/27 19:54:36 +0000")
         user.email_address.should == "eoga@mail.com"
         user.should_not be_admin
         user.id.should == 415731

data/spec/firering/data_spec.rb

@@ -1,12 +1,14 @@
 require 'spec_helper'
 
-class TestData < Firering::Data
-  data_attributes :a, :b
+TestData = Struct.new(:connection, :a, :b)
+
+class TestData
+  extend Firering::Instantiator
 end
 
-describe Firering::Data do
+describe Firering::Instantiator do
 
-  it "initializes an object from a hash with a base key, and defines accessors" do
+  it "initializes an object from a hash with a base key" do
     object = TestData.instantiate(:connection, {:test_data => { :a => 1, :b => 2}}, :test_data)
     object.a.should == 1
     object.b.should == 2

data/spec/spec_helper.rb

@@ -2,13 +2,12 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
 require 'firering'
-require 'spec'
-require 'spec/autorun'
+require 'rspec'
+require 'rspec/autorun'
 require 'fixtures/load_server'
 require 'support/helpers'
-require 'ap'
 
-Spec::Runner.configure do |config|
+RSpec.configure do |config|
   config.include Helpers
 
   config.before :all do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: firering
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 31
   prerelease: false
   segments: 
   - 1
   - 0
-  - 3
-  version: 1.0.3
+  - 4
+  version: 1.0.4
 platform: ruby
 authors: 
 - Emmanuel Oga
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-12 00:00:00 -03:00
+date: 2011-02-24 00:00:00 -03:00
 default_executable: campf-notify
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,7 +24,7 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: 59
         segments: 
@@ -40,14 +40,14 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 19
         segments: 
         - 0
-        - 2
-        - 10
-        version: 0.2.10
+        - 3
+        - 0
+        version: 0.3.0
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -56,7 +56,7 @@ dependencies:
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: 15
         segments: 
@@ -72,30 +72,30 @@ dependencies:
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 11
         segments: 
+        - 2
         - 1
-        - 3
         - 0
-        version: 1.3.0
+        version: 2.1.0
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: sinatra
+  name: rack
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 31
         segments: 
         - 1
+        - 2
         - 0
-        - 0
-        version: 1.0.0
+        version: 1.2.0
   type: :development
   version_requirements: *id005
 description: Campfire API interface powered by eventmachine em-http-request and yajl-ruby.
@@ -120,11 +120,11 @@ files:
 - firering.gemspec
 - lib/firering.rb
 - lib/firering/connection.rb
-- lib/firering/data.rb
 - lib/firering/data/message.rb
 - lib/firering/data/room.rb
 - lib/firering/data/upload.rb
 - lib/firering/data/user.rb
+- lib/firering/instantiator.rb
 - lib/firering/requests.rb
 - log/.gitignore
 - spec/firering/connection_spec.rb

data/lib/firering/data.rb

@@ -1,42 +0,0 @@
-module Firering
-  class Data
-    # Generates methods to access the data stored in the @data Hash
-    def self.data_attributes(*keys)
-      include Module.new {
-        keys.each do |key|
-          module_eval <<-CODE, __FILE__, __LINE__
-            def #{key}
-              @_attributes[#{key.to_sym.inspect}]
-            end
-          CODE
-        end
-      }
-    end
-
-    attr_accessor :connection
-
-    # factory method to instantiate data classes
-    def self.instantiate(conn, data, base_key= nil, &callback)
-      instance = new
-      instance.connection = conn
-      instance.initialize_attributes(data, base_key)
-      callback.call(instance) if callback
-      instance
-    end
-
-    # data is a hash or a json encoded hash (String)
-    # base_key if present is the main data key on the hash.
-    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
-    end
-
-    def inspect
-      "<#{self.class.name} #{@_attributes.inspect}>"
-    end
-  end
-end