toritori 0.1.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 03d2eef669e357b0d84585f3f04ed0c53ae37674edda3ed875c5983cf0963cb7
-  data.tar.gz: 0a4a405fab280b0b3cc124503dbfc6c21ca4736f606e2672ae0327b41e9c7dc7
+  metadata.gz: eaa8ad4915b1a30d7e653060e3b9bf1e245e5933d849bb8e7f62e544295907fc
+  data.tar.gz: 8aa97304d8dcfd2d0c182d31631713cb2b25b530059057c59c24287555fd393e
 SHA512:
-  metadata.gz: a172fc3f47049d3dcd804bc6904d6ec34ea9e4beb5400cae0e3eeb1c25051598ba1c0d380b1172b8af2c311e207f6649fc989596389b0a95c9015100f4ee6c32
-  data.tar.gz: 7e8b7ac71257f8f108093ba50a5a937c80c22dc17ab0150bc5867e4927a08523e39b073a4f8add5358685684a634b76c24c89220141506d53ed904daa77be878
+  metadata.gz: 443583cf5aeb8cd4a888237a13cec6077b6f1aad57a0187da47420a3ba4c28669e5e7bb6c3773bd8410192be58e26293fd2e3bb22a0564ef56aa76808ca233c3
+  data.tar.gz: 1169e0c5495a9b5f609864d1d64ad76dc380d7f9579707a3e98f0622fe79be7ccde0adacf27417ac560915f3069348f491a9015936aac4bbc7955d8744b4c388

data/CHANGELOG.md

@@ -0,0 +1,12 @@
+## [0.2.0] - 2023-07-05
+
+### Improved
+  * Performace and memory usage
+
+### Changed
+  * The way to specify different method to create object (default `new`)
+  * `factory.subclass` is a method now, not a "value object"
+
+## [0.1.0] - 2023-05-18
+
+- Initial release

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    toritori (0.1.0)
+    toritori (0.2.1)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -66,10 +66,7 @@ The library defaults is to use `new` method for instantiation and bypass paramet
 class MyAbstractFactory
   include Toritori
 
-  factory :file, produces: File do |file_name|
-    # Every method is called on File
-    open(file_name, 'r')
-  end
+  factory :file, produces: File, creation_method: :open
 end
 
 MyAbstractFactory.file_factory.create('/dev/null') # => #<File @path='/dev/null'>
@@ -112,11 +109,6 @@ class ModernFactory < MyAbstractFactory
 
     attr_reader :wifi
   end
-
-  # Notify factory about new way to create objects
-  chair_factory.subclass.init do |width, wifi:|
-    new(width, wifi)
-  end
 end
 
 modern_chair = ModernFactory.chair_factory.create(2500, wifi: false)
