metrics-rails 0.1.0 → 0.2.0

data/test/unit/aggregator_test.rb

@@ -1,8 +1,8 @@
 require 'test_helper'
 
-class MetricsRailsAggregatorTest < ActiveSupport::TestCase
+class MetricsRailsAggregatorTest < MiniTest::Unit::TestCase
   
-  test 'adding timings' do
+  def test_adding_timings
     agg = Metrics::Rails::Aggregator.new
     
     agg.timing 'request.time.total', 23.7

data/test/unit/configuration_test.rb

@@ -1,8 +1,14 @@
 require 'test_helper'
 
-class MetricsRailsAggregatorTest < ActiveSupport::TestCase
+class MetricsRailsAggregatorTest < MiniTest::Unit::TestCase
   
-  test 'environmental variable config' do
+  def teardown
+    ENV.delete('METRICS_EMAIL')
+    ENV.delete('METRICS_API_KEY')
+    Metrics::Rails.check_config
+  end
+  
+  def test_environmental_variable_config
     ENV['METRICS_EMAIL'] = 'foo@bar.com'
     ENV['METRICS_API_KEY'] = 'api_key'
     Metrics::Rails.check_config
@@ -10,7 +16,7 @@ class MetricsRailsAggregatorTest < ActiveSupport::TestCase
     assert_equal 'api_key', Metrics::Rails.api_key
   end
   
-  test 'config file config' do
+  def test_config_file_config
     with_fixture_config do
       assert_equal 'test@bar.com', Metrics::Rails.email
       assert_equal 'test api key', Metrics::Rails.api_key
@@ -20,7 +26,7 @@ class MetricsRailsAggregatorTest < ActiveSupport::TestCase
     end
   end
   
-  test 'environmental and config file config' do
+  def test_environmental_and_config_file_config
     ENV['METRICS_EMAIL'] = 'foo@bar.com'
     ENV['METRICS_API_KEY'] = 'api_key'
     with_fixture_config do
@@ -31,12 +37,6 @@ class MetricsRailsAggregatorTest < ActiveSupport::TestCase
     end
   end
   
-  def teardown
-    ENV.delete('METRICS_EMAIL')
-    ENV.delete('METRICS_API_KEY')
-    Metrics::Rails.check_config
-  end
-  
   def with_fixture_config
     fixture_config = File.join(File.dirname(__FILE__), '../fixtures/config/metrics.yml')
     previous, Metrics::Rails.config_file = Metrics::Rails.config_file, fixture_config

data/test/unit/counter_cache_test.rb

@@ -1,8 +1,8 @@
 require 'test_helper'
 
-class MetricsRailsCounterCacheTest < ActiveSupport::TestCase
+class MetricsRailsCounterCacheTest < MiniTest::Unit::TestCase
   
-  test 'basic operations' do
+  def test_basic_operations
     cc = Metrics::Rails::CounterCache.new
     cc.increment :foo
     assert_equal 1, cc[:foo]

data/test/unit/group_test.rb

@@ -1,8 +1,8 @@
 require 'test_helper'
 
-class MetricsRailsGroupTest < ActiveSupport::TestCase
+class MetricsRailsGroupTest < MiniTest::Unit::TestCase
   
-  test 'basic grouping' do
+  def test_basic_grouping
     Metrics::Rails.group 'fruit' do |g|
       g.increment 'bites'
       g.increment 'nibbles', 5
@@ -24,7 +24,7 @@ class MetricsRailsGroupTest < ActiveSupport::TestCase
     assert_equal 146.5, aggregate['fruit.grow_time'][:sum]
   end
   
-  test 'nesting' do
+  def test_nesting
     Metrics::Rails.group 'street' do |s|
       s.increment 'count'
       s.group 'market' do |m|

data/test/unit/middleware_test.rb

