librato-metrics 1.1.1 → 1.2.0

data.tar.gz.sig

@@ -1,2 +1 @@
-6/w���WeLz��6<t�|)��Ň�b�I&m��o̫�fcX�i��}���������
�u~38 �#1bfH���X�1Ε|6b��0�	
-�'������+��JdB��xfpٟ��5J��4�J�
+�ԇ��d�I�T.���`<���3��e����U�Q����6��f�M;AC�@yCf���V��H�$.��B҄&܈��LʔSOS�����$ƒ5�Ak�]�g�M����
�ru��D��ؖC1f>��z���ɠ�`�ɥ/U[�aYJ���������I�+~w��sn��*�ď��:Sb�
ލ�9�u �>�z����0 V��ο.�Y:0͟�=ʍL��7c�/�N]=�9��^[]3z/���풏'B���[*

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## Changelog
 
+### Version 1.2.0
+* Give metric-facing methods more explicit names & deprecate priors
+* Documentation improvements
+
 ### Version 1.1.1
 * Move gem sign code to rake task, fixes bug bundling in some environments
 

data/README.md

@@ -186,52 +186,52 @@ Both options are driven by the addition of measurements. Specifically for time-b
 
 Get name and properties for all metrics you have in the system:
 
-    metrics = Librato::Metrics.list
+    metrics = Librato::Metrics.metrics
 
 Get only metrics whose name includes `time`:
 
-    metrics = Librato::Metrics.list :name => 'time'
+    metrics = Librato::Metrics.metrics :name => 'time'
 
 ## Querying Metric Data
 
 Get attributes for metric `temperature`:
 
-    data = Librato::Metrics.fetch :temperature
+    data = Librato::Metrics.get_metric :temperature
 
 Get the 20 most recent data points for `temperature`:
 
-    data = Librato::Metrics.fetch :temperature, :count => 20
+    data = Librato::Metrics.get_measurements :temperature, :count => 20
 
 Get the 20 most recent data points for `temperature` from a specific source:
 
-    data = Librato::Metrics.fetch :temperature, :count => 20, :source => 'app1'
+    data = Librato::Metrics.get_measurements :temperature, :count => 20, :source => 'app1'
 
 Get the 20 most recent 15 minute data point rollups for `temperature`:
 
-    data = Librato::Metrics.fetch :temperature, :count => 20, :resolution => 900
+    data = Librato::Metrics.get_measurements :temperature, :count => 20, :resolution => 900
 
