resol 0.4.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd11fdb0b0b5ddbc8db9593a530f0e19fe728f1ac58cc3dbb102868a52573f24
-  data.tar.gz: c628da55ad7e1847881c979b782dce7d973b23ace0f84ca20e1f528904c2fba9
+  metadata.gz: 88557b0033bec108dc7f19bf2d6bd4bd7c7edbd79f6cd4f23257c9bc5b23856d
+  data.tar.gz: 3d25ee143170fd03b32421a560e7f6f3d353d2ced93f53748c9931ae1a10fcb8
 SHA512:
-  metadata.gz: 6f4f0eff29c871470ac99506bb77738fe9bb7d6bf485b01d010973462659766e397c96915e7807aa15ffeb480e46738106ece879e8fdb4e5f76ad6170bceced5
-  data.tar.gz: a8d952cd3325b38b6b63f4066308c402b811fcdd6b2edd0e9d2d336ea15068bde3eb575add4d28cccd496b1f2978a7e1c4b96511851a4b387d7ced8f3b895551
+  metadata.gz: e7424a06501000c75fe95e5f0b4397235594d8d0bbb2b16224ea0a5e456831e0c0b7e70c7a37d04a6bc43e1521e2a1585a711894ed11b6bf38a6f74a6e5583a0
+  data.tar.gz: 6c02d8eb6bb3d87f63ea4481f6d95b08a6c33e186ae501756443eee235eef2d1f358c677e99cdddcbf4bf431eed592fde9720087597905777cbcffb56514b010

data/Gemfile.lock

@@ -1,14 +1,13 @@
 PATH
   remote: .
   specs:
-    resol (0.4.0)
-      smart_initializer (~> 0.5)
-      uber (~> 0.1)
+    resol (0.6.0)
+      smart_initializer (~> 0.7)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.3.1)
+    activesupport (6.1.4)
       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)
@@ -57,19 +56,19 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-support (3.10.2)
-    rubocop (1.11.0)
+    rubocop (1.17.0)
       parallel (~> 1.10)
       parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 1.2.0, < 2.0)
+      rubocop-ast (>= 1.7.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 (= 1.11.0)
+    rubocop-ast (1.7.0)
+      parser (>= 3.0.1.1)
+    rubocop-config-umbrellio (1.17.0.53)
+      rubocop (= 1.17.0)
       rubocop-performance (= 1.10.0)
       rubocop-rails (= 2.9.1)
       rubocop-rake (= 0.5.1)
@@ -90,34 +89,34 @@ 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)
+    smart_initializer (0.7.0)
       qonfig (~> 0.24)
       smart_engine (~> 0.11)
       smart_types (~> 0.4)
     smart_types (0.4.0)
       smart_engine (~> 0.11)
-    symbiont-ruby (0.6.0)
+    symbiont-ruby (0.7.0)
     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)
 
 PLATFORMS
   x86_64-darwin-19
+  x86_64-darwin-20
   x86_64-linux
 
 DEPENDENCIES
@@ -132,4 +131,4 @@ DEPENDENCIES
   simplecov-lcov
 
 BUNDLED WITH
-   2.2.15
+   2.2.21

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(*args)
+      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, *args)
+          new_klass = klass.builders.call(klass, *args, **kwargs)
           break if new_klass == klass
 
           klass = new_klass
@@ -21,8 +45,8 @@ module Resol
         klass
       end
 
-      def build(*args)
-        build_klass(*args).new(*args)
+      def build(...)
+        build_klass(...).new(...)
       end
     end
   end

data/lib/resol/callbacks.rb

@@ -20,7 +20,7 @@ module Resol
       private
 
       def __run_callbacks__(instance)
-        @__callback_methods__.each { |method_name| instance.send(method_name) }
+        @__callback_methods__.each { |method_name| instance.__send__(method_name) }
       end
     end
   end

data/lib/resol/result.rb

@@ -70,11 +70,11 @@ module Resol
     end
   end
 
-  def self.Success(*args)
-    Success.new(*args)
+  def self.Success(...)
+    Success.new(...)
   end
 
-  def self.Failure(*args)
-    Failure.new(*args)
+  def self.Failure(...)
+    Failure.new(...)
   end
 end

data/lib/resol/service.rb

@@ -8,64 +8,53 @@ module Resol
   class Service
     class InvalidCommandImplementation < StandardError; end
 
-    class Interruption < StandardError
-      attr_accessor :data
+    class Failure < StandardError
+      attr_accessor :data, :code
 
-      def initialize(data)
+      def initialize(code, data)
+        self.code = code
         self.data = data
-        super
+        super(data)
       end
 
       def inspect
         "#{self.class.name}: #{message}"
       end
 
-      def message
-        data.inspect
-      end
-    end
-
-    class Failure < Interruption
-      attr_accessor :code
-
-      def initialize(code, data)
-        self.code = code
-        super(data)
-      end
-
       def message
         data ? "#{code.inspect} => #{data.inspect}" : code.inspect
       end
     end
 
-    class Success < Interruption; end
-
     include SmartCore::Initializer
     include Resol::Builder
     include Resol::Callbacks
 
+    Result = Struct.new(:data)
+
     class << self
       def inherited(klass)
         klass.const_set(:Failure, Class.new(klass::Failure))
-        klass.const_set(:Success, Class.new(klass::Success))
         super
       end
 
-      def call(*args, &block)
-        command = build(*args)
-        __run_callbacks__(command)
-        command.call(&block)
+      def call(*args, **kwargs, &block)
+        command = build(*args, **kwargs)
+        result = catch(command) do
+          __run_callbacks__(command)
+          command.call(&block)
+          nil
+        end
+        return Resol::Success(result.data) unless result.nil?
 
         error_message = "No success! or fail! called in the #call method in #{command.class}"
         raise InvalidCommandImplementation, error_message
-      rescue self::Success => e
-        Resol::Success(e.data)
       rescue self::Failure => e
         Resol::Failure(e)
       end
 
-      def call!(*args)
-        call(*args).value_or { |error| raise error }
+      def call!(...)
+        call(...).value_or { |error| raise error }
       end
     end
 
@@ -78,7 +67,7 @@ module Resol
     end
 
     def success!(data = nil)
-      raise self.class::Success.new(data)
+      throw(self, Result.new(data))
     end
   end
 end

data/lib/resol/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: resol
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Aleksei Bespalov
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-21 00:00:00.000000000 Z
+date: 2021-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: smart_initializer
@@ -16,28 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !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'
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: bundler-audit
   requirement: !ruby/object:Gem::Requirement
@@ -179,7 +165,7 @@ homepage: https://github.com/umbrellio/resol
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -194,8 +180,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: Gem for creating (any) object patterns
 test_files: []