headmin 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 503fa2fc7ec041e2a3baca7937f969f7cc8061da02fcb698924f43f3ccc384f9
-  data.tar.gz: 88ad583e50e5d72b8f08c6212bdee24ce1f504d4776bcf0ff6c21faadb37db6e
+  metadata.gz: c2df34e0f6abc35cd855cab3059a40f7716b336df77abdbd4ea9609fc3cf6e5e
+  data.tar.gz: 2c2c5953560f608e6d479bcb7de506ce8da701be8d56b5fbf72cfcaf3a9478ad
 SHA512:
-  metadata.gz: 6bc9c3497c44c255eca104e024d672fa37041029c0da730ee257078f42a72b2d299b427c636b52ee6d0a370c41576d16af83b2ec55db4ad90418f104dbe406e9
-  data.tar.gz: ccecbb9860f879f0bd398954e67f546671e090a230a5f812bff8c59dd268e62755147ee4d14b3eafd7a59f182c39ee012f70e234ea14b47e58a63ef60dea71c7
+  metadata.gz: 17a7d48956fb48e286cd0fd2ac043741256c2e573ffb024cc4ae7fffb2e39c54d4db380efb4308f6816649f43e3fde68fabda7d104211cbcdf8f387d6c7d384b
+  data.tar.gz: 33afd17085196473000927125f9186e5b5703575373cdee9be982e6ca32db31ce09aef1fdf3ebf65b2efb9e31b16595fb6b5076ea65e7872f2ecaf49f260ea12

data/CHANGELOG.md

@@ -1,6 +1,13 @@
 # Headmin Changelog
 
-## HEAD
+## 0.4.2
+- FEATURE: New field type "files" to allow simple gallery creation
+- FIX: Fields hash with duplicate keys no longer mix up
+- BREAK: Image field is now deprecated. Use the file field instead
+- BREAK: Field uses "has_many_attached :files" instead of "has_one_attache :file" now. Rename "file" to "files" in `active_storage_attachments`
+- BREAK: You need to set a File object in the fields_hash, instead of creating an intermediate Blob instance
+
+## 0.4
 - FEATURE: Introduction of a `ViewModel` class to clean up the component views. This allows for a cleaner abstraction and better testing.
 - FEATURE: New `wysiwyg` component which currently defaults to Redactor X. Redactor X will be swapped with a free open source version in the 1.0 release.
 - FEATURE: `headmin/forms/redactorx` now accepts `hybrid: true` to hide the controls

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    headmin (0.4.0)
+    headmin (0.4.1)
       closure_tree (~> 7.4)
       inline_svg (~> 1.7)
       redcarpet (~> 3.5)
@@ -10,67 +10,67 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (7.0.1)
-      actionpack (= 7.0.1)
-      activesupport (= 7.0.1)
+    actioncable (7.0.2.4)
+      actionpack (= 7.0.2.4)
+      activesupport (= 7.0.2.4)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (7.0.1)
-      actionpack (= 7.0.1)
-      activejob (= 7.0.1)
-      activerecord (= 7.0.1)
-      activestorage (= 7.0.1)
-      activesupport (= 7.0.1)
+    actionmailbox (7.0.2.4)
+      actionpack (= 7.0.2.4)
+      activejob (= 7.0.2.4)
+      activerecord (= 7.0.2.4)
+      activestorage (= 7.0.2.4)
+      activesupport (= 7.0.2.4)
       mail (>= 2.7.1)
       net-imap
       net-pop
       net-smtp
-    actionmailer (7.0.1)
-      actionpack (= 7.0.1)
-      actionview (= 7.0.1)
-      activejob (= 7.0.1)
-      activesupport (= 7.0.1)
+    actionmailer (7.0.2.4)
+      actionpack (= 7.0.2.4)
+      actionview (= 7.0.2.4)
+      activejob (= 7.0.2.4)
+      activesupport (= 7.0.2.4)
       mail (~> 2.5, >= 2.5.4)
       net-imap
       net-pop
       net-smtp
       rails-dom-testing (~> 2.0)
