simple_form_nested_fields 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6503b66d302d584519904f940376f2d31dad4c1d8b70ed35f21e1b18949236db
-  data.tar.gz: 944ab3847f631786be2f648c99c0cff69def74146edc9fe6065e61c2cd3691ca
+  metadata.gz: 777df20aaed96a6a38e9a46763102c7f14bf64e729a7ccf20dda5f12fb3fc389
+  data.tar.gz: c0e99aa18e7cfabfba0dc388efe87bbaffa171bd5e929ad30f163b43c544d8cc
 SHA512:
-  metadata.gz: ad749bc8d209f5c081b3228a7139bd4e4038e08ebb1057c68ee487fb28bfe07885d7be2b9fba2f289b3c9fb8ab3c40ef82b37600afd8c34a531aa20edebfb9cc
-  data.tar.gz: d92e37368e2f8db9e85c52d554c2f4cc82f05a5b84f8eee29141bffcba6c09cf9da5dc1e944dfec3ec7ab7754aea007a16c75eb1ab6c89e23a74ccb8309abbff
+  metadata.gz: db98c8de682982c7491974f975d6bcb9adf294c750b6b0255a5b0d9b50726aea3ad10112e62b48232f0985857fef1a77305a8640028c31527ac9f34dc6bc5e13
+  data.tar.gz: f33490c2edb4542051188f4131805445fa19bdb8df917b21b0b757917ae35b05ac8704cbe142635c52017476c96fc0b84fa52dba8120cff219f79d605616459e

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # CHANGELOG
 
