timber-rails 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f4f0a765269e2b04700d9f0b5e8be9c8c5a1e2b7335ee31decc53379e0c29c6
-  data.tar.gz: 113255c96a2bcd218ce6d444c665a811f8e4ab47cf09cba3c2cebdc82e998084
+  metadata.gz: 67b9d85a00327859acdbe2b7d7f749b334bfe9305a4aa4bd01b150bd3f1a4224
+  data.tar.gz: aca39d8017d73c8dea0f03442854dffbb2c4a7248f3d1aad6a369e2527cf8638
 SHA512:
-  metadata.gz: b053eb354944ecac2cdae780546d70b00f10ff9ce00c73d1ef9a210fbe6977fe270e6136270e80124d58ad146423ee57e5c23ddd11be177cca9a4143cbc2f725
-  data.tar.gz: de16848d218e687879c3af22f1ceffe1b84647da03044a7356ae26d009b118b8a308d1d5151f3efdcfb29395fc6c4a25aa82f00a51a9fee1fc102beaec80af89
+  metadata.gz: 5cfa79513c8b1501b7ef00b9113f43c7c9274e1a24e07e2c18b595188b4e04e1efdbd35197192224669703200b80db226f4a4d7aab500c2233b7a2ff27bbaa2b
+  data.tar.gz: bddc19da37b1ca346ddd08e322c4dd5741a4a91b9c8ce67a99f0b0bfa3bc339d23ef27e4057915f25ec59a6430745fcf366c54f6d35b2b29e0ba6674a6b22b97

data/Gemfile

@@ -1,8 +1,3 @@
 source "https://rubygems.org"
 
-# TODO: REMOVE ME
-gem 'timber', git: 'https://github.com/mitchellhenke/timber-ruby.git', branch: '3.0'
-gem 'timber-rack', git: 'https://github.com/timberio/timber-ruby-rack.git', branch: 'master'
-
-# Specify your gem's dependencies in timber-ruby-rails.gemspec
 gemspec

data/README.md