-    actionpack (7.0.1)
-      actionview (= 7.0.1)
-      activesupport (= 7.0.1)
+    actionpack (7.0.2.4)
+      actionview (= 7.0.2.4)
+      activesupport (= 7.0.2.4)
       rack (~> 2.0, >= 2.2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (7.0.1)
-      actionpack (= 7.0.1)
-      activerecord (= 7.0.1)
-      activestorage (= 7.0.1)
-      activesupport (= 7.0.1)
+    actiontext (7.0.2.4)
+      actionpack (= 7.0.2.4)
+      activerecord (= 7.0.2.4)
+      activestorage (= 7.0.2.4)
+      activesupport (= 7.0.2.4)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.0.1)
-      activesupport (= 7.0.1)
+    actionview (7.0.2.4)
+      activesupport (= 7.0.2.4)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (7.0.1)
-      activesupport (= 7.0.1)
+    activejob (7.0.2.4)
+      activesupport (= 7.0.2.4)
       globalid (>= 0.3.6)
-    activemodel (7.0.1)
-      activesupport (= 7.0.1)
-    activerecord (7.0.1)
-      activemodel (= 7.0.1)
-      activesupport (= 7.0.1)
-    activestorage (7.0.1)
-      actionpack (= 7.0.1)
-      activejob (= 7.0.1)
-      activerecord (= 7.0.1)
-      activesupport (= 7.0.1)
+    activemodel (7.0.2.4)
+      activesupport (= 7.0.2.4)
+    activerecord (7.0.2.4)
+      activemodel (= 7.0.2.4)
+      activesupport (= 7.0.2.4)
+    activestorage (7.0.2.4)
+      actionpack (= 7.0.2.4)
+      activejob (= 7.0.2.4)
+      activerecord (= 7.0.2.4)
+      activesupport (= 7.0.2.4)
       marcel (~> 1.0)
       mini_mime (>= 1.1.0)
-    activesupport (7.0.1)
+    activesupport (7.0.2.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -91,25 +91,24 @@ GEM
     closure_tree (7.4.0)
       activerecord (>= 4.2.10)
       with_advisory_lock (>= 4.0.0)
-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.1.10)
     crass (1.0.6)
-    debug (1.4.0)
+    debug (1.5.0)
       irb (>= 1.3.6)
       reline (>= 0.2.7)
     digest (3.1.0)
     erubi (1.10.0)
     globalid (1.0.0)
       activesupport (>= 5.0)
-    i18n (1.9.1)
+    i18n (1.10.0)
       concurrent-ruby (~> 1.0)
     inline_svg (1.8.0)
       activesupport (>= 3.0)
       nokogiri (>= 1.6)
     io-console (0.5.11)
-    io-wait (0.2.1)
     irb (1.4.1)
       reline (>= 0.3.0)
