librato-rails 0.12.0 → 1.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: a4563a727c2d24286d6bee498c2f7560cd586208
+  data.tar.gz: b7dd937e6544d3dfe2b7af675d1723bf973ddc0c
+SHA512:
+  metadata.gz: 54c81caa7ef34c047e288e034750d86165060517283cc021d686a23d2370be6af129a511e06cbbfee78eb03c79f8345e71f27f383cdd414ab3f0db1db833d7bb
+  data.tar.gz: b99ce4c90b2a3ab5f4deac78e822665ea94474fbd9f523e15312daa16fc7415a5be1333245b96b783171a865ec637bcdd93223837b307b64f7446722f372ba28

checksums.yaml.gz.sig

@@ -0,0 +1 @@
+#f��3�S:C������{Eq��1�Mn���<�����zw�����Y�EǨ�\qxd�-D�N��!�GЍ߾F�����W��g��{j��n�cA���j��[��"�3_�
D_R�XC��S5��e�

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+### Version 1.0.0
+* Add Active Job support for job counters and timings
+* Add `VersionSpecifier` to manage Rails version runtime dependencies
+
 ### Version 0.12.0
 * Add percentile support for timings
 * Start reporting 95th percentile for key ActionController metrics

data/README.md

@@ -80,7 +80,7 @@ Note that if Heroku idles your application measurements will not be sent until i
 
 ## Automatic Measurements
 
-After installing `librato-rails` and restarting your app and you will see a number of new metrics appear in your Librato account. These track request performance, sql queries, mail handling, and other key stats.
+After installing `librato-rails` and restarting your app you will see a number of new metrics appear in your Librato account. These track request performance, sql queries, mail handling, and other key stats.
 
 Built-in performance metrics will start with either `rack` or `rails`, depending on the level they are being sampled from. For example: `rails.request.total` is the total number of requests rails has received each minute.
 

data/lib/librato/rails/subscribers/job.rb

@@ -0,0 +1,18 @@
+module Librato
+  module Rails
+    module Subscribers
+      hooks = %w{enqueue_at enqueue perform_start perform}
+
+      hooks.each do |hook|
+        ActiveSupport::Notifications.subscribe "#{hook}.active_job" do |*args|
+          event = ActiveSupport::Notifications::Event.new(*args)
+
+          collector.group 'rails.job' do |c|
+            c.increment hook
+            c.timing "#{hook}.time", event.duration, source: event.payload[:job].class
+          end
+        end
+      end
+    end
+  end
+end

data/lib/librato/rails/subscribers.rb

@@ -19,4 +19,8 @@ require_relative 'subscribers/cache'
 require_relative 'subscribers/controller'
 require_relative 'subscribers/render'
 require_relative 'subscribers/sql'
-require_relative 'subscribers/mail'
+require_relative 'subscribers/mail'
+
+Librato::Rails::VersionSpecifier.supported(min: '4.2') do
+  require_relative 'subscribers/job'
+end

data/lib/librato/rails/version.rb

@@ -1,5 +1,5 @@
 module Librato
   module Rails
-    VERSION = "0.12.0"
+    VERSION = "1.0.0"
   end
 end

data/lib/librato/rails/version_specifier.rb

@@ -0,0 +1,45 @@
+module Librato
+  module Rails
+    class VersionSpecifier
+      def self.supported(opts={}, &block)
+        new(::Rails).supported(opts, &block)
+      end
+
+      def initialize(env)
+        @env = env
+      end
+
+      def supported(opts={}, &block)
+        unless block_given?
+          raise VersionSpecifierError, 'version specific block required'
+        end
+
+        if !opts.key?(:min) && !opts.key?(:max)
+          raise VersionSpecifierError, ':min and/or :max arguments required'
+        end
+
+        yield if is_supported?(opts)
+      end
+
+      private
+
+      def version
+        [@env::VERSION::MAJOR, @env::VERSION::MINOR].compact.join('.')
+      end
+
+      def is_supported?(opts={})
+        if version >= opts[:min].to_s && !opts.key?(:max)
+          return true
+        elsif version <= opts[:max].to_s && !opts.key?(:min)
+          return true
+        elsif version.between?(opts[:min].to_s, opts[:max].to_s)
+          return true
+        else
+          return false
+        end
+      end
+    end
+
+    class VersionSpecifierError < StandardError; end
+  end
+end