@@ -0,0 +1,82 @@
+require 'test_helper'
+
+class MetricRackMiddlewareTest < MiniTest::Unit::TestCase
+
+  def setup
+    Metrics::Rails.stubs(:forking_server?).returns(false)
+    Metrics::Rails.stubs(:measure).returns(true)
+    Metrics::Rails.stubs(:increment).returns(true)
+
+    Time.stubs(:now).returns(Time.at(0.1305), Time.at(0.20075))
+
+    @middleware = Metrics::Rack::Middleware.new(
+      stub(:call => [200, {}, []])
+    )
+  end
+
+  def teardown
+    Metrics::Rails.unstub :forking_server?, :measure, :increment
+    Time.unstub :now
+  end
+
+  def test_logs_header_metrics
+    Metrics::Rails.expects(:measure).with('rack.heroku.queue.depth', 1.0)
+    Metrics::Rails.expects(:measure).with('rack.heroku.queue.wait_time', 20.5)
+    Metrics::Rails.expects(:measure).with('rack.heroku.queue.dynos', 2.0)
+
+    @middleware.call(
+      'HTTP_X_HEROKU_QUEUE_DEPTH'     => '1',
+      'HTTP_X_HEROKU_QUEUE_WAIT_TIME' => '20.5',
+      'HTTP_X_HEROKU_DYNOS_IN_USE'    => '2'
+    )
+  end
+
+  def test_logs_request_time
+    Metrics::Rails.expects(:measure).with('rack.request.time', 70.25)
+
+    @middleware.call({})
+  end
+
+  def test_increments_request_count
+    Metrics::Rails.expects(:increment).with('rack.request.total', 1)
+
+    @middleware.call({})
+  end
+
+  def test_log_200_status
+    Metrics::Rails.expects(:increment).with('rack.request.status.200', 1)
+    Metrics::Rails.expects(:increment).with('rack.request.status.2xx', 1)
+
+    Metrics::Rails.expects(:measure).with('rack.request.status.200.time', 70.25)
+    Metrics::Rails.expects(:measure).with('rack.request.status.2xx.time', 70.25)
+
+    @middleware.call({})
+  end
+
+  def test_log_403_status
+    Metrics::Rails.expects(:increment).with('rack.request.status.403', 1)
+    Metrics::Rails.expects(:increment).with('rack.request.status.4xx', 1)
+
+    Metrics::Rails.expects(:measure).with('rack.request.status.403.time', 70.25)
+    Metrics::Rails.expects(:measure).with('rack.request.status.4xx.time', 70.25)
+
+    @middleware = Metrics::Rack::Middleware.new stub(:call => [403, {}, []])
+    @middleware.call({})
+  end
+
+  def test_fast_queries_are_not_slow
+    Time.stubs(:now).returns(0.1305, 0.3305)
+
+    Metrics::Rails.expects(:increment).with('rack.request.slow', 1).never
+
+    @middleware.call({})
+  end
+
+  def test_log_slow_queries
+    Time.stubs(:now).returns(0.1305, 0.40075)
+
+    Metrics::Rails.expects(:increment).with('rack.request.slow', 1)
+
+    @middleware.call({})
+  end
+end

data/test/unit/worker_test.rb

@@ -1,8 +1,8 @@
 require 'test_helper'
 
-class MetricsRailsWorkerTest < ActiveSupport::TestCase
+class MetricsRailsWorkerTest < MiniTest::Unit::TestCase
   
-  test 'basic use' do
+  def test_basic_use
     worker = Metrics::Rails::Worker.new
     counter = 0
     Thread.new do
@@ -14,7 +14,7 @@ class MetricsRailsWorkerTest < ActiveSupport::TestCase
     assert_equal counter, 4
   end
   
-  test 'start time' do
+  def test_start_time
     worker = Metrics::Rails::Worker.new
     
     time = Time.now

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metrics-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-27 00:00:00.000000000 Z
+date: 2012-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -59,6 +59,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Report key app statistics to the Librato Metrics service and easily track
   your own custom metrics.
 email:
@@ -67,6 +83,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/metrics/rack/middleware.rb
+- lib/metrics/rack.rb
 - lib/metrics/rails/aggregator.rb
 - lib/metrics/rails/counter_cache.rb
 - lib/metrics/rails/group.rb
@@ -163,6 +181,7 @@ files:
 - test/unit/configuration_test.rb
 - test/unit/counter_cache_test.rb
 - test/unit/group_test.rb
+- test/unit/middleware_test.rb
 - test/unit/worker_test.rb
 homepage: https://github.com/librato/metrics-rails
 licenses: []
@@ -178,7 +197,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3211601922657433338
+      hash: 3976744292861344544
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -187,7 +206,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3211601922657433338
+      hash: 3976744292861344544
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -277,4 +296,5 @@ test_files:
 - test/unit/configuration_test.rb
 - test/unit/counter_cache_test.rb
 - test/unit/group_test.rb
+- test/unit/middleware_test.rb
 - test/unit/worker_test.rb