-    loofah (2.13.0)
+    loofah (2.16.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
@@ -118,7 +117,7 @@ GEM
     matrix (0.4.2)
     method_source (1.0.0)
     mini_mime (1.1.2)
-    minitest (5.14.4)
+    minitest (5.15.0)
     minitest-spec-rails (6.1.0)
       minitest (>= 5.0)
       railties (>= 4.1)
@@ -130,78 +129,77 @@ GEM
       digest
       net-protocol
       timeout
-    net-protocol (0.1.2)
-      io-wait
+    net-protocol (0.1.3)
       timeout
     net-smtp (0.3.1)
       digest
       net-protocol
       timeout
     nio4r (2.5.8)
-    nokogiri (1.13.1-arm64-darwin)
+    nokogiri (1.13.4-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.13.1-x86_64-darwin)
+    nokogiri (1.13.4-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.13.1-x86_64-linux)
+    nokogiri (1.13.4-x86_64-linux)
       racc (~> 1.4)
-    parallel (1.21.0)
-    parser (3.1.0.0)
+    parallel (1.22.1)
+    parser (3.1.2.0)
       ast (~> 2.4.1)
-    public_suffix (4.0.6)
+    public_suffix (4.0.7)
     racc (1.6.0)
     rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (7.0.1)
-      actioncable (= 7.0.1)
-      actionmailbox (= 7.0.1)
-      actionmailer (= 7.0.1)
-      actionpack (= 7.0.1)
-      actiontext (= 7.0.1)
-      actionview (= 7.0.1)
-      activejob (= 7.0.1)
-      activemodel (= 7.0.1)
-      activerecord (= 7.0.1)
-      activestorage (= 7.0.1)
-      activesupport (= 7.0.1)
+    rails (7.0.2.4)
+      actioncable (= 7.0.2.4)
+      actionmailbox (= 7.0.2.4)
+      actionmailer (= 7.0.2.4)
+      actionpack (= 7.0.2.4)
+      actiontext (= 7.0.2.4)
+      actionview (= 7.0.2.4)
+      activejob (= 7.0.2.4)
+      activemodel (= 7.0.2.4)
+      activerecord (= 7.0.2.4)
+      activestorage (= 7.0.2.4)
+      activesupport (= 7.0.2.4)
       bundler (>= 1.15.0)
-      railties (= 7.0.1)
+      railties (= 7.0.2.4)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.4.2)
       loofah (~> 2.3)
-    railties (7.0.1)
-      actionpack (= 7.0.1)
-      activesupport (= 7.0.1)
+    railties (7.0.2.4)
+      actionpack (= 7.0.2.4)
+      activesupport (= 7.0.2.4)
       method_source
       rake (>= 12.2)
       thor (~> 1.0)
       zeitwerk (~> 2.5)
     rainbow (3.1.1)
-    rake (13.0.3)
+    rake (13.0.6)
     redcarpet (3.5.1)
-    regexp_parser (2.2.0)
+    regexp_parser (2.3.1)
     reline (0.3.1)
       io-console (~> 0.5)
     rexml (3.2.5)
     rouge (3.28.0)
-    rubocop (1.25.0)
+    rubocop (1.28.2)
       parallel (~> 1.10)
       parser (>= 3.1.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 1.15.1, < 2.0)
+      rubocop-ast (>= 1.17.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.15.1)
-      parser (>= 3.0.1.1)
-    rubocop-performance (1.13.2)
+    rubocop-ast (1.17.0)
+      parser (>= 3.1.1.0)
+    rubocop-performance (1.13.3)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
     ruby-progressbar (1.11.0)
-    sprockets (4.0.2)
+    sprockets (4.0.3)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-rails (3.4.2)
@@ -209,9 +207,9 @@ GEM
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
     sqlite3 (1.4.2)
-    standard (1.7.0)
-      rubocop (= 1.25.0)
-      rubocop-performance (= 1.13.2)
+    standard (1.11.0)
+      rubocop (= 1.28.2)
+      rubocop-performance (= 1.13.3)
     strscan (3.0.1)
     thor (1.2.1)
     timeout (0.2.0)

data/app/models/concerns/headmin/field.rb

@@ -11,8 +11,10 @@ module Headmin
       belongs_to :field, optional: true, touch: true
       has_many :fields, foreign_key: "parent_id"
       accepts_nested_attributes_for :fields, allow_destroy: true
-      has_one_attached :file
-      accepts_nested_attributes_for :file_attachment
+
+      # field_type: :files, :file
+      has_many_attached :files
+      accepts_nested_attributes_for :files_attachments, allow_destroy: true
     end
   end
 end

data/app/models/concerns/headmin/fieldable.rb

@@ -6,68 +6,162 @@ module Headmin
       has_many :fields, as: :fieldable, dependent: :destroy
       accepts_nested_attributes_for :fields, allow_destroy: true
 
+      # Callbacks
+      before_validation :build_fields
+
       def fields_hash
