manufacturable 1.3.1 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64ba1d8142de2349f8c7acfe7b10a01b5c1c2a9e8f29bd5de1804384beb44a62
-  data.tar.gz: cb9378f6abf5b7e105208b025e6f7bef0993a5414faadd8903413861c191d733
+  metadata.gz: 0a31e2944a3a3ba6d32850cc919ff1a74e2172645cd3e8557f7e71a1e3968dcb
+  data.tar.gz: 12129e965112f3425b00cf46e812ce8b0bddf47169ac4ee3adedaae7561f72f1
 SHA512:
-  metadata.gz: c88675be039138f4500f7dd6e533e499591a8ecb6958a7310b4ed2ffb1db79fbca531673ef634b13bc9efe20c3026091a50165ca775afa79f25768e48dd1c262
-  data.tar.gz: 8ae031b419030987e2430b42d671941b6f224c117fc79c2ca948a6a761f8c6bb6c9f2ed89430a5033a47734b4b1dcf4ec4176fa82df052ac92972914f3c6c51f
+  metadata.gz: 336fb5ac884d512ad3a43ef9f720b11fec7e56475dd28e5be8ad80f4de86c3787f6cc89de2e6c98207a45f4eb67345fbcb1874316d251de6721f44cb1fa9b9b9
+  data.tar.gz: 96ba407a234793cca65a245f7fca4ccb4bd96687e124e605f6ba24116cba045b45f8654c38ab5a9fd56ef9d69cc190e026251385f58b77af9b949e4cc2491661

data/lib/manufacturable.rb

@@ -3,23 +3,23 @@ require 'manufacturable/config'
 require 'manufacturable/factory'
 require 'manufacturable/item'
 require 'manufacturable/object_factory'
-require 'manufacturable/railtie' if defined?(Rails)
+require 'manufacturable/railtie'
 
 module Manufacturable
-  def self.build(*args)
-    Builder.build(*args)
+  def self.build(*args, **kwargs, &block)
+    Builder.build(*args, **kwargs, &block)
   end
 
-  def self.build_one(*args)
-    Builder.build_one(*args)
+  def self.build_one(*args, **kwargs, &block)
+    Builder.build_one(*args, **kwargs, &block)
   end
 
-  def self.build_many(*args)
-    Builder.build_all(*args)
+  def self.build_many(*args, **kwargs, &block)
+    Builder.build_all(*args, **kwargs, &block)
   end
 
-  def self.build_all(*args)
-    Builder.build_all(*args)
+  def self.build_all(*args, **kwargs, &block)
+    Builder.build_all(*args, **kwargs, &block)
   end
 
   def self.registered_types

data/lib/manufacturable/builder.rb

@@ -2,16 +2,16 @@ require 'manufacturable/registrar'
 
 module Manufacturable
   class Builder
-    def self.build(*args, **kwargs)
-      self.new(*args, **kwargs).build
+    def self.build(*args, **kwargs, &block)
+      self.new(*args, **kwargs, &block).build
     end
 
-    def self.build_one(*args, **kwargs)
-      self.new(*args, **kwargs).build_one
+    def self.build_one(*args, **kwargs, &block)
+      self.new(*args, **kwargs, &block).build_one
     end
 
-    def self.build_all(*args, **kwargs)
-      self.new(*args, **kwargs).build_all
+    def self.build_all(*args, **kwargs, &block)
+      self.new(*args, **kwargs, &block).build_all
     end
 
     def build
@@ -28,10 +28,10 @@ module Manufacturable
 
     private
 
-    attr_reader :type, :key, :args, :kwargs
+    attr_reader :type, :key, :args, :kwargs, :block
 
-    def initialize(type, key, *args, **kwargs)
-      @type, @key, @args, @kwargs = type, key, args, kwargs
+    def initialize(type, key, *args, **kwargs, &block)
+      @type, @key, @args, @kwargs, @block = type, key, args, kwargs, block
     end
 
     def return_first?
@@ -39,19 +39,25 @@ module Manufacturable
     end
 
     def instances
-      @instances ||= klasses.map { |klass| klass&.new(*args, **kwargs) }
+      @instances ||= klasses.map do |klass|
+        klass.new(*args, **kwargs_with_key).tap { |instance| block&.call(instance) }
+      end
+    end
+
+    def last_instance
+      last_klass&.new(*args, **kwargs_with_key)&.tap { |instance| block&.call(instance) }
     end
 
     def klasses
-      Registrar.get(type, key)
+      Registrar.get(type, key).to_a
     end
 
-    def last_instance
-      last_klass&.new(*args, **kwargs)
+    def kwargs_with_key
+      kwargs.merge(manufacturable_item_key: key)
     end
 
     def last_klass
-      klasses.to_a.last
+      klasses.last
     end
   end
 end

data/lib/manufacturable/item.rb

@@ -2,6 +2,21 @@ require 'manufacturable/registrar'
 
 module Manufacturable
   module Item
+    def self.extended(base)
+      base.instance_eval do
+        def new(*args, **kwargs, &block)
+          key = kwargs.delete(:manufacturable_item_key)
+          instance = kwargs.empty? ? super(*args, &block) : super
+          instance.instance_variable_set(:@manufacturable_item_key, key)
+          instance
+        end
+      end
+
+      base.class_eval do
+        attr_reader :manufacturable_item_key
+      end
+    end
+
     def corresponds_to(key, type = self.superclass)
       key = key == type ? Registrar::ALL_KEY : key
       Registrar.register(type, key, self)

data/lib/manufacturable/railtie.rb

@@ -1,9 +1,21 @@
 require 'manufacturable/config'
 
 module Manufacturable
-  class Railtie < Rails::Railtie
-    initializer "manufacturable.require_paths" do |app|
-      Manufacturable::Config.require_method = app.config.eager_load ? :require : :require_dependency
+  class Railtie
+    def self.load
+      load_railtie if rails_defined?
+    end
+
+    def self.load_railtie
+      Class.new(Rails::Railtie).initializer('manufacturable.require_paths') do |app|
+        Manufacturable::Config.require_method = app.config.eager_load ? :require : :require_dependency
+      end
+    end
+
+    def self.rails_defined?
+      defined?(Rails)
     end
   end
 end
+
+Manufacturable::Railtie.load

data/lib/manufacturable/version.rb

@@ -1,3 +1,3 @@
 module Manufacturable
-  VERSION = "1.3.1"
+  VERSION = "1.5.0"
 end

data/manufacturable.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   }
 
   spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
-    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features|assets)/}) }
   end
 
   spec.bindir        = "exe"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: manufacturable
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.5.0
 platform: ruby
 authors:
 - Alan Ridlehoover
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-08-29 00:00:00.000000000 Z
+date: 2020-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -101,7 +101,6 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- assets/factory.png
 - bin/console
 - bin/setup
 - lib/manufacturable.rb