resol 0.2.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ace6271ca99729b99ebf4828dd8915078834d010d883ee14e71f98ac28534602
-  data.tar.gz: c3c864c2622e681e0dba5bae64020083a7754604ed0f67623779cc73fc324a9a
+  metadata.gz: 3e85fb79be6315df1a0073d5ee5b5c78dd18c2bc4b7f208c4bd72754f923ff13
+  data.tar.gz: ee06e3e8d41e9800ddb12a9ba0392ab3d7e171ea66332f702a9c46126c6042c0
 SHA512:
-  metadata.gz: dcbbc7fc8aed320aae8dbc8134ba1bf04b9226bb0555d49889777ba72f113b215a31986168a6248ab1d3001619ac3ba0f5c82f63aaed8db143f7f9f4aced4930
-  data.tar.gz: 01ff693499b76bad144bdd215e1709db905b0ceedb6d805ebc4796538dcc96c0e1213623e0dec0b337da649d4b409a703a2dde01d2df5b6c8a877d402dfd0968
+  metadata.gz: fef4615bf36c1bde74815e9e5db5e3c5ff3ae7bada67142207042096c150bba680227755568298893f1024d5c8aaf5a6e14fc3e164a4f07b9d0176d70a4271d2
+  data.tar.gz: deeb6d29fdd34f3116df29f143134f44efd7d8f112ae07b9e564cf62e830b97171e9abae8edd03541b9f8e3aac6f1e43850d15c2d95d8d37374fbb5324bc1914

data/Gemfile.lock

@@ -1,14 +1,13 @@
 PATH
   remote: .
   specs:
-    resol (0.2.1)
+    resol (0.5.0)
       smart_initializer (~> 0.5)
-      uber (~> 0.1)
 
 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.19

data/README.md

@@ -63,6 +63,34 @@ All incoming params and options can be defined using a [smart_initializer](https
 - `success!(value)` – finish with a success value
 - `fail!(code, data = nil)` – fail with any error code and optional data
 
+#### Define callbacks
+
+You can define callbacks to be executed before calling the `#call` method.
+
+```ruby
+class FindUser < Resol::Service
+  param :id
+
+  before_call :set_user
+
+  def call
+    if user
+      success!(user)
+    else
+      fail!(:not_found)
+    end
+  end
+
+  private
+
+  attr_accessor :user
+
+  def set_user
+    self.user = User.find(id)
+  end
+end
+```
+
 ### Result objects
 
 Methods:
@@ -71,6 +99,8 @@ 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.
 
 
 ### Configuration

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

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Resol
+  module Callbacks
+    def self.included(base)
+      base.extend(ClassMethods)
+      base.instance_variable_set(:@__callback_methods__, [])
+    end
+
+    module ClassMethods
+      def inherited(subclass)
+        super
+        subclass.instance_variable_set(:@__callback_methods__, @__callback_methods__.dup)
+      end
+
+      def before_call(method_name)
+        @__callback_methods__ << method_name
+      end
+
+      private
+
+      def __run_callbacks__(instance)
+        @__callback_methods__.each { |method_name| instance.__send__(method_name) }
+      end
+    end
+  end
+end

data/lib/resol/result.rb

@@ -10,6 +10,14 @@ module Resol
     # @!method value!
 
     def initialize(*); end
+
+    def or
+      yield(@value) if failure?
+    end
+
+    def either(success_proc, failure_proc)
+      success? ? success_proc.call(@value) : failure_proc.call(@value)
+    end
   end
 
   class Success < Result
@@ -62,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

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative "builder"
+require_relative "callbacks"
 require_relative "result"
 
 module Resol
@@ -41,6 +42,7 @@ module Resol
 
     include SmartCore::Initializer
     include Resol::Builder
+    include Resol::Callbacks
 
     class << self
       def inherited(klass)
@@ -49,8 +51,9 @@ module Resol
         super
       end
 
-      def call(*args, &block)
-        command = build(*args)
+      def call(*args, **kwargs, &block)
+        command = build(*args, **kwargs)
+        __run_callbacks__(command)
         command.call(&block)
 
         error_message = "No success! or fail! called in the #call method in #{command.class}"
@@ -61,8 +64,8 @@ module Resol
         Resol::Failure(e)
       end
 
-      def call!(*args)
-        call(*args).value_or { |error| raise error }
+      def call!(...)
+        call(...).value_or { |error| raise error }
       end
     end
 

data/lib/resol/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: resol
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Aleksei Bespalov
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-19 00:00:00.000000000 Z
+date: 2021-06-28 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
@@ -171,6 +157,7 @@ files:
 - bin/setup
 - lib/resol.rb
 - lib/resol/builder.rb
+- lib/resol/callbacks.rb
 - lib/resol/result.rb
 - lib/resol/service.rb
 - lib/resol/version.rb
@@ -178,7 +165,7 @@ homepage: https://github.com/umbrellio/resol
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -193,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: []