resol 0.7.1 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5fcf57857ff7296ff6a03d749bf23b753bb7c954f35c646337bafdca35d0b421
-  data.tar.gz: 70c0d5f63ec8bd3ee7b75b9a4857138d86ba77afa3186af778f3bae357c7922c
+  metadata.gz: 737ecf288d9db1fc0440dda961c9e0a3a9c5072fba6f1f3a4049a67647a782bb
+  data.tar.gz: c50a24b67fb2a5c20c37d9a4204ba6c2293b7d597c0aa46085422ff30fbc0d9e
 SHA512:
-  metadata.gz: f1c39188fbbfc3280db5989ad7de4f706f5a2064ebd4a55de1a9b1be16f300ffc11d0e7b40907a7273f5a26d0200af4176a9683979e1cafee1d9c47ef92a0c4b
-  data.tar.gz: 9a7fd22c0ca24a6d8bb1470c95a840c2ab8679009eed7fd0b3f32404735e498553432d09c8f009de160b26eeec33f23f6ec8e9b46dad7be074265386f2b70838
+  metadata.gz: dec029e7a8b86070c7e3090d7f755415d57e88a572c8d67ef29feec935066cba996cfadd71ef3a93e7e4c502c218952bd00d299fa1473673ee4e6923367c199b
+  data.tar.gz: 78332a4cc2eb93b82bc1f963ae141c9b1176ec11c7fc145dcbe1219493817d465f971fe94cdbd2d6727acc7b1cb4f0c9c546f51ce3bfc0cb1c3a11680567a62b

data/.github/workflows/test.yml

@@ -16,7 +16,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3
+          ruby-version: "3.1"
           bundler-cache: true
       - name: Run Linter
         run: bundle exec ci-helper RubocopLint
@@ -43,7 +43,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [2.7]
+        ruby: ["2.7", "3.0"]
         experimental: [false]
         include:
           - ruby: head

data/Gemfile

@@ -3,3 +3,12 @@
 source "https://rubygems.org"
 
 gemspec
+
+gem "bundler-audit"
+gem "ci-helper"
+gem "pry"
+gem "rake"
+gem "rspec"
+gem "rubocop-config-umbrellio"
+gem "simplecov"
+gem "simplecov-lcov"

data/Gemfile.lock

@@ -1,123 +1,142 @@
 PATH
   remote: .
   specs:
-    resol (0.7.1)
+    resol (0.9.0)
       smart_initializer (~> 0.7)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.4.1)
+    activesupport (7.1.2)
+      base64
+      bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
+      mutex_m
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
     ast (2.4.2)
-    bundler-audit (0.9.0.1)
+    base64 (0.2.0)
+    bigdecimal (3.1.4)
+    bundler-audit (0.9.1)
       bundler (>= 1.2.0, < 3)
       thor (~> 1.0)
-    ci-helper (0.4.2)
+    ci-helper (0.5.0)
       colorize (~> 0.8)
       dry-inflector (~> 0.2)
       umbrellio-sequel-plugins (~> 0.4)
     coderay (1.1.3)
     colorize (0.8.1)
-    concurrent-ruby (1.1.9)
-    diff-lcs (1.4.4)
+    concurrent-ruby (1.2.2)
+    connection_pool (2.4.1)
+    diff-lcs (1.5.0)
     docile (1.4.0)
-    dry-inflector (0.2.1)
-    i18n (1.8.11)
+    drb (2.2.0)
+      ruby2_keywords
+    dry-inflector (0.3.0)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
+    json (2.6.3)
     method_source (1.0.0)
-    minitest (5.14.4)
-    parallel (1.21.0)
-    parser (3.0.3.1)
+    minitest (5.20.0)
+    mutex_m (0.2.0)
+    parallel (1.23.0)
+    parser (3.2.2.4)
       ast (~> 2.4.1)
