librato-rails 0.7.2 → 0.7.3

data/test/remote/rails_remote_test.rb

@@ -1,7 +1,8 @@
+# encoding: UTF-8
 require 'test_helper'
 
 class LibratoRailsRemoteTest < ActiveSupport::TestCase
-  
+
   # These tests connect to the Metrics server with an account and verify remote
   # functions. They will only run if the below environment variables are set.
   #
@@ -9,7 +10,7 @@ class LibratoRailsRemoteTest < ActiveSupport::TestCase
   # test account.
   #
   if ENV['LIBRATO_RAILS_TEST_EMAIL'] && ENV['LIBRATO_RAILS_TEST_API_KEY']
-  
+
     setup do
       # delete any generated Librato::Rails
       Librato::Rails.user = ENV['LIBRATO_RAILS_TEST_EMAIL']
@@ -18,22 +19,22 @@ class LibratoRailsRemoteTest < ActiveSupport::TestCase
         Librato::Rails.api_endpoint = ENV['LIBRATO_RAILS_TEST_API_ENDPOINT']
       end
       Librato::Rails.delete_all
+      delete_all_metrics
     end
-    
+
     teardown do
       Librato::Rails.prefix = nil
     end
 
     test 'flush sends counters' do
-      delete_all_metrics
       source = Librato::Rails.qualified_source
-      
+
       Librato::Rails.increment :foo
       Librato::Rails.increment :bar, 2
       Librato::Rails.increment :foo
       Librato::Rails.increment :foo, :source => 'baz', :by => 3
       Librato::Rails.flush
-    
+
       client = Librato::Rails.client
       metric_names = client.list.map { |m| m['name'] }
       assert metric_names.include?('foo'), 'foo should be present'
@@ -42,104 +43,151 @@ class LibratoRailsRemoteTest < ActiveSupport::TestCase
       foo = client.fetch 'foo', :count => 10
       assert_equal 1, foo[source].length
       assert_equal 2, foo[source][0]['value']
-      
+
       # custom source
       assert_equal 1, foo['baz'].length
-      assert_equal 3, foo['baz'][0]['value']  
-    
+      assert_equal 3, foo['baz'][0]['value']
+
       bar = client.fetch 'bar', :count => 10
       assert_equal 1, bar[source].length
       assert_equal 2, bar[source][0]['value']
     end
-  
+
     test 'counters should persist through flush' do
       Librato::Rails.increment 'knightrider'
       Librato::Rails.increment 'badguys', :sporadic => true
       assert_equal 1, Librato::Rails.counters['knightrider']
       assert_equal 1, Librato::Rails.counters['badguys']
-      
+
       Librato::Rails.flush
       assert_equal 0, Librato::Rails.counters['knightrider']
       assert_equal nil, Librato::Rails.counters['badguys']
     end
-  
+
     test 'flush sends measures/timings' do
-      delete_all_metrics
       source = Librato::Rails.qualified_source
-      
+
       Librato::Rails.timing  'request.time.total', 122.1
       Librato::Rails.measure 'items_bought', 20
       Librato::Rails.timing  'request.time.total', 81.3
       Librato::Rails.timing  'jobs.queued', 5, :source => 'worker.3'
       Librato::Rails.flush
-    
+
       client = Librato::Rails.client
       metric_names = client.list.map { |m| m['name'] }
       assert metric_names.include?('request.time.total'), 'request.time.total should be present'
       assert metric_names.include?('items_bought'), 'request.time.db should be present'
-    
+
       total = client.fetch 'request.time.total', :count => 10
       assert_equal 2, total[source][0]['count']
       assert_in_delta 203.4, total[source][0]['sum'], 0.1
-    
+
       items = client.fetch 'items_bought', :count => 10
       assert_equal 1, items[source][0]['count']
       assert_in_delta 20, items[source][0]['sum'], 0.1
-      
+
       jobs = client.fetch 'jobs.queued', :count => 10
       assert_equal 1, jobs['worker.3'][0]['count']
       assert_in_delta 5, jobs['worker.3'][0]['sum'], 0.1
     end
-  
+
     test 'flush should purge measures/timings' do
-      delete_all_metrics
-    
       Librato::Rails.timing  'request.time.total', 122.1
       Librato::Rails.measure 'items_bought', 20
       Librato::Rails.flush
