librato-metrics 0.6.0 → 0.6.1

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 ## Changelog
 
+### Version 0.6.1
+* Loosen restrictions to older versions of faraday and multi_json
+* Fix symbol casting issue in jruby with metric delete
+* client#new_queue now respects passed options
+* Queue objects support default source properly
+
 ### Version 0.6.0
 * Add Aggregator class for aggregating measurements client-side
 * Queue and Aggregator can auto-submit on a time interval

data/Gemfile

@@ -1,3 +1,7 @@
 source "http://rubygems.org"
 
+platforms :jruby do
+  gem 'jruby-openssl'
+end
+
 gemspec

data/LICENSE

@@ -8,14 +8,14 @@ modification, are permitted provided that the following conditions are met:
     * Redistributions in binary form must reproduce the above copyright
       notice, this list of conditions and the following disclaimer in the
       documentation and/or other materials provided with the distribution.
-    * Neither the name of the <organization> nor the
-      names of its contributors may be used to endorse or promote products
-      derived from this software without specific prior written permission.
+    * Neither the name of Librato, Inc. nor the names of project contributors 
+      may be used to endorse or promote products derived from this software 
+      without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+DISCLAIMED. IN NO EVENT SHALL LIBRATO, INC. BE LIABLE FOR ANY
 DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
 (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
 LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND

data/README.md

@@ -20,6 +20,10 @@ Then, in your application or script:
 For best performance we recommend installing [yajl-ruby](https://github.com/brianmario/yajl-ruby):
 
     gem install yajl-ruby
+    
+If you are using jruby, you need to ensure [jruby-openssl](https://github.com/jruby/jruby-ossl) is available:
+
+    gem install jruby-openssl
 
 ## Quick Start
 
@@ -218,8 +222,6 @@ The `librato-metrics` gem currently does not do internal locking for thread safe
 These are features we expect to add in future versions, roughly in the order of current priority. If you feel strongly about a feature, feel free to [create an issue](https://github.com/librato/librato-metrics/issues) or [join us in live chat](https://librato.campfirenow.com/269d3) and talk to us about it.
 
 * Queue objects support a single default measure_time to use for any measurements which don't have it set
-* Queues auto-submit when they hit a set number of records
-* Queues auto-submit when they hit a max time interval
 * Query actions return a collection object which auto-paginates large result sets
 
 ## Contribution

data/lib/librato/metrics/client.rb

@@ -70,7 +70,8 @@ module Librato
       #   Librato::Metrics.delete :foo, :bar
       def delete(*metric_names)
         raise(NoMetricsProvided, 'Metric name missing.') if metric_names.empty?
-        params = {:names => metric_names}
+        metric_names.map!{|i| i.to_s}
+        params = {:names => metric_names }
         connection.delete do |request|
           request.url connection.build_url("metrics")
           request.body = MultiJson.dump(params)
@@ -156,8 +157,9 @@ module Librato
       # Create a new queue which uses this client.
       #
       # @return [Queue]
-      def new_queue
-        Queue.new(:client => self)
+      def new_queue(options={})
+        options[:client] = self
+        Queue.new(options)
       end
 
       # Persistence type to use when saving metrics.

data/lib/librato/metrics/queue.rb

@@ -74,7 +74,10 @@ module Librato
       #
       # @return Hash
       def queued
-        @queued
+        return {} if @queued.empty?
+        globals = {}
+        globals[:source] = @source if @source
+        @queued.merge(globals)
       end
 
       # Count of metrics currently queued

data/lib/librato/metrics/version.rb

@@ -1,5 +1,5 @@
 module Librato
   module Metrics
-    VERSION = "0.6.0"
+    VERSION = "0.6.1"
   end
 end

data/librato-metrics.gemspec

@@ -24,13 +24,13 @@ Gem::Specification.new do |s|
   s.extra_rdoc_files = %w[LICENSE]
 
   ## runtime dependencies
-  s.add_dependency 'faraday', '~>0.7.6'
-  s.add_dependency 'multi_json', '~>1.3.1'
-  s.add_dependency 'aggregate', '~>0.2.2'
+  s.add_dependency 'faraday', '~> 0.7'
+  s.add_dependency 'multi_json', '~> 1.3'
+  s.add_dependency 'aggregate', '~> 0.2.2'
 
   ## development dependencies
   s.add_development_dependency 'rake'
-  s.add_development_dependency 'rspec', '~>2.6.0'
+  s.add_development_dependency 'rspec', '~> 2.6.0'
   s.add_development_dependency 'pry'
   s.add_development_dependency 'yard'
   s.add_development_dependency 'sinatra'

data/spec/integration/metrics/queue_spec.rb

@@ -5,6 +5,7 @@ module Librato
    
     describe Queue do
       before(:all) { prep_integration_tests }
+      before(:each) { delete_all_metrics }
       
       context "with a large number of metrics" do
         it "should submit them in multiple requests" do
@@ -25,8 +26,6 @@ module Librato
           (1..3).each do |i|
             queue.add "counter_#{i}" => {:type => :counter, :value => i}
           end
-          
-          delete_all_metrics
           queue.submit
           
           metrics = Metrics.list
@@ -37,6 +36,19 @@ module Librato
           gauge['unassigned'][0]['value'].should == 5
         end
       end
+      
+      it "should respect default and individual sources" do
+        queue = Queue.new(:source => 'default')
+        queue.add :foo => 123
+        queue.add :bar => {:value => 456, :source => 'barsource'}
+        queue.submit
+        
+        foo = Metrics.fetch :foo, :count => 2
+        foo['default'][0]['value'].should == 123
+        
+        bar = Metrics.fetch :bar, :count => 2
+        bar['barsource'][0]['value'].should == 456
+      end
     
     end
     

data/spec/unit/metrics/queue_spec.rb

@@ -146,6 +146,11 @@ module Librato
       end
       
       describe "#last_submit_time" do
+        before(:all) do
+          Librato::Metrics.authenticate 'me@librato.com', 'foo'
+          Librato::Metrics.persistence = :test
+        end
+        
         it "should default to nil" do
           subject.last_submit_time.should be_nil
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: librato-metrics
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,33 +9,43 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-09 00:00:00.000000000Z
+date: 2012-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &70349186771660 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.6
+        version: '0.7'
   type: :runtime
   prerelease: false
-  version_requirements: *70349186771660
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70349186771180 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70349186771180
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: aggregate
-  requirement: &70349186770720 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +53,15 @@ dependencies:
         version: 0.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *70349186770720
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.2.2
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70349186802320 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70349186802320
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70349186801780 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +85,15 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70349186801780
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.6.0
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &70349186801360 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +101,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70349186801360
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70349186800900 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +117,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70349186800900
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70349186800480 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +133,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70349186800480
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: popen4
-  requirement: &70349186800060 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +149,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70349186800060
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: An easy to use ruby wrapper for Librato's Metrics API
 email: matt@librato.com
 executables: []
@@ -167,6 +212,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -2003019020857888110
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -175,7 +223,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.16
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 2
 summary: Ruby wrapper for Librato's Metrics API