@@ -127,12 +119,16 @@ The subclass (`ModernFactory`) will gen a copy of `factories` so you can customi
 Sometimes when subclass definition is big it is better to put it into a separate file. To make the library to use that sub-class:
 ```ruby
 class ModernTable < MyAbstractFactory.table_factory.base_class
-  # ... omitied ...
-end
+  # ... omitted ...
+  end
 
 class ModernFactory < MyAbstractFactory
   # Update initialize method
-  table_factory.subclass.base_class ModernTable
+  table_factory.subclass(produces: ModernTable, creation_method: :produce) do
+    def self.produce(...)
+      new(...)
+    end
+  end
 
   table_factory.create # => #<ModernTable>
 end

data/lib/toritori/factory.rb

@@ -3,37 +3,40 @@
 module Toritori
   # Generates module that adds support for objects creation
   class Factory
-    attr_reader :name
-
-    def cached_instantiator(subclass)
-      id = [subclass.base_class.object_id, subclass.init.object_id].join('_')
-      @cache ||= ::Hash.new do |h, key|
-        h[key] = Instantiator.new(subclass)
-      end
-      @cache[id]
-    end
+    attr_reader :base_class, :creation_method
 
     def copy
-      self.class.new(name, base_class: base_class, &subclass.init)
+      self.class.new(@name, base_class: @base_class, creation_method: @creation_method)
     end
 
-    def initialize(name, base_class: nil, &block)
+    def initialize(name, base_class: nil, creation_method: :new)
       @name = name
-      @subclass = Subclass.new(base_class, block)
+      @base_class = base_class
+      @creation_method = creation_method
     end
 
-    def subclass(&block)
-      return @subclass unless block
-
-      @subclass = Subclass.new(Class.new(base_class, &block), @subclass.init)
+    def subclass(produces: nil, creation_method: @creation_method, &block)
+      @base_class = check_base_class(produces) || @base_class
+      @base_class = Class.new(@base_class, &block) if block
+      @creation_method = creation_method
     end
 
     def create(*args, **kwargs, &block)
-      cached_instantiator(@subclass).__create__(*args, **kwargs, &block)
+      return @base_class.new(*args, **kwargs, &block) if @creation_method == :new
+
+      @base_class.public_send(@creation_method, *args, **kwargs, &block)
     end
 
-    def base_class
-      @subclass.base_class
+    private
+
+    def check_base_class(subclass_const = nil)
+      return unless subclass_const
+
+      ::Kernel.raise NotAClassError unless subclass_const.is_a?(::Class)
+
+      ::Kernel.raise(SubclassError, "must be a subclass of #{@base_class.inspect}") unless subclass_const <= @base_class
+
+      subclass_const
     end
   end
 end

data/lib/toritori/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Toritori
-  VERSION = '0.1.0'
+  VERSION = '0.2.1'
 end

data/lib/toritori.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'toritori/factory/instantiator'
-require 'toritori/factory/subclass'
 require 'toritori/factory'
 require 'toritori/version'
 
@@ -21,8 +19,8 @@ module Toritori
       @factories = other
     end
 
-    def factory(name, produces: Class.new, &block)
-      factories[name] = Toritori::Factory.new(name, base_class: produces, &block)
+    def factory(name, produces: Class.new, creation_method: :new, &block)
+      factories[name] = Toritori::Factory.new(name, base_class: produces, creation_method: creation_method, &block)
       define_singleton_method(:"#{name}_factory") { factories[name] }
     end
 
@@ -30,10 +28,10 @@ module Toritori
       super
       subclass.factories = factories.transform_values(&:copy)
     end
-  end
 
-  def self.default_init
-    @default_init ||= ->(*args, **kwargs, &block) { new(*args, **kwargs, &block) }
+    def create(name, *args, **kwargs, &block)
+      factories[name].create(*args, **kwargs, &block)
+    end
   end
 
   def self.included(receiver)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: toritori
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Andrii Baran
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-06-17 00:00:00.000000000 Z
+date: 2023-12-31 00:00:00.000000000 Z
 dependencies: []
 description: Create factories with DSL
 email:
@@ -32,8 +32,6 @@ files:
 - bin/setup
 - lib/toritori.rb
 - lib/toritori/factory.rb
-- lib/toritori/factory/instantiator.rb
-- lib/toritori/factory/subclass.rb
 - lib/toritori/version.rb
 - toritori.gemspec
 homepage: https://github.com/andriy-baran/toritori

data/lib/toritori/factory/instantiator.rb

@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-module Toritori
-  class Factory
-    # Utility class that evaluates initalization procs
-    class Instantiator < BasicObject
-      def initialize(subclass)
-        @subclass = subclass
-        @type = subclass.base_class
-        define_singleton_method(:__create__, &subclass.init)
-      end
-
-      def method_missing(method, *args, **kwargs, &block)
-        return super unless @type.respond_to?(method)
-
-        @type.public_send(method, *args, **kwargs, &block)
-      end
-
-      def respond_to_missing?(method, include_private = false)
-        @type.respond_to?(method, include_private) || super
-      end
-    end
-  end
-end

data/lib/toritori/factory/subclass.rb

@@ -1,30 +0,0 @@
-# frozen_string_literal: true
-
-module Toritori
-  class Factory
-    # Utility class that stores initalization procs
-    class Subclass < BasicObject
-      def initialize(base_class, init)
-        @init = init || ::Toritori.default_init
-        @base_class = base_class
-      end
-
-      def init(&block)
-        return @init unless block
-
-        @init = block
-      end
-
-      def base_class(subclass_const = nil)
-        return @base_class unless subclass_const
-
-        ::Kernel.raise NotAClassError unless subclass_const.is_a?(::Class)
-        unless subclass_const <= @base_class
-          ::Kernel.raise(SubclassError, "must be a subclass of #{@base_class.inspect}")
-        end
-
-        @base_class = subclass_const
-      end
-    end
-  end
-end