nina 0.1.1 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 59b40ebfbf0d151bfa494c0656ee33725b11e3ce6bb3934f20ee84d62cdec19c
-  data.tar.gz: a821c8aa025985bbfe3036e4a091cf29c4007939e32f3ba183379c0f9902bf59
+  metadata.gz: 2fa283d983d2df265fc4d74813c9abefb8f351c2582245d359a497514f4a61a5
+  data.tar.gz: 0e6ee2d867415efdec03f53d35be33a99ad202b4e2aa9f76ab9683b9657af999
 SHA512:
-  metadata.gz: 2441cf19ef6c542fc567384f475f6c21956de6a89dd1dd100f3b993c92e463034527235a3a599088c759c7f32de3ece32d38822a4bb45afbb87087080d81a865
-  data.tar.gz: c5b7297094aab27bac3bae21f438360ee63b2314c875179c21bdede94ba7b0fece93633706d46e34c040a9346b5efb64577412ea7d90dec4a33e4777f46bbdc5
+  metadata.gz: 822d7360687494fefea19be97898eefa121c3aff71ba579d1030730b9a3b97e5409d6fe53990f43f2b175e132ff78a7184c79956e2545647aeaccd1c0a8c8c2a
+  data.tar.gz: fc42924b259b4c68ceca3e14b951ae45aadd61214b8ac7944294a283d183cd5bfedc6b4248287b55364e175ef9bfcb7fbfaad8e5c564a33fcbbc0acd9b851aaf

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 ## [Unreleased]
 
+## [0.1.2] - 2023-07-12
+
+### Improved
+  * Builder#with_callbacks will copy callbacks from previous calls.
+
 ## [0.1.1] - 2023-07-05
 
 ### Added

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    nina (0.1.1)
-      toritori (= 0.1.0)
+    nina (0.1.4)
+      toritori (= 0.2.1)
 
 GEM
   remote: https://rubygems.org/
@@ -58,7 +58,7 @@ GEM
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
-    toritori (0.1.0)
+    toritori (0.2.1)
     unicode-display_width (2.4.2)
 
 PLATFORMS

data/README.md