@@ -3,10 +3,9 @@
 [![ISC License](https://img.shields.io/badge/license-ISC-ff69b4.svg)](LICENSE.md)
 [![Yard Docs](http://img.shields.io/badge/yard-docs-blue.svg)](http://www.rubydoc.info/github/timberio/timber-ruby-rails)
 [![Build Status](https://travis-ci.org/timberio/timber-ruby-rails.svg?branch=master)](https://travis-ci.org/timberio/timber-ruby-rails)
-[![Code Climate](https://codeclimate.com/github/timberio/timber-ruby-rails/badges/gpa.svg)](https://codeclimate.com/github/timberio/timber-ruby-rails)
 
-This library integrates the [`timber` Ruby library][timber_ruby] with the [Rails][rails] framework,
-turning your Rails logs into rich structured events.
+This library integrates the [`timber` Ruby library](https://github.com/timberio/timber-ruby) with the [rails](https://github.com/rails/rails) framework,
+turning your rails logs into rich structured events.
 
 * **Sign-up: [https://app.timber.io](https://app.timber.io)**
 * **Documentation: [https://docs.timber.io/setup/languages/ruby/integrations/rails](https://docs.timber.io/setup/languages/ruby/integrations/rails)**

data/gemfiles/rails-3.0.gemfile

@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 
 gem 'rails', '~> 3.0.0'
 # TODO: REMOVE ME
-gem 'timber', git: 'https://github.com/timberio/timber-ruby.git', branch: '3.0'
+gem 'timber', git: 'https://github.com/timberio/timber-ruby.git', branch: '3.0-cleanup'
 gem 'timber-rack', git: 'https://github.com/timberio/timber-ruby-rack.git', branch: 'master'
 
 gemspec :path => '../'

data/gemfiles/rails-3.1.gemfile

@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 
 gem 'rails', '~> 3.1.0'
 # TODO: REMOVE ME
-gem 'timber', git: 'https://github.com/timberio/timber-ruby.git', branch: '3.0'
+gem 'timber', git: 'https://github.com/timberio/timber-ruby.git', branch: '3.0-cleanup'
 gem 'timber-rack', git: 'https://github.com/timberio/timber-ruby-rack.git', branch: 'master'
 
 gemspec :path => '../'

data/gemfiles/rails-3.2.gemfile

@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 
 gem 'rails', '~> 3.2.0'
 # TODO: REMOVE ME
-gem 'timber', git: 'https://github.com/timberio/timber-ruby.git', branch: '3.0'
+gem 'timber', git: 'https://github.com/timberio/timber-ruby.git', branch: '3.0-cleanup'
 gem 'timber-rack', git: 'https://github.com/timberio/timber-ruby-rack.git', branch: 'master'
 
 gemspec :path => '../'

data/gemfiles/rails-4.0.gemfile

@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 
 gem 'rails', '~> 4.0.0'
 # TODO: REMOVE ME
-gem 'timber', git: 'https://github.com/timberio/timber-ruby.git', branch: '3.0'
+gem 'timber', git: 'https://github.com/timberio/timber-ruby.git', branch: '3.0-cleanup'
 gem 'timber-rack', git: 'https://github.com/timberio/timber-ruby-rack.git', branch: 'master'
 
 if RUBY_PLATFORM == "java"

data/gemfiles/rails-4.1.gemfile

@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 
 gem 'rails', '~> 4.1.0'
 # TODO: REMOVE ME
-gem 'timber', git: 'https://github.com/timberio/timber-ruby.git', branch: '3.0'
+gem 'timber', git: 'https://github.com/timberio/timber-ruby.git', branch: '3.0-cleanup'
 gem 'timber-rack', git: 'https://github.com/timberio/timber-ruby-rack.git', branch: 'master'
 
 if RUBY_PLATFORM == "java"

data/gemfiles/rails-4.2.gemfile

@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 
 gem 'rails', '~> 4.2.0'
 # TODO: REMOVE ME
-gem 'timber', git: 'https://github.com/timberio/timber-ruby.git', branch: '3.0'
+gem 'timber', git: 'https://github.com/timberio/timber-ruby.git', branch: '3.0-cleanup'
 gem 'timber-rack', git: 'https://github.com/timberio/timber-ruby-rack.git', branch: 'master'
 
 if RUBY_PLATFORM == "java"

data/gemfiles/rails-5.0.gemfile

@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 
 gem 'rails', '~> 5.0.0'
 # TODO: REMOVE ME
-gem 'timber', git: 'https://github.com/timberio/timber-ruby.git', branch: '3.0'
+gem 'timber', git: 'https://github.com/timberio/timber-ruby.git', branch: '3.0-cleanup'
 gem 'timber-rack', git: 'https://github.com/timberio/timber-ruby-rack.git', branch: 'master'
 
 if RUBY_PLATFORM == "java"

data/gemfiles/rails-5.1.gemfile

@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 
 gem 'rails', '~> 5.1.0'
 # TODO: REMOVE ME
-gem 'timber', git: 'https://github.com/timberio/timber-ruby.git', branch: '3.0'
+gem 'timber', git: 'https://github.com/timberio/timber-ruby.git', branch: '3.0-cleanup'
 gem 'timber-rack', git: 'https://github.com/timberio/timber-ruby-rack.git', branch: 'master'
 
 if RUBY_PLATFORM == "java"

data/gemfiles/rails-5.2.gemfile

@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 
 gem 'rails', '~> 5.2.0'
 # TODO: REMOVE ME
-gem 'timber', git: 'https://github.com/timberio/timber-ruby.git', branch: '3.0'
+gem 'timber', git: 'https://github.com/timberio/timber-ruby.git', branch: '3.0-cleanup'
 gem 'timber-rack', git: 'https://github.com/timberio/timber-ruby-rack.git', branch: 'master'
 
 if RUBY_PLATFORM == "java"

data/gemfiles/rails-edge.gemfile

@@ -5,7 +5,7 @@ gem 'arel', git: 'https://github.com/rails/arel', branch: 'master'
 gem 'rails', git: 'https://github.com/rails/rails', branch: 'master'
 
 # TODO: REMOVE ME
-gem 'timber', git: 'https://github.com/timberio/timber-ruby.git', branch: '3.0'
+gem 'timber', git: 'https://github.com/timberio/timber-ruby.git', branch: '3.0-cleanup'
 gem 'timber-rack', git: 'https://github.com/timberio/timber-ruby-rack.git', branch: 'master'
 
 gemspec :path => '../'

data/lib/timber-rails.rb

@@ -2,6 +2,7 @@ require "timber-rails/overrides"
 
 require "timber"
 require "rails"
+require "timber-rails/active_support_log_subscriber"
 require "timber-rails/config"
 require "timber-rails/railtie"
 
@@ -17,6 +18,7 @@ require "timber-rails/action_dispatch"
 require "timber-rails/action_view"
 require "timber-rails/active_record"
 
+
 require "timber-rails/logger"
 
 module Timber

data/lib/timber-rails/action_controller/log_subscriber.rb

@@ -14,9 +14,9 @@ module Timber
         end
 
         def integrate!
-          return true if Util::ActiveSupportLogSubscriber.subscribed?(:action_controller, TimberLogSubscriber)
+          return true if Timber::Integrations::Rails::ActiveSupportLogSubscriber.subscribed?(:action_controller, TimberLogSubscriber)
 
-          Util::ActiveSupportLogSubscriber.unsubscribe!(:action_controller, ::ActionController::LogSubscriber)
+          Timber::Integrations::Rails::ActiveSupportLogSubscriber.unsubscribe!(:action_controller, ::ActionController::LogSubscriber)
           TimberLogSubscriber.attach_to(:action_controller)
         end
       end

data/lib/timber-rails/action_view/log_subscriber.rb

@@ -14,9 +14,9 @@ module Timber
         end
 
         def integrate!
-          return true if Util::ActiveSupportLogSubscriber.subscribed?(:action_view, TimberLogSubscriber)
+          return true if Timber::Integrations::Rails::ActiveSupportLogSubscriber.subscribed?(:action_view, TimberLogSubscriber)
 
-          Util::ActiveSupportLogSubscriber.unsubscribe!(:action_view, ::ActionView::LogSubscriber)
+          Timber::Integrations::Rails::ActiveSupportLogSubscriber.unsubscribe!(:action_view, ::ActionView::LogSubscriber)
           TimberLogSubscriber.attach_to(:action_view)
         end
       end

data/lib/timber-rails/active_record/log_subscriber.rb

@@ -9,9 +9,9 @@ module Timber
       # @private
       class LogSubscriber < Integrator
         def integrate!
-          return true if Util::ActiveSupportLogSubscriber.subscribed?(:active_record, TimberLogSubscriber)
+          return true if Timber::Integrations::Rails::ActiveSupportLogSubscriber.subscribed?(:active_record, TimberLogSubscriber)
 
-          Util::ActiveSupportLogSubscriber.unsubscribe!(:active_record, ::ActiveRecord::LogSubscriber)
+          Timber::Integrations::Rails::ActiveSupportLogSubscriber.unsubscribe!(:active_record, ::ActiveRecord::LogSubscriber)
           TimberLogSubscriber.attach_to(:active_record)
         end
       end

data/lib/timber-rails/active_support_log_subscriber.rb

@@ -0,0 +1,39 @@
+module Timber
+  module Integrations
+    module Rails
+      # @private
+      module ActiveSupportLogSubscriber
+        extend self
+
+        def find(component, type)
+          ::ActiveSupport::LogSubscriber.log_subscribers.find do |subscriber|
+            subscriber.class == type
+          end
+        end
+
+        def subscribed?(component, type)
+          !find(component, type).nil?
+        end
+
+        # I don't know why this has to be so complicated, but it is. This code was taken from
+        # lograge :/
+        def unsubscribe!(component, type)
+          subscriber = find(component, type)
+
+          if !subscriber
+            raise "We could not find a log subscriber for #{component.inspect} of type #{type.inspect}"
+          end
+
+          events = subscriber.public_methods(false).reject { |method| method.to_s == 'call' }
+          events.each do |event|
+            ::ActiveSupport::Notifications.notifier.listeners_for("#{event}.#{component}").each do |listener|
+              if listener.instance_variable_get('@delegate') == subscriber
+                ::ActiveSupport::Notifications.unsubscribe listener
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/timber-rails/session_context.rb

@@ -11,12 +11,9 @@ module Timber
           id = get_session_id(env)
           if id
             context = Contexts::Session.new(id: id)
-            CurrentContext.with(context) do
-              @app.call(env)
-            end
-          else
-            @app.call(env)
+            CurrentContext.add(context.to_hash)
           end
+          @app.call(env)
         end
 
         private

data/lib/timber-rails/version.rb

@@ -1,7 +1,7 @@
 module Timber
   module Integrations
     module Rails
-      VERSION = "1.0.0"
+      VERSION = "1.0.1"
     end
   end
 end

data/timber-rails.gemspec

@@ -34,9 +34,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "rails", ">= 3.0.0", "< 6.0.0"
-  # TODO add these
-  # spec.add_runtime_dependency "timber", "3.0.0.alpha.0"
-  # spec.add_runtime_dependency "timber-rack", "1.0.0.alpha.0"
+  spec.add_runtime_dependency "timber", "~> 3.0"
+  spec.add_runtime_dependency "timber-rack", "~> 1.0"
 
   spec.add_development_dependency "bundler", ">= 0.0"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: timber-rails
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Timber Technologies, Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-08 00:00:00.000000000 Z
+date: 2019-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -30,6 +30,34 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 6.0.0
+- !ruby/object:Gem::Dependency
+  name: timber
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: timber-rack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -194,6 +222,7 @@ files:
 - lib/timber-rails/active_record.rb
 - lib/timber-rails/active_record/log_subscriber.rb
 - lib/timber-rails/active_record/log_subscriber/timber_log_subscriber.rb
+- lib/timber-rails/active_support_log_subscriber.rb
 - lib/timber-rails/config.rb
 - lib/timber-rails/config/action_controller.rb
 - lib/timber-rails/config/action_view.rb