restful_metrics 1.1.1 → 1.1.2

data/VERSION

@@ -1 +1 @@
-1.1.1
+1.1.2

data/lib/restful_metrics/connection.rb

@@ -2,7 +2,7 @@ module RestfulMetrics
 
   class Connection
 
-    extend LogTools
+    include LogTools
 
     attr_accessor :debug, :async
     attr_reader :api_key, :default_options

data/lib/restful_metrics/log_tools.rb

@@ -3,20 +3,20 @@ unless defined?(Logger)
 end
 
 module RestfulMetrics
-  
+
   module LogTools
-    
+
     def logger(msg, level = :warn)
-      msg = "#### Restful Metrics #### " + msg
+      msg = "#### RESTful Metrics #### " + msg
       if defined?(Rails) && defined?(Rails.logger)
         log = Rails.logger
       else
         log = Logger.new(STDOUT)
       end
-      
+
       level == :warn ? log.warn(msg) : log.info(msg)
     end
-    
+
   end
 
 end

data/spec/client_spec.rb

@@ -61,45 +61,44 @@ end
 
 describe "An initialized RESTful Metrics client" do
 
+  class SampleRequest
+
+    def body
+      '{ "test": "success" }'
+    end
+
+    def code
+      200
+    end
+
+    def header
+      { "one" => "test", "two" => "test" }
+    end
+
+  end
+
   before(:each) do
     @connection = RestfulMetrics::Connection
     RestfulMetrics::Client.set_credentials('xyz123')
     RestfulMetrics::Client.disabled = false
+    RestClient::Request.any_instance.stubs(:execute).returns(SampleRequest.new)
+    Logger.any_instance.stubs(:warn).returns("") # disable output
     Delayed::Job.delete_all
   end
 
   describe "in debug mode" do
 
-    class SampleRequest
-
-      def body
-        '{ "test": "success" }'
-      end
-
-      def code
-        200
-      end
-
-      def header
-        { "one" => "test", "two" => "test" }
-      end
-
-    end
-
     before(:all) do
       RestfulMetrics::Client.debug = true
       RestfulMetrics::Client.debug?.should be_true
+      RestfulMetrics::Connection.any_instance.expects(:logger).at_least_once.returns("")
     end
 
     it "should send a metric to RESTful Metrics while outputting debug info" do
-      @connection.any_instance.expects(:logger).at_least_once
-      @connection.any_instance.expects(:send_request).once.returns(SampleRequest.new)
-      RestfulMetrics::Client.add_metric("foo.bar.org", "hit", 1).should == true
+      RestfulMetrics::Client.add_metric("foo.bar.org", "hit", 1).should be_true
     end
 
     it "should send the compound metric to RESTful Metrics while outputting debug info" do
-      @connection.any_instance.expects(:logger).at_least_once
-      @connection.any_instance.expects(:send_request).once.returns(SampleRequest.new)
       RestfulMetrics::Client.add_compound_metric("foo.bar.org", "hit", [1,2,3]).should be_true
     end
 
@@ -107,10 +106,6 @@ describe "An initialized RESTful Metrics client" do
 
   describe "initializing the client" do
 
-    before(:each) do
-      @connection.any_instance.stubs(:post).returns(true)
-    end
-
     it "should set the API key" do
       RestfulMetrics::Client.set_credentials('4ed4ef44e44ed4').should be_true
     end
@@ -124,22 +119,16 @@ describe "An initialized RESTful Metrics client" do
 
   describe "adding metrics synchronously" do
 
-    before(:each) do
-      @connection.any_instance.stubs(:post).returns(true)
-    end
-
     before(:all) do
       RestfulMetrics::Client.async = false
       RestfulMetrics::Client.async?.should be_false
     end
 
     it "should send the metric to RESTful Metrics" do
-      @connection.any_instance.expects(:post).at_least_once.returns({})
       RestfulMetrics::Client.add_metric("foo.bar.org", "hit", 1).should be_true
     end
 
     it "should send the compound metric to RESTful Metrics" do
-      @connection.any_instance.expects(:post).at_least_once.returns({})
       RestfulMetrics::Client.add_compound_metric("foo.bar.org", "hit", [1,2,3]).should be_true
     end
 
@@ -147,10 +136,6 @@ describe "An initialized RESTful Metrics client" do
 
   describe "adding metrics asynchronously" do
 
-    before(:each) do
-      @connection.any_instance.stubs(:post).returns(true)
-    end
-
     before(:all) do
       RestfulMetrics::Client.async = true
       RestfulMetrics::Client.async?.should be_true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: restful_metrics
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70322334817280 !ruby/object:Gem::Requirement
+  requirement: &70311601479860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.8.1
   type: :runtime
   prerelease: false
-  version_requirements: *70322334817280
+  version_requirements: *70311601479860
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70322334816280 !ruby/object:Gem::Requirement
+  requirement: &70311601478840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *70322334816280
+  version_requirements: *70311601478840
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70322334831700 !ruby/object:Gem::Requirement
+  requirement: &70311601494180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *70322334831700
+  version_requirements: *70311601494180
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70322334831000 !ruby/object:Gem::Requirement
+  requirement: &70311601493460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.10.4
   type: :development
   prerelease: false
-  version_requirements: *70322334831000
+  version_requirements: *70311601493460
 - !ruby/object:Gem::Dependency
   name: actionpack
-  requirement: &70322334830300 !ruby/object:Gem::Requirement
+  requirement: &70311601492840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 3.0.0
   type: :development
   prerelease: false
-  version_requirements: *70322334830300
+  version_requirements: *70311601492840
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70322334829500 !ruby/object:Gem::Requirement
+  requirement: &70311601492100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.2.5
   type: :development
   prerelease: false
-  version_requirements: *70322334829500
+  version_requirements: *70311601492100
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70322334828920 !ruby/object:Gem::Requirement
+  requirement: &70311601491380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 3.0.0
   type: :development
   prerelease: false
-  version_requirements: *70322334828920
+  version_requirements: *70311601491380
 - !ruby/object:Gem::Dependency
   name: delayed_job
-  requirement: &70322334828280 !ruby/object:Gem::Requirement
+  requirement: &70311601490760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,7 +98,7 @@ dependencies:
         version: 3.0.1
   type: :development
   prerelease: false
-  version_requirements: *70322334828280
+  version_requirements: *70311601490760
 description: Ruby client for the RESTful Metrics service.
 email: mauricio@restful-labs.com
 executables: []