ucasy 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70419e05c271d22afe46d15e1240acd4aabf448afe0a1a48d777021cdbf34436
-  data.tar.gz: ff6993e059cae6ba5d9b5c308b3bb3655865a2a1470f824beaefbec17e075ad3
+  metadata.gz: 67593caa8d99804e6a530e3407876287c836b2063d4c12bf3bb1e55f3ffb90c7
+  data.tar.gz: 7949ccfcb35f64041dd200650eadde71e3e4c88fa0ab6ca93bb9bb863bce0b5d
 SHA512:
-  metadata.gz: 6cb72b1bf8058f627118163f05d466bc4aecbcf283e4adfbdbbd7f6040f1e8aa96b207c5b65cd9a1752ff4998056d71ffbaeb21df4cbed831614a6dd4698b6f3
-  data.tar.gz: 6d95bbe0e815efa7a45b71de34a026a3735f41d90c3a2a4cf7add330be44abb8385d95435b08ec44de4e9104fa3b0fb9e6fcbd383c7d9e9740c95b97fc89b769
+  metadata.gz: ac7c3e73fa889ef1ea92b7d9a2b02249ad049d79180366079eef7f0513c53836ec5cb6a89a5126382c27d78f26ffdc9648eeb186abb757d61bf606e2c5d35bea
+  data.tar.gz: f0c7713da0f80ed978df0b23e3f8c6ea380ba5fd693ac7cb13473447020df6be0a3f807552445c4225c911d7e4803297d927e801c0bb663539ac34d8ce1cb7a4

data/lib/ucasy/base.rb

@@ -1,10 +1,9 @@
 require_relative "context"
 require_relative "failure"
+require_relative "validators/required_attributes"
 
 module Ucasy
-  class Base
-    include Ucasy::Callable
-
+  class Base < Ucasy::Callable
     class << self
       def call(context)
         new(context).perform
@@ -26,10 +25,10 @@ module Ucasy
     def perform
       return if failure?
 
-      validate_context!
-      before if respond_to?(:before)
-      call
-      after if respond_to?(:after)
+      validate_required_attributes!
+      try(:before) if success?
+      call if success?
+      try(:after) if success?
 
       self
     rescue Failure
@@ -40,12 +39,8 @@ module Ucasy
 
     attr_reader :context
 
-    def validate_context!
-      self.class._required_attributes.each do |attribute|
-        next if context.respond_to?(attribute)
-
-        raise ArgumentError, "You must set '#{attribute}' variable"
-      end
+    def validate_required_attributes!
+      Validators::RequiredAttributes.call(context, self.class._required_attributes)
     end
 
     def method_missing(method_name, *, &block)

data/lib/ucasy/callable.rb

@@ -1,5 +1,11 @@
 module Ucasy
-  module Callable
+  class Callable
+    class << self
+      def call(...)
+        new(...).call
+      end
+    end
+
     def call
       raise NotImplementedError, "You must implement call method"
     end

data/lib/ucasy/validators/required_attributes.rb

@@ -0,0 +1,16 @@
+module Ucasy::Validators
+  class RequiredAttributes < Ucasy::Callable
+    def initialize(context, required_attributes)
+      @context = context
+      @required_attributes = required_attributes
+    end
+
+    def call
+      @required_attributes.each do |attribute|
+        next if @context.respond_to?(attribute)
+
+        raise ArgumentError, "You must set '#{attribute}' variable in '#{self.class}'"
+      end
+    end
+  end
+end

data/lib/ucasy/version.rb

@@ -1,3 +1,3 @@
 module Ucasy
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ucasy
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Lavenda Software
@@ -32,8 +32,7 @@ files:
 - lib/ucasy/context.rb
 - lib/ucasy/failure.rb
 - lib/ucasy/flow.rb
-- lib/ucasy/keyword_base.rb
-- lib/ucasy/positional_base.rb
+- lib/ucasy/validators/required_attributes.rb
 - lib/ucasy/version.rb
 - sig/ucasy/spec.rbs
 - ucasy.gemspec

data/lib/ucasy/keyword_base.rb

@@ -1,9 +0,0 @@
-module Ucasy
-  class KeywordBase
-    include Ucasy::Callable
-
-    def self.call(**)
-      new(**).call
-    end
-  end
-end

data/lib/ucasy/positional_base.rb

@@ -1,9 +0,0 @@
-module Ucasy
-  class PositionalBase
-    include Ucasy::Callable
-
-    def self.call(*)
-      new(*).call
-    end
-  end
-end