resol 0.5.1 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 010d5a745816d85fe7754f0f8cf9ab9bc73803e5daf75b7a07e517b4d64c9432
-  data.tar.gz: f939bbb9522f095651ef7ff15e050babb786eb4bc1d4d34d51644c6470ae8fb3
+  metadata.gz: 5fcf57857ff7296ff6a03d749bf23b753bb7c954f35c646337bafdca35d0b421
+  data.tar.gz: 70c0d5f63ec8bd3ee7b75b9a4857138d86ba77afa3186af778f3bae357c7922c
 SHA512:
-  metadata.gz: 5342c5148df6bf09ed709152d3962efe079dc7ae3fb88680e930a643bcdb24a1603ce4eb6ffb43780f0b65cfe9221ec2eadcf8269d28f42bb3d807066b0a2053
-  data.tar.gz: f45af14da0c224877ccfa8f1f156d51f42c3f2e3a2e92f8aa336842a66e0cdb2c1c5b7df93448023d6df20891a8d7439b92d9dfd616d03356bf02dedf3d2923b
+  metadata.gz: f1c39188fbbfc3280db5989ad7de4f706f5a2064ebd4a55de1a9b1be16f300ffc11d0e7b40907a7273f5a26d0200af4176a9683979e1cafee1d9c47ef92a0c4b
+  data.tar.gz: 9a7fd22c0ca24a6d8bb1470c95a840c2ab8679009eed7fd0b3f32404735e498553432d09c8f009de160b26eeec33f23f6ec8e9b46dad7be074265386f2b70838

data/Gemfile.lock

@@ -1,20 +1,20 @@
 PATH
   remote: .
   specs:
-    resol (0.5.1)
+    resol (0.7.1)
       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,22 +26,22 @@ GEM
     concurrent-ruby (1.1.9)
     diff-lcs (1.4.4)
     docile (1.4.0)
-    dry-inflector (0.2.0)
-    i18n (1.8.10)
+    dry-inflector (0.2.1)
+    i18n (1.8.11)
       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.3.1)
       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)
-    regexp_parser (2.1.1)
+    rake (13.0.6)
+    regexp_parser (2.2.0)
     rexml (3.2.5)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
@@ -55,7 +55,7 @@ GEM
     rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-support (3.10.2)
+    rspec-support (3.10.3)
     rubocop (1.17.0)
       parallel (~> 1.10)
       parser (>= 3.0.0.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.14.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.51.0)
     simplecov (0.21.2)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
@@ -98,11 +98,11 @@ GEM
     simplecov-lcov (0.8.0)
     simplecov_json_formatter (0.1.3)
     smart_engine (0.11.0)
-    smart_initializer (0.7.0)
+    smart_initializer (0.8.0)
       qonfig (~> 0.24)
       smart_engine (~> 0.11)
       smart_types (~> 0.4)
-    smart_types (0.4.0)
+    smart_types (0.7.0)
       smart_engine (~> 0.11)
     symbiont-ruby (0.7.0)
     thor (1.1.0)
@@ -111,12 +111,13 @@ GEM
     umbrellio-sequel-plugins (0.5.1.27)
       sequel
       symbiont-ruby
-    unicode-display_width (2.0.0)
-    zeitwerk (2.4.2)
+    unicode-display_width (2.1.0)
+    zeitwerk (2.5.1)
 
 PLATFORMS
   x86_64-darwin-19
   x86_64-darwin-20
+  x86_64-darwin-21
   x86_64-linux
 
 DEPENDENCIES
@@ -131,4 +132,4 @@ DEPENDENCIES
   simplecov-lcov
 
 BUNDLED WITH
-   2.2.19
+   2.2.31

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.1"
+  VERSION = "0.7.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: resol
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.7.1
 platform: ruby
 authors:
 - Aleksei Bespalov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-28 00:00:00.000000000 Z
+date: 2021-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: smart_initializer