resol 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 33dbd02433c7393f8d8f266c695d200183c89353a8b7a8c88ead39fe440e6adf
-  data.tar.gz: aba889493d6a145d47f34a9aebd85a86802b6e132383fbaf59a1e53e6c814609
+  metadata.gz: 0dc5047622a240e207abad9020c3835060ae039eb93fa5f3741896d57871f681
+  data.tar.gz: e608a7e82d8c8d54169d305f7b1dbc01a7e1f6088877a05815d7b95979df4da8
 SHA512:
-  metadata.gz: 34cc31c049d23bceb945518162b725fc919bd3aae6746d58a90038fe6d678d9ab5c8b4060d6e39a3ae248974973768c97f4ffe5abdcde49bad922081dc6dbf2f
-  data.tar.gz: aa8c2b3c450dc5b23314a53ed3c65fd662ce3e880b15ca6ab271b5f99a0e05229659c43fd6793ae47b0c7a99f53bcec2541ea025897075cc60ddedda970c1857
+  metadata.gz: 9cdd9fe171f117b346c4ebc787451a9def9fc28fbc23f8023852bb2388eb030e3b898dc883864eb0c4b180683c8f4058c74ee4661e856f0d9ce8e55a33cc46e4
+  data.tar.gz: 143cd088406f35993f522d3e2549741277eb28fee2b9f99248b86ba9dbd5302b3eee3ec4db9cefbefc8ad8992af64348272e7e09bb068c58b0407df365ce2ce8

data/Gemfile.lock

@@ -1,14 +1,13 @@
 PATH
   remote: .
   specs:
-    resol (0.4.1)
+    resol (0.4.2)
       smart_initializer (~> 0.5)
-      uber (~> 0.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.3.1)
+    activesupport (6.1.3.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -24,18 +23,18 @@ GEM
       umbrellio-sequel-plugins (~> 0.4)
     coderay (1.1.3)
     colorize (0.8.1)
-    concurrent-ruby (1.1.8)
+    concurrent-ruby (1.1.9)
     diff-lcs (1.4.4)
-    docile (1.3.5)
+    docile (1.4.0)
     dry-inflector (0.2.0)
     i18n (1.8.10)
       concurrent-ruby (~> 1.0)
     method_source (1.0.0)
     minitest (5.14.4)
     parallel (1.20.1)
-    parser (3.0.1.0)
+    parser (3.0.1.1)
       ast (~> 2.4.1)
-    pry (0.14.0)
+    pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
     qonfig (0.25.0)
@@ -66,9 +65,9 @@ GEM
       rubocop-ast (>= 1.2.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.4.1)
-      parser (>= 2.7.1.5)
-    rubocop-config-umbrellio (1.11.0.40)
+    rubocop-ast (1.7.0)
+      parser (>= 3.0.1.1)
+    rubocop-config-umbrellio (1.11.0.51)
       rubocop (= 1.11.0)
       rubocop-performance (= 1.10.0)
       rubocop-rails (= 2.9.1)
@@ -90,14 +89,14 @@ GEM
     rubocop-sequel (0.2.0)
       rubocop (~> 1.0)
     ruby-progressbar (1.11.0)
-    sequel (5.43.0)
+    sequel (5.45.0)
     simplecov (0.21.2)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
     simplecov-lcov (0.8.0)
-    simplecov_json_formatter (0.1.2)
+    simplecov_json_formatter (0.1.3)
     smart_engine (0.11.0)
     smart_initializer (0.5.0)
       qonfig (~> 0.24)
@@ -109,10 +108,9 @@ GEM
     thor (1.1.0)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
-    uber (0.1.0)
-    umbrellio-sequel-plugins (0.4.0.164)
+    umbrellio-sequel-plugins (0.5.1.27)
       sequel
-      symbiont-ruby (>= 0.6)
+      symbiont-ruby
     unicode-display_width (2.0.0)
     zeitwerk (2.4.2)
 

data/lib/resol.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "uber/builder"
 require "smart_core/initializer"
 
 require_relative "resol/version"

data/lib/resol/builder.rb

@@ -1,18 +1,42 @@
 # frozen_string_literal: true
 
 module Resol
+  # Most of the code here is borrowed from Uber::Builder code
+  # See https://github.com/apotonick/uber/blob/master/lib/uber/builder.rb
   module Builder
     def self.included(base)
-      base.include(Uber::Builder)
       base.extend(ClassMethods)
     end
 
+    class Builders < Array
+      def call(initial_klass, *args, **kwargs)
+        each do |block|
+          klass = block.call(initial_klass, *args, **kwargs) and return klass
+        end
+
+        initial_klass
+      end
+
+      def <<(proc)
+        wrapped = -> (ctx, *args, **kwargs) { ctx.instance_exec(*args, **kwargs, &proc) }
+        super(wrapped)
+      end
+    end
+
     module ClassMethods
-      def build_klass(...)
+      def builders
+        @builders ||= Builders.new
+      end
+
+      def builds(proc = nil, &block)
+        builders << (proc || block)
+      end
+
+      def build_klass(*args, **kwargs)
         klass = self
 
         loop do
-          new_klass = klass.build!(klass, ...)
+          new_klass = klass.builders.call(klass, *args, **kwargs)
           break if new_klass == klass
 
           klass = new_klass

data/lib/resol/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Resol
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: resol
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Aleksei Bespalov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-18 00:00:00.000000000 Z
+date: 2021-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: smart_initializer
@@ -24,20 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
-- !ruby/object:Gem::Dependency
-  name: uber
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: bundler-audit
   requirement: !ruby/object:Gem::Requirement