action_form 0.6.4 → 0.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e194888488e1747bdc4e384b5cfb2f6fd78ab9cbcf16c9bf00fd81fda9bb849
-  data.tar.gz: bb3f84b823d7fc870fbd84fcfbbdf58259792345b47aba4ac9681fdd58d1c5e6
+  metadata.gz: a30578d111d84b9c748248c82a65eac75389b0696f27dbb3a36a3c437b5643e3
+  data.tar.gz: 2da98bb16f9368a0f07a70d1c47f904b80421f584c024ae69ea18db009f23bf3
 SHA512:
-  metadata.gz: 22dd6884375dd7eaa180de1210a8ab702a1aefaa9e72c4988bc00f3f5ec65db16c5018281fabfbc5bd770a355460aa077eca1d3b66766269ed13f2ab09d9d0dc
-  data.tar.gz: 8216c17312f90892b83cae63291222d6630a7d5c33ea8b623e3785b1d68e0b7f82b56d8952164f1960762c5b40274639cbe2662ec792239c0395a091312b2ea7
+  metadata.gz: 8c9a05b8349c2072c787d95102fd047e6a067e4d367b79c4284c326c75abc2cd05c1a09b38c41dac2d52536cdbb737c927b4f9231a38472cfda66690ed82085f
+  data.tar.gz: e654910d6f00232ee6995955f48c2089edc70de5151c07ccb247b48758b1ed5c2ad6f3306807b37ac3008d9e0bc722c6ebb7ca1b208ea49aa105d448143133d5

data/lib/action_form/base.rb

@@ -12,7 +12,7 @@ module ActionForm
     attr_reader :elements_instances, :scope, :object, :html_options, :errors
 
     class << self
-      attr_writer :elements, :scope
+      attr_writer :elements, :scope, :params_definition
 
       def subform_class
         ActionForm::Subform
@@ -27,7 +27,7 @@ module ActionForm
       def inherited(subclass)
         super
         subclass.elements = elements.dup
-        subclass.scope = scope.dup
+        subclass.scope = scope&.dup
       end
     end
 
@@ -35,7 +35,7 @@ module ActionForm
       super()
       @object = object
       @scope ||= scope
-      @params = @scope && params.respond_to?(@scope) ? params.public_send(@scope) : params
+      @params = params
       @html_options = html_options
       @elements_instances = []
       @owner = owner

data/lib/action_form/rails/base.rb

@@ -31,19 +31,6 @@ module ActionForm
           @scope = model.model_name.param_key.to_sym
         end
 
-        def params_definition(scope: self.scope)
-          return super unless scope
-
-          @params_definitions ||= Hash.new do |h, key|
-            h[key] = begin
-              klass = super
-              Class.new(params_class) { has scope, klass }
-            end
-          end
-          @params_definitions[scope].form_class = self
-          @params_definitions[scope]
-        end
-
         def many(name, default: nil, &block)
           super
           elements[name].subform_definition.add_primary_key_element
@@ -63,18 +50,6 @@ module ActionForm
         end
       end
 
-      def params_definition(scope: self.scope)
-        return super unless scope
-
-        @params_definitions ||= Hash.new do |h, key|
-          h[key] = begin
-            klass = super
-            Class.new(self.class.params_class) { has scope, klass }
-          end
-        end
-        @params_definitions[scope]
-      end
-
       private
 
       def subform_html_name(name, index: nil)

data/lib/action_form/schema_dsl.rb

@@ -13,19 +13,31 @@ module ActionForm
         ActionForm::Params
       end
 
-      def params_definition(*)
+      def params_definition
         @params_definition ||= create_params_definition
       end
 
+      def params_blocks
+        @params_blocks ||= []
+      end
+
       def params(&block)
-        @params_definition = scope ? params_definition(scope: scope) : create_params_definition(&block)
-        @params_definition.class_eval(&block) if block
+        params_blocks << block if block
+      end
+
+      def inherited_params_blocks
+        parent = superclass
+        blocks = []
+        while parent.respond_to?(:params_blocks)
+          parent.params_blocks.each { |block| blocks.unshift(block) }
+          parent = parent.superclass
+        end
+        blocks
       end
 
-      def create_params_definition # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+      def create_params_definition(elements_definitions: elements) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
         schema = Class.new(params_class)
-        schema.form_class = self
-        elements.each do |name, element_definition|
+        elements_definitions.each do |name, element_definition|
           if element_definition < ActionForm::SubformsCollection
             # nested forms are passed as a hash that looks like this:
             # { "0" => { "id" => "1" }, "1" => { "id" => "2" } }
@@ -45,40 +57,25 @@ module ActionForm
             schema.public_send(method_name, name, **options)
           end
         end
+        patches = inherited_params_blocks + params_blocks
+        patches.each do |block|
+          schema = Class.new(schema, &block)
+        end
+        schema.form_class = self
         schema
       end
     end
 
     module InstanceMethods # rubocop:disable Style/Documentation
-      def params_definition(*)
+      def params_definition
         @params_definition ||= create_params_definition
       end
 
-      def create_params_definition # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+      def create_params_definition
         schema = Class.new(self.class.params_class)
         schema.form_class = self.class
-        elements_instances.select(&:render?).each do |element|
-          case element
-          when ActionForm::SubformsCollection
-            # nested forms are passed as a hash that looks like this:
-            # { "0" => { "id" => "1" }, "1" => { "id" => "2" } }
-            # it is coercing to an array of hashes:
-            # [['0', { "id" => "1" }], ['1', { "id" => "2" }]]
-            # we need to normalize it to an array of hashes:
-            # [ { "id" => "1" }, { "
-            # id" => "2" } ]
-            schema.each(:"#{element.name}_attributes", element.subforms.first.params_definition,
-                        normalize: ->(value) { value.flatten.select { |v| v.is_a?(Hash) } },
-                        default: element.class.default)
-          when ActionForm::Subform
-            schema.has(:"#{element.name}_attributes", element.params_definition, default: element.class.default)
-          when ActionForm::Element
-            options = element.class.output_options.dup
-            method_name = options.delete(:type)
-            schema.public_send(method_name, element.name, **options)
-          end
-        end
-        schema
+        renderable_elements = elements_instances.select(&:render?).to_h { |element| [element.name, element.class] }
+        self.class.create_params_definition(elements_definitions: renderable_elements)
       end
     end
   end

data/lib/action_form/subforms_collection.rb

@@ -22,7 +22,7 @@ module ActionForm
 
       def inherited(subclass)
         super
-        subclass.subform_definition = subform_definition
+        subclass.subform_definition = Class.new(subform_definition) if subform_definition
         subclass.default = default
         subclass.host_class = host_class
       end

data/lib/action_form/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActionForm
-  VERSION = "0.6.4"
+  VERSION = "0.6.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: action_form
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.6
 platform: ruby
 authors:
 - Andrii Baran