@@ -111,6 +111,18 @@ instance.query.b # => 2
 instance.c # => nil
 ```
 
+We are copying callbacks from builder if had some defined
+```ruby
+builder_with_callbacks = builder.with_callbacks do |c|
+  c.params { _1.a = 1 }
+end
+builder_with_callbacks_with_callbacks = builder_with_callbacks.with_callbacks do |c|
+  c.params { _1.a += 1 }
+end
+instance = builder_with_callbacks.wrap
+instance.a # => 2
+```
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/nina/assembler.rb

@@ -3,27 +3,6 @@
 module Nina
   # Generates module that adds support for objects creation
   class Assembler
-    # Adds ability to delegeate methods via method_missing
-    module MethodMissingDelegation
-      def method_missing(name, *attrs, &block)
-        return super unless methods.detect { |m| m == :__predecessor }
-
-        public_send(__predecessor).public_send(name, *attrs, &block)
-      end
-
-      def respond_to_missing?(method_name, _include_private = false)
-        return super unless methods.detect { |m| m == :__predecessor }
-
-        public_send(__predecessor).respond_to?(method_name)
-      end
-    end
-
-    def self.def_accessor(accessor, on:, to:, delegate: false)
-      on.define_singleton_method(:__predecessor) { accessor }
-      on.define_singleton_method(accessor) { to }
-      on.extend(MethodMissingDelegation) if delegate
-    end
-
     def initialize(abstract_factory)
       @abstract_factory = abstract_factory
     end
@@ -31,8 +10,8 @@ module Nina
     def inject(build_order, initialization = {}, callbacks: nil, delegate: false)
       build_order.each.with_index(-1).inject(nil) do |prev, (name, idx)|
         object = create_object(name, initialization)
-        self.class.def_accessor(build_order[idx], on: object, to: prev, delegate: delegate) if prev
-        callbacks.to_h.fetch(name, []).each { |c| c.call(object) } if callbacks
+        Nina.def_accessor(build_order[idx], on: object, to: prev, delegate: delegate) if prev
+        callbacks[name].each { |c| c.call(object) } if callbacks&.key?(name)
         object
       end
     end
@@ -40,10 +19,10 @@ module Nina
     private
 
     def create_object(name, initialization = {})
-      return @abstract_factory.send("#{name}_factory").create if initialization[name].nil?
+      return @abstract_factory.factories[name].create if initialization[name].nil?
 
       args, kwargs, block = initialization[name]
-      @abstract_factory.send("#{name}_factory").create(*args, **kwargs, &block)
+      @abstract_factory.factories[name].create(*args, **kwargs, &block)
     end
   end
 end

data/lib/nina/builder/callbacks.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Nina
+  class Builder
+    # Utility to get user defined callbacks
+    class Callbacks < Initialization
+      def copy
+        Callbacks.new(@allow_list, to_h.dup)
+      end
+
+      def method_missing(method, *args, **kwargs, &block)
+        return super unless @allow_list.include?(method)
+
+        @atts[method] unless block
+        @atts[method] ||= []
+        @atts[method] << block
+      end
+
+      def respond_to_missing?(method, include_private = false)
+        super
+      end
+    end
+  end
+end

data/lib/nina/builder/initialization.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Nina
+  class Builder
+    # A way to call methods from initalization proc on base_class
+    class Initialization < BasicObject
+      attr_reader :allow_list
+
+      def initialize(allow_list, atts = {})
+        @allow_list = allow_list
+        @atts = atts
+      end
+
+      def method_missing(method, *args, **kwargs, &block)
+        return super unless @allow_list.include?(method)
+
+        @atts[method] = [args, kwargs, block]
+      end
+
+      def respond_to_missing?(method, include_private = false)
+        @allow_list.include?(method) || super
+      end
+
+      def to_h
+        @atts
+      end
+    end
+  end
+end

data/lib/nina/builder.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require 'nina/builder/initialization'
+require 'nina/builder/callbacks'
+
 # This should be a kind of factory that creates complex objects
 # from simple ones. It should use torirori to create objects.
 # It also enriches objects with some methods that make them more
@@ -7,41 +10,7 @@
 module Nina
   # Generates module that adds support for objects creation
   class Builder
-    attr_reader :name, :abstract_factory, :def_block
-    attr_accessor :callbacks
-
-    # A way to call methods from initalization proc on base_class
-    class Initialization < BasicObject
-      def initialize(list)
-        @list = list
-        @atts = {}
-      end
-
-      def method_missing(method, *args, **kwargs, &block)
-        return super unless @list.include?(method)
-
-        @atts[method] = [args, kwargs, block]
-      end
-
-      def respond_to_missing?(method, include_private = false)
-        @list.include?(method) || super
-      end
-
-      def to_h
-        @atts
-      end
-    end
-
-    # Utility to get user defined callbacks
-    class Callbacks < Initialization
-      def method_missing(method, *args, **kwargs, &block)
-        return super unless @list.include?(method)
-
-        @atts[method] unless block
-        @atts[method] ||= []
-        @atts[method] << block
-      end
-    end
+    attr_reader :name, :abstract_factory, :def_block, :callbacks
 
     # Definaes support methods and variables for concrete builder
     module ClassMethods
@@ -62,23 +31,12 @@ module Nina
         build_order_list << name
         super
         define_singleton_method(name) do |klass = nil, &definition|
-          factories[__method__].subclass.base_class(klass) if klass
-          factories[__method__].subclass(&definition) if definition
+          factories[__method__].subclass(produces: klass, &definition)
         end
       end
     end
 
-    def copy
-      self.class.new(name, abstract_factory: abstract_factory)
-    end
-
-    def with_callbacks(&block)
-      yield c = Callbacks.new(abstract_factory.factories.keys) if block
-
-      self.class.new(name, abstract_factory: abstract_factory).tap { _1.callbacks = c }
-    end
-
-    def initialize(name, abstract_factory: nil, &def_block)
+    def initialize(name, abstract_factory: nil, callbacks: nil, &def_block)
       @name = name
       @def_block = def_block
       @abstract_factory = abstract_factory.include(Toritori).extend(ClassMethods)
@@ -86,6 +44,18 @@ module Nina
       @abstract_factory.build_order_list.freeze
       @initialization = Initialization.new(@abstract_factory.factories.keys)
       @assembler = Assembler.new(@abstract_factory)
+      @callbacks = callbacks
+    end
+
+    def copy
+      self.class.new(name, abstract_factory: abstract_factory)
+    end
+
+    def with_callbacks(&block)
+      c = callbacks&.copy || Callbacks.new(abstract_factory.factories.keys)
+      yield c if block
+
+      self.class.new(name, abstract_factory: abstract_factory, callbacks: c)
     end
 
     def wrap(delegate: false, &block)
@@ -94,7 +64,7 @@ module Nina
       @assembler.inject(
         @abstract_factory.build_order_list,
         @initialization.to_h,
-        callbacks: callbacks,
+        callbacks: callbacks.to_h,
         delegate: delegate
       )
     end
@@ -105,7 +75,7 @@ module Nina
       @assembler.inject(
         @abstract_factory.build_order_list.reverse,
         @initialization.to_h,
-        callbacks: callbacks,
+        callbacks: callbacks.to_h,
         delegate: delegate
       )
     end

data/lib/nina/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Nina
-  VERSION = '0.1.1'
+  VERSION = '0.1.4'
 end

data/lib/nina.rb

@@ -31,7 +31,47 @@ module Nina
     end
   end
 
+  # Adds ability to delegeate methods via method_missing
+  module MethodMissingDelegation
+    def method_missing(name, *attrs, **kwargs, &block)
+      if (prev = predecessors.detect { |o| o.public_methods.include?(name) })
+        prev.public_send(name, *attrs, **kwargs, &block)
+      else
+        super
+      end
+    end
+
+    def respond_to_missing?(method_name, _include_private = false)
+      public_methods.detect { |m| m == :predecessor_name } || super
+    end
+
+    def predecessors
+      @predecessors ||= begin
+        obj = self
+        [].tap do |list|
+          list << obj = obj.public_send(obj.predecessor_name) while obj.methods.detect { |m| m == :predecessor_name }
+        end
+      end
+    end
+  end
+
   def self.included(receiver)
     receiver.extend ClassMethods
   end
+
+  def self.def_accessor(accessor, on:, to:, delegate: false)
+    on.define_singleton_method(accessor) { to }
+    return unless delegate
+
+    on.define_singleton_method(:predecessor_name) { accessor }
+    on.extend(MethodMissingDelegation)
+  end
+
+  def self.linked_list(build_config, delegate: false)
+    build_order = build_config.keys
+    build_config.each.with_index(-1).inject(nil) do |prev, ((_, object), idx)|
+      Nina.def_accessor(build_order[idx], on: object, to: prev, delegate: delegate) if prev
+      object
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nina
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.4
 platform: ruby
 authors:
 - Andrii Baran
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-07-05 00:00:00.000000000 Z
+date: 2024-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: toritori
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.2.1
 description: Reduce biolerplate code when you need to create complex OOD composition
 email:
 - andriy.baran.v@gmail.com
@@ -43,6 +43,8 @@ files:
 - lib/nina.rb
 - lib/nina/assembler.rb
 - lib/nina/builder.rb
+- lib/nina/builder/callbacks.rb
+- lib/nina/builder/initialization.rb
 - lib/nina/version.rb
 homepage: https://github.com/andriy-baran/nina
 licenses: