firering 1.2.0 → 1.2.1

data/Gemfile

@@ -0,0 +1,2 @@
+source :rubygems
+gemspec

data/README.rdoc

@@ -84,6 +84,7 @@ For more details take a look at spec/fixtures/load_server.rb file.
 * indirect (Andre Arko), https://github.com/EmmanuelOga/firering/pull/1 ,
                          https://github.com/EmmanuelOga/firering/pull/2 ,
                          https://github.com/EmmanuelOga/firering/pull/3
+                         https://github.com/EmmanuelOga/firering/pull/7
 * caius (Caius Durling), https://github.com/EmmanuelOga/firering/pull/5
 * cesario (Franck Verrot), https://github.com/EmmanuelOga/firering/pull/6
 * PizzaPowered, https://github.com/PizzaPowered/firering

data/firering.gemspec

@@ -4,8 +4,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = '1.3.5'
 
   s.name              = 'firering'
-  s.version           = '1.2.0'
-  s.date              = '2011-08-08'
+  s.version           = '1.2.1'
+  s.date              = '2011-09-27'
   s.rubyforge_project = 'firering'
 
   s.summary     = "Campfire API interface powered by eventmachine em-http-request and yajl-ruby."
@@ -32,6 +32,7 @@ Gem::Specification.new do |s|
 
   # = MANIFEST =
   s.files = %w[
+    Gemfile
     LICENSE
     README.rdoc
     Rakefile

data/lib/firering/connection.rb

@@ -64,8 +64,14 @@ module Firering
       http.callback {
         reset_retries_counter
         if callback
-          data = Yajl::Parser.parse(http.response, :symbolize_keys => true) rescue Hash.new
-          callback.call(data, http)
+          begin
+            data = Yajl::Parser.parse(http.response, :symbolize_keys => true)
+            callback.call(data, http)
+          rescue Yajl::ParseError
+            perform_retry(http) do
+              http(method, path, data, &callback)
+            end
+          end
         end
       }
 

data/lib/firering/instantiator.rb

@@ -15,13 +15,9 @@ module Firering
         if instance.respond_to?(setter)
           instance.send(setter, value)
         else
-          warning = "WARNING: Tried to set #{setter} #{value.inspect} on a #{instance.class} instance but it didn't respond. Probably the API got updated, please report this! (https://github.com/EmmanuelOga/firering/issues)"
-
-          if conn && conn.logger
-            conn.logger.warn warning
-          else
-            Kernel.warn warning
-          end
+          msg = "WARNING: Could not set attribute '#{key}' to value '#{value}' on #{self} object."
+          msg << " It is likely the Campfire API has changed. Please report this! (https://github.com/EmmanuelOga/firering/issues)"
+          conn.logger.warn msg
         end
       end
 

data/lib/firering.rb

@@ -5,7 +5,7 @@ require 'yajl'
 require 'em-http'
 
 module Firering
-  VERSION = '1.2.0'
+  VERSION = '1.2.1'
 
   Error = Class.new(StandardError)
 

data/spec/firering/data_spec.rb

@@ -7,12 +7,24 @@ class TestData
 end
 
 describe Firering::Instantiator do
+  before do
+    @logger = mock("logger")
+    @connection = mock("connection", :logger => @logger)
+  end
 
   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 = TestData.instantiate(@connection, {:test_data => { :a => 1, :b => 2}}, :test_data)
     object.a.should == 1
     object.b.should == 2
-    object.connection.should == :connection
+    object.connection.should == @connection
+  end
+
+  it "warns when attributes don't exist on the struct" do
+    warning = "WARNING: Could not set attribute 'c' to value '3' on TestData object."
+    warning << " It is likely the Campfire API has changed. Please report this! (https://github.com/EmmanuelOga/firering/issues)"
+    @logger.should_receive(:warn).with(warning)
+    object = TestData.instantiate(@connection, {:test_data => {:c => 3}}, :test_data)
+    lambda { object.c }.should raise_error(NoMethodError)
   end
 
 end

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: firering
 version: !ruby/object:Gem::Version 
+  hash: 29
   prerelease: 
-  version: 1.2.0
+  segments: 
+  - 1
+  - 2
+  - 1
+  version: 1.2.1
 platform: ruby
 authors: 
 - Emmanuel Oga
@@ -10,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-08 00:00:00 -03:00
+date: 2011-09-27 00:00:00 -03:00
 default_executable: campf-notify
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -21,6 +26,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 59
+        segments: 
+        - 0
+        - 12
+        - 10
         version: 0.12.10
   type: :runtime
   version_requirements: *id001
@@ -32,6 +42,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 0
+        - 3
+        - 0
         version: 0.3.0
   type: :runtime
   version_requirements: *id002
@@ -43,6 +58,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 0
+        - 7
+        - 6
         version: 0.7.6
   type: :runtime
   version_requirements: *id003
@@ -54,6 +74,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 2
+        - 1
+        - 0
         version: 2.1.0
   type: :development
   version_requirements: *id004
@@ -65,6 +90,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 31
+        segments: 
+        - 1
+        - 2
+        - 0
         version: 1.2.0
   type: :development
   version_requirements: *id005
@@ -78,6 +108,7 @@ extra_rdoc_files:
 - README.rdoc
 - LICENSE
 files: 
+- Gemfile
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -155,12 +186,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   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: []