haku 1.1.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d706591454ee0f992403b400e7dc75e621bccb120978050d98f55f2aaceca5bd
-  data.tar.gz: 18652ffbeff0a83d8a7344d7de7e7f4bb905d973a740fecc99a14a05d1258d46
+  metadata.gz: a4a4e86fc890d168831b4b5988501287334e47e4c5e74d5fe74e20b2eb4e6401
+  data.tar.gz: '090842d8de8748ab2ae966ca710a2d87c4779b5dc1d3b02c6cbda0a2345d533a'
 SHA512:
-  metadata.gz: f4ad33422d9efcba85416ee72099e1c577b1172f6e4a40bea8c9d28cfd4edb8f3259eb5f04671a54ca67dcab0cc796bb407f39111d5ecb9fd30cc6d2d6bf235a
-  data.tar.gz: ee0e64b2f70d88f833cedbf96b56af02a9ffaaa17e29df5d582ae6b71a6199935e6897b8bbc704f4d2c035215be45b9767e5814275da002aa8836e627f5c5db8
+  metadata.gz: c0daf950c8414065e1fd3e845baefc1f926b35275cf1da27c6f901fe7fad04e00f2228c780b7f3ce2b741c792d3a8e1da693b115d2c5fc244378172ec9943260
+  data.tar.gz: f60b323cabc9f226072bca8a7bc0f42806d96a1a4aa085c8f19197d852cc16cbf2f8e50f05453d8074dc494d980108c8269633b80812509e2db6ec3f56b4e633

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 ## [Unreleased]
 
+## [1.3.0] - 2022-04-27
+- Fix accessors creation
+- **Breaking**: Remove Rails railtie. Use `include Haku::Controller` in controllers instead.
+
+## [1.2.1] - 2022-04-20
+- Fix accessors creation when result is plain array
+
+## [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.1)
       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.is_a?(Hash)
+
+      @payload.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 = 3
     TINY  = 0
     PRE   = nil
 

data/lib/haku.rb

@@ -4,13 +4,10 @@ require "active_support/core_ext/module/attribute_accessors"
 require "active_support/core_ext/string/inflections"
 require_relative "haku/core"
 require_relative "haku/eventable"
-require_relative "haku/railtie" if defined?(Rails)
 require_relative "haku/resourceable"
 require_relative "haku/version"
 
 module Haku
-  mattr_accessor :enable_in_action_controller_base, default: true
-  mattr_accessor :enable_in_action_controller_api, default: true
   mattr_accessor :event_model, default: "Event"
   mattr_accessor :event_properties, default: %i[actor resource target context]
   mattr_accessor :event_property_for_name, default: :name

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: haku
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Javier Aranda
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-04-19 00:00:00.000000000 Z
+date: 2022-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -59,7 +59,6 @@ files:
 - lib/haku/controller.rb
 - lib/haku/core.rb
 - lib/haku/eventable.rb
-- lib/haku/railtie.rb
 - lib/haku/resourceable.rb
 - lib/haku/result.rb
 - lib/haku/version.rb
@@ -68,8 +67,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.3.0
+  changelog_uri: https://github.com/javierav/haku/blob/v1.3.0/CHANGELOG.md
   rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options:

data/lib/haku/railtie.rb

@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-require "rails/railtie"
-require_relative "controller"
-
-module Haku
-  class Railtie < ::Rails::Railtie
-    initializer "haku.action_controller_base" do
-      if Haku.enable_in_action_controller_base
-        ActiveSupport.on_load(:action_controller_base) do
-          ActionController::Base.include Haku::Controller
-        end
-      end
-
-      if Haku.enable_in_action_controller_api
-        ActiveSupport.on_load(:action_controller_api) do
-          ActionController::API.include Haku::Controller
-        end
-      end
-    end
-  end
-end