-    pry (0.14.1)
+      racc
+    pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    qonfig (0.26.0)
-    rack (2.2.3)
-    rainbow (3.0.0)
-    rake (13.0.6)
-    regexp_parser (2.2.0)
-    rexml (3.2.5)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
+    qonfig (0.28.0)
+    racc (1.7.3)
+    rack (3.0.8)
+    rainbow (3.1.1)
+    rake (13.1.0)
+    regexp_parser (2.8.2)
+    rexml (3.2.6)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.2)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.6)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.3)
-    rubocop (1.17.0)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.1)
+    rubocop (1.50.2)
+      json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 3.0.0.0)
+      parser (>= 3.2.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.7.0, < 2.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.28.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.14.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)
-      rubocop-rspec (= 2.2.0)
-      rubocop-sequel (= 0.2.0)
-    rubocop-performance (1.10.0)
-      rubocop (>= 0.90.0, < 2.0)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.30.0)
+      parser (>= 3.2.1.0)
+    rubocop-capybara (2.19.0)
+      rubocop (~> 1.41)
+    rubocop-config-umbrellio (1.50.0.85)
+      rubocop (~> 1.50.0)
+      rubocop-performance (~> 1.17.0)
+      rubocop-rails (~> 2.19.0)
+      rubocop-rake (~> 0.6.0)
+      rubocop-rspec (~> 2.20.0)
+      rubocop-sequel (~> 0.3.3)
+    rubocop-performance (1.17.1)
+      rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
-    rubocop-rails (2.9.1)
+    rubocop-rails (2.19.1)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
-      rubocop (>= 0.90.0, < 2.0)
-    rubocop-rake (0.5.1)
-      rubocop
-    rubocop-rspec (2.2.0)
+      rubocop (>= 1.33.0, < 2.0)
+    rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-      rubocop-ast (>= 1.1.0)
-    rubocop-sequel (0.2.0)
+    rubocop-rspec (2.20.0)
+      rubocop (~> 1.33)
+      rubocop-capybara (~> 2.17)
+    rubocop-sequel (0.3.4)
       rubocop (~> 1.0)
-    ruby-progressbar (1.11.0)
-    sequel (5.51.0)
-    simplecov (0.21.2)
+    ruby-progressbar (1.13.0)
+    ruby2_keywords (0.0.5)
+    sequel (5.74.0)
+      bigdecimal
+    simplecov (0.22.0)
       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.3)
-    smart_engine (0.11.0)
-    smart_initializer (0.8.0)
+    simplecov_json_formatter (0.1.4)
+    smart_engine (0.17.0)
+    smart_initializer (0.11.1)
       qonfig (~> 0.24)
-      smart_engine (~> 0.11)
-      smart_types (~> 0.4)
-    smart_types (0.7.0)
+      smart_engine (~> 0.16)
+      smart_types (~> 0.8)
+    smart_types (0.8.0)
       smart_engine (~> 0.11)
     symbiont-ruby (0.7.0)
-    thor (1.1.0)
-    tzinfo (2.0.4)
+    thor (1.3.0)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    umbrellio-sequel-plugins (0.5.1.27)
+    umbrellio-sequel-plugins (0.14.0.189)
       sequel
       symbiont-ruby
-    unicode-display_width (2.1.0)
-    zeitwerk (2.5.1)
+    unicode-display_width (2.5.0)
 
 PLATFORMS
+  arm64-darwin-21
   x86_64-darwin-19
   x86_64-darwin-20
   x86_64-darwin-21
+  x86_64-darwin-22
   x86_64-linux
 
 DEPENDENCIES
@@ -132,4 +151,4 @@ DEPENDENCIES
   simplecov-lcov
 
 BUNDLED WITH
-   2.2.31
+   2.4.10

data/lib/resol/configuration.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+module Resol
+  class Configuration
+    DEFAULT_RETURN_ENGINE = ReturnEngine::Catch
+
+    class << self
+      def configure
+        SmartCore::Initializer::Configuration.configure do |c|
+          self.smartcore_config = c
+          yield self
+          self.smartcore_config = nil
+        end
+      end
+
+      def return_engine
+        @return_engine || DEFAULT_RETURN_ENGINE
+      end
+
+      def return_engine=(engine)
+        @return_engine = engine
+      end
+
+      private
+
+      attr_accessor :smartcore_config
+
+      def method_missing(meth, *args, &block)
+        # rubocop:disable Style/SafeNavigation
+        if smartcore_config && smartcore_config.respond_to?(meth)
+          # rubocop:enable Style/SafeNavigation
+          smartcore_config.__send__(meth, *args, &block)
+        else
+          super(meth, *args, &block)
+        end
+      end
+
+      def respond_to_missing?(meth, include_private)
+        smartcore_config.respond_to?(meth, include_private)
+      end
+    end
+  end
+end