-        fields.order(position: :asc).map do |field|
-          parse_hash_tree(field.hash_tree)
-        end.reduce({}, :merge)
+        @fields_hash ||= parse_fields
       end
 
       def fields_hash=(hash)
-        parse_fields_hash(hash)
+        @fields_hash = hash
       end
 
       private
 
-      def parse_fields_hash(hash)
+      def parse_fields
+        fields.where(parent: nil).order(position: :asc).map { |field| parse_hash_tree(field.hash_tree) }.reduce({}, :merge)
+      end
+
+      def build_fields
+        return unless @fields_hash
+        self.fields = fields_for(@fields_hash)
+      end
+
+      def fields_for(hash)
         hash.map do |key, value|
           case value
           when Hash
-            fields.build(
-              name: key,
-              field_type: "group",
-              fields: parse_fields_hash(value)
-            )
+            field_for_hash(key, value)
           when Array
-            fields.build(
-              name: key,
-              field_type: "list",
-              fields: value.map do |item|
-                fields.new(name: "item", field_type: "group", fields: parse_fields_hash(item))
-              end
-            )
-          when String
-            fields.build(
-              name: key,
-              field_type: "text",
-              value: value
-            )
+            field_for_array(key, value)
+          when File
+            field_for_file(key, value)
           else
-            fields.build(
-              name: key,
-              field_type: "file",
-              file: value
-            )
+            field_for_string(key, value)
           end
         end
       end
 
+      def field_for_hash(name, hash)
+        ::Field.new(
+          fieldable: self,
+          name: name,
+          field_type: "group",
+          fields: fields_for(hash)
+        )
+      end
+
+      def field_for_array(name, array)
+        if array.all? { |item| item.is_a?(File) }
+          field_for_files(name, array)
+        elsif array.all? { |item| item.is_a?(Hash) }
+          field_for_group_list(name, array)
+        else
+          field_for_simple_list(name, array)
+        end
+      end
+
+      def field_for_simple_list(name, array)
+        ::Field.new(
+          fieldable: self,
+          name: name,
+          field_type: "list",
+          fields: array.map { |item| fields_for({item: item}) }.flatten
+        )
+      end
+
+      def field_for_group_list(name, array)
+        ::Field.new(
+          fieldable: self,
+          name: name,
+          field_type: "list",
+          fields: array.map { |item| ::Field.new(fieldable: self, name: "item", field_type: "group", fields: fields_for(item)) }
+        )
+      end
+
+      def field_for_string(name, string)
+        ::Field.new(
+          fieldable: self,
+          name: name,
+          field_type: "text",
+          value: string
+        )
+      end
+
+      def field_for_file(name, file)
+        ::Field.new(
+          fieldable: self,
+          name: name,
+          field_type: "file",
+          value: nil,
+          files: [ActiveStorage::Blob.create_and_upload!(
+            io: file,
+            filename: File.basename(file.path)
+          )]
+        )
+      end
+
+      def field_for_files(name, files)
+        ::Field.new(
+          fieldable: self,
+          name: name,
+          field_type: "files",
+          value: nil,
+          files: files.map { |file|
+            ActiveStorage::Blob.create_and_upload!(
+              io: file,
+              filename: File.basename(file.path)
+            )
+          }
+        )
+      end
+
+      # From hash tree to hash
       def parse_hash_tree(hash_tree)
