carb-container 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95c46b2436f16825eb22774536485297b23ad8ba
-  data.tar.gz: 60f675251e578ea250cae6f2f47e16e8194714d0
+  metadata.gz: 4b2266086979fc001d37b802f0737e46a0101fa7
+  data.tar.gz: 85fe087f9b35d32ee015b897f3eeba8f6a670a3e
 SHA512:
-  metadata.gz: aa4c49159f53467cff172a8dd54214c702ebaa4b7987f9d015c611c3483f09dc60775debe3406ce22099b54fb4edcef58d0c86c3ba5ed8d7b3a9224bedeb1418
-  data.tar.gz: c32e3f6ef95c1ca332e58a802aeb67415f1631a31b5800c98f73b922117e94dc8bfa1f6a0f12a917d35672df056e9907c2c67acbe59641bd940d293600b82a46
+  metadata.gz: 3fe8e15f66cae9431cec660c5cbd082e13c5394d5a6c619dc99ccff405ff702ef206acc6f7e94770e0b10ab3e34e4c866f786b45c53f2a7acdf4421cd729f489
+  data.tar.gz: 0353b4d1bb150e98b3a8815f62e1585b7cd0d41523ace337c6778f0764255d95c3f20dbbe6a66d02e5ccb22605af1adeec1278c66efd000b80a4df8b2135eff7

data/README.md

@@ -61,9 +61,9 @@ container[:my_class].new.hello
 
 ### Carb::Container::RegistrationGlue
 
-A utility class that allows you to create a class method inside `Class` so that
-you can easily register any newly created class. This is entirely optional, for
-people who don't like monkey patching, can be skipped.
+A utility class that allows you to create a class method inside `Module` so
+that you can easily register any newly created class. This is entirely
+optional, for people who don't like monkey patching, can be skipped.
 
 ```ruby
 MyContainer = Carb::Container::RegistryContainer.new

data/bin/console

@@ -6,9 +6,5 @@ require "carb/container"
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
 
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require "irb"
-IRB.start(__FILE__)
+require "pry"
+Pry.start(__FILE__)

data/lib/carb/container/registerer.rb

@@ -17,18 +17,18 @@ module Carb::Container
     def initialize(container, converter: ClassNameToMethodName.new)
       @container = container
       @converter = converter
+      def_carb_container(container, converter)
     end
 
-    def included(klass)
-      # Required for scope purposes
-      kontainer = container
-      convert   = converter
+    private
 
-      klass.define_singleton_method(:carb_container) do |as: nil|
+    def def_carb_container(kontainer, convert)
+      define_method(:carb_container) do |as: nil|
         as ||= convert.call(self.name.to_s)
         as   = as.to_sym
         kontainer.register(as, -> { self })
       end
+      send(:protected, :carb_container)
     end
   end
 end

data/lib/carb/container/registration_glue.rb

@@ -10,8 +10,9 @@ module Carb::Container
     # @param container [#register] a generic object, usually a
     #   {RegistryContainer} which responds to `#register(name, dependency)`,
     #   it's the only required argument
-    # @param target [Object] class where you want to add the class method
-    #   `carb_container`. Usually it's {::Class} itself
+    # @param target [Class, Module] class where you want to add the class
+    #   method `carb_container`. Usually it's the {::Module} class so it's
+    #   available on all classes
     # @param registerer [Module] subclass of a module which can be included.
     #   Usually it's {Registerer} which is an internal module used to store
     #   objects inside a container which responds to `#register`
@@ -20,11 +21,30 @@ module Carb::Container
     #   name. By default it uses an instance of {ClassNameToMethodName}
     def call(
       container,
-      target:     Class,
+      target:     Module,
       registerer: Registerer,
       converter:  ClassNameToMethodName.new
     )
-      target.send(:include, registerer.new(container, converter: converter))
+      registerer_instance = registerer.new(container, converter: converter)
+
+      include_registerer(target, registerer_instance)
+    end
+
+    private
+
+    def perform_include(target, includer, registerer)
+      target.send(includer, registerer)
+    end
+
+    def include_registerer(target, registerer)
+      includer = inclusion_method(target)
+
+      perform_include(target, includer, registerer)
+    end
+
+    def inclusion_method(target)
+      return :include if target <= Module
+      :extend
     end
 
     class << self

data/lib/carb/container/version.rb

@@ -1,5 +1,5 @@
 module Carb
   module Container
-    VERSION = "0.1.0"
+    VERSION = "0.2.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carb-container
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Fire-Dragon-DoL
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-24 00:00:00.000000000 Z
+date: 2017-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carb-core