active_form_objects 1.0.0.beta → 1.0.0.beta.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '03871811ee607637a50a7c85d85985dea846a563709f4d1b803aa681589e5517'
-  data.tar.gz: d6fb754563a486d09e99cb09dc183dc276d83f0d1ab9b8a11c83003a8920340e
+  metadata.gz: 4cc38391b46ea4d3dd453708fd14842a0848017c270003e0ffcc67088aaf4ce8
+  data.tar.gz: 91c862cc0a28c7f2be22d9af319e41eae764421cf8234badacc0dc66c708afa5
 SHA512:
-  metadata.gz: f041ee7728861ab7112f9202284bb1d133c877fe42def63e9ba437efb2ebc87efb8ffab77f5a7d519001eba7639c51b03b87371e5c35d5586bde821dc7a18ce4
-  data.tar.gz: 362e0149393a0fd88f129e4169e16c3f037ec506610de8469fe6d33a5478f540c7fda66da8aafebe8be0981f17a200c58a011c94f0d695925ec1a5ff565bf194
+  metadata.gz: c9a52467cb2e00a176b5044869b125728b45eca076931ecbc5f049ca72eccf1b33d878516449ef29dbbcc08501add7c59ed5eeedd191faadb9d594b571b01146
+  data.tar.gz: 401e27c9bd4024c242eda7d211d2df1759cbea23a85a12c0375c59443490d4dec5edafd8159d4ea662fb8300935a2c09cf98c5f65e1ad6989eedd98220bc0632

data/lib/active_form_objects.rb

@@ -1,16 +1,20 @@
 require 'active_model'
+require 'active_support/core_ext/hash/indifferent_access'
+
 
 require_relative 'dsl/relations'
 require_relative 'dsl/attributes'
 require_relative 'dsl/delegates'
 require_relative 'dsl/savings'
 require_relative 'dsl/resource'
+require_relative 'dsl/associates'
 require_relative 'dsl/polymorphs'
 
 require_relative 'handlers/initializer'
 require_relative 'handlers/relations'
 require_relative 'handlers/resource'
 require_relative 'handlers/attributes'
+require_relative 'handlers/associates'
 
 module ActiveFormObjects
   class Base
@@ -21,13 +25,15 @@ module ActiveFormObjects
     include Dsl::Relations
     include Dsl::Polymorphs
     include Dsl::Delegates
+    include Dsl::Associates
     include Dsl::Savings
 
     def initialize(params, resource = nil)
-      @params = params
+      @params = params.with_indifferent_access
       @resource = resource
 
       Handlers::Initializer.handle(self)
+      Handlers::Associates.handle(self)
       Handlers::Resource.handle(self)
       Handlers::Attributes.handle(self)
       super(@params)

data/lib/dsl/associates.rb

@@ -0,0 +1,18 @@
+require 'active_support'
+
+module Dsl
+  module Associates
+    extend ActiveSupport::Concern
+
+    @@associated_forms = {}
+
+    class_methods do
+      def associated(key, form, params = nil)
+        @@associated_forms[name] ||= []
+        @@associated_forms[name] << { name: key, form: form, params: params }
+
+        set_default value: {}, to: key
+      end
+    end
+  end
+end

data/lib/dsl/attributes.rb

@@ -1,4 +1,5 @@
 require 'active_support'
+require 'active_support/core_ext/hash/indifferent_access'
 
 module Dsl
   module Attributes
@@ -9,6 +10,14 @@ module Dsl
     @@default_params = {}
     @@preparers = {}
 
+    def attrs_only(params)
+      attributes.slice(*params)
+    end
+
+    def attributes
+      instance_values.with_indifferent_access.symbolize_keys
+    end
+
     included do
       attr_accessor :params
 

data/lib/dsl/delegates.rb

@@ -5,13 +5,20 @@ module Dsl
     extend ActiveSupport::Concern
 
     @@delegators = {}
-
     included do
       def self.delegate(*params)
-        delegator = params.last[:to].merge(attributes: params)
+        delegator = params.last[:to]
         params.pop
 
-        @@delegators[name] = (@@delegators[name] || []) << delegator
+        if delegator.is_a?(Hash)
+          delegator[:attributes] = params
+          @@delegators[name] = (@@delegators[name] || []) << delegator
+        else
+          send(:attributes, *params)
+          define_method("#{delegator}_params") do
+            attrs_only(params)
+          end
+        end
       end
     end
   end

data/lib/handlers/associates.rb

