sweet_notifications 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b10b735828800811baddaaf6234ccde5d4825d0c
-  data.tar.gz: f4a229a8c82c4fbd5d098cae36c945d32fe78c43
+  metadata.gz: 313330fe1e88bea48a41438d6a59bdd87d84a486
+  data.tar.gz: c50418d1bff9d94602e99760c7f88758556362ee
 SHA512:
-  metadata.gz: 46055d7192e980297c47042fd7c0d72a86e9c97fac56b02befc39055f7cfea05537fe79de7876e52406f03fea4bc309bff5035720a9492b0931ca0b5b12a24c7
-  data.tar.gz: 9244a85530d1b16dcb7ade6b656986f9a699d70c25d02a3fd2aaefde9b77efb81c64611c637df3f730116286ab8e092f9b255ad823da60a0bf401b5118aeda3f
+  metadata.gz: eb9591a334961e3fa5ee4c0a41f5e9992f698a7acb40ea0c3d1806df365d886635325ed0789f765d32da3f211d0940f3da6ad4569416151b87630e03de47ca66
+  data.tar.gz: 97b08cdc255d9162edc4f0650129bd5d5d0255d1ac346229cfc73d567d751bcd623c3e10be2414e10dab40187c90ee0a3173f6b85ca8319bf3e984b2eb2ea853

data/.rubocop.yml

@@ -1,7 +1,10 @@
 AllCops:
+  RunRailsCops: true
   Exclude:
     - sweet_notifications.gemspec
     - lib/sweet_notifications/version.rb
+    - "vendor/**/*"
+    - "gemfiles/vendor/**/*"
 
 ClassAndModuleChildren:
   Exclude:
@@ -17,3 +20,10 @@ MethodLength:
 
 ModuleFunction:
   Enabled: false
+
+Metrics/AbcSize:
+  Enabled: false
+
+Style/StringLiterals:
+  Enabled: true
+  EnforcedStyle: single_quotes

data/.travis.yml

@@ -1,12 +1,22 @@
 language: ruby
+sudo: false
+cache: bundler
 gemfile:
   - gemfiles/rails_4.0.gemfile
   - gemfiles/rails_4.1.gemfile
+  - gemfiles/rails_4.2.gemfile
 rvm:
   - 2.0.0
-  - 2.1.2
+  - 2.1.7
+  - 2.2.3
+  - jruby-9.0.1.0
+  - rbx-2.5
 matrix:
   include:
     - rvm: jruby
-      gemfile: gemfiles/rails_4.1.gemfile
+      gemfile: gemfiles/rails_4.2.gemfile
       env: JRUBY_OPTS="--2.0"
+    - rvm: 2.2.3
+      gemfile: gemfiles/rails_head.gemfile
+  allow_failures:
+    - gemfile: gemfiles/rails_head.gemfile

data/Appraisals

@@ -5,3 +5,13 @@ end
 appraise "rails-4.1" do
   gem 'rails', '~> 4.1.0'
 end
+
+appraise "rails-4.2" do
+  gem 'rails', '~> 4.2.0'
+end
+
+appraise "rails-head" do
+  gem 'rails', github: 'rails'
+  gem 'arel', github: 'rails/arel'
+  gem 'rack', github: 'rack'
+end

data/CHANGELOG.md

@@ -0,0 +1,7 @@
+## 0.2.1 (3 October 2015)
+
+- support Rails 5.0
+
+## 0.2.0 (11 June 2014)
+
+- allow overriding label used in logging

data/README.md

@@ -3,7 +3,8 @@
 Syntactic sugar for ActiveSupport::LogSubscriber for easy instrumentation and
 logging from third-party libraries.
 
-This gem currently requires Ruby 2.0 or JRuby in 2.0 mode.
+This gem requires Ruby 2.0 or newer. Compatible versions of JRuby and Rubinius
+are also supported.
 
 ## Installation
 
@@ -43,7 +44,7 @@ Then, subscribe to these notifications using SweetNotifications in an initialize
 SweetNotifications.subscribe :candies do
   color ActiveSupport::LogSubscriber::GREEN
   event :list, runtime: true do |event|
-    return unless logger.debug?
+    next unless logger.debug? # Use next in blocks
     debug message(event, 'Candy', "listing candies: #{event.payload[:candies]}")
   end
 end

data/gemfiles/rails_4.2.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 4.2.0"
+
+gemspec :path => "../"

