metriks-middleware 2.1.0 → 2.1.1

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NDQ0YWZjMmFlYjM0ZjU4ZTBmMTVhMmNkNGMzYTk3MmY2MDMxZWJiMg==
-  data.tar.gz: !binary |-
-    YmEwMWZkNjhjYjIxOWUyYzE3ZTdhZGMwZDQzNjFjOTY5NjZlZTUzYw==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    ZjE1NTEyZGEyNjMxMDk4MGJmZmZhZWFmZTU2YzcwMzNlZTc2ZDUyYzdiODhh
-    NTJlZmFmMWFmNTEyYzlhNmQyMjZiNzEyZTM4ODBkYjlmMmJiYjMwZjRkM2Mx
-    NGU2NTE1MmNhOGEzMWJmMGU2YzVjMDU5NGY3N2E0ZDRjNDMwMDM=
-  data.tar.gz: !binary |-
-    NDMwMWFmZWY4NmNiZmY5OTYyN2FkZGRjMmE4MzZmNjU2YTVmZjIyM2Q4ZDA5
-    NjgwMWZhNDZmMTBlODkzOGFlMmViNGI5MjFmMGUxODhkZGYyZWZmMWQ1YWY0
-    NjViZGZiYzFkMDkxNDg4NTU1ZDRjMzg5NzQ1MjM0YmU4YzExN2Q=
+SHA1:
+  metadata.gz: 39f457cd2e5a084679e0dfeb4495bd4adaf92710
+  data.tar.gz: 2280424b3d0f4d8e5170c6b34752a786ca22d707
+SHA512:
+  metadata.gz: 8be5b9c8faf07e56dfc4789771822fe074b6ab64138fcbfde867b5c144ddcb5b574c5f56373dad896e0271d3a38f30160773af69f7022954db926e068b9cbbdb
+  data.tar.gz: 1d743a27716f543585fc199d3c6a0057c5bdbe4d120f877b4fd9b46edbdf9acb14795128bac4b749bd34da06bde1a3e1829e3eace50993b285bd11f8374f9da0

data/lib/metriks/middleware.rb

@@ -2,8 +2,6 @@ require 'metriks'
 
 module Metriks
   class Middleware
-    VERSION = '2.1.0'
-
     REQUEST_DELAY              = 'request_delay'
     ERROR_RESPONSE             = 'responses.error'
     NOT_FOUND_RESPONSE         = 'responses.not_found'
@@ -58,6 +56,7 @@ module Metriks
     end
 
     def record_staus_code(status)
+      status = status.to_i
       if status >= 500
         Metriks.meter(ERROR_RESPONSE).mark
       elsif status == 404

data/lib/metriks/middleware/version.rb

@@ -0,0 +1,5 @@
+module Metriks
+  class Middleware
+    VERSION = '2.1.1'
+  end
+end

data/metriks-middleware.gemspec