@@ -0,0 +1,23 @@
+require 'active_support/core_ext/hash/reverse_merge'
+require_relative 'base'
+
+module Handlers
+  class Associates < Base
+    def handle
+      (upper('@@associated_forms') || []).each do |form|
+        @klass.instance_variable_set("@#{form[:name]}_form", form[:form])
+      end
+    end
+
+    def save_associated_forms!
+      (upper('@@associated_forms') || []).each do |associated|
+        params = associated[:params].nil? ? @params[associated[:name]] : @klass.send(associated[:params])
+        resource_to_save = @klass.send("#{associated[:name]}_to_update") rescue nil
+        the_form = associated[:form]
+
+        saved_form = the_form.new(params, resource_to_save).save!
+        @klass.instance_variable_set("@#{associated[:name]}", saved_form)
+      end
+    end
+  end
+end

data/lib/handlers/delegates.rb

@@ -3,7 +3,8 @@ require_relative 'base'
 module Handlers
   class Delegates < Base
     def handle
-      delegates = upper :@@delegators
+      delegates = upper('@@delegators')
+
       (delegates || []).each do |delegate|
         Delegate.new(@klass, delegate).handle
       end
@@ -23,7 +24,7 @@ module Handlers
     end
 
     def handle
-      @attributes = @raw_params.slice(*@attributes).merge({
+      @attributes = @raw_params.slice(*@attributes.map(&:to_s)).merge({
         @foreign_key => @resource.id
       })
 

data/lib/handlers/polymorphs.rb

@@ -34,15 +34,14 @@ module Handlers
     def handle
       @params_to_send = @params[@polymorph[:key]] || {}
       polymorph_instance = form_class.new(@params_to_send, @resource.try(@polymorph[:key])).save!
-
-      @params["#{@polymorph[:key]}_id".to_sym] = polymorph_instance.id
-      @params["#{@polymorph[:key]}_type".to_sym] = polymorph_instance.class.name
+      @params["#{@polymorph[:key]}_id"] = polymorph_instance.id
+      @params["#{@polymorph[:key]}_type"] = polymorph_instance.class.name
       @params.delete(@polymorph[:key])
     end
 
     def form_class
       @polymorph[:types][
-        @resource.try("#{@polymorph[:key]}_type".to_sym) || clean_params.try(:to_sym)
+        @resource.try("#{@polymorph[:key]}_type") || clean_params.try(:to_sym)
       ]
     end
 

data/lib/handlers/relations.rb

@@ -5,7 +5,7 @@ module Handlers
     def affect_relation_values!
       relation_keys = upper(:@@relation_keys) || {}
       {}.merge(@params).each_key do |key|
-        @params["#{key}_id".to_sym] = @params[key.to_sym].id if relation_keys.include?(key)
+        @params["#{key}_id"] = @params[key].id if relation_keys.include?(key.to_sym)
       end
     end
   end

data/lib/handlers/savings.rb

@@ -4,19 +4,19 @@ require 'active_record'
 require_relative 'base'
 require_relative 'polymorphs'
 require_relative 'delegates'
+require_relative 'associates'
 
 module Handlers
   class Savings < Base
     def save!(&block)
-      # ActiveRecord::Base.transaction do
+      ActiveRecord::Base.transaction do
+        return save_associated_forms! unless upper('@@associated_forms').nil?
         @klass.validate!
-
         before_save_hooks!
         block ? save_with_block!(block) : save_without_block!
         after_save_hooks!
-
         @resource
-      # end
+      end
     rescue ActiveRecord::RecordInvalid => e
       e.record.errors.add(e.record.class.name, '')
       raise ActiveRecord::RecordInvalid.new(e.record)
@@ -28,6 +28,7 @@ module Handlers
 
     def save_with_block!(block)
       @klass.instance_eval(&block)
+      @resource = @klass.instance_variable_get(:@resource)
       @resource.try(:save!)
     end
 
@@ -38,5 +39,9 @@ module Handlers
     def before_save_hooks!
       Polymorphs.handle(@klass)
     end
+
+    def save_associated_forms!
+      Associates.new(@klass).save_associated_forms!
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_form_objects
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta
+  version: 1.0.0.beta.2
 platform: ruby
 authors:
 - Michaël Villeneuve
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-20 00:00:00.000000000 Z
+date: 2018-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -59,12 +59,14 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/active_form_objects.rb
+- lib/dsl/associates.rb
 - lib/dsl/attributes.rb
 - lib/dsl/delegates.rb
 - lib/dsl/polymorphs.rb
 - lib/dsl/relations.rb
 - lib/dsl/resource.rb
 - lib/dsl/savings.rb
+- lib/handlers/associates.rb
 - lib/handlers/attributes.rb
 - lib/handlers/base.rb
 - lib/handlers/delegates.rb