+## 0.3.0
+
+* added support for inheritance and multiple item types (configurable via the `item_classes` option)
+* with subclasses, the `_type` hidden field is inserted automatically
+* when sortable, the `position` hidden field is inserted automatically
+
 ## 0.2.1
 
 * [PR#3](https://github.com/tomasc/simple_form_nested_fields/pull/3) fix duplicate dom classes

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    simple_form_nested_fields (0.2.1)
+    simple_form_nested_fields (0.3.0)
       coffee-rails
       simple_form
 

data/README.md

@@ -83,6 +83,19 @@ helper:
 = fields.input :body
 ```
 
+### Inheritance
+
+Subclassing of the relation class is handled automatically by default with:
+
+* partials corresponding to each subclass
+* select input next to the add link that allows the user choose the subclass to be added
+
+The choice of classes can be configured as follows:
+
+```slim
+= f.nested_fields_for :variants, nil, item_classes: [MyDoc::Variant::One, MyDoc::Variant::Two]
+```
+
 ### Sortable
 
 Making the nested fields sortable is straight forward.
@@ -117,13 +130,7 @@ have to pass the second parameter: the collection/record object):
   = f.submit
 ```
 
-And in your `Text` fields partial add the position input:
-
-```slim
-// app/views/my_docs/texts/_fields.html.slim
-= fields.input :position, as: :hidden
-= fields.input :body
-```
+Please note the `position` input is automatically added to the partial.
 
 ### Configuration
 

data/lib/assets/javascripts/simple_form_nested_fields__links.coffee

@@ -25,8 +25,13 @@ do ($ = jQuery, window, document) ->
       @$element.off "click.#{@_name}", '.simple_form_nested_fields__link--add'
 
     get_index: -> new Date().getTime()
-    get_template: (link) -> $(link).data('template').replace(@options.regexp, @get_index())
+    get_item_class_name: -> @get_select().val()
     get_items_container: -> @$element.find('.simple_form_nested_fields__items')
+    get_template: (link) ->
+      item_class_name = @get_item_class_name()
+      $template = @$element.find("template[data-class='#{item_class_name}']").first()
+      $template.html().replace(@options.regexp, @get_index())
+    get_select: -> @$element.find('.simple_form_nested_fields__select--add')
 
     add_new_item: (link) ->
       $template = $(@get_template(link))

data/lib/simple_form_nested_fields/nested_fields_builder.rb

@@ -16,13 +16,17 @@ module SimpleFormNestedFields
     end
 
     def_delegators :builder, :object, :object_name, :simple_fields_for
-    def_delegators :template, :concat, :content_tag, :hidden_field_tag, :link_to, :render
+    def_delegators :template, :concat, :content_tag, :hidden_field_tag, :select_tag, :options_for_select, :link_to, :render
 
     def nested_fields_for
       content_tag(:div, class: wrapper_class) do
         concat nested_fields_title
         concat nested_fields_items
         concat nested_fields_links
+
+        item_classes.each do |cls|
+          concat nested_fields_template(cls)
+        end
       end
     end
 
@@ -34,11 +38,24 @@ module SimpleFormNestedFields
     end
 
     def is_sortable?
-      options[:sortable] == true
+      options.fetch(:sortable, false)
+    end
+
+    def multiple_item_classes?
+      item_classes.length > 1
+    end
+
+    def item_classes
+      options.fetch(:item_classes) do
+        return relation.klass.descendants if relation.klass.descendants.present?
+        [relation.klass]
+      end
     end
 
-    def partial_path
-      options.fetch(:partial, File.join(object.model_name.collection, relation.klass.model_name.collection, 'fields'))
+    def partial_path(cls)
+      options.fetch(:partial) do
+        File.join(object.model_name.collection, cls.model_name.collection, 'fields')
+      end
     end
 
     def relation
@@ -51,15 +68,24 @@ module SimpleFormNestedFields
       content_tag(:div, title, class: dom_class).html_safe
     end
 
+    def nested_fields_item_class_name(cls)
+      return unless multiple_item_classes?
+      dom_class = bem_class(e: :item_class_name)
+      content_tag(:div, cls.model_name.human, class: dom_class).html_safe
+    end
+
     def nested_fields_items
       content_tag(:div, class: bem_class(e: :items)) do
         simple_fields_for(record_name, record_object, options) do |fields|
-          dom_class = bem_class(e: :item, m: relation.klass)
-          dom_data = { id: fields.object.id.to_s }
+          dom_class = bem_class(e: :item)
+          dom_data = { id: fields.object.id.to_s, class: fields.object.class.to_s }
 
           content_tag(:div, class: dom_class, data: dom_data) do
+            concat nested_fields_item_class_name(fields.object.class)
             concat nested_fields_item_handle
-            concat render(partial_path, fields: fields)
+            concat nested_fields__type_input(fields)
+            concat nested_fields_position_input(fields)
+            concat render(partial_path(fields.object.class), fields: fields)
             concat link_to_remove(fields)
           end
         end
@@ -68,13 +94,23 @@ module SimpleFormNestedFields
 
     def nested_fields_links
       dom_class = bem_class(e: :links)
-      content_tag(:div, link_to_add, class: dom_class).html_safe
+      content_tag(:div, class: dom_class) do
+        concat select_for_add
+        concat link_to_add
+      end.html_safe
+    end
+
+    def select_for_add
+      dom_class = bem_class(e: :select, m: :add)
+      dom_style = ""
+      dom_style = "display: none;" unless multiple_item_classes?
+      select_tag nil, options_for_select(item_classes.map { |kls| [kls.model_name.human, kls.to_s] }), class: dom_class, style: dom_style
     end
 
     def link_to_add
       label = options.fetch(:label_add, ::I18n.t(:add, scope: %i[simple_form_nested_fields links], model_name: relation.klass.model_name.human))
-      dom_class = [bem_class(e: :link), bem_class(e: :link, m: :add)]
-      dom_data = { template: CGI.escapeHTML(nested_fields_template).html_safe, turbolinks: 'false' }
+      dom_class = bem_class(e: :link, m: :add)
+      dom_data = { turbolinks: 'false' }
       link_to(label, '#', class: dom_class, data: dom_data).html_safe
     end
 
@@ -84,17 +120,29 @@ module SimpleFormNestedFields
       content_tag(:div, nil, class: dom_class).html_safe
     end
 
-    def nested_fields_template
-      dom_class = bem_class(e: :item, m: relation.klass)
-      content_tag :div, nested_fields_template_string, class: dom_class
+    def nested_fields_position_input(fields)
+      return unless is_sortable?
+      fields.input(:position, as: :hidden).html_safe
+    end
+
+    def nested_fields__type_input(fields)
+      return unless fields.object.respond_to?(:_type)
+      fields.input(:_type, as: :hidden).html_safe
     end
 
-    def nested_fields_template_string
-      simple_fields_for(record_name, relation.klass.new, child_index: CHILD_INDEX_STRING) do |fields|
-        nested_fields_item_handle.to_s.html_safe +
-          render(partial_path, fields: fields).html_safe +
-          link_to_remove(fields)
-      end.html_safe
+    def nested_fields_template(cls)
+      content_tag :template, data: { class: cls.to_s } do
+        content_tag :div, class: bem_class(e: :item), data: { class: cls.to_s } do
+          simple_fields_for(record_name, cls.new, child_index: CHILD_INDEX_STRING) do |fields|
+            concat nested_fields_item_class_name(cls)
+            concat nested_fields_item_handle
+            concat nested_fields__type_input(fields)
+            concat nested_fields_position_input(fields)
+            concat render(partial_path(cls), fields: fields)
+            concat link_to_remove(fields)
+          end
+        end
+      end
     end
 
     def destroy_field_tag(fields)
@@ -104,7 +152,7 @@ module SimpleFormNestedFields
 
     def link_to_remove(fields, options = {})
       label = options.fetch(:label, ::I18n.t(:remove, scope: %i[simple_form_nested_fields links]))
-      dom_class = [bem_class(e: :link), bem_class(e: :link, m: :remove)]
+      dom_class = bem_class(e: :link, m: :remove)
       dom_data = { turbolinks: 'false' }
       [
         destroy_field_tag(fields),

data/lib/simple_form_nested_fields/version.rb

@@ -1,3 +1,3 @@
 module SimpleFormNestedFields
-  VERSION = '0.2.1'.freeze
+  VERSION = '0.3.0'.freeze
 end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "simple_form_nested_fields",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "…",
   "main": "package/dist/index.js",
   "repository": "https://github.com/tomasc/simple_form_nested_fields.git",

data/package/dist/index.js

@@ -154,15 +154,28 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
         return new Date().getTime();
       }
     }, {
-      key: 'get_template',
-      value: function get_template(link) {
-        return $(link).data('template').replace(this.options.regexp, this.get_index());
+      key: 'get_item_class_name',
+      value: function get_item_class_name() {
+        return this.get_select().val();
       }
     }, {
       key: 'get_items_container',
       value: function get_items_container() {
         return this.$element.find('.simple_form_nested_fields__items');
       }
+    }, {
+      key: 'get_template',
+      value: function get_template(link) {
+        var $template, item_class_name;
+        item_class_name = this.get_item_class_name();
+        $template = this.$element.find('template[data-class=\'' + item_class_name + '\']').first();
+        return $template.html().replace(this.options.regexp, this.get_index());
+      }
+    }, {
+      key: 'get_select',
+      value: function get_select() {
+        return this.$element.find('.simple_form_nested_fields__select--add');
+      }
     }, {
       key: 'add_new_item',
       value: function add_new_item(link) {

data/package/src/__links.coffee

@@ -24,8 +24,13 @@ do ($ = jQuery, window, document) ->
       @$element.off "click.#{@_name}", '.simple_form_nested_fields__link--add'
 
     get_index: -> new Date().getTime()
-    get_template: (link) -> $(link).data('template').replace(@options.regexp, @get_index())
+    get_item_class_name: -> @get_select().val()
     get_items_container: -> @$element.find('.simple_form_nested_fields__items')
+    get_template: (link) ->
+      item_class_name = @get_item_class_name()
+      $template = @$element.find("template[data-class='#{item_class_name}']").first()
+      $template.html().replace(@options.regexp, @get_index())
+    get_select: -> @$element.find('.simple_form_nested_fields__select--add')
 
     add_new_item: (link) ->
       $template = $(@get_template(link))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_form_nested_fields
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Tomas Celizna
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-21 00:00:00.000000000 Z
+date: 2018-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simple_form