sweet_notifications 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c1adad5429dc0a8d3ec40a499531b9fabacc9b5
-  data.tar.gz: 360d747cf1d39ac6bfc3c9583e87adcf110d0f03
+  metadata.gz: b10b735828800811baddaaf6234ccde5d4825d0c
+  data.tar.gz: f4a229a8c82c4fbd5d098cae36c945d32fe78c43
 SHA512:
-  metadata.gz: 1e20abf7323c1ccc38984ff3b03105503c8e1e96025d54c3cb0ea23d8de015164923a6c8076f1bbc649b4f1d365bc167a3687a4dc92f96ee2b6724805d8ffd1a
-  data.tar.gz: 2019786e91f894fbb984e351f1d996da0f8b78c3b694026ba8aacee5d213fd50a14a6e541d2416372fb29a345816801383c060065943fe6905c892506a86190d
+  metadata.gz: 46055d7192e980297c47042fd7c0d72a86e9c97fac56b02befc39055f7cfea05537fe79de7876e52406f03fea4bc309bff5035720a9492b0931ca0b5b12a24c7
+  data.tar.gz: 9244a85530d1b16dcb7ade6b656986f9a699d70c25d02a3fd2aaefde9b77efb81c64611c637df3f730116286ab8e092f9b255ad823da60a0bf401b5118aeda3f

data/Rakefile

@@ -13,6 +13,6 @@ YARD::Rake::YardocTask.new do |t|
 end
 
 desc 'Check for code style'
-Rubocop::RakeTask.new
+RuboCop::RakeTask.new
 
 task default: [:test, :rubocop]

data/lib/sweet_notifications.rb

@@ -16,6 +16,7 @@ module SweetNotifications
   # initialized.
   #
   # @param name [Symbol] event namespace
+  # @param label [String] optional label for logging
   # @return [Rails::Railtie, ActiveSupport::LogSubscriber] An array consisting
   #   of a Railtie and a LogSubscriber
   # @yield event subscription
@@ -29,9 +30,10 @@ module SweetNotifications
   #      debug message(event, event.payload[:name], event.payload[:sql])
   #    end
   #  end
-  def self.subscribe(name, &block)
+  def self.subscribe(name, label: nil, &block)
+    label ||= name
     log_subscriber = Class.new(SweetNotifications::LogSubscriber, &block)
-    controller_runtime = self.controller_runtime(name, log_subscriber)
+    controller_runtime = self.controller_runtime(label, log_subscriber)
     if Rails.try(:application).try(:initialized?)
       initialize_rails(name, log_subscriber, controller_runtime)
       [nil, log_subscriber]

data/lib/sweet_notifications/log_subscriber.rb

@@ -7,6 +7,11 @@ module SweetNotifications
   class LogSubscriber < ActiveSupport::LogSubscriber
     class_attribute :odd_color, :even_color
 
+    def initialize
+      super
+      @odd = false
+    end
+
     # Format a message for logging
     #
     # @param event [ActiveSupport::Notifications::Event] subscribed event

data/lib/sweet_notifications/version.rb

@@ -1,3 +1,3 @@
 module SweetNotifications
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

data/sweet_notifications.gemspec

@@ -30,5 +30,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "yard", "~> 0.8.7"
   spec.add_development_dependency "appraisal", "~> 1.0"
   spec.add_development_dependency "simplecov", "~> 0.8.2"
-  spec.add_development_dependency "rubocop", "~> 0.22.0"
+  spec.add_development_dependency "rubocop", "~> 0.23.0"
 end

data/test/controller_runtime_test.rb

@@ -1,8 +1,3 @@
-require 'active_support/test_case'
-require 'active_support/log_subscriber'
-require 'active_support/log_subscriber/test_helper'
-require 'action_controller/log_subscriber'
-require 'action_controller'
 require 'test_helper'
 
 describe SweetNotifications::ControllerRuntime do

data/test/log_subscriber_test.rb

@@ -1,5 +1,4 @@
 require 'test_helper'
-require 'active_support/log_subscriber/test_helper'
 
 describe SweetNotifications::LogSubscriber do
   include ActiveSupport::LogSubscriber::TestHelper

data/test/sweet_notifications_test.rb

@@ -1,7 +1,17 @@
 require 'test_helper'
 
+class SweetNotificationsController < ActionController::Base
+  def index
+    ActiveSupport::Notifications.instrument 'test.controller' do
+      'ok'
+    end
+    render nothing: true
+  end
+end
+
 describe SweetNotifications do
   include ActiveSupport::LogSubscriber::TestHelper
+  tests SweetNotificationsController
 
   describe '.subscribe' do
     it 'creates a railtie' do
@@ -56,5 +66,20 @@ describe SweetNotifications do
       end
       assert_match(/Direct \(\d\.\d{2}ms\)  foo bar/, @logger.logged(:info)[0])
     end
+
+    it 'logs to Rails logger' do
+      railtie, _ = SweetNotifications.subscribe 'controller', label: 'Label' do
+        event :test, runtime: true do |event|
+          info message(event, 'Test', 'logging')
+        end
+      end
+      railtie.run_initializers
+
+      get :index
+      wait
+      assert_match(/Test \(\d\.\d{2}ms\)  logging/, @logger.logged(:info)[0])
+      out = ActionController::Base.log_process_action(label_runtime: 1234)
+      assert_match(/Label: 1234\.0ms/, out[0])
+    end
   end
 end

data/test/test_helper.rb

@@ -11,6 +11,8 @@ require 'minitest/spec'
 require 'minitest/pride'
 require 'sweet_notifications'
 require 'active_support/test_case'
+require 'action_controller'
+require 'active_support/log_subscriber/test_helper'
 require 'securerandom'
 
 class ActiveSupport::TestCase
@@ -19,6 +21,7 @@ class ActiveSupport::TestCase
   end
 
   extend MiniTest::Spec::DSL
+  register_spec_type(/SweetNotifications$/, ActionController::TestCase)
   register_spec_type(/ControllerRuntime$/, ActionController::TestCase)
   register_spec_type(self)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sweet_notifications
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Ville Lautanala
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-08 00:00:00.000000000 Z
+date: 2014-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.22.0
+        version: 0.23.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.22.0
+        version: 0.23.0
 description: Syntactic sugar for ActiveSupport::LogSubscriber for easy instrumentation
   and logging from third-party libraries.
 email: