resol 0.5.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e85fb79be6315df1a0073d5ee5b5c78dd18c2bc4b7f208c4bd72754f923ff13
-  data.tar.gz: ee06e3e8d41e9800ddb12a9ba0392ab3d7e171ea66332f702a9c46126c6042c0
+  metadata.gz: 77dffd7c902fc23453017169fe4e817b133495404143604a804b37c684223241
+  data.tar.gz: 05a63f798b1635788e913cb156001d8244128567e6c868d6a82a84424c2bb091
 SHA512:
-  metadata.gz: fef4615bf36c1bde74815e9e5db5e3c5ff3ae7bada67142207042096c150bba680227755568298893f1024d5c8aaf5a6e14fc3e164a4f07b9d0176d70a4271d2
-  data.tar.gz: deeb6d29fdd34f3116df29f143134f44efd7d8f112ae07b9e564cf62e830b97171e9abae8edd03541b9f8e3aac6f1e43850d15c2d95d8d37374fbb5324bc1914
+  metadata.gz: a84fdcd1b22fd64fe1c6a5d3025d95de0ca9a10d60a1513ba6b10842638e6c1748abc1ae412d32098a7e3fc8cb53b33a69a21335523ee7d2c753adbc4673eff6
+  data.tar.gz: ad1d2be7635092e0ad39097bf570b31b63fec0841c0b8bcbe7459c893f4c8487cf3eda95eb404b7e26000a3276ea4de828f69696b31033fa4edcc3449dbf0bdc

data/Gemfile.lock

@@ -1,20 +1,20 @@
 PATH
   remote: .
   specs:
-    resol (0.5.0)
-      smart_initializer (~> 0.5)
+    resol (0.7.0)
+      smart_initializer (~> 0.7)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.4)
+    activesupport (6.1.4.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
       zeitwerk (~> 2.3)
     ast (2.4.2)
-    bundler-audit (0.8.0)
+    bundler-audit (0.9.0.1)
       bundler (>= 1.2.0, < 3)
       thor (~> 1.0)
     ci-helper (0.4.2)
@@ -26,21 +26,21 @@ GEM
     concurrent-ruby (1.1.9)
     diff-lcs (1.4.4)
     docile (1.4.0)
-    dry-inflector (0.2.0)
+    dry-inflector (0.2.1)
     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.1)
+    parallel (1.21.0)
+    parser (3.0.2.0)
       ast (~> 2.4.1)
     pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    qonfig (0.25.0)
+    qonfig (0.26.0)
     rack (2.2.3)
     rainbow (3.0.0)
-    rake (13.0.3)
+    rake (13.0.6)
     regexp_parser (2.1.1)
     rexml (3.2.5)
     rspec (3.10.0)
@@ -65,7 +65,7 @@ GEM
       rubocop-ast (>= 1.7.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.7.0)
+    rubocop-ast (1.11.0)
       parser (>= 3.0.1.1)
     rubocop-config-umbrellio (1.17.0.53)
       rubocop (= 1.17.0)
@@ -89,7 +89,7 @@ GEM
     rubocop-sequel (0.2.0)
       rubocop (~> 1.0)
     ruby-progressbar (1.11.0)
-    sequel (5.45.0)
+    sequel (5.48.0)
     simplecov (0.21.2)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
@@ -102,7 +102,7 @@ GEM
       qonfig (~> 0.24)
       smart_engine (~> 0.11)
       smart_types (~> 0.4)
-    smart_types (0.4.0)
+    smart_types (0.6.0)
       smart_engine (~> 0.11)
     symbiont-ruby (0.7.0)
     thor (1.1.0)
@@ -111,7 +111,7 @@ GEM
     umbrellio-sequel-plugins (0.5.1.27)
       sequel
       symbiont-ruby
-    unicode-display_width (2.0.0)
+    unicode-display_width (2.1.0)
     zeitwerk (2.4.2)
 
 PLATFORMS
@@ -131,4 +131,4 @@ DEPENDENCIES
   simplecov-lcov
 
 BUNDLED WITH
-   2.2.19
+   2.2.21

data/README.md

@@ -99,9 +99,16 @@ Methods:
 - `failure?` – returns `true` for failure result and `false` for success result
 - `value!` – unwraps a result object, returns the value for success result, and throws an error for failure result
 - `value_or(other_value, &block)` – returns a value for success result or `other_value` for failure result (either calls `block` in case it given)
-- `or(&block)` - calls block for failure result, for success result does nothing
-- `either(success_proc, failure_proc)` - for success result calls success_proc with result value in args, for failure result calls failure_proc with error in args.
+- `error` – returns `nil` for success result and error object (with code and data) for failure result
+- `or(&block)` – calls block for failure result, for success result does nothing
+- `either(success_proc, failure_proc)` – for success result calls success_proc with result value in args, for failure result calls failure_proc with error in args.
 
+### Error object
+
+In case of failure you can get an error object with error code
+and data from `fail!` arguments. This can be done by method `error` on
+the result object and the returned object will have corresponding
+methods `code` and `data`.
 
 ### Configuration
 

data/lib/resol/result.rb

@@ -41,6 +41,10 @@ module Resol
     def value!
       @value
     end
+
+    def error
+      nil
+    end
   end
 
   class Failure < Result
@@ -68,6 +72,10 @@ module Resol
     def value!
       raise UnwrapError, "Failure result #{@value.inspect}"
     end
+
+    def error
+      @value
+    end
   end
 
   def self.Success(...)

data/lib/resol/service.rb

@@ -8,58 +8,47 @@ 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, **kwargs, &block)
         command = build(*args, **kwargs)
-        __run_callbacks__(command)
-        command.call(&block)
+        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
@@ -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.5.0"
+  VERSION = "0.7.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: resol
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Aleksei Bespalov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-28 00:00:00.000000000 Z
+date: 2021-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: smart_initializer
@@ -16,14 +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'
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: bundler-audit
   requirement: !ruby/object:Gem::Requirement