data/lib/resol/return_engine/catch.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Resol
+  module ReturnEngine
+    module Catch
+      extend self
+
+      def wrap_call(service)
+        catch(service) do
+          yield
+          NOT_EXITED
+        end
+      end
+
+      def uncaught_call?(return_obj)
+        return_obj == NOT_EXITED
+      end
+
+      def handle_return(service, data)
+        throw(service, data)
+      end
+    end
+  end
+end

data/lib/resol/return_engine/return.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Resol
+  module ReturnEngine
+    module Return
+      extend self
+
+      def wrap_call(_service)
+        yield
+      end
+
+      def uncaught_call?(return_obj)
+        !return_obj.is_a?(Resol::Service::Result)
+      end
+
+      def handle_return(_service, data)
+        data
+      end
+    end
+  end
+end

data/lib/resol/return_engine.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Resol
+  module ReturnEngine
+    NOT_EXITED = Object.new.freeze
+    DataWrapper = Struct.new(:data)
+  end
+end
+
+require_relative "return_engine/catch"
+require_relative "return_engine/return"

data/lib/resol/service.rb

@@ -7,6 +7,7 @@ require_relative "result"
 module Resol
   class Service
     class InvalidCommandImplementation < StandardError; end
+    class InvalidCommandCall < StandardError; end
 
     class Failure < StandardError
       attr_accessor :data, :code
@@ -39,20 +40,28 @@ module Resol
       end
 
       def call(*args, **kwargs, &block)
-        command = build(*args, **kwargs)
-        result = catch(command) do
-          __run_callbacks__(command)
-          command.call(&block)
-          nil
+        service = build(*args, **kwargs)
+
+        result = return_engine.wrap_call(service) do
+          service.instance_variable_set(:@__performing__, true)
+          __run_callbacks__(service)
+          service.call(&block)
         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
+        if return_engine.uncaught_call?(result)
+          error_message = "No `#success!` or `#fail!` called in `#call` method in #{service.class}."
+          raise InvalidCommandImplementation, error_message
+        else
+          Resol::Success(result.data)
+        end
       rescue self::Failure => e
         Resol::Failure(e)
       end
 
+      def return_engine
+        Resol::Configuration.return_engine
+      end
+
       def call!(...)
         call(...).value_or { |error| raise error }
       end
@@ -62,12 +71,30 @@ module Resol
 
     private
 
+    attr_reader :__performing__
+
     def fail!(code, data = nil)
-      raise self.class::Failure.new(code, data)
+      check_performing do
+        raise self.class::Failure.new(code, data)
+      end
     end
 
     def success!(data = nil)
-      throw(self, Result.new(data))
+      check_performing do
+        self.class.return_engine.handle_return(self, Result.new(data))
+      end
+    end
+
+    def check_performing
+      if __performing__
+        yield
+      else
+        error_message =
+          "It looks like #call instance method was called directly in #{self.class}. " \
+          "You must always use class-level `.call` or `.call!` method."
+
+        raise InvalidCommandCall, error_message
+      end
     end
   end
 end

data/lib/resol/version.rb

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

data/lib/resol.rb

@@ -3,8 +3,9 @@
 require "smart_core/initializer"
 
 require_relative "resol/version"
+require_relative "resol/return_engine"
+require_relative "resol/configuration"
 require_relative "resol/service"
 
 module Resol
-  Configuration = SmartCore::Initializer::Configuration
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: resol
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.9.0
 platform: ruby
 authors:
 - Aleksei Bespalov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-06 00:00:00.000000000 Z
+date: 2023-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: smart_initializer
@@ -24,118 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
-- !ruby/object:Gem::Dependency
-  name: bundler-audit
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: ci-helper
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop-config-umbrellio
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: simplecov-lcov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Gem for creating (any) object patterns
 email:
 - nulldefiner@gmail.com
@@ -158,7 +46,11 @@ files:
 - lib/resol.rb
 - lib/resol/builder.rb
 - lib/resol/callbacks.rb
+- lib/resol/configuration.rb
 - lib/resol/result.rb
+- lib/resol/return_engine.rb
+- lib/resol/return_engine/catch.rb
+- lib/resol/return_engine/return.rb
 - lib/resol/service.rb
 - lib/resol/version.rb
 homepage: https://github.com/umbrellio/resol
@@ -180,7 +72,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.4.21
 signing_key:
 specification_version: 4
 summary: Gem for creating (any) object patterns