librato-metrics 1.0.1 → 1.0.2

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 ## Changelog
 
+### Version 1.0.2
+* Fix bug with some versions of MultiJson (Thomas Dippel)
+* Use delegation for JSON handling
+* Improve integration tests
+
 ### Version 1.0.1
 * Fix Forwardable dependency loading bug
 

data/lib/librato/metrics/smart_json.rb

@@ -1,31 +1,25 @@
-# wrap MultiJSON's implementation so we can use any version
+require 'multi_json'
+
 module Librato
   module Metrics
     class SmartJSON
-
-      class << self
-
-        # prefer modern syntax; def once at startup
-        if MultiJson.respond_to?(:load)
-          def read(json)
-            MultiJson.load(json)
-          end
-
-          def write(data)
-            MultiJson.dump(data)
-          end
-        else
-          def read(json)
-            MultiJson.decode(json)
-          end
-
-          def write(data)
-            MultiJson.encode(data)
-          end
-        end
-
+      JSON_HANDLER = MultiJson
+      extend SingleForwardable
+      
+      # wrap MultiJSON's implementation so we can use any version
+      # prefer modern syntax if available; def once at startup
+      if JSON_HANDLER.respond_to?(:load)
+        def_delegator JSON_HANDLER, :load, :read
+      else
+        def_delegator JSON_HANDLER, :decode, :read
+      end
+      
+      if JSON_HANDLER.respond_to?(:dump)
+        def_delegator JSON_HANDLER, :dump, :write
+      else
+        def_delegator JSON_HANDLER, :encode, :write
       end
 
     end
   end
-end
+end

data/lib/librato/metrics/version.rb

@@ -1,5 +1,5 @@
 module Librato
   module Metrics
-    VERSION = "1.0.1"
+    VERSION = "1.0.2"
   end
 end

data/lib/librato/metrics.rb

@@ -3,7 +3,6 @@ $:.unshift(File.dirname(__FILE__)) unless
 
 require 'base64'
 require 'forwardable'
-require 'multi_json'
 
 require 'metrics/aggregator'
 require 'metrics/annotator'

data/spec/integration/metrics_spec.rb

@@ -211,7 +211,7 @@ module Librato
           Metrics.submit :foo => 123
         end
 
-        it "should upate the metric" do
+        it "should update the metric" do
           Metrics.update :foo, :display_name => "Foo Metric",
                                :period => 15,
                                :attributes => {
@@ -220,7 +220,7 @@ module Librato
           foo = Metrics.fetch :foo
           foo['display_name'].should == 'Foo Metric'
           foo['period'].should == 15
-          foo['attributes'].should == {'display_max' => 1000}
+          foo['attributes']['display_max'].should == 1000
         end
       end
 
@@ -236,7 +236,7 @@ module Librato
           foo = Metrics.fetch :foo
           foo['display_name'].should == 'Foo Metric'
           foo['period'].should == 15
-          foo['attributes'].should == {'display_max' => 1000}
+          foo['attributes']['display_max'].should == 1000
         end
 
         it "should raise error if no type specified" do

data/spec/unit/metrics/aggregator_spec.rb

@@ -5,8 +5,8 @@ module Librato
     describe Aggregator do
 
       before(:all) do
-        @time = Time.now.to_i
-        Aggregator.stub(:epoch_time).and_return(@time)
+        @time = 1354720160 #Time.now.to_i
+        Aggregator.any_instance.stub(:epoch_time).and_return(@time)
       end
 
       describe "initialization" do

data/spec/unit/metrics/queue_spec.rb

@@ -6,8 +6,8 @@ module Librato
     describe Queue do
 
       before(:each) do
-        @time = Time.now.to_i
-        Processor.stub(:epoch_time).and_return(@time)
+        @time = 1354720160 #Time.now.to_i
+        Queue.any_instance.stub(:epoch_time).and_return(@time)
       end
 
       describe "initialization" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: librato-metrics
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-05 00:00:00.000000000 Z
+date: 2012-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -218,7 +218,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -361956509088678057
+      hash: 2478461788804600344
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: