traxor 0.1.17 → 0.1.18

data/lib/traxor/rails.rb

@@ -1,34 +1,3 @@
-module Traxor
-  class Rails < ::Rails::Engine
-    initializer 'traxor.setup'.freeze do |app|
-      if ::Rails.env.development? || ::Rails.env.test?
-        Traxor.initialize_logger(::Rails.root.join('log'.freeze, 'traxor.log'.freeze))
-      end
+# frozen_string_literal: true
 
-      require 'traxor/rack'
-      app.config.middleware.insert 0, Traxor::Rack::Middleware::Pre
-      app.config.middleware.use Traxor::Rack::Middleware::Post
-
-      ActiveSupport.on_load :action_controller do
-        require 'traxor/rails/action_controller'
-      end
-      ActiveSupport.on_load :active_record do
-        require 'traxor/rails/active_record'
-      end
-      ActiveSupport.on_load :action_mailer do
-        require 'traxor/rails/action_mailer'
-      end
-    end
-
-    config.before_configuration do
-      require 'traxor/faraday' if defined?(Faraday)
-
-      if defined?(Sidekiq)
-        require 'traxor/sidekiq'
-        ::Sidekiq.server_middleware do |chain|
-          chain.add Traxor::Sidekiq
-        end
-      end
-    end
-  end
-end
+require 'traxor/rails/engine'

data/lib/traxor/sidekiq.rb

@@ -1,21 +1,23 @@
-require 'benchmark'
+# frozen_string_literal: true
+
+require 'active_support/core_ext/benchmark'
 
 module Traxor
   class Sidekiq
+    DURATION_METRIC = 'sidekiq.worker.duration'
+    COUNT_METRIC = 'sidekiq.worker.count'
+    EXCEPTION_METRIC = 'sidekiq.worker.exception.count'
+
     def call(worker, _job, queue)
-      tags = Traxor::Tags.sidekiq = {
-        sidekiq_worker: worker.class.name,
-        sidekiq_queue: queue
-      }
+      tags = Traxor::Tags.sidekiq = { sidekiq_worker: worker.class.name, sidekiq_queue: queue }
       begin
-        time = Benchmark.ms do
-          yield
-        end
-        Metric.measure 'sidekiq.worker.duration'.freeze, "#{time.round(2)}ms", tags if time.positive?
-        Metric.count 'sidekiq.worker.count'.freeze, 1, tags
+        time = Benchmark.ms { yield }
+        Metric.measure DURATION_METRIC, "#{time.round(2)}ms", tags if time.positive?
       rescue StandardError
-        Metric.count 'sidekiq.worker.exception.count'.freeze, 1, tags
+        Metric.count EXCEPTION_METRIC, 1, tags
         raise
+      ensure
+        Metric.count COUNT_METRIC, 1, tags
       end
     end
   end

data/lib/traxor/tags.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_support/core_ext/module/attribute_accessors_per_thread'
 
 module Traxor
@@ -5,7 +7,7 @@ module Traxor
     thread_mattr_accessor :controller, :sidekiq
 
     def self.all
-      (controller || {}).merge(sidekiq || {})
+      Hash(controller).merge(Hash(sidekiq)).dup
     end
   end
 end

data/lib/traxor/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Traxor
-  VERSION = '0.1.17'.freeze
+  VERSION = '0.1.18'
 end

data/lib/traxor.rb

@@ -1,7 +1,11 @@
+# frozen_string_literal: true
+
 require 'logger'
-require 'rails'
+require 'traxor/faraday' if defined?(Faraday)
 require 'traxor/metric'
-require 'traxor/rails'
+require 'traxor/rack' if defined?(Rack)
+require 'traxor/rails' if defined?(Rails::Engine)
+require 'traxor/sidekiq' if defined?(Sidekiq)
 require 'traxor/tags'
 require 'traxor/version'
 

data/traxor.gemspec

@@ -1,4 +1,6 @@
 
+# frozen_string_literal: true
+
 lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'traxor/version'
@@ -20,15 +22,14 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '>= 2.2'
+  spec.required_ruby_version = '>= 2.4'
 
-  spec.add_dependency 'activesupport'
-  spec.add_dependency 'rails', '>= 4.2'
+  spec.add_dependency 'activesupport', '>= 5.0'
 
+  spec.add_development_dependency 'appraisal'
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'faraday'
-  spec.add_development_dependency 'lois'
-  spec.add_development_dependency 'pry'
+  spec.add_development_dependency 'guard-rspec'
   spec.add_development_dependency 'pry-byebug'
   spec.add_development_dependency 'rails'
   spec.add_development_dependency 'rake'
@@ -36,7 +37,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'rspec_junit_formatter'
   spec.add_development_dependency 'rubocop'
-  spec.add_development_dependency 'rubocop-rspec'
   spec.add_development_dependency 'sidekiq'
   spec.add_development_dependency 'simplecov'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: traxor
 version: !ruby/object:Gem::Version
-  version: 0.1.17
+  version: 0.1.18
 platform: ruby
 authors:
 - Ryan Hansen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-01 00:00:00.000000000 Z
+date: 2018-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,30 +16,16 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: faraday
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: lois
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -192,20 +178,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop-rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement
@@ -247,18 +219,29 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".travis.yml"
+- Appraisals
 - Gemfile
 - Gemfile.lock
+- Guardfile
 - README.md
 - Rakefile
+- bin/_guard-core
+- bin/appraisal
 - bin/code_climate_reek
 - bin/console
-- bin/lois
+- bin/guard
 - bin/rake
 - bin/reek
 - bin/rspec
 - bin/rubocop
 - bin/setup
+- gemfiles/.bundle/config
+- gemfiles/active_support_5_0.gemfile
+- gemfiles/active_support_5_0.gemfile.lock
+- gemfiles/active_support_5_1.gemfile
+- gemfiles/active_support_5_1.gemfile.lock
+- gemfiles/active_support_5_2.gemfile
+- gemfiles/active_support_5_2.gemfile.lock
 - lib/traxor.rb
 - lib/traxor/faraday.rb
 - lib/traxor/metric.rb
@@ -271,6 +254,7 @@ files:
 - lib/traxor/rails/action_controller.rb
 - lib/traxor/rails/action_mailer.rb
 - lib/traxor/rails/active_record.rb
+- lib/traxor/rails/engine.rb
 - lib/traxor/sidekiq.rb
 - lib/traxor/tags.rb
 - lib/traxor/version.rb
@@ -286,7 +270,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.2'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="