active_form_objects 2.0.4 → 2.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2daaa8dd6cc58ada79b0fbab645c19bdc3f8ba9439d5c2c58e2a9db8d45b64ff
-  data.tar.gz: 2ca8cb23a9f2b1118cfbf699463d64e1e6db8d9a3804ce8e56abffbdbef846e5
+  metadata.gz: e8035dcb27f78b8e96f423efa20368bf9a458a10254cf11daac46ac5da94f2e5
+  data.tar.gz: 8547c9553340dcc67451b6f0a5eddfe21db24ebeddcd5064f1627344f6070ce6
 SHA512:
-  metadata.gz: c2f92a20ca5941af70874c8bce8d7c4cf1a963fe61c933e08a9321e67212a8dfc4c8a88936ded00a063f07825b26d44185fbc50c667e8ded2ce22b3ce10f67a9
-  data.tar.gz: 49b4ab98dc7d917878ef897a080ce95b61d11345077ee5c93554ac64e1472ad474e9f7ba4ba45cb5c05887c3bb36b5c32640a5712ee3d5b034edf12c3b62a466
+  metadata.gz: '08eecf07d908b7940c5611beb5676e629ddc6761bea108fca62689a90b2ec614cc6cfe3f2e65f0bb6f4544fc8b5fa7ff77986ff51658c8cf21969a4aa4a824d5'
+  data.tar.gz: 4fab25d2fa5c139d5db542dc14bdc52c190ea4fad92c76cdbe985215eeb2333b79dc443e85f19fc3a77c2084e40e0343ad1e487ee569866dcea563ef9b36894f

data/lib/dsl/attributes.rb

@@ -8,6 +8,7 @@ module Dsl
 
     @@attributes = {}
     @@overrided_params = {}
+    @@remaped_params = {}
     @@default_params = {}
     @@preparers = {}
 
@@ -46,6 +47,15 @@ module Dsl
         send(:attributes, param)
       end
 
+      def self.remap(key, options)
+        @@remaped_params[name] = (@@remaped_params[name] || []) + [{
+          key: key,
+          to: options[:to]
+        }]
+
+        send(:attributes, options[:to])
+      end
+
       def self.prepare(*params)
         raise ActiveFormObjects::DslError.new("[#{self.name}] prepare takes a lambda as second argument, not a #{params.last.class.name}") if !params.last.respond_to?(:call)
 

data/lib/dsl/error_handling.rb

@@ -6,8 +6,9 @@ module Dsl
       record = (e.try(:record) || e.model)
       initial_messages = record.errors.messages.as_json
       record.errors.clear
-      record.errors.messages[form] = initial_messages
-
+      initial_messages.each do |i|
+        record.errors.add(form, i)
+      end
       raise ActiveModel::ValidationError, record
     end
   end

data/lib/dsl/hooks.rb

@@ -8,6 +8,7 @@ module Dsl
     @@before_save = {}
     @@after_save = {}
     @@after_validation = {}
+    @@after_commit = {}
 
     class_methods do
       def before_save(*params, &block)
@@ -24,6 +25,11 @@ module Dsl
         hooks = block.present? ? [block] : params
         @@after_validation[name] = (@@after_validation[name] || []) + hooks
       end
+
+      def after_commit(*params, &block)
+        hooks = block.present? ? [block] : params
+        @@after_commit[name] = (@@after_commit[name] || []) + hooks
+      end
     end
   end
 end

data/lib/handlers/attributes.rb

@@ -1,4 +1,5 @@
 require 'active_support/core_ext/hash/reverse_merge'
+require 'active_support/core_ext/hash/indifferent_access'
 require_relative 'base'
 require_relative 'relations'
 require_relative 'delegates'
@@ -8,6 +9,7 @@ module Handlers
     def handle
       start_with_default_params!
       affect_prepared_values!
+      remap_attributes!
       merge_with_resource_attributes!
       affect_relation_values!
       merge_overrided_params!
@@ -27,6 +29,13 @@ module Handlers
       end
     end
 
+    # DSL method : remap
+    def remap_attributes!
+      (upper(:@@remaped_params) || []).each do |remaped|
+        @params[remaped[:to]] = @raw_params[remaped[:key].to_s] if @raw_params.key?(remaped[:key].to_s) && @params[remaped[:to]].blank?
+      end
+    end
+
     def merge_with_resource_attributes!
       return unless @resource.respond_to?(:attributes)
       @params.reverse_merge!(@resource.attributes.symbolize_keys)

data/lib/handlers/hooks.rb

@@ -39,4 +39,10 @@ module Handlers
       handle_hooks('after_validation')
     end
   end
+
+  class AfterCommitHooks < BeforeSaveHooks
+    def handle
+      handle_hooks('after_commit')
+    end
+  end
 end

data/lib/handlers/savings.rb

@@ -14,8 +14,9 @@ module Handlers
         after_validations_hooks!
         block ? save_with_block!(block) : save_without_block!
         after_save_hooks!
-        @resource
       end
+      after_commit_hooks!
+      @resource
     rescue ActiveRecord::RecordInvalid => e
       e.record.errors.add(e.record.class.name, '')
       raise ActiveRecord::RecordInvalid.new(e.record)
@@ -29,7 +30,7 @@ module Handlers
     def save_with_block!(block)
       @klass.instance_eval(&block)
       @resource = @klass.instance_variable_get(:@resource)
-      @resource.try(:save!)
+      @resource
     end
 
     def save_without_block!
@@ -40,5 +41,9 @@ module Handlers
       AfterValidationsHooks.handle(@klass)
       Polymorphs.handle(@klass)
     end
+
+    def after_commit_hooks!
+      AfterCommitHooks.handle(@klass)
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_form_objects
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.1.4
 platform: ruby
 authors:
 - Michaël Villeneuve
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-15 00:00:00.000000000 Z
+date: 2020-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -142,8 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: A step toward an hexagonal Rails architecture