@@ -1,36 +1,27 @@
-lib = "metriks-middleware"
-lib_file = File.expand_path("../lib/metriks/middleware.rb", __FILE__)
-File.read(lib_file) =~ /\bVERSION\s*=\s*["'](.+?)["']/
-version = $1
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'metriks/middleware/version'
 
 Gem::Specification.new do |spec|
-  spec.specification_version = 2 if spec.respond_to? :specification_version=
-  spec.required_rubygems_version = '>= 1.3.6'
-
-  spec.name    = lib
-  spec.version = version
-
+  spec.name        = 'metriks-middleware'
+  spec.version     = Metriks::Middleware::VERSION
   spec.summary     = "Rack middleware for metriks"
   spec.description = "Rack middleware to track throughput and response time with metriks."
-
-  spec.authors  = ["Larry Marburger"]
-  spec.email    = 'larry@marburger.cc'
-  spec.homepage = 'https://github.com/lmarburger/metriks-middleware'
-  spec.licenses = ['MIT']
+  spec.authors     = ["Larry Marburger"]
+  spec.email       = 'larry@marburger.cc'
+  spec.homepage    = 'https://github.com/lmarburger/metriks-middleware'
+  spec.licenses    = ['MIT']
 
   spec.add_dependency 'metriks', '~> 0.9.9'
   spec.add_development_dependency 'mocha', '~> 0.11.4'
   spec.add_development_dependency 'rake', '>= 0.9'
 
   spec.files = %w(Gemfile LICENSE README.md Rakefile)
-  spec.files << "#{lib}.gemspec"
+  spec.files << "metriks-middleware.gemspec"
   spec.files += Dir.glob("lib/**/*.rb")
   spec.files += Dir.glob("test/**/*.rb")
   spec.files += Dir.glob("script/*")
-
-  dev_null    = File.exist?('/dev/null') ? '/dev/null' : 'NUL'
-  git_files   = `git ls-files -z 2>#{dev_null}`
-  spec.files &= git_files.split("\0") if $?.success?
-
   spec.test_files = Dir.glob("test/**/*.rb")
+
+  spec.required_rubygems_version = '>= 1.3.6'
 end

data/test/async_app_test.rb

@@ -167,4 +167,36 @@ class AsyncAppTest < Test::Unit::TestCase
     delay = Metriks.histogram('request_delay').mean
     assert_equal 0, delay
   end
+
+  def test_records_string_statuses
+    error_sync_app  = lambda do |env| ['500', {}, ['']] end
+    error_async_app = lambda do |env|
+      env['async.callback'].call ['500', {}, ['']]
+      [-1, {}, ['']]
+    end
+
+    Metriks::Middleware.new(error_sync_app).call(@env.dup)
+    Metriks::Middleware.new(error_async_app).call(@env.dup)
+
+    errors = Metriks.meter('responses.error').count
+    assert_equal 2, errors
+  end
+
+  def test_ignores_non_integer_statuses
+    error_sync_app  = lambda do |env| ['fail', {}, ['']] end
+    error_async_app = lambda do |env|
+      env['async.callback'].call ['fail', {}, ['']]
+      [-1, {}, ['']]
+    end
+
+    Metriks::Middleware.new(error_sync_app).call(@env.dup)
+    Metriks::Middleware.new(error_async_app).call(@env.dup)
+
+    errors        = Metriks.meter('responses.error').count
+    not_founds    = Metriks.meter('responses.not_found').count
+    not_modifieds = Metriks.meter('responses.not_modified').count
+    assert_equal 0, errors
+    assert_equal 0, not_founds
+    assert_equal 0, not_modifieds
+  end
 end

data/test/sync_app_test.rb

@@ -106,4 +106,26 @@ class SyncAppTest < Test::Unit::TestCase
     delay = Metriks.histogram('request_delay').mean
     assert_equal 0, delay
   end
+
+  def test_records_string_statuses
+    error_app = lambda do |env| ['500', {}, ['']] end
+    2.times { Metriks::Middleware.new(error_app).call(@env) }
+    Metriks::Middleware.new(@downstream).call(@env)
+
+    errors = Metriks.meter('responses.error').count
+    assert_equal 2, errors
+  end
+
+  def test_ignores_non_integer_statuses
+    error_app = lambda do |env| ['fail', {}, ['']] end
+    2.times { Metriks::Middleware.new(error_app).call(@env) }
+    Metriks::Middleware.new(@downstream).call(@env)
+
+    errors        = Metriks.meter('responses.error').count
+    not_founds    = Metriks.meter('responses.not_found').count
+    not_modifieds = Metriks.meter('responses.not_modified').count
+    assert_equal 0, errors
+    assert_equal 0, not_founds
+    assert_equal 0, not_modifieds
+  end
 end

data/test/test_helper.rb

@@ -1,3 +1,4 @@
+require 'bundler/setup'
 require 'test/unit'
 require 'mocha'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metriks-middleware
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Larry Marburger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-22 00:00:00.000000000 Z
+date: 2013-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metriks
@@ -42,14 +42,14 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0.9'
 description: Rack middleware to track throughput and response time with metriks.
@@ -63,6 +63,7 @@ files:
 - README.md
 - Rakefile
 - metriks-middleware.gemspec
+- lib/metriks/middleware/version.rb
 - lib/metriks/middleware.rb
 - test/async_app_test.rb
 - test/sync_app_test.rb
@@ -79,19 +80,19 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.2
 signing_key: 
-specification_version: 2
+specification_version: 4
 summary: Rack middleware for metriks
 test_files:
 - test/async_app_test.rb