data/gemfiles/rails_head.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", :github => "rails"
+gem "arel", :github => "rails/arel"
+gem "rack", :github => "rack"
+
+gemspec :path => "../"

data/lib/sweet_notifications/controller_runtime.rb

@@ -39,7 +39,8 @@ module SweetNotifications
 
         const_set(:ClassMethods, Module.new do
           define_method :log_process_action do |payload|
-            messages, runtime = super(payload), payload[runtime_attr]
+            messages = super(payload)
+            runtime = payload[runtime_attr]
             if runtime && runtime != 0
               messages << format("#{name}: %.1fms", runtime.to_f)
             end

data/lib/sweet_notifications/log_subscriber.rb

@@ -52,7 +52,8 @@ module SweetNotifications
       #
       # @return Numeric previous runtime value
       def reset_runtime
-        rt, self.runtime = runtime, 0
+        rt = runtime
+        self.runtime = 0
         rt
       end
 

data/lib/sweet_notifications/version.rb

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

data/sweet_notifications.gemspec

@@ -20,15 +20,15 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '~> 2.0'
 
-  spec.add_runtime_dependency "activesupport", "~> 4.0"
+  spec.add_runtime_dependency "activesupport", ">= 4.0", "< 6"
   spec.add_runtime_dependency "request_store", "~> 1.0"
-  spec.add_runtime_dependency "railties", "~> 4.0"
-  spec.add_development_dependency "actionpack", "~> 4.0"
+  spec.add_runtime_dependency "railties", ">= 4.0", "< 6"
+  spec.add_development_dependency "actionpack", ">= 4.0", "< 6"
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "minitest"
   spec.add_development_dependency "rake", "~> 10.3"
   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.23.0"
+  spec.add_development_dependency "appraisal", "~> 2.0"
+  spec.add_development_dependency "simplecov", "~> 0.10.0"
+  spec.add_development_dependency "rubocop", "~> 0.34.0"
 end

data/test/controller_runtime_test.rb

@@ -11,18 +11,28 @@ describe SweetNotifications::ControllerRuntime do
   class LogSubscribersController < ActionController::Base
     def create
       TestLogSubscriber.runtime += 100
-      render text: '100'
+      render_text '100'
     end
 
     def show
-      render text: '0'
+      render_text '0'
     end
 
     def destroy
       TestLogSubscriber.runtime += 50
-      render text: 'OK'
+      render_text 'OK'
       TestLogSubscriber.runtime += 5
     end
+
+    private
+
+    def render_text(text)
+      if Gem.loaded_specs['rails'].version < Gem::Version.new('4.2')
+        render text: text
+      else
+        render plain: text
+      end
+    end
   end
 
   include ActiveSupport::LogSubscriber::TestHelper
@@ -53,13 +63,13 @@ describe SweetNotifications::ControllerRuntime do
 
   describe 'runtime logging' do
     it 'does not append runtime when it is 0' do
-      get :show, id: 1
+      get :show, params: { id: 1 }
       wait
       assert_no_match(/Test:/, @logger.logged(:info)[2])
     end
 
     it 'appends non-zero runtime' do
-      post :create, test: 1
+      post :create, params: { test: 1 }
       wait
       expected_message = /\(Views: [\d.]+ms \| Test: 100.0ms\)/
       assert_match(expected_message, @logger.logged(:info)[2])
@@ -67,14 +77,14 @@ describe SweetNotifications::ControllerRuntime do
 
     it 'resets runtime before request' do
       TestLogSubscriber.runtime += 1000
-      post :create, test: 1
+      post :create, params: { test: 1 }
       wait
       expected_message = /\(Views: [\d.]+ms \| Test: 100.0ms\)/
       assert_match(expected_message, @logger.logged(:info)[2])
     end
 
     it 'includes runtime after render' do
-      post :destroy, id: 1
+      post :destroy, params: { id: 1 }
       wait
       expected_message = /\(Views: [\d.]+ms \| Test: 55.0ms\)/
       assert_match(expected_message, @logger.logged(:info)[2])

data/test/log_subscriber_test.rb

@@ -5,7 +5,7 @@ describe SweetNotifications::LogSubscriber do
 
   def event(name: 'Test', duration: 1, transaction_id: SecureRandom.hex,
             payload: {})
-    now = Time.now
+    now = Time.current
     ActiveSupport::Notifications::Event.new(name,
                                             now,
                                             now + duration,
@@ -144,6 +144,5 @@ describe SweetNotifications::LogSubscriber do
       message = subject.message(event, 'Label', 'body')
       assert !message.include?(ActiveSupport::LogSubscriber::CYAN)
     end
-
   end
 end

data/test/sweet_notifications_test.rb

@@ -5,7 +5,12 @@ class SweetNotificationsController < ActionController::Base
     ActiveSupport::Notifications.instrument 'test.controller' do
       'ok'
     end
-    render nothing: true
+
+    if Gem.loaded_specs['rails'].version < Gem::Version.new('4.2')
+      render text: 'ok'
+    else
+      render plain: 'ok'
+    end
   end
 end
 
@@ -15,7 +20,7 @@ describe SweetNotifications do
 
   describe '.subscribe' do
     it 'creates a railtie' do
-      railtie, _ = SweetNotifications.subscribe 'railtie_create' do
+      railtie, = SweetNotifications.subscribe 'railtie_create' do
       end
       assert railtie < Rails::Railtie
     end
@@ -29,7 +34,7 @@ describe SweetNotifications do
     end
 
     it 'binds log subscriber to notifications' do
-      railtie, _ = SweetNotifications.subscribe 'sweet' do
+      railtie, = SweetNotifications.subscribe 'sweet' do
         event :test do |event|
           info message(event, 'Test', 'blah blah')
         end
@@ -49,7 +54,7 @@ describe SweetNotifications do
         end
       end
 
-      railtie, _ = SweetNotifications.subscribe 'sweet' do
+      railtie, = SweetNotifications.subscribe 'sweet' do
         event :direct do |event|
           info message(event, 'Direct', 'foo bar')
         end
@@ -68,7 +73,7 @@ describe SweetNotifications do
     end
 
     it 'logs to Rails logger' do
-      railtie, _ = SweetNotifications.subscribe 'controller', label: 'Label' do
+      railtie, = SweetNotifications.subscribe 'controller', label: 'Label' do
         event :test, runtime: true do |event|
           info message(event, 'Test', 'logging')
         end

data/test/test_helper.rb

@@ -3,7 +3,7 @@ require 'simplecov'
 
 SimpleCov.start do
   add_filter 'test'
-  command_name 'Mintest'
+  command_name 'Minitest'
 end
 
 require 'minitest/autorun'
@@ -13,11 +13,12 @@ require 'sweet_notifications'
 require 'active_support/test_case'
 require 'action_controller'
 require 'active_support/log_subscriber/test_helper'
+require 'active_support/core_ext/string'
 require 'securerandom'
 
 class ActiveSupport::TestCase
   class << self
-    remove_method :describe
+    remove_method :describe if method_defined? :describe
   end
 
   extend MiniTest::Spec::DSL
@@ -26,6 +27,10 @@ class ActiveSupport::TestCase
   register_spec_type(self)
 end
 
+if ActiveSupport::TestCase.respond_to?(:test_order=)
+  ActiveSupport::TestCase.test_order = :random
+end
+
 module ActionController
   TestRoutes = ActionDispatch::Routing::RouteSet.new
   TestRoutes.draw do

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: sweet_notifications
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Ville Lautanala
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-10 00:00:00.000000000 Z
+date: 2015-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: request_store
   requirement: !ruby/object:Gem::Requirement
@@ -42,30 +48,42 @@ dependencies:
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -128,42 +146,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.2
+        version: 0.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.2
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.23.0
+        version: 0.34.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.23.0
+        version: 0.34.0
 description: Syntactic sugar for ActiveSupport::LogSubscriber for easy instrumentation
   and logging from third-party libraries.
 email:
@@ -176,6 +194,7 @@ files:
 - ".rubocop.yml"
 - ".travis.yml"
 - Appraisals
+- CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
 - LICENSE.txt
@@ -183,6 +202,8 @@ files:
 - Rakefile
 - gemfiles/rails_4.0.gemfile
 - gemfiles/rails_4.1.gemfile
+- gemfiles/rails_4.2.gemfile
+- gemfiles/rails_head.gemfile
 - lib/sweet_notifications.rb
 - lib/sweet_notifications/controller_runtime.rb
 - lib/sweet_notifications/log_subscriber.rb
@@ -214,7 +235,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Syntactic sugar for ActiveSupport::LogSubscriber.