-    
+
       assert Librato::Rails.aggregate.empty?, 'measures and timings should be cleared with flush'
     end
-  
+
     test 'empty flush should not be sent' do
-      delete_all_metrics
       Librato::Rails.flush
-    
       assert_equal [], Librato::Rails.client.list
     end
-    
+
     test 'flush respects prefix' do
-      delete_all_metrics
       source = Librato::Rails.qualified_source
       Librato::Rails.prefix = 'testyprefix'
-      
+
       Librato::Rails.timing 'mytime', 221.1
       Librato::Rails.increment 'mycount', 4
       Librato::Rails.flush
-      
+
       client = Librato::Rails.client
       metric_names = client.list.map { |m| m['name'] }
       assert metric_names.include?('testyprefix.mytime'), 'testyprefix.mytime should be present'
       assert metric_names.include?('testyprefix.mycount'), 'testyprefix.mycount should be present'
-      
+
       mytime = client.fetch 'testyprefix.mytime', :count => 10
       assert_equal 1, mytime[source][0]['count']
-      
+
       mycount = client.fetch 'testyprefix.mycount', :count => 10
       assert_equal 4, mycount[source][0]['value']
     end
-  
+
+    test 'flush recovers from failed flush' do
+      client = Librato::Rails.client
+      source = Librato::Rails.qualified_source
+
+      # create a metric foo of counter type
+      client.submit :foo => {:type => :counter, :value => 12}
+
+      # failing flush - submit a foo measurement as a gauge (type mismatch)
+      Librato::Rails.measure :foo, 2.12
+      Librato::Rails.flush
+
+      foo = client.fetch :foo, :count => 10
+      assert_equal 1, foo['unassigned'].length
+      assert_nil foo[source] # shouldn't have been accepted
+
+      Librato::Rails.measure :boo, 2.12
+      Librato::Rails.flush
+
+      boo = client.fetch :boo, :count => 10
+      assert_equal 2.12, boo[source][0]["value"]
+    end
+
+    test 'flush tolerates invalid metric names' do
+      client = Librato::Rails.client
+      source = Librato::Rails.qualified_source
+
+      Librato::Rails.increment :foo
+      Librato::Rails.increment 'fübar'
+      Librato::Rails.measure 'fu/bar/baz', 12.1
+      Librato::Rails.flush
+
+      metric_names = client.list.map { |m| m['name'] }
+      assert metric_names.include?('foo')
+
+      # should have saved values for foo even though
+      # other metrics had invalid names
+      foo = client.fetch :foo, :count => 5
+      assert_equal 1.0, foo[source][0]["value"]
+    end
+
+    test 'flush tolerates invalid source names' do
+      client = Librato::Rails.client
+
+      Librato::Rails.increment :foo, :source => 'atreides'
+      Librato::Rails.increment :bar, :source => 'glébnöst'
+      Librato::Rails.measure 'baz', 2.25, :source => 'b/l/ak/nok'
+      Librato::Rails.flush
+
+      # should have saved values for foo even though
+      # other metrics had invalid sources
+      foo = client.fetch :foo, :count => 5
+      assert_equal 1.0, foo['atreides'][0]["value"]
+    end
+
     private
-  
+
     def delete_all_metrics
       client = Librato::Rails.client
-      client.list.each do |metric|
-        client.connection.delete("metrics/#{metric['name']}")
-      end
+      metric_names = client.list.map { |metric| metric['name'] }
+      client.delete(*metric_names) if !metric_names.empty?
     end
-  
+
   else
     puts "Skipping remote tests..."
   end
-  
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: librato-rails
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-06 00:00:00.000000000 Z
+date: 2012-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -91,6 +91,7 @@ files:
 - lib/librato/rails/group.rb
 - lib/librato/rails/railtie.rb
 - lib/librato/rails/subscribers.rb
+- lib/librato/rails/validating_queue.rb
 - lib/librato/rails/version.rb
 - lib/librato/rails/worker.rb
 - lib/librato/rails.rb
@@ -197,7 +198,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3855473348708511701
+      hash: 1346909575512186282
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -206,7 +207,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3855473348708511701
+      hash: 1346909575512186282
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24