data/lib/librato/rails.rb

@@ -5,7 +5,8 @@ require_relative 'rails/version'
 
 # must load after all module setup and in this order
 if defined?(Rails)
+  require_relative 'rails/version_specifier'
   require_relative 'rails/railtie'
   require_relative 'rails/subscribers'
   require_relative 'rails/helpers'
-end
+end

data/test/dummy/config/application.rb

@@ -11,8 +11,11 @@ module Dummy
     # Application configuration should go into files in config/initializers
     # -- all .rb files in that directory are automatically loaded.
 
-    # Custom directories with classes and modules you want to be autoloadable.
-    # config.autoload_paths += %W(#{config.root}/extras)
+    Librato::Rails::VersionSpecifier.supported(min: '4.2') do
+      # Custom directories with classes and modules you want to be autoloadable.
+      # config.autoload_paths += %W(#{config.root}/extras)
+      config.autoload_paths += %W(#{config.root}/extras)
+    end
 
     # Only load the plugins named here, in the order given (default is alphabetical).
     # :all can be used as a placeholder for all plugins not explicitly named.
@@ -43,7 +46,7 @@ module Dummy
     # like if you have constraints or database-specific column types
     # config.active_record.schema_format = :sql
 
-    if Rails.version[0] == '3'
+    Librato::Rails::VersionSpecifier.supported(min: '3.0', max: '3.2') do
       # Enforce whitelist mode for mass assignment.
       # This will create an empty whitelist of attributes available for mass-assignment for all models
       # in your app. As such, your models will need to explicitly whitelist or blacklist accessible
@@ -62,4 +65,3 @@ module Dummy
     config.librato_rails.flush_interval = 5
   end
 end
-

data/test/dummy/extras/dummy_job.rb

@@ -0,0 +1,7 @@
+class DummyJob < ActiveJob::Base
+  queue_as :default
+
+  def perform
+    sleep 1
+  end
+end

data/test/integration/job_test.rb

@@ -0,0 +1,18 @@
+require 'test_helper'
+
+class JobTest < ActiveSupport::IntegrationCase
+  Librato::Rails::VersionSpecifier.supported(min: '4.2') do
+    test 'jobs performed' do
+      DummyJob.perform_now
+
+      assert_equal 1, counters['rails.job.perform']
+      assert_equal 1, aggregate.fetch('rails.job.perform.time', source: 'DummyJob')[:count]
+    end
+
+    test 'jobs enqueued' do
+      DummyJob.perform_later
+
+      assert_equal 1, counters['rails.job.enqueue']
+    end
+  end
+end

data/test/unit/version_specifier_test.rb

@@ -0,0 +1,31 @@
+require 'test_helper'
+
+class VersionSpecifierTest < MiniTest::Unit::TestCase
+  def setup
+    @version = [Rails::VERSION::MAJOR, Rails::VERSION::MINOR].compact.join('.')
+    @yielded = false
+  end
+
+  def test_supported_min
+    Librato::Rails::VersionSpecifier.supported(min: @version) { @yielded = true }
+
+    assert_equal true, @yielded
+  end
+
+  def test_supported_max
+    Librato::Rails::VersionSpecifier.supported(max: @version) { @yielded = true }
+
+    assert_equal true, @yielded
+  end
+
+  def test_supported_not_yielded
+    Librato::Rails::VersionSpecifier.supported(max: '2.0') { @yielded = true }
+
+    assert_equal false, @yielded
+  end
+
+  def test_supported_raises
+    assert_raises(Librato::Rails::VersionSpecifierError) { Librato::Rails::VersionSpecifier.supported }
+    assert_raises(Librato::Rails::VersionSpecifierError) { Librato::Rails::VersionSpecifier.supported(max: '2.0') }
+  end
+end

metadata

@@ -1,79 +1,67 @@
 --- !ruby/object:Gem::Specification
 name: librato-rails
 version: !ruby/object:Gem::Version
-  version: 0.12.0
-  prerelease: 
+  version: 1.0.0
 platform: ruby
 authors:
 - Matt Sanders
 autorequire: 
 bindir: bin
 cert_chain:
-- !binary |-
-  LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURMakNDQWhhZ0F3SUJB
-  Z0lCQURBTkJna3Foa2lHOXcwQkFRVUZBREE5TVEwd0N3WURWUVFEREFSdFlY
-  UjAKTVJjd0ZRWUtDWkltaVpQeUxHUUJHUllIYkdsaWNtRjBiekVUTUJFR0Nn
-  bVNKb21UOGl4a0FSa1dBMk52YlRBZQpGdzB4TlRFd01USXlNakEwTXpWYUZ3
-  MHhOakV3TVRFeU1qQTBNelZhTUQweERUQUxCZ05WQkFNTUJHMWhkSFF4CkZ6
-  QVZCZ29Ka2lhSmsvSXNaQUVaRmdkc2FXSnlZWFJ2TVJNd0VRWUtDWkltaVpQ
-  eUxHUUJHUllEWTI5dE1JSUIKSWpBTkJna3Foa2lHOXcwQkFRRUZBQU9DQVE4
-  QU1JSUJDZ0tDQVFFQXZmTjhSbEFzVXMrSzVrSzQ2U2tocFlleQo1NG01Ylhs
-  R1plcUlndU95Z3BHKzJGSnJVSk1DbmtROVJteUswV1VqZG1BTmV2VzAxY2FR
-  UVN4NVdhdFFac28wCkdmSnlKZktuNGRHZWN6OUxPRVBwYmx3KytxYXBMWHI0
-  dmJ1T2xOWHN1bTJnZFVGYzQvWVY5bDNjc3hDbE1WRXEKK1pVbXJIamQya29P
-  dnpqSytHRFJmM2lJb3pDc2dZMG9lc2VyWjBsaS8wcVJBNVpKZUZ3V3pzOUZP
-  OVNYUHZJRApNazA3V05hWFNSVDM4bGxjUEdYNEw4SytETDd3aFF3eGFGajZJ
-  WmJvYlVFdFJqelY5di9pUDdQaUppcGlqYktCCkVpZWZnVXVvbFJSMzhOeFFF
-  K2Y0TS9sRXF3RXBrWS9mZVlNWUY2UTRoWFZydUczZnN3anJER1d5aUc1bkVR
-  SUQKQVFBQm96a3dOekFKQmdOVkhSTUVBakFBTUIwR0ExVWREZ1FXQkJSOCts
-  MFpTVGJqL1RUNllWYkZGcGRHcGc3cQpVREFMQmdOVkhROEVCQU1DQkxBd0RR
-  WUpLb1pJaHZjTkFRRUZCUUFEZ2dFQkFLdVVpdUcyUEh2NnBhUWpYamFaCkxR
-  T3NGdW5TY0h5aERoUEZoL0NjQ1VEYm1YVkRPSjNXSXlEVlF1VWdLN0kzalBF
-  RGFTRmV6U1BCcGp3WnZnTUsKMC9pbjdwWExSS2pJOEN6c1k4WTR1MTIyRE45
-  dEJ4THVyK0Uva3Y1ZnBVYmY4RkdVU3VSVDVYM3doNlpCVHpzWgpFYU1lM0xw
-  UEZVZU1TaEgvSC9GRVlyZXhSdmFNSG8vNTJCZzB6UDB5U1NBUURvdG0rcWdN
-  ZHJ1MlhSRGpFNU1zCjlCaGVBbm95Z0dIcG9LV3RFeHBza2xDcHBMMXEyWGx6
-  dzJsaG9DTUxDU1NqOVQvWXlSVEwzVVFZb0s1cFBBNzYKaHZqeDBXSlA4cHpa
-  TUpQS0pCUlpRWEpPNWlmRVB5S2paeU1pNVhNSG1ydERjbEhMajNzeDRSQXZF
-  WmpHV2tSUApKU1E9Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K
-date: 2015-10-12 00:00:00.000000000 Z
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIDLjCCAhagAwIBAgIBADANBgkqhkiG9w0BAQUFADA9MQ0wCwYDVQQDDARtYXR0
+  MRcwFQYKCZImiZPyLGQBGRYHbGlicmF0bzETMBEGCgmSJomT8ixkARkWA2NvbTAe
+  Fw0xNTEwMTIyMjA0MzVaFw0xNjEwMTEyMjA0MzVaMD0xDTALBgNVBAMMBG1hdHQx
+  FzAVBgoJkiaJk/IsZAEZFgdsaWJyYXRvMRMwEQYKCZImiZPyLGQBGRYDY29tMIIB
+  IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvfN8RlAsUs+K5kK46SkhpYey
+  54m5bXlGZeqIguOygpG+2FJrUJMCnkQ9RmyK0WUjdmANevW01caQQSx5WatQZso0
+  GfJyJfKn4dGecz9LOEPpblw++qapLXr4vbuOlNXsum2gdUFc4/YV9l3csxClMVEq
+  +ZUmrHjd2koOvzjK+GDRf3iIozCsgY0oeserZ0li/0qRA5ZJeFwWzs9FO9SXPvID
+  Mk07WNaXSRT38llcPGX4L8K+DL7whQwxaFj6IZbobUEtRjzV9v/iP7PiJipijbKB
+  EiefgUuolRR38NxQE+f4M/lEqwEpkY/feYMYF6Q4hXVruG3fswjrDGWyiG5nEQID
+  AQABozkwNzAJBgNVHRMEAjAAMB0GA1UdDgQWBBR8+l0ZSTbj/TT6YVbFFpdGpg7q
+  UDALBgNVHQ8EBAMCBLAwDQYJKoZIhvcNAQEFBQADggEBAKuUiuG2PHv6paQjXjaZ
+  LQOsFunScHyhDhPFh/CcCUDbmXVDOJ3WIyDVQuUgK7I3jPEDaSFezSPBpjwZvgMK
+  0/in7pXLRKjI8CzsY8Y4u122DN9tBxLur+E/kv5fpUbf8FGUSuRT5X3wh6ZBTzsZ
+  EaMe3LpPFUeMShH/H/FEYrexRvaMHo/52Bg0zP0ySSAQDotm+qgMdru2XRDjE5Ms
+  9BheAnoygGHpoKWtExpsklCppL1q2Xlzw2lhoCMLCSSj9T/YyRTL3UQYoK5pPA76
+  hvjx0WJP8pzZMJPKJBRZQXJO5ifEPyKjZyMi5XMHmrtDclHLj3sx4RAvEZjGWkRP
+  JSQ=
+  -----END CERTIFICATE-----
+date: 2015-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: librato-rack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -81,7 +69,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -89,49 +76,43 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.3
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
 description: Report key app statistics to the Librato Metrics service and easily track
@@ -142,25 +123,29 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG.md
+- FAQ.md
+- LICENSE
+- README.md
+- Rakefile
+- lib/librato-rails.rb
+- lib/librato/rails.rb
 - lib/librato/rails/configuration.rb
-- lib/librato/rails/helpers/controller.rb
 - lib/librato/rails/helpers.rb
+- lib/librato/rails/helpers/controller.rb
 - lib/librato/rails/railtie.rb
+- lib/librato/rails/subscribers.rb
 - lib/librato/rails/subscribers/cache.rb
 - lib/librato/rails/subscribers/controller.rb
+- lib/librato/rails/subscribers/job.rb
 - lib/librato/rails/subscribers/mail.rb
 - lib/librato/rails/subscribers/render.rb
 - lib/librato/rails/subscribers/sql.rb
-- lib/librato/rails/subscribers.rb
 - lib/librato/rails/tracker.rb
 - lib/librato/rails/version.rb
-- lib/librato/rails.rb
-- lib/librato-rails.rb
-- LICENSE
-- Rakefile
-- README.md
-- CHANGELOG.md
-- FAQ.md
+- lib/librato/rails/version_specifier.rb
+- test/dummy/README.rdoc
+- test/dummy/Rakefile
 - test/dummy/app/assets/javascripts/application.js
 - test/dummy/app/assets/javascripts/home.js
 - test/dummy/app/assets/javascripts/status.js
@@ -187,6 +172,7 @@ files:
 - test/dummy/app/views/render/template.html.erb
 - test/dummy/app/views/status/code.html.erb
 - test/dummy/app/views/user_mailer/welcome_email.text.erb
+- test/dummy/config.ru
 - test/dummy/config/application.rb
 - test/dummy/config/boot.rb
 - test/dummy/config/database.yml
@@ -204,15 +190,13 @@ files:
 - test/dummy/config/locales/en.yml
 - test/dummy/config/routes.rb
 - test/dummy/config/unicorn.rb
-- test/dummy/config.ru
 - test/dummy/db/migrate/20120719231810_create_users.rb
 - test/dummy/db/schema.rb
+- test/dummy/extras/dummy_job.rb
 - test/dummy/public/404.html
 - test/dummy/public/422.html
 - test/dummy/public/500.html
 - test/dummy/public/favicon.ico
-- test/dummy/Rakefile
-- test/dummy/README.rdoc
 - test/dummy/script/rails
 - test/fixtures/config/empty.yml
 - test/fixtures/config/librato.yml
@@ -220,6 +204,7 @@ files:
 - test/integration/cache_test.rb
 - test/integration/custom_test.rb
 - test/integration/instrument_action_test.rb
+- test/integration/job_test.rb
 - test/integration/mail_test.rb
 - test/integration/render_test.rb
 - test/integration/request_test.rb
@@ -228,36 +213,30 @@ files:
 - test/test_helper.rb
 - test/unit/configuration_test.rb
 - test/unit/tracker_test.rb
+- test/unit/version_specifier_test.rb
 homepage: https://github.com/librato/librato-rails
 licenses:
 - BSD 3-clause
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1537943949532100725
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1537943949532100725
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23.2
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Use Librato Metrics with your Rails 3 app
 test_files:
 - test/dummy/app/assets/javascripts/application.js
@@ -306,6 +285,7 @@ test_files:
 - test/dummy/config.ru
 - test/dummy/db/migrate/20120719231810_create_users.rb
 - test/dummy/db/schema.rb
+- test/dummy/extras/dummy_job.rb
 - test/dummy/public/404.html
 - test/dummy/public/422.html
 - test/dummy/public/500.html
@@ -319,6 +299,7 @@ test_files:
 - test/integration/cache_test.rb
 - test/integration/custom_test.rb
 - test/integration/instrument_action_test.rb
+- test/integration/job_test.rb
 - test/integration/mail_test.rb
 - test/integration/render_test.rb
 - test/integration/request_test.rb
@@ -327,3 +308,4 @@ test_files:
 - test/test_helper.rb
 - test/unit/configuration_test.rb
 - test/unit/tracker_test.rb
+- test/unit/version_specifier_test.rb