sweet_notifications 0.2.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 313330fe1e88bea48a41438d6a59bdd87d84a486
-  data.tar.gz: c50418d1bff9d94602e99760c7f88758556362ee
+  metadata.gz: 84ab4e40ea53b74590ab970eaa73567e2e39a2b2
+  data.tar.gz: 310e180a86a817c76a2d3344ac714987c17e6eb0
 SHA512:
-  metadata.gz: eb9591a334961e3fa5ee4c0a41f5e9992f698a7acb40ea0c3d1806df365d886635325ed0789f765d32da3f211d0940f3da6ad4569416151b87630e03de47ca66
-  data.tar.gz: 97b08cdc255d9162edc4f0650129bd5d5d0255d1ac346229cfc73d567d751bcd623c3e10be2414e10dab40187c90ee0a3173f6b85ca8319bf3e984b2eb2ea853
+  metadata.gz: dc59c557faed07b6f3cde36e19d9491b37cf0413a96d33510f1d61498946e4ca74886a07cdfa4cb51fb1e6e2c9712478605c225e751f6bcffa4a169200b03fa2
+  data.tar.gz: db298fe8379e644a51a1e8a0eced32465e2a78792d8aa34bc9193c41046c98b977b2ee3ace58828c8b2af8a8caee7bd5fac241c561b6693fc04eea64a66adbaa

data/.rubocop.yml

@@ -1,11 +1,13 @@
 AllCops:
-  RunRailsCops: true
   Exclude:
     - sweet_notifications.gemspec
     - lib/sweet_notifications/version.rb
     - "vendor/**/*"
     - "gemfiles/vendor/**/*"
 
+Rails:
+  Enabled: true
+
 ClassAndModuleChildren:
   Exclude:
     - test/**/*.rb
@@ -24,6 +26,5 @@ ModuleFunction:
 Metrics/AbcSize:
   Enabled: false
 
-Style/StringLiterals:
-  Enabled: true
-  EnforcedStyle: single_quotes
+Metrics/BlockLength:
+  Enabled: false

data/.travis.yml

@@ -6,17 +6,19 @@ gemfile:
   - gemfiles/rails_4.1.gemfile
   - gemfiles/rails_4.2.gemfile
 rvm:
-  - 2.0.0
-  - 2.1.7
-  - 2.2.3
-  - jruby-9.0.1.0
-  - rbx-2.5
+  - '2.1'
+  - '2.2'
+  - 2.3.3
+  - jruby-9.1.7.0
 matrix:
   include:
-    - rvm: jruby
-      gemfile: gemfiles/rails_4.2.gemfile
-      env: JRUBY_OPTS="--2.0"
-    - rvm: 2.2.3
+    - rvm: 2.3.0
+      gemfile: gemfiles/rails_5.0.gemfile
+    - rvm: 2.4.0
+      gemfile: gemfiles/rails_5.0.gemfile
+    - rvm: jruby-9.1.6.0
+      gemfile: gemfiles/rails_5.0.gemfile
+    - rvm: 2.4.0
       gemfile: gemfiles/rails_head.gemfile
   allow_failures:
     - gemfile: gemfiles/rails_head.gemfile

data/Appraisals

@@ -10,6 +10,10 @@ appraise "rails-4.2" do
   gem 'rails', '~> 4.2.0'
 end
 
+appraise "rails-5.0" do
+  gem 'rails', '~> 5.0.0.beta'
+end
+
 appraise "rails-head" do
   gem 'rails', github: 'rails'
   gem 'arel', github: 'rails/arel'

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.0.0 (18 January 2017)
+
+- more robust Rails initialization testing
+
 ## 0.2.1 (3 October 2015)
 
 - support Rails 5.0

data/gemfiles/rails_5.0.gemfile

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

data/lib/sweet_notifications.rb

@@ -34,11 +34,19 @@ module SweetNotifications
     label ||= name
     log_subscriber = Class.new(SweetNotifications::LogSubscriber, &block)
     controller_runtime = self.controller_runtime(label, log_subscriber)
-    if Rails.try(:application).try(:initialized?)
+    if rails_initialized?
       initialize_rails(name, log_subscriber, controller_runtime)
       [nil, log_subscriber]
     else
       [railtie(name, log_subscriber, controller_runtime), log_subscriber]
     end
   end
+
+  def self.rails_initialized?
+    Rails.respond_to?(:application) &&
+      Rails.application &&
+      Rails.application.initialized?
+  end
+
+  private_class_method :rails_initialized?
 end

data/lib/sweet_notifications/version.rb

@@ -1,3 +1,3 @@
 module SweetNotifications
-  VERSION = '0.2.1'
+  VERSION = '1.0.0'.freeze
 end

data/sweet_notifications.gemspec

@@ -26,9 +26,9 @@ Gem::Specification.new do |spec|
   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 "rake", "~> 12.0"
