concerning 1.0.3 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 46300e9d1f6336b137f30a7ce604b609af70949b
-  data.tar.gz: 5af204914956c879ab923da970083186eed8ea5a
+  metadata.gz: bba544478b9125ab14ef5cbe4c9f76599019ba15
+  data.tar.gz: f54ab418712a3135f16c3f2ee4b82cb2c8f5a3a4
 SHA512:
-  metadata.gz: 8134f6abaf203e3d1d3e8397ceb14e2868307a07051f0f5dbffb6f72c7f32997537b5ff39361ef58b6aaf180a2039c3166d1967dd410149f5cabea568bfe28b9
-  data.tar.gz: 99bd868353c2e2d28e5f2b7c22ef2f4c03da6dafd5fbfb58b63325640a0ef61fcaf3005784b2a7eff4b1b27fb6f1ce9f83341320fea565f10c23afb1e8462dd3
+  metadata.gz: 015670567443a9a37ef4a204dbbcc4d12dc9e4ea9ee6c6ce42792e860c89afa25ddf2bafe8c3c9cf24420d6d81e0213a75069bf10ea1d2f6c0d79a734e76c5fa
+  data.tar.gz: 4ee89b3d9e83bba243fbe1428df4fea1dfe824e2ea30e8d6ec3f66ac898ce0a20ec6430d108a6e4eab2a78dc1edb678397ae8937e808608d760ef83a0f6ecdb3

data/lib/concerning.rb

@@ -5,8 +5,24 @@
 # This allows libraries which support multiple Rails versions to depend on
 # `concerning` without worrying about implementation collision. This lib
 # will step aside if it sees its work is done.
+
+require 'active_support/concern'
+
+# Check for Concern#class_methods
+if !ActiveSupport::Concern.method_defined?(:class_methods)
+  require 'concerning/concern_class_methods'
+end
+
+# Check for Module#concerning
 begin
   require 'active_support/core_ext/module/concerning'
 rescue LoadError
-  require 'concerning/extension'
+  require 'concerning/module_concerning'
+end
+
+# Check for Kernel#concern
+begin
+  require 'active_support/core_ext/kernel/concern'
+rescue LoadError
+  require 'concerning/kernel_concern'
 end

data/lib/concerning/concern_class_methods.rb

@@ -0,0 +1,11 @@
+module ActiveSupport::Concern
+  # Provide a class_methods alternative to ClassMethods since defining
+  # a constant within a block doesn't work as folks would expect.
+  def class_methods(&class_methods_module_definition)
+    mod = const_defined?(:ClassMethods) ?
+      const_get(:ClassMethods) :
+      const_set(:ClassMethods, Module.new)
+
+    mod.module_eval(&class_methods_module_definition)
+  end
+end

data/lib/concerning/kernel_concern.rb

@@ -0,0 +1,6 @@
+module Kernel
+  # A shortcut to define a toplevel concern, not within a module.
+  def concern(topic, &module_definition)
+    ::Object.concern topic, &module_definition
+  end
+end

data/lib/concerning/{extension.rb → module_concerning.rb}

@@ -115,41 +115,28 @@ class Module
   # * clean up junk drawer classes by encapsulating their concerns
   # * stop leaning on protected/private for "internal stuff" modularity
   module Concerning
+    # Define a new concern and mix it in.
     def concerning(topic, &block)
       include concern(topic, &block)
     end
-  end
-  include Concerning # We do this mixin just for nice RDoc.
-end
 
-module Kernel
-  # A low-cruft shortcut to define a concern.
-  #
-  #   concern :EventTracking do
-  #     ...
-  #   end
-  #
-  #   module EventTracking
-  #     extend ActiveSupport::Concern
-  #
-  #     ...
-  #   end
-  def concern(topic, &module_definition)
-    const_set topic, Module.new {
-      extend ActiveSupport::Concern
-      module_eval(&module_definition)
-    }
+    # A low-cruft shortcut to define a concern.
+    #
+    #   concern :EventTracking do
+    #     ...
+    #   end
+    #
+    #   module EventTracking
+    #     extend ActiveSupport::Concern
+    #
+    #     ...
+    #   end
+    def concern(topic, &module_definition)
+      const_set topic, Module.new {
+        extend ActiveSupport::Concern
+        module_eval(&module_definition)
+      }
+    end
   end
-end
-
-# Provide a class_methods alternative to ClassMethods since defining
-# a constant within a block doesn't work as folks would expect.
-ActiveSupport::Concern.module_eval do
-  def class_methods(&class_methods_module_definition)
-    mod = const_defined?(:ClassMethods) ?
-      const_get(:ClassMethods) :
-      const_set(:ClassMethods, Module.new)
-
-    mod.module_eval(&class_methods_module_definition)
-  end unless method_defined? :class_methods
+  include Concerning # We do this mixin just for nice RDoc.
 end

data/test/active_support_stub/active_support/core_ext/kernel/concern.rb

@@ -0,0 +1 @@
+KERNEL_CONCERN_DEFERRED_TO_ACTIVE_SUPPORT = true

data/test/active_support_stub/active_support/core_ext/module/concerning.rb

@@ -1 +1 @@
-CONCERNING_DEFERRED_TO_ACTIVE_SUPPORT = true
+MODULE_CONCERNING_DEFERRED_TO_ACTIVE_SUPPORT = true

data/test/concerning_test.rb

@@ -33,7 +33,7 @@ class ConcernTest < Minitest::Test
   end
 
   def test_may_be_defined_at_toplevel
-    mod = Kernel.concern(:Foo) { }
+    mod = ::TOPLEVEL_BINDING.eval 'concern(:Foo) { }'
     assert_equal mod, ::Foo
     assert_kind_of ActiveSupport::Concern, ::Foo
     assert !Object.ancestors.include?(::Foo), mod.ancestors.inspect
@@ -83,7 +83,8 @@ class ForwardCompatibilityWithRails41Test < Minitest::Test
     with_stubbed_active_support_in_load_path do
       require 'concerning'
     end
-    assert defined?(::CONCERNING_DEFERRED_TO_ACTIVE_SUPPORT)
+    assert defined?(::MODULE_CONCERNING_DEFERRED_TO_ACTIVE_SUPPORT)
+    assert defined?(::KERNEL_CONCERN_DEFERRED_TO_ACTIVE_SUPPORT)
   end
 
   private

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: concerning
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
 platform: ruby
 authors:
 - Jeremy Kemper
@@ -44,8 +44,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ./lib/concerning/extension.rb
+- ./lib/concerning/concern_class_methods.rb
+- ./lib/concerning/kernel_concern.rb
+- ./lib/concerning/module_concerning.rb
 - ./lib/concerning.rb
+- ./test/active_support_stub/active_support/core_ext/kernel/concern.rb
 - ./test/active_support_stub/active_support/core_ext/module/concerning.rb
 - ./test/concerning_test.rb
 homepage: https://github.com/basecamp/concerning
@@ -73,5 +76,6 @@ signing_key:
 specification_version: 4
 summary: Separating small concerns
 test_files:
+- ./test/active_support_stub/active_support/core_ext/kernel/concern.rb
 - ./test/active_support_stub/active_support/core_ext/module/concerning.rb
 - ./test/concerning_test.rb