-        hash_tree.map do |field, children|
-          case field.field_type.to_sym
-          when :group
-            children = children.any? ? children : field.hash_tree
-            [field.name, parse_hash_tree(children)]
-          when :list
-            children = children.any? ? children : field.hash_tree
-            [field.name, children.map { |child, grand_children| parse_hash_tree(grand_children) }]
-          when :image
-            [field.name, field.file]
-          when :file
-            [field.name, field.file]
-          else
-            [field.name, field.value]
-          end
-        end.to_h
+        new_hash = {}
+        hash_tree.each do |field, children|
+          new_hash[field.name.to_sym] = parse_field(field, children)
+        end
+        new_hash
+      end
+
+      # Parse value for given field
+      def parse_field(field, children)
+        case field.field_type.to_sym
+        when :group
+          parse_group_field(field, children)
+        when :list
+          parse_list_field(field, children)
+        when :files
+          parse_files_field(field)
+        when :file
+          parse_file_field(field)
+        else
+          parse_text_field(field)
+        end
+      end
+
+      def parse_group_field(field, children)
+        parse_hash_tree(children)
+      end
+
+      def parse_list_field(field, children)
+        children.map do |child, grand_children|
+          parse_field(child, grand_children)
+        end
+      end
+
+      def parse_files_field(field)
+        field.files.all
+      end
+
+      def parse_file_field(field)
+        field.files.last
+      end
+
+      def parse_text_field(field)
+        field.value
       end
     end
   end

data/app/views/headmin/forms/fields/_file.html.erb

@@ -13,5 +13,5 @@
 %>
 
 <%= render 'headmin/forms/fields/base', form: form, field_type: :file, name: name do |field, label| %>
-  <% yield field, :file, label %>
+  <% yield field, :files, label %>
 <% end %>

data/app/views/headmin/forms/fields/_files.html.erb

@@ -0,0 +1,17 @@
+<%
+  # name: headmin/forms/fields/file
+  #
+  # ==== Options
+  # * +form+ - Form object
+  # * +name+ - Name for the field
+  #
+  # ==== Examples
+  #   Basic version
+  #   <%= render 'headmin/forms/fields/file', form: group, name: :file do |field, attribute, label| %#>
+  #     <%= render "headmin/forms/file", form: field, attribute: attribute, label: label %#>
+  #   <% end %#>
+%>
+
+<%= render 'headmin/forms/fields/base', form: form, field_type: :files, name: name do |field, label| %>
+  <% yield field, :files, label %>
+<% end %>

data/lib/headmin/version.rb

@@ -1,3 +1,3 @@
 module Headmin
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "headmin",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "description": "Admin component library",
   "module": "app/assets/javascripts/headmin.js",
   "main": "app/assets/javascripts/headmin.js",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: headmin
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Jef Vlamings
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-04-20 00:00:00.000000000 Z
+date: 2022-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: closure_tree
@@ -76,6 +76,7 @@ extra_rdoc_files: []
 files:
 - ".github/workflows/ci.yml"
 - ".gitignore"
+- ".lock-487e157d270f3062a98b7b2a012753708-1272821827"
 - ".nvmrc"
 - ".ruby-version"
 - CHANGELOG.md
@@ -332,8 +333,8 @@ files:
 - app/views/headmin/forms/autocomplete/_list.html.erb
 - app/views/headmin/forms/fields/_base.html.erb
 - app/views/headmin/forms/fields/_file.html.erb
+- app/views/headmin/forms/fields/_files.html.erb
 - app/views/headmin/forms/fields/_group.html.erb
-- app/views/headmin/forms/fields/_image.html.erb
 - app/views/headmin/forms/fields/_list.html.erb
 - app/views/headmin/forms/fields/_text.html.erb
 - app/views/headmin/forms/repeater/_row.html.erb

data/app/views/headmin/forms/fields/_image.html.erb

@@ -1,17 +0,0 @@
-<%
-  # name: headmin/forms/fields/image
-  #
-  # ==== Options
-  # * +form+ - Form object
-  # * +name+ - Name for the field
-  #
-  # ==== Examples
-  #   Basic version
-  #   <%= render 'headmin/forms/fields/image', form: group, name: :image do |field, attribute, label| %#>
-  #     <%= render "headmin/forms/image", form: field, attribute: attribute, label: label %#>
-  #   <% end %#>
-%>
-
-<%= render 'headmin/forms/fields/base', form: form, field_type: :image, name: name do |field, label| %>
-  <% yield field, :file, label %>
-<% end %>