-There are many more options supported for querying, take a look at the [REST API docs](http://dev.librato.com/v1/get/gauges/:name) or the [fetch documentation](http://rubydoc.info/github/librato/librato-metrics/master/Librato/Metrics/Client#fetch-instance_method)  for more details.
+There are many more options supported for querying, take a look at the [REST API docs](http://dev.librato.com/v1/get/gauges/:name) or the [`get_metric`](http://rubydoc.info/github/librato/librato-metrics/master/Librato/Metrics/Client#get_metric-instance_method)/[`get_measurements`](http://rubydoc.info/github/librato/librato-metrics/master/Librato/Metrics/Client#get_measurements-instance_method) documentation for more details.
 
 ## Setting Metric Properties
 
 Setting custom [properties](http://dev.librato.com/v1/metrics#metric_properties) on your metrics is easy:
 
     # assign a period and default color
-    Librato::Metrics.update :temperature, :period => 15, :attributes => { :color => 'F00' }
+    Librato::Metrics.update_metric :temperature, :period => 15, :attributes => { :color => 'F00' }
 
-It is also possible to update properties for multiple metrics at once, see the [#update method documentation](http://rubydoc.info/github/librato/librato-metrics/master/Librato/Metrics/Client#update-instance_method) for more information.
+It is also possible to update properties for multiple metrics at once, see the [`#update_metric` method documentation](http://rubydoc.info/github/librato/librato-metrics/master/Librato/Metrics/Client#update_metric-instance_method) for more information.
 
 ## Deleting Metrics
 
 If you ever need to remove a metric and all of its measurements, doing so is easy:
 
 	# delete the metrics 'temperature' and 'humidity'
-	Librato::Metrics.delete :temperature, :humidity
+	Librato::Metrics.delete_metrics :temperature, :humidity
 
 You can also delete using wildcards:
 
     # delete metrics that start with cpu. except for cpu.free
-    Librato::Metrics.delete :names => 'cpu.*', :exclude => ['cpu.free']
+    Librato::Metrics.delete_metrics :names => 'cpu.*', :exclude => ['cpu.free']
 
 Note that deleted metrics and their measurements are unrecoverable, so use with care.
 
@@ -248,10 +248,10 @@ If you need to use metrics with multiple sets of authentication credentials simu
 All of the same operations you can call directly from `Librato::Metrics` are available per-client:
 
 	# list Joe's metrics
-	joe.list
+	joe.metrics
 
 	# fetch the last 20 data points for Mike's metric, humidity
-	mike.fetch :humidity, :count => 20
+	mike.get_measurements :humidity, :count => 20
 
 There are two ways to associate a new queue with a client:
 

data/lib/librato/metrics.rb

@@ -32,7 +32,7 @@ module Librato
   #   Librato::Metrics.submit :foo => 12712
   #
   #   # fetch the last 10 values of foo
-  #   Librato::Metrics.fetch :foo, :count => 10
+  #   Librato::Metrics.get_measurements :foo, :count => 10
   #
   # @example Queuing metrics for submission
   #   queue = Librato::Metrics::Queue.new
@@ -73,10 +73,15 @@ module Librato
     # Client.
     #
     def_delegators :client, :agent_identifier, :annotate, :api_endpoint,
-                   :api_endpoint=, :authenticate, :connection, :delete,
-                   :faraday_adapter, :faraday_adapter=, :fetch, :list,
-                   :persistence, :persistence=, :persister, :submit,
-                   :update
+                   :api_endpoint=, :authenticate, :connection,
+                   :faraday_adapter, :faraday_adapter=,
+                   :persistence, :persistence=, :persister,
+                   :get_metric, :get_measurements, :metrics,
+                   :delete_metrics, :update_metric, :update_metrics,
+                   :submit,
+                   # Deprecated metrics methods
+                   :fetch, :list, :delete, :update
+
 
     # The Librato::Metrics::Client being used by module-level
     # access.

data/lib/librato/metrics/aggregator.rb

@@ -4,6 +4,24 @@ require 'metrics/processor'
 module Librato
   module Metrics
 
+    # If you are measuring something very frequently you can sample into
+    # an aggregator and it will track and submit a single aggregate
+    # measurement
+    #
+    # @example
+    #   aggregator = Libato::Metrics::Aggregator.new
+    #
+    #   40.times do
+    #     # do work...
+    #     aggregator.add 'work.time' => work_time
+    #   end
+    #
+    #   # send directly
+    #   aggregator.submit
+    #
+    #   # or merge into a queue for submission
+    #   queue.merge!(aggregator)
+    #
     class Aggregator
       SOURCE_SEPARATOR = '%%' # must not be in valid source name criteria
 
@@ -24,6 +42,12 @@ module Librato
 
       # Add a metric entry to the metric set:
       #
+      # @example Basic use
+      #   annotator.add 'request.time' => 30.24
+      #
+      # @example With a custom source
+      #   annotator.add 'request.time' => {value: 20.52, source: 'staging'}
+      #
       # @param [Hash] measurements measurements to add
       # @return [Aggregator] returns self
       def add(measurements)

data/lib/librato/metrics/client.rb

@@ -86,15 +86,15 @@ module Librato
       # careful with this, this is instant and permanent.
       #
       # @example Delete metric 'temperature'
-      #   Librato::Metrics.delete :temperature
+      #   Librato::Metrics.delete_metrics :temperature
       #
       # @example Delete metrics 'foo' and 'bar'
-      #   Librato::Metrics.delete :foo, :bar
+      #   Librato::Metrics.delete_metrics :foo, :bar
       #
       # @example Delete metrics that start with 'foo' except 'foobar'
-      #   Librato::Metrics.delete :names => 'foo*', :exclude => ['foobar']
+      #   Librato::Metrics.delete_metrics :names => 'foo*', :exclude => ['foobar']
       #
-      def delete(*metric_names)
+      def delete_metrics(*metric_names)
         raise(NoMetricsProvided, 'Metric name missing.') if metric_names.empty?
         if metric_names[0].respond_to?(:keys) # hash form
           params = metric_names[0]
@@ -109,6 +109,12 @@ module Librato
         true
       end
 
+      # Completely delete metrics with the given names. Be
+      # careful with this, this is instant and permanent.
+      #
+      # @deprecated Use {#delete_metrics} instead
+      def delete(*metric_names); delete_metrics(*metric_names); end
+
       # Return current adapter this client will use.
       # Defaults to Metrics.faraday_adapter if set, otherwise
       # Faraday.default_adapter
@@ -123,6 +129,8 @@ module Librato
 
       # Query metric data
       #
+      # @deprecated Use {#get_metric} or {#get_measurements} instead.
+      #
       # @example Get attributes for a metric
       #   attrs = Librato::Metrics.fetch :temperature
       #
@@ -146,11 +154,30 @@ module Librato
       #                                 :resolution => 900
       #
       # A full list of query parameters can be found in the API
-      # documentation: {http://dev.librato.com/v1/get/gauges/:name}
+      # documentation: {http://dev.librato.com/v1/get/metrics/:name}
       #
       # @param [Symbol|String] metric Metric name
       # @param [Hash] options Query options
       def fetch(metric, options={})
+        metric = get_metric(metric, options)
+        options.empty? ? metric : metric["measurements"]
+      end
+
+      # Retrieve a specific metric by name, optionally including data points
+      #
+      # @example Get attributes for a metric
+      #   metric = Librato::Metrics.get_metric :temperature
+      #
+      # @example Get a metric and its 20 most recent data points
+      #   metric = Librato::Metrics.fetch :temperature, :count => 20
+      #   metric['measurements'] # => {...}
+      #
+      # A full list of query parameters can be found in the API
+      # documentation: {http://dev.librato.com/v1/get/metrics/:name}
+      #
+      # @param [Symbol|String] name Metric name
+      # @param [Hash] options Query options
+      def get_metric(name, options = {})
         query = options.dup
         if query[:start_time].respond_to?(:year)
           query[:start_time] = query[:start_time].to_i
@@ -162,11 +189,42 @@ module Librato
           query[:resolution] ||= 1
         end
         # expects 200
-        url = connection.build_url("metrics/#{metric}", query)
+        url = connection.build_url("metrics/#{name}", query)
         response = connection.get(url)
         parsed = SmartJSON.read(response.body)
         # TODO: pagination support
-        query.empty? ? parsed : parsed["measurements"]
+        parsed
+      end
+
+      # Retrieve data points for a specific metric
+      #
+      # @example Get 20 most recent data points for metric
+      #   data = Librato::Metrics.get_measurements :temperature, :count => 20
+      #
+      # @example Get 20 most recent data points for a specific source
+      #   data = Librato::Metrics.get_measurements :temperature, :count => 20,
+      #                                            :source => 'app1'
+      #
+      # @example Get the 20 most recent 15 minute data point rollups
+      #   data = Librato::Metrics.get_measurements :temperature, :count => 20,
+      #                                            :resolution => 900
+      #
+      # @example Get data points for the last hour
+      #   data = Librato::Metrics.get_measurements :start_time => Time.now-3600
+      #
+      # @example Get 15 min data points from two hours to an hour ago
+      #   data = Librato::Metrics.get_measurements :start_time => Time.now-7200,
+      #                                            :end_time => Time.now-3600,
+      #                                            :resolution => 900
+      #
+      # A full list of query parameters can be found in the API
+      # documentation: {http://dev.librato.com/v1/get/metrics/:name}
+      #
+      # @param [Symbol|String] metric_name Metric name
+      # @param [Hash] options Query options
+      def get_measurements(metric_name, options = {})
+        raise ArgumentError, "you must provide at least a :start_time or :count" if options.empty?
+        get_metric(metric_name, options)["measurements"]
       end
 
       # Purge current credentials and connection.
@@ -186,7 +244,7 @@ module Librato
       #   Librato::Metrics.list :name => 'foo'
       #
       # @param [Hash] options
-      def list(options={})
+      def metrics(options={})
         query = {}
         query[:name] = options[:name] if options[:name]
         offset = 0
@@ -194,6 +252,11 @@ module Librato
         Collection.paginated_metrics(connection, path, query)
       end
 
+      # List currently existing metrics
+      #
+      # @deprecated Use {#metrics} instead
+      def list(options={}); metrics(options); end
+
       # Create a new queue which uses this client.
       #
       # @return [Queue]
@@ -232,32 +295,48 @@ module Librato
         @queue.submit
       end
 
-      # Update one or more metrics. Note that attributes are specified in
-      # their own hash for updating a single metric but are included inline
-      # when updating multiple metrics.
+      # Update a single metric with new attributes.
       #
       # @example Update metric 'temperature'
-      #   Librato::Metrics.update :temperature, :period => 15, :attributes => { :color => 'F00' }
+      #   Librato::Metrics.update_metric :temperature, :period => 15, :attributes => { :color => 'F00' }
       #
       # @example Update metric 'humidity', creating it if it doesn't exist
-      #   Librato::Metrics.update 'humidity', :type => :gauge, :period => 60, :display_name => 'Humidity'
+      #   Librato::Metrics.update_metric 'humidity', :type => :gauge, :period => 60, :display_name => 'Humidity'
+      #
+      def update_metric(metric, options = {})
+        url = "metrics/#{metric}"
+        connection.put do |request|
+          request.url connection.build_url(url)
+          request.body = SmartJSON.write(options)
+        end
+      end
+
+      # Update multiple metrics.
       #
       # @example Update multiple metrics by name
-      #   Librato::Metrics.update :names => ["foo", "bar"], :period => 60
+      #   Librato::Metrics.update_metrics :names => ["foo", "bar"], :period => 60
       #
       # @example Update all metrics that start with 'foo' that aren't 'foobar'
-      #   Librato::Metrics.update :names => 'foo*', :exclude => ['foobar'], :display_min => 0
+      #   Librato::Metrics.update_metrics :names => 'foo*', :exclude => ['foobar'], :display_min => 0
       #
-      def update(metric, options = {})
-        if metric.respond_to?(:each)
-          url = "metrics" # update multiple metrics
-          options = metric
-        else
-          url = "metrics/#{metric}" # update single
-        end
+      def update_metrics(metrics)
+        url = "metrics" # update multiple metrics
         connection.put do |request|
           request.url connection.build_url(url)
-          request.body = SmartJSON.write(options)
+          request.body = SmartJSON.write(metrics)
+        end
+      end
+
+      # Update one or more metrics. Note that attributes are specified in
+      # their own hash for updating a single metric but are included inline
+      # when updating multiple metrics.
+      #
+      # @deprecated Use {#update_metric} or {#update_metrics} instead
+      def update(metric, options={})
+        if metric.respond_to?(:each)
+          update_metrics(metric)
+        else
+          update_metric(metric, options)
         end
       end
 
@@ -278,4 +357,4 @@ module Librato
     end
 
   end
-end
+end

data/lib/librato/metrics/collection.rb

@@ -1,5 +1,9 @@
 module Librato
   module Metrics
+
+    # An internal class used for extracting pagination logic
+    #
+    # @api private
     class Collection
 
       MAX_RESULTS = 100

data/lib/librato/metrics/persistence.rb

@@ -1,3 +1,2 @@
-
 require 'metrics/persistence/direct'
 require 'metrics/persistence/test'

data/lib/librato/metrics/processor.rb

@@ -1,6 +1,8 @@
 module Librato
   module Metrics
 
+    # Mixin which provides common logic between {Queue} and {Aggregator}
+    # objects.
     module Processor
       MEASUREMENTS_PER_REQUEST = 500
 

data/lib/librato/metrics/version.rb

@@ -1,5 +1,5 @@
 module Librato
   module Metrics
-    VERSION = "1.1.1"
+    VERSION = "1.2.0"
   end
 end

data/spec/integration/deprecated_methods_spec.rb

@@ -0,0 +1,85 @@
+require 'spec_helper'
+
+DEPRECATED_METHODS = %w[fetch list update delete]
+describe Librato::Metrics do
+
+  DEPRECATED_METHODS.each do |deprecated_method|
+    it { should respond_to(deprecated_method) }
+  end
+
+  describe "Client" do
+    let(:client) { Librato::Metrics.client }
+    subject { client }
+
+    before(:all) { prep_integration_tests }
+
+    before do
+      client.submit :test_metric => 123.0
+    end
+
+    DEPRECATED_METHODS.each do |deprecated_method|
+      it { should respond_to(deprecated_method) }
+    end
+
+    describe "#fetch" do
+      context "with no measurements attributes" do
+        let(:metric) { client.fetch(:test_metric) }
+        subject { metric }
+
+        it { should_not be_nil }
+
+        it "should return a metric" do
+          metric["name"].should == "test_metric"
+        end
+      end
+
+      context "with measurements attributes" do
+        let(:measurements) { client.fetch(:test_metric, :count => 1) }
+        subject { measurements }
+
+        it { should_not be_nil }
+        it { should_not be_empty }
+
+        it "should return the measurements" do
+          measurements.should have_key("unassigned")
+          measurements["unassigned"].should be_an(Array)
+          measurements["unassigned"].first["value"].should == 123.0
+        end
+      end
+    end
+
+    describe "#list" do
+      let(:metrics) { client.list }
+      subject { metrics }
+
+      it { should_not be_nil }
+      it { should_not be_empty }
+
+      it "should return the list of metrics" do
+        metric = metrics.find { |m| m["name"] == "test_metric" }
+        metric.should_not be_nil
+      end
+    end
+
+    describe "#update" do
+      before do
+        client.update("test_metric", :display_name => "Test Deprecated Update")
+      end
+
+      let(:updated_metric) { client.get_metric("test_metric") }
+
+      it "should update the metric" do
+        updated_metric["display_name"].should == "Test Deprecated Update"
+      end
+    end
+
+    describe "#delete" do
+      it "should delete the metric" do
+        client.metrics(:name => "test_metric").should_not be_empty
+        client.delete("test_metric")
+        client.metrics(:name => "test_metric").should be_empty
+      end
+    end
+
+  end
+end

data/spec/integration/metrics/queue_spec.rb

@@ -30,9 +30,9 @@ module Librato
 
           metrics = Metrics.list
           metrics.length.should == 8
-          counter = Metrics.fetch :counter_3, :count => 1
+          counter = Metrics.get_measurements :counter_3, :count => 1
           counter['unassigned'][0]['value'].should == 3
-          gauge = Metrics.fetch :gauge_5, :count => 1
+          gauge = Metrics.get_measurements :gauge_5, :count => 1
           gauge['unassigned'][0]['value'].should == 5
         end
       end
@@ -43,10 +43,10 @@ module Librato
         queue.add :bar => {:value => 456, :source => 'barsource'}
         queue.submit
 
-        foo = Metrics.fetch :foo, :count => 2
+        foo = Metrics.get_measurements :foo, :count => 2
         foo['default'][0]['value'].should == 123
 
-        bar = Metrics.fetch :bar, :count => 2
+        bar = Metrics.get_measurements :bar, :count => 2
         bar['barsource'][0]['value'].should == 456
       end
 

data/spec/integration/metrics_spec.rb

@@ -43,7 +43,7 @@ module Librato
       end
     end
 
-    describe "#delete" do
+    describe "#delete_metrics" do
       before(:each) { delete_all_metrics }
 
       context 'by names' do
@@ -51,19 +51,19 @@ module Librato
         context "with a single argument" do
           it "should delete named metric" do
             Metrics.submit :foo => 123
-            Metrics.list(:name => :foo).should_not be_empty
-            Metrics.delete :foo
-            Metrics.list(:name => :foo).should be_empty
+            Metrics.metrics(:name => :foo).should_not be_empty
+            Metrics.delete_metrics :foo
+            Metrics.metrics(:name => :foo).should be_empty
           end
         end
 
         context "with multiple arguments" do
           it "should delete named metrics" do
             Metrics.submit :foo => 123, :bar => 345, :baz => 567
-            Metrics.delete :foo, :bar
-            Metrics.list(:name => :foo).should be_empty
-            Metrics.list(:name => :bar).should be_empty
-            Metrics.list(:name => :baz).should_not be_empty
+            Metrics.delete_metrics :foo, :bar
+            Metrics.metrics(:name => :foo).should be_empty
+            Metrics.metrics(:name => :bar).should be_empty
+            Metrics.metrics(:name => :baz).should_not be_empty
           end
         end
 
@@ -71,14 +71,14 @@ module Librato
           it "should run cleanly" do
             # the API currently returns success even if
             # the metric has already been deleted or is absent.
-            Metrics.delete :missing
+            Metrics.delete_metrics :missing
           end
         end
 
         context "with no arguments" do
           it "should not make request" do
             lambda {
-              Metrics.delete
+              Metrics.delete_metrics
             }.should raise_error(Metrics::NoMetricsProvided)
           end
         end
@@ -88,22 +88,22 @@ module Librato
       context 'by pattern' do
         it "should filter properly" do
           Metrics.submit :foo => 1, :foobar => 2, :foobaz => 3, :bar => 4
-          Metrics.delete :names => 'fo*', :exclude => ['foobar']
+          Metrics.delete_metrics :names => 'fo*', :exclude => ['foobar']
 
           %w{foo foobaz}.each do |name|
             lambda {
-              Metrics.fetch name
+              Metrics.get_metric name
             }.should raise_error(Librato::Metrics::NotFound)
           end
 
           %w{foobar bar}.each do |name|
-            Metrics.fetch name # stil exist
+            Metrics.get_metric name # stil exist
           end
         end
       end
     end
 
-    describe "#fetch" do
+    describe "#get_metric" do
       before(:all) do
         delete_all_metrics
         Metrics.submit :my_counter => {:type => :counter, :value => 0, :measure_time => Time.now.to_i-60}
@@ -117,7 +117,7 @@ module Librato
 
       context "without arguments" do
         it "should get metric attributes" do
-          metric = Metrics.fetch :my_counter
+          metric = Metrics.get_metric :my_counter
           metric['name'].should == 'my_counter'
           metric['type'].should == 'counter'
         end
@@ -126,7 +126,8 @@ module Librato
       context "with a start_time" do
         it "should return entries since that time" do
           # 1 hr ago
-          data = Metrics.fetch :my_counter, :start_time => Time.now-3600
+          metric = Metrics.get_metric :my_counter, :start_time => Time.now-3600
+          data = metric['measurements']
           data['unassigned'].length.should == 3
           data['baz'].length.should == 2
         end
@@ -134,7 +135,8 @@ module Librato
 
       context "with a count limit" do
         it "should return that number of entries per source" do
-          data = Metrics.fetch :my_counter, :count => 2
+          metric = Metrics.get_metric :my_counter, :count => 2
+          data = metric['measurements']
           data['unassigned'].length.should == 2
           data['baz'].length.should == 2
         end
@@ -142,7 +144,8 @@ module Librato
 
       context "with a source limit" do
         it "should only return that source" do
-          data = Metrics.fetch :my_counter, :source => 'baz', :start_time => Time.now-3600
+          metric = Metrics.get_metric :my_counter, :source => 'baz', :start_time => Time.now-3600
+          data = metric['measurements']
           data['baz'].length.should == 2
           data['unassigned'].should be_nil
         end
@@ -150,7 +153,7 @@ module Librato
 
     end
 
-    describe "#list" do
+    describe "#metrics" do
       before(:all) do
         delete_all_metrics
         Metrics.submit :foo => 123, :bar => 345, :baz => 678, :foo_2 => 901
@@ -158,14 +161,14 @@ module Librato
 
       context "without arguments" do
         it "should list all metrics" do
-          metric_names = Metrics.list.map { |metric| metric['name'] }
+          metric_names = Metrics.metrics.map { |metric| metric['name'] }
           metric_names.sort.should == %w{foo bar baz foo_2}.sort
         end
       end
 
       context "with a name argument" do
         it "should list metrics that match" do
-          metric_names = Metrics.list(:name => 'foo').map { |metric| metric['name'] }
+          metric_names = Metrics.metrics(:name => 'foo').map { |metric| metric['name'] }
           metric_names.sort.should == %w{foo foo_2}.sort
         end
       end
@@ -181,13 +184,13 @@ module Librato
         end
 
         it "should create the metrics" do
-          metric = Metrics.list[0]
+          metric = Metrics.metrics[0]
           metric['name'].should == 'foo'
           metric['type'].should == 'gauge'
         end
 
         it "should store their data" do
-          data = Metrics.fetch :foo, :count => 1
+          data = Metrics.get_measurements :foo, :count => 1
           data.should_not be_empty
           data['unassigned'][0]['value'] == 123.0
         end
@@ -200,13 +203,13 @@ module Librato
         end
 
         it "should create the metrics" do
-          metric = Metrics.list[0]
+          metric = Metrics.metrics[0]
           metric['name'].should == 'bar'
           metric['type'].should == 'counter'
         end
 
         it "should store their data" do
-          data = Metrics.fetch :bar, :count => 1
+          data = Metrics.get_measurements :bar, :count => 1
           data.should_not be_empty
           data['baz'][0]['value'] == 456.0
         end
@@ -225,7 +228,7 @@ module Librato
 
     end
 
-    describe "#update" do
+    describe "#update_metric[s]" do
 
       context 'with a single metric' do
         context "with an existing metric" do
@@ -235,12 +238,12 @@ module Librato
           end
 
           it "should update the metric" do
-            Metrics.update :foo, :display_name => "Foo Metric",
-                                 :period => 15,
-                                 :attributes => {
-                                   :display_max => 1000
-                                 }
-            foo = Metrics.fetch :foo
+            Metrics.update_metric :foo, :display_name => "Foo Metric",
+                                        :period => 15,
+                                        :attributes => {
+                                          :display_max => 1000
+                                        }
+            foo = Metrics.get_metric :foo
             foo['display_name'].should == 'Foo Metric'
             foo['period'].should == 15
             foo['attributes']['display_max'].should == 1000
@@ -250,13 +253,13 @@ module Librato
         context "without an existing metric" do
           it "should create the metric if type specified" do
             delete_all_metrics
-            Metrics.update :foo, :display_name => "Foo Metric",
-                                 :type => 'gauge',
-                                 :period => 15,
-                                 :attributes => {
-                                   :display_max => 1000
-                                 }
-            foo = Metrics.fetch :foo
+            Metrics.update_metric :foo, :display_name => "Foo Metric",
+                                        :type => 'gauge',
+                                        :period => 15,
+                                        :attributes => {
+                                        :display_max => 1000
+                                      }
+            foo = Metrics.get_metric :foo
             foo['display_name'].should == 'Foo Metric'
             foo['period'].should == 15
             foo['attributes']['display_max'].should == 1000
@@ -265,11 +268,11 @@ module Librato
           it "should raise error if no type specified" do
             delete_all_metrics
             lambda {
-              Metrics.update :foo, :display_name => "Foo Metric",
-                                   :period => 15,
-                                   :attributes => {
-                                     :display_max => 1000
-                                   }
+              Metrics.update_metric :foo, :display_name => "Foo Metric",
+                                          :period => 15,
+                                          :attributes => {
+                                            :display_max => 1000
+                                          }
             }.should raise_error
           end
         end
@@ -284,28 +287,28 @@ module Librato
 
         it "should support named list" do
           names = ['my.1', 'my.3']
-          Metrics.update :names => names, :period => 60
+          Metrics.update_metrics :names => names, :period => 60
 
           names.each do |name|
-             metric = Metrics.fetch name
+             metric = Metrics.get_metric name
              metric['period'].should == 60
            end
         end
 
         it "should support patterns" do
-          Metrics.update :names => 'my.*', :exclude => ['my.3'],
+          Metrics.update_metrics :names => 'my.*', :exclude => ['my.3'],
             :display_max => 100
 
           %w{my.1 my.2 my.4}.each do |name|
-            metric = Metrics.fetch name
+            metric = Metrics.get_metric name
             metric['attributes']['display_max'].should == 100
           end
 
-          excluded = Metrics.fetch 'my.3'
+          excluded = Metrics.get_metric 'my.3'
           excluded['attributes']['display_max'].should_not == 100
         end
       end
     end
 
   end
-end
+end

data/spec/spec_helper.rb

@@ -14,7 +14,7 @@ RSpec.configure do |config|
   # purge all metrics from test account
   def delete_all_metrics
     connection = Librato::Metrics.client.connection
-    Librato::Metrics.list.each do |metric|
+    Librato::Metrics.metrics.each do |metric|
       #puts "deleting #{metric['name']}..."
       # expects 204
       connection.delete("metrics/#{metric['name']}")
@@ -89,4 +89,4 @@ RSpec::Matchers.define :equal_unordered do |result|
     end
     target == result
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: librato-metrics
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -37,7 +37,7 @@ cert_chain:
   bktaNmhlblFBRjFDSDk2WmNxY0pIMTc5UzJ0SWlLRE04a2VlUklVT1BDM1dU
   MGZhb2svMgpnQTJvemRyODUxYy9uQT09Ci0tLS0tRU5EIENFUlRJRklDQVRF
   LS0tLS0K
-date: 2013-08-26 00:00:00.000000000 Z
+date: 2013-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -221,6 +221,7 @@ files:
 - lib/librato/metrics/smart_json.rb
 - lib/librato/metrics/version.rb
 - librato-metrics.gemspec
+- spec/integration/deprecated_methods_spec.rb
 - spec/integration/metrics/annotator_spec.rb
 - spec/integration/metrics/connection_spec.rb
 - spec/integration/metrics/middleware/count_requests_spec.rb
@@ -249,7 +250,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2087135859290358676
+      hash: -3545928183344149228
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -263,6 +264,7 @@ signing_key:
 specification_version: 2
 summary: Ruby wrapper for Librato's Metrics API
 test_files:
+- spec/integration/deprecated_methods_spec.rb
 - spec/integration/metrics/annotator_spec.rb
 - spec/integration/metrics/connection_spec.rb
 - spec/integration/metrics/middleware/count_requests_spec.rb

metadata.gz.sig

@@ -1,2 +1 @@
-��}�E)��{��#���Q���u�9���4��~��Nu(�d��zd������������ǜf�
�"�7���,2{��L�e�"��\_�]Lg@�F���Lj|ˆyIfgh��
-�i��i4�(FF�_�t���q���~���op�F�͆1�r��|� ��“�Ṫy�C�R�H��}���B��9�ct(�?m�+�� +�u2�.
!r�˲R&�݃��Y�����Z�
+����bl�~��z:�dž���g��otd�����Q�����Lfz:�_%�m�,ht��lgR6�=܅E�"�~�Z'6aS
o��;�"Kg�L�q�r�_Nrb� 4������P�uo�%���5����5a�����D�r��`dfV�q�6��3���Sů/�ņ,J���ڶm�0�[Q�`��|��%�]�N9S�!���bU%��QJ��e�I�Rޡ�H�����!?�4���>�~�6��H�*��b��Ǟin+�1