haku 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d706591454ee0f992403b400e7dc75e621bccb120978050d98f55f2aaceca5bd
-  data.tar.gz: 18652ffbeff0a83d8a7344d7de7e7f4bb905d973a740fecc99a14a05d1258d46
+  metadata.gz: b65774c4966531378070fabd031b8bdb943b10b7ec18f6fea1424d00d5ab382d
+  data.tar.gz: 7505219941e0b0dcb7189671dcf9a8593f3cdaa6d9c893b0b4ba6c438c6ee56b
 SHA512:
-  metadata.gz: f4ad33422d9efcba85416ee72099e1c577b1172f6e4a40bea8c9d28cfd4edb8f3259eb5f04671a54ca67dcab0cc796bb407f39111d5ecb9fd30cc6d2d6bf235a
-  data.tar.gz: ee0e64b2f70d88f833cedbf96b56af02a9ffaaa17e29df5d582ae6b71a6199935e6897b8bbc704f4d2c035215be45b9767e5814275da002aa8836e627f5c5db8
+  metadata.gz: e310f74ec63fe80d30381b56e36515311786dc6e8c13b065dab9d99a93ee6c9b87891582017f0de199c3e7e18d5ea2534adc9f7927633151127a2abb236fec91
+  data.tar.gz: c9ca7c513ec7cb2f92b9719071e84d0817d8722480274409b1937aa33062995845eb979bd91314ee41337756dcfe6faa55e7cfe8170fd89aae9a92056cbe92fa

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 ## [Unreleased]
 
+## [1.2.0] - 2022-04-20
+- Refactor how response is created on finish
+
 ## [1.1.0] - 2022-04-19
 - Allow to configure Haku using block
 - Add Eventable module to fire events

data/Gemfile.lock

@@ -11,7 +11,7 @@ GIT
 PATH
   remote: .
   specs:
-    haku (1.1.0)
+    haku (1.2.0)
       activesupport (>= 6.0, < 8.0)
 
 GEM

data/README.md

@@ -47,6 +47,7 @@ end
 response = Users::Update.call(user: User.first, attributes: { name: "Javier" })
 
 response.success? # => true
+response.result # => { resource: <User id="1" ...> }
 response.resource # => <User id="1" ...>
 ````
 

data/lib/haku/core.rb

@@ -44,12 +44,17 @@ module Haku
       end
     end
 
+    Finish = Struct.new("Finish", :status, :payload)
+
     module Callable
       def call
-        result = super
+        response = catch(:finish) { super }
+
+        status = response.is_a?(Finish) ? response.status : :success
+        payload = response.is_a?(Finish) ? response.payload : response
 
-        Result.new(_haku_status, _haku_response.merge(result: result)).tap do
-          _haku_run_callbacks
+        Result.new(status, payload).tap do
+          _haku_run_callbacks(status)
         end
       end
     end
@@ -57,9 +62,6 @@ module Haku
     def initialize(params={})
       @params = params
 
-      @_haku_status = :success
-      @_haku_response = {}
-
       self.class.haku_inputs.each do |name|
         define_singleton_method(name) { @params[name] } unless respond_to?(name)
       end
@@ -67,32 +69,16 @@ module Haku
 
     private
 
-    def success!(response={})
-      @_haku_status = :success
-      @_haku_response = _haku_normalize_response(response)
-      nil
-    end
-
-    def failure!(response={})
-      @_haku_status = :failure
-      @_haku_response = _haku_normalize_response(response)
-      nil
-    end
-
-    def _haku_normalize_response(response)
-      response.is_a?(Hash) ? response : { data: response }
-    end
-
-    def _haku_status
-      @_haku_status
+    def success!(data=nil)
+      throw :finish, Finish.new(:success, data)
     end
 
-    def _haku_response
-      @_haku_response
+    def failure!(data=nil)
+      throw :finish, Finish.new(:failure, data)
     end
 
-    def _haku_run_callbacks
-      (self.class.send("haku_#{_haku_status}_callbacks") || []).each { |cb| send(cb) }
+    def _haku_run_callbacks(status)
+      (self.class.send("haku_#{status}_callbacks") || []).each { |cb| send(cb) }
     end
   end
 end

data/lib/haku/result.rb

@@ -4,15 +4,21 @@ require "active_support/string_inquirer"
 
 module Haku
   class Result
-    def initialize(status, response)
+    def initialize(status, payload)
       @status = ActiveSupport::StringInquirer.new(status.to_s)
-      @response = response
+      @payload = payload
 
-      @response.each_key do |key|
-        define_singleton_method(key) { @response[key] }
+      return unless @payload.respond_to?(:to_h)
+
+      @payload.to_h.each_key do |key|
+        define_singleton_method(key) { @payload[key] }
       end
     end
 
+    def result
+      @payload
+    end
+
     def success?
       @status.success?
     end

data/lib/haku/version.rb

@@ -3,7 +3,7 @@
 module Haku
   module VERSION
     MAJOR = 1
-    MINOR = 1
+    MINOR = 2
     TINY  = 0
     PRE   = nil
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: haku
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Javier Aranda
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-04-19 00:00:00.000000000 Z
+date: 2022-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -68,8 +68,8 @@ licenses:
 - MIT
 metadata:
   homepage_uri: https://github.com/javierav/haku
-  source_code_uri: https://github.com/javierav/haku/tree/v1.1.0
-  changelog_uri: https://github.com/javierav/haku/blob/v1.1.0/CHANGELOG.md
+  source_code_uri: https://github.com/javierav/haku/tree/v1.2.0
+  changelog_uri: https://github.com/javierav/haku/blob/v1.2.0/CHANGELOG.md
   rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: