manufacturable 1.4.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 89a955dbe25bfe0a0409045c03e9349d06c4ce710b6cb3a2bf0cbe95ea2c088b
-  data.tar.gz: efbc6e1f0f512d7306d1b343bd2ff957728ac72e3abddf54b8e6efe0d3446451
+  metadata.gz: ed7ea8785e7afdcc33f4071742a85a6e4074b64cb54a19274df867a6ac6cff8f
+  data.tar.gz: a3d15704c9600dfa8f7565c4f8eb43979b3e97d945c91dcbaf4e29fe0794a6e1
 SHA512:
-  metadata.gz: 3fd2846ae381bea9934e498c15e202e1d6b72e17bbdbea22d2742a214772edbaa71c02e1f2364dd5e2c88d06e5a7017ce734dde10676a1297206d2a7310378dc
-  data.tar.gz: e909d7f0234635b01fec866a020e61b5815276024aad25b0a22e96dfbb1dfe7bb80c89d68ce44ff400b61d525bf8fe640a894d535d373166b5ae102902420ffd
+  metadata.gz: d93e23562e81927917d9313b18c9a0ae0678716b4d718d62d8ada471e539e32f1ae5705c2ac33cc7bbc5f82f32a7fb4120ed314d0f11c06600653be825e63a9e
+  data.tar.gz: 9038acc6b59bbf7792bdae8a556753fb42c3f4f65f7ce17e565952585bed3f99ac8a25cea20c558c867e8e9f957a7e3c4e73eafefaafe634fd37a993ec7b6dc0

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,11 @@ 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(*args, **kwargs, &block)
+      @type, @key, *@args = args
+      @kwargs, @block = kwargs, block
     end
 
     def return_first?
@@ -39,15 +40,17 @@ module Manufacturable
     end
 
     def instances
-      @instances ||= klasses.map { |klass| klass&.new(*args, **kwargs_with_key) }
+      @instances ||= klasses.map do |klass|
+        klass.new(*args, **kwargs_with_key).tap { |instance| block&.call(instance) }
+      end
     end
 
-    def klasses
-      Registrar.get(type, key)
+    def last_instance
+      last_klass&.new(*args, **kwargs_with_key)&.tap { |instance| block&.call(instance) }
     end
 
-    def last_instance
-      last_klass&.new(*args, **kwargs_with_key)
+    def klasses
+      Registrar.get(type, key).to_a
     end
 
     def kwargs_with_key
@@ -55,7 +58,7 @@ module Manufacturable
     end
 
     def last_klass
-      klasses.to_a.last
+      klasses.last
     end
   end
 end

data/lib/manufacturable/item.rb

@@ -2,32 +2,32 @@ require 'manufacturable/registrar'
 
 module Manufacturable
   module Item
-    def self.extended(base)
-      base.instance_eval do
-        def corresponds_to(key, type = self.superclass)
-          key = key == type ? Registrar::ALL_KEY : key
-          Registrar.register(type, key, self)
-        end
+    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
+
+    def corresponds_to(key, type = self.superclass)
+      key = key == type ? Registrar::ALL_KEY : key
+      Registrar.register(type, key, self)
+    end
 
-        def corresponds_to_all(type = self.superclass)
-          corresponds_to(Registrar::ALL_KEY, type)
-        end
+    def corresponds_to_all(type = self.superclass)
+      corresponds_to(Registrar::ALL_KEY, type)
+    end
 
-        def default_manufacturable(type = self.superclass)
-          corresponds_to(Registrar::DEFAULT_KEY, type)
-        end
+    def default_manufacturable(type = self.superclass)
+      corresponds_to(Registrar::DEFAULT_KEY, type)
+    end
 
-        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
+    def self.extended(base)
+      base.include(InstanceMethods)
+    end
 
-      base.class_eval do
-        attr_reader :manufacturable_item_key
-      end
+    module InstanceMethods
+      attr_reader :manufacturable_item_key
     end
   end
 end

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/registrar.rb

@@ -1,3 +1,5 @@
+require 'set'
+
 module Manufacturable
   class Registrar
     ALL_KEY = :__all__

data/lib/manufacturable/version.rb

@@ -1,3 +1,3 @@
 module Manufacturable
-  VERSION = "1.4.0"
+  VERSION = "1.5.1"
 end

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, **kwargs)
-    Builder.build(*args, **kwargs)
+  def self.build(*args, **kwargs, &block)
+    Builder.build(*args, **kwargs, &block)
   end
 
-  def self.build_one(*args, **kwargs)
-    Builder.build_one(*args, **kwargs)
+  def self.build_one(*args, **kwargs, &block)
+    Builder.build_one(*args, **kwargs, &block)
   end
 
-  def self.build_many(*args, **kwargs)
-    Builder.build_all(*args, **kwargs)
+  def self.build_many(*args, **kwargs, &block)
+    Builder.build_all(*args, **kwargs, &block)
   end
 
-  def self.build_all(*args, **kwargs)
-    Builder.build_all(*args, **kwargs)
+  def self.build_all(*args, **kwargs, &block)
+    Builder.build_all(*args, **kwargs, &block)
   end
 
   def self.registered_types

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,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: manufacturable
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Alan Ridlehoover
 - Fito von Zastrow
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-09-10 00:00:00.000000000 Z
+date: 2021-09-05 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
@@ -121,7 +120,7 @@ metadata:
   bug_tracker_uri: https://github.com/first-try-software/manufacturable/issues
   homepage_uri: https://github.com/first-try-software/manufacturable
   source_code_uri: https://github.com/first-try-software/manufacturable
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -136,8 +135,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.2.15
+signing_key:
 specification_version: 4
 summary: Manufacturable is a factory that builds self-registering objects.
 test_files: []