phlexi-form 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ac3397bb304c81e234196e86557aab193ef8d6a53716ec1422ea91e3419f74d
-  data.tar.gz: 4e43c5162c7b52c219fb13bbc5ea6b03d972e626c680e7d37a048082743c328f
+  metadata.gz: e6b1a5926f08261bf0fa3c607395ddd570c52417636f559b7f11a87a46e8c06d
+  data.tar.gz: ca036dc0035a0161fe4a0411dddbff11d7b1edea529b266ac3b29b1caded91e5
 SHA512:
-  metadata.gz: fea5552a774d2d0c548745d66af37a48bb560a620879a30ad19158866f924558fb91c8a458d78050f768652f9249798b752803b31bf5d0e83b133979947d1de4
-  data.tar.gz: b7876511b1b81038ab04e3255efe12e366c0a357d7ee796467e1be36ddffd2c748fbfa36cef614255790cbffaa41cfe6dc025f501a38441ae81882ed42bea86b
+  metadata.gz: 94a54baa5507d3309efbf06dc8aa230ec8814be37fe7a99e72b294c9d3ed0528e90ea5f782b1333179a5fef8b3b244355b22f38b8bd4d98a661d40440adc52ad
+  data.tar.gz: bea9112fe8131a517381b1a2d4715b266b09fe82a608e96495366e43d4a565ae0bd60296e455118ad515ea41d795e49218a917367dcd3c7478fc88d2ce0cd1da

data/lib/phlexi/form/base.rb

@@ -34,7 +34,7 @@ module Phlexi
 
       attr_reader :key, :object
 
-      delegate :field, :submit_button, :nest_one, :nest_many, to: :@namespace
+      delegate :field, :submit_button, :nest_one, :nest_many, :has_file_input?, to: :@namespace
 
       # Initializes a new Form instance.
       #
@@ -65,10 +65,18 @@ module Phlexi
       #
       # @return [void]
       def view_template(&)
-        form_tag {
+        captured = capture { form_template(&) }
+        form_tag do
           form_errors
-          form_template(&)
-        }
+          plain(captured)
+        end
+
+        # TODO: phlex v2
+        # captured = capture { form_template(&) }
+        # form_tag do
+        #   form_errors
+        #   raw(safe(captured))
+        # end
       end
 
       def form_errors
@@ -254,12 +262,14 @@ module Phlexi
       #
       # @return [Hash] The form attributes
       def form_attributes
-        mix({
+        attrs = mix({
           id: @namespace.dom_id,
           class: form_class,
           action: form_action,
           method: standardized_form_method
         }, attributes)
+        attrs[:enctype] ||= "multipart/form-data" if has_file_input?
+        attrs
       end
 
       # Renders the authenticity token if required.

data/lib/phlexi/form/builder.rb

@@ -249,10 +249,17 @@ module Phlexi
         @field_input_extractor.extract_input(params)
       end
 
+      def has_file_input!
+        parent.has_file_input!
+      end
+
       protected
 
       def create_component(component_class, theme_key, **attributes, &)
         theme_attributes = apply_component_theme(attributes, theme_key)
+        # TODO: refactor all this type checking code such that, the concerns will perform these actions.
+        # Basically, invert control so that the component asks for the extra attributes
+        # or calls #has_file_input!
         extra_attributes = if component_class.include?(Phlexi::Form::Components::Concerns::HandlesInput)
           input_attributes
         else
@@ -260,10 +267,11 @@ module Phlexi
         end
         attributes = mix(theme_attributes, extra_attributes, attributes)
         component = component_class.new(self, **attributes, &)
-        if component_class.include?(Components::Concerns::ExtractsInput)
+        if component_class.include?(Components::Concerns::ExtractsInput) 
           raise "input component already defined: #{@field_input_extractor.inspect}" if @field_input_extractor
 
           @field_input_extractor = component
+          has_file_input! if component_class.include?(Components::Concerns::UploadsFile)
         end
 
         component

data/lib/phlexi/form/components/concerns/uploads_file.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Phlexi
+  module Form
+    module Components
+      module Concerns
+        module UploadsFile
+        end
+      end
+    end
+  end
+end

data/lib/phlexi/form/components/file_input.rb

@@ -4,6 +4,8 @@ module Phlexi
   module Form
     module Components
       class FileInput < Input
+        include Phlexi::Form::Components::Concerns::UploadsFile
+
         def view_template
           input(type: :hidden, name: attributes[:name], value: "", autocomplete: "off", hidden: true) if include_hidden?
           input(**attributes)

data/lib/phlexi/form/structure/manages_fields.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Phlexi
+  module Form
+    module Structure
+      module ManagesFields
+        def has_file_input!
+          if parent
+           parent.has_file_input!
+          else
+            @has_file_input = true
+          end
+        end
+
+        def has_file_input?
+          if parent
+           parent.has_file_input?
+          else
+            @has_file_input || false
+          end
+        end
+      end
+    end
+  end
+end

data/lib/phlexi/form/structure/namespace.rb

@@ -4,6 +4,8 @@ module Phlexi
   module Form
     module Structure
       class Namespace < Phlexi::Field::Structure::Namespace
+        include Phlexi::Form::Structure::ManagesFields
+        
         class NamespaceCollection < Phlexi::Form::Structure::NamespaceCollection; end
 
         def submit_button(key = :submit_button, **, &)

data/lib/phlexi/form/structure/namespace_collection.rb

@@ -4,6 +4,8 @@ module Phlexi
   module Form
     module Structure
       class NamespaceCollection < Phlexi::Field::Structure::NamespaceCollection
+        include Phlexi::Form::Structure::ManagesFields
+        
         def extract_input(params)
           namespace = build_namespace(0)
           @block.call(namespace)

data/lib/phlexi/form/version.rb

@@ -2,6 +2,6 @@
 
 module Phlexi
   module Form
-    VERSION = "0.5.1"
+    VERSION = "0.5.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phlexi-form
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Stefan Froelich
@@ -215,6 +215,7 @@ files:
 - lib/phlexi/form/components/concerns/handles_array_input.rb
 - lib/phlexi/form/components/concerns/handles_input.rb
 - lib/phlexi/form/components/concerns/submits_form.rb
+- lib/phlexi/form/components/concerns/uploads_file.rb
 - lib/phlexi/form/components/error.rb
 - lib/phlexi/form/components/file_input.rb
 - lib/phlexi/form/components/form_errors.rb
@@ -245,6 +246,7 @@ files:
 - lib/phlexi/form/options/step.rb
 - lib/phlexi/form/options/validators.rb
 - lib/phlexi/form/structure/field_collection.rb
+- lib/phlexi/form/structure/manages_fields.rb
 - lib/phlexi/form/structure/namespace.rb
 - lib/phlexi/form/structure/namespace_collection.rb
 - lib/phlexi/form/theme.rb