+  spec.add_development_dependency "yard", "~> 0.9.7"
   spec.add_development_dependency "appraisal", "~> 2.0"
-  spec.add_development_dependency "simplecov", "~> 0.10.0"
-  spec.add_development_dependency "rubocop", "~> 0.34.0"
+  spec.add_development_dependency "simplecov", "~> 0.12.0"
+  spec.add_development_dependency "rubocop", "~> 0.46.0"
 end

data/test/controller_runtime_test.rb

@@ -27,7 +27,7 @@ describe SweetNotifications::ControllerRuntime do
     private
 
     def render_text(text)
-      if Gem.loaded_specs['rails'].version < Gem::Version.new('4.2')
+      if rails_version?('< 4.2')
         render text: text
       else
         render plain: text
@@ -39,6 +39,13 @@ describe SweetNotifications::ControllerRuntime do
   tests LogSubscribersController
 
   before do
+    require 'rails'
+    if rails_version?('>= 5.0')
+      ActionController::TestRoutes.draw do
+        resources :log_subscribers
+      end
+    end
+
     @old_logger = ActionController::Base.logger
     ActionController::LogSubscriber.attach_to :action_controller
   end

data/test/sweet_notifications_test.rb

@@ -6,7 +6,7 @@ class SweetNotificationsController < ActionController::Base
       'ok'
     end
 
-    if Gem.loaded_specs['rails'].version < Gem::Version.new('4.2')
+    if rails_version?('< 4.2')
       render text: 'ok'
     else
       render plain: 'ok'
@@ -18,6 +18,14 @@ describe SweetNotifications do
   include ActiveSupport::LogSubscriber::TestHelper
   tests SweetNotificationsController
 
+  before do
+    if rails_version?('>= 5.0')
+      ActionController::TestRoutes.draw do
+        resources :sweet_notifications
+      end
+    end
+  end
+
   describe '.subscribe' do
     it 'creates a railtie' do
       railtie, = SweetNotifications.subscribe 'railtie_create' do
@@ -60,7 +68,8 @@ describe SweetNotifications do
         end
       end
 
-      assert_equal nil, railtie
+      assert_nil railtie
+
       module ::Rails
         class << self
           undef application

data/test/test_helper.rb

@@ -16,6 +16,14 @@ require 'active_support/log_subscriber/test_helper'
 require 'active_support/core_ext/string'
 require 'securerandom'
 
+module RailsVersion
+  extend self
+  def rails_version?(constraint)
+    gem_spec = Gem.loaded_specs['actionpack']
+    gem_spec && Gem::Requirement.new(constraint).satisfied_by?(gem_spec.version)
+  end
+end
+
 class ActiveSupport::TestCase
   class << self
     remove_method :describe if method_defined? :describe
@@ -25,6 +33,8 @@ class ActiveSupport::TestCase
   register_spec_type(/SweetNotifications$/, ActionController::TestCase)
   register_spec_type(/ControllerRuntime$/, ActionController::TestCase)
   register_spec_type(self)
+
+  include RailsVersion
 end
 
 if ActiveSupport::TestCase.respond_to?(:test_order=)
@@ -32,14 +42,19 @@ if ActiveSupport::TestCase.respond_to?(:test_order=)
 end
 
 module ActionController
+  extend RailsVersion
   TestRoutes = ActionDispatch::Routing::RouteSet.new
-  TestRoutes.draw do
-    match ':controller(/:action)', via: [:all]
+
+  if rails_version?('< 5.0')
+    TestRoutes.draw do
+      match ':controller(/:action)', via: [:all]
+    end
   end
 
   class Base
     include ActionController::Testing
     include TestRoutes.url_helpers
+    include RailsVersion
   end
 
   class ActionController::TestCase

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sweet_notifications
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Ville Lautanala
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-03 00:00:00.000000000 Z
+date: 2017-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -118,28 +118,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.3'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.3'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.7
+        version: 0.9.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.7
+        version: 0.9.7
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -160,28 +160,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 0.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 0.12.0
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.34.0
+        version: 0.46.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.34.0
+        version: 0.46.0
 description: Syntactic sugar for ActiveSupport::LogSubscriber for easy instrumentation
   and logging from third-party libraries.
 email:
@@ -203,6 +203,7 @@ files:
 - gemfiles/rails_4.0.gemfile
 - gemfiles/rails_4.1.gemfile
 - gemfiles/rails_4.2.gemfile
+- gemfiles/rails_5.0.gemfile
 - gemfiles/rails_head.gemfile
 - lib/sweet_notifications.rb
 - lib/sweet_notifications/controller_runtime.rb
@@ -235,7 +236,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Syntactic sugar for ActiveSupport::LogSubscriber.
@@ -245,4 +246,3 @@ test_files:
 - test/railtie_test.rb
 - test/sweet_notifications_test.rb
 - test/test_helper.rb
-has_rdoc: