abyme 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 54da5a9a0118b560b3e9006d85f175d3a84ccd067a8654a61c4a46dfeb5ba15b
-  data.tar.gz: 3d836ed9cf5564e2b311a8e100466bc589307c0c5bf77f527fae70c94bc05fb9
+  metadata.gz: 0aefabdd57f0839a84d951c5cf2c1cbf8e515b9e6735ee4786cd867a81ef6817
+  data.tar.gz: 7a54056dd25d3dd5783904ee2b54891040c3c614daa6e667c2eca4108e3e1aef
 SHA512:
-  metadata.gz: e7095310324451424bccce250acd5cddd059108861581169990ec1be1abe8e5a9453aaf7710f1cb62d63bebbb5af4220f6257897119d43477e2a923b01067d3e
-  data.tar.gz: 20bb396ba92d7b739fdf137d37627163f71f3dbc4dbbe84ea346d24ccbe7317af2b253a1b451e52a650da0e01b078a153e8565e268475765769347e2c1e56be5
+  metadata.gz: 77880b3666f91e2c0f525ac89c25c74d98a12b89714068b3834e236d806f59b264679a24eb78f962f4f37899146de5f225664633d4ed1470a3827a2441e40a97
+  data.tar.gz: 79f862ec2e13b4e491b7109a691742f8f986f1651c779ba2b8f56d283185a35116edc632b96df28347e772e56058b9321279e762a35915641e0d85c00306e640

data/README.md

@@ -2,6 +2,16 @@
 
 abyme is a modern take on handling dynamic nested forms in Rails 6+ using StimulusJS.
 
+## Disclaimer
+This project is still a work in progress and subject to change. We encourage not to use it in production code just yet.
+
+Any enhancement proposition or bug report welcome !
+
+General remarks : 
+* A demo app will soon be online.
+* For now, the gem is tested through our demo app. Specific autonomous tests will be transfered/written in the following days.
+* Help is very much wanted on the Events part of the gem (see bottom of this documentation)
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -46,14 +56,14 @@ Let's consider a to-do application with Projects having many Taks, themselves ha
 ```ruby
 # models/project.rb
 class Project < ApplicationRecord
-  has_many :tasks, inverse_of: :project, dependent: :destroy
+  has_many :tasks
   validates :title, :description, presence: true
 end
 
 # models/task.rb
 class Task < ApplicationRecord
   belongs_to :project
-  has_many :comments, inverse_of: :project, dependent: :destroy
+  has_many :comments
   validates :title, :description, presence: true
 end
 
@@ -63,50 +73,257 @@ class Comment < ApplicationRecord
   validates :content, presence: true
 end
 ```
-The end-goal is to be able to create a project along with different tasks, and immediately add comments to some of these tasks ; all in a single form.
-What we'll have is a 2-level nested form. Thus, we'll need to add these lines to both `Project` and `Task` :
+The end-goal here is to be able to create a project along with different tasks, and immediately add comments to some of these tasks ; all within a single form.
+What we'll have is a 2-level nested form. Thus, we'll need to configure our `Project` and `Task` models like so :
 ```ruby
 # models/project.rb
 class Project < ApplicationRecord
   include Abyme::Model
-  #...
+  has_many :tasks, inverse_of: :project
+  # ...
   abyme_for :tasks
 end
 
 # models/task.rb
 class Task < ApplicationRecord
   include Abyme::Model
-  #...
+  has_many :comments, inverse_of: :task
+  # ...
   abyme_for :comments
 end
 ```
+Note the use of the `inverse_of` option. It is needed for Rails to effectively associate children to their yet unsaved parent. Have a peek to the bottom of [this page](https://api.rubyonrails.org/classes/ActiveRecord/NestedAttributes/ClassMethods.html#method-i-accepts_nested_attributes_for) for more info.
 
 ### Controller
 Since we're dealing with one form, we're only concerned with one controller : the one the form routes to. In our example, this would be the `ProjectsController`.
-The only configuration needed here will be our strong_params. Nested attributes require a very specific syntax to white-list the permitted attributes. It looks like this :
+The only configuration needed here will concern our strong params. Nested attributes require a very specific syntax to white-list the permitted attributes. It looks like this :
 
 ```ruby
-  def project_params
-  	params.require(:project).permit(
-      :title, :description, tasks_attributes: [
-        :id, :title, :description, :_destroy, comments_attributes: [
-          :id, :content, :_destroy
-        ]
+def project_params
+  params.require(:project).permit(
+    :title, :description, tasks_attributes: [
+      :id, :title, :description, :_destroy, comments_attributes: [
+        :id, :content, :_destroy
       ]
-    )
-  end
+    ]
+  )
+end
 ```
 A few explanations here. 
 
 * To permit a nested model attributes in your params, you'll need to pass the `association_attributes: [...]` hash at the end of your resource attributes. Key will always be `association_name` followed by `_attributes`, while the value will be an array of symbolized attributes, just like usual.
 
-**Note**: if your association is a singular one (`has_one` or `belongs_to`, the association will be singular ; if a Project `has_one :owner`, you would then need to pass `owner_attributes: [...]`)
+> **Note**: if your association is a singular one (`has_one` or `belongs_to`) the association will be singular ; if a Project `has_one :owner`, you would then need to pass `owner_attributes: [...]`)
+
+* You may have remarked the presence of `id` and `_destroy` among those params. These are necessary for edit actions : if you want to allow your users to destroy or update existing records, these are **mandatory**.  Otherwise, Rails won't be able to recognize these records as existing ones, and will just create new ones. More info [here](https://api.rubyonrails.org/classes/ActiveRecord/NestedAttributes/ClassMethods.html).
+
+## Basic Usage
+
+Dealing with nested attributes means you'll generally have to handle a few things inside your form:
+* Display fields for the **persisted records** (here, already existing `:tasks`)
+* Display fields for the **new records** (future `:tasks` not yet persisted)
+* A button to **trigger the addition** of fields for a new resource (an `Add a new task` button)
+* A button to **remove fields** for a given resource (`Remove task`)
+
+abyme provides helper methods for all these. Here's how our form for `Project` looks like when using default values:
+
+```ruby
+# views/projects/_form.html.erb
+<%= simple_form_for @project do |f| %>
+  <%= f.input :title %>
+  <%= f.input :description %>
+  <%= f.submit 'Save' %>
+
+  <%= abymize(:tasks, f) do |abyme| %>
+    <%= abyme.records %>
+    <%= abyme.new_records %>
+    <%= add_association %>
+  <% end %>
+<% end %>
+```
+
+`abyme.records` will contain the persisted associations fields, while `abyme.new_records` will contain fields for the new associations. `add_association` will by default generate a button with a text of type "Add `resource_name`". To work properly, this method **has** to be called **inside the block** passed to the `abymize` method.
+
+Now where's the code for these fields ? abyme will assume a **partial** to be present in the directory `/views/abyme` with a *name respecting this naming convention* (just like with [cocoon](https://github.com/nathanvda/cocoon#basic-usage)): `_singular_association_name_fields.html.erb`. 
+
+This partial might look like this:
+```ruby
+# views/abyme/_task_fields.html.erb
+<%= f.input :title %>
+<%= f.input :description %>
+<%= f.hidden_field :_destroy %>
+
+<%= remove_association(tag: :div) do %>
+  <i class="fas fa-trash"></i>
+<% end %>
+```
+
+Note the presence of the `remove_association` button. Here, we pass it an option to make it a `<div>`, as well as a block to customize its content. Don't forget the `_destroy` attribute, needed to mark items for destruction.
+
+### What about the controller ?
+
+What about it ? Well, not much. That's the actual magical thing about `nested_attributes`: once your model is aware of its acceptance of those for a given association, and your strong params are correctly configured, there's nothing else to do.
+`@project.create(project_params)` is all you'll need to save a project along with its descendants 👨‍👧‍👧
+
+### Auto mode
+
+Let's now take care of our comments fields. We'll add these using our neat *automatic mode*: just stick this line at the end of the partial:
+```ruby
+# views/abyme/_task_fields.html.erb
+# ... rest of the partial above
+<%= abymize(:comments, f) %>
+```
+Where's the rest of the code ? Well, if the default configuration you saw above in the `_form.html.erb` suits you, and the order in which the different resources appear feels right (persisted first, new fields second, and the 'Add' button last), then you can just spare the block, and it will be taken care of for you. We'll just write our `_comment_fields.html.erb` partial in the `views/abyme` directory and we'll be all set.
+
+## Advanced usage
+### Models
+In models, the `abyme_for :association` acts as an alias for this command :
+
+```ruby
+  accepts_nested_attributes_for :association, reject_if: :all_blank, :allow_destroy: true
+```
+
+Which is the way you would configure `nested_attributes` 90% of the time. Should you want to pass [any available options](https://api.rubyonrails.org/classes/ActiveRecord/NestedAttributes/ClassMethods.html#method-i-accepts_nested_attributes_for) to this method or change those, you may just pass them as with the original method :
+```ruby
+  abyme_for :association, limit: 3, allow_destroy: false
+```
+
+### Views
 
-* You may have remarked the presence of `id` and `_destroy` among those params. These are necessary for edit actions : if you want to allow your users to destroy or update existing records, these are **mandatory**.  Otherwise, Rails won't be able to recognize these records as existing ones, and will just create new ones.
+#### #records
+A few options can be passed to `abyme.records`:
+* `collection:` : allows you to pass a collection of your choice to only display specific objects.
+```ruby
+  <%= abymize(:tasks, f) do |abyme| %>
+    <%= abyme.records(collection: @project.tasks.where(done: false)) %>
+    <%= abyme.new_records %>
+    <%= add_association %>
+  <% end %>
+```
+* `order:` : allows you to pass an ActiveRecord `order` method to sort your instances the way you want.
+```ruby
+  <%= abymize(:tasks, f) do |abyme| %>
+    <%= abyme.records(order: { created_at: :asc }) %>
+    <%= abyme.new_records %>
+    <%= add_association %>
+  <% end %>
+```
+* `partial:` : allows you to indicate a custom partial, if one has not already been passed to `abymize`.
+```ruby
+  <%= abymize(:tasks, f) do |abyme| %>
+    <%= abyme.records %>
+    <%= abyme.new_records(partial: 'projects/task_fields') %>
+    <%= add_association %>
+  <% end %>
+```
+* `fields_html:` : gives you the possibility to add any HTML attribute you may want to each set of fields. By default, an `abyme--fields` and an `singular_association-fields` class are already present.
+```ruby
+  <%= abymize(:tasks, f) do |abyme| %>
+    <%= abyme.records(fields_html: { class: "some-class" }) %>
+    # Every set of persisted fields will have these 3 classes : 'abyme--fields', 'task-fields', and 'some-class'
+    <%= abyme.new_records %>
+    <%= add_association %>
+  <% end %>
+```
+* `wrapper_html:` : gives you the possibility to add any HTML attribute you may want to the wrapper containing all fields. By default, an `abyme-association-wrapper` class is already present.
+```ruby
+  <%= abymize(:tasks, f) do |abyme| %>
+    <%= abyme.records(html: { class: "persisted-records" }) %>
+    # The wrapper containing all persisted task fields will have an id "abyme-tasks-wrapper" and a class "persisted-records"
+    <%= abyme.new_records %>
+    <%= add_association %>
+  <% end %>
+```
+#### #new_records
+Here are the options that can be passed to `abyme.new_records`:
+* `position:` : allows you to specify whether new fields added dynamically should go at the top or at the bottom. `:end` is the default value.
+```ruby
+  <%= abymize(:tasks, f) do |abyme| %>
+    <%= abyme.records %>
+    <%= abyme.new_records(position: :start) %>
+    <%= add_association %>
+  <% end %>
+```
+* `partial:` : same as `#records`
+* `fields_html:` : same as `#records`
+* `wrapper_html:` : same as `#records`
+
+#### #add_association, #remove_association
+These 2 methods behave the same. Here are their options :
+* `tag:` : allows you to specify a tag of your choosing, like `:a`, or `:div`. Default is `:button`.
+* `content:` : the text to display inside the element. Default is `Add association_name`
+* `html:` : gives you the possibility to add any HTML attribute you may want to the element.
+```ruby
+  <%= abymize(:tasks, f) do |abyme| %>
+    # ...
+    <%= add_association(tag: :a, content: "Add a super task", html: {id: "add-super-task"}) %>
+  <% end %>
+```
+
+As you may have seen above, you can also pass a block to the method to give it whatever HTML content you want :
+```ruby
+  <%= abymize(:tasks, f) do |abyme| %>
+    # ...
+    <%= add_association(tag: :div, html: {id: "add-super-task", class: "flex"}) do %>
+      <i class="fas fa-plus"></i>
+      <h2>Add a super task</h2>
+    <% end %>
+  <% end %>
+```
+
+
+#### #abymize(:association, form_object)
+This is the container for all your nested fields. It takes two parameters (the symbolized association and the `form_builder`), and some optional ones. Please note an id is automatically added to this element, which value is : `abyme--association`. 
+* `partial:` : allows you to indicate a custom partial path for both `records` and `new_records`
+```ruby
+  <%= abymize(:tasks, f, partial: 'projects/task_fields') do |abyme| %>
+    <%= abyme.records %>
+    <%= abyme.new_records %>
+    <%= add_association %>
+  <% end %>
+```
+* `limit:` : allows you to limit the number of fields that can be created through JS. If you need to limit the number of associations in database, you will need to add validations. You can also pass an option [in your model as well](https://api.rubyonrails.org/classes/ActiveRecord/NestedAttributes/ClassMethods.html#method-i-accepts_nested_attributes_for).
+```ruby
+  <%= abymize(:tasks, f, limit: 5) do |abyme| %>
+    # Beyond 5 tasks, the add button won't add any more fields. See events section below to see how to handle the 'abyme:limit-reached' event
+    <%= abyme.records %>
+    <%= abyme.new_records %>
+    <%= add_association %>
+  <% end %>
+```
+* `min-count` : by default, there won't be any blank fields added on page load. By passing a `min-count` option, you can set how many empty fields should appear in the form.
+```ruby
+  <%= abymize(:tasks, f, min-count: 1) do |abyme| %>
+    # 1 blank task will automatically be added to the form.
+    <%= abyme.records %>
+    <%= abyme.new_records %>
+    <%= add_association %>
+  <% end %>
+```
+
+*When in auto mode*, the abymize method can take a few options:
+* `add-button-text:` : this will set the `add_association` button text to the string of your choice.
+* All options that should be passed to either `records` or `new_records` can be passed here and will be passed down.
+
+## Events
+This part is still a work in progress and subject to change. We're providing some basic self-explanatory events to attach to. These are emitted by the main container (created by the `abymize` method).
+
+We're currently thinking about a way to attach to these via Stimulus. Coming soon !
 
-### View
+### Lifecycle events
+* `abyme:before-add`
+* `abyme:after-add`
+* `abyme:before-remove`
+* `abyme:after-remove`
+```javascript
+document.getElementById('abyme--tasks').addEventListener('abyme:before-add', yourCallback)
+```
 
-TODO...
+### Other events
+* `abyme:limit-reached`
+```javascript
+document.getElementById('abyme--tasks').addEventListener('abyme:limit-reached', () => { alert('You reached the max number of tasks !) })
+```
 
 ## Development
 

data/javascript/abyme_controller.js

@@ -1,60 +1,60 @@
 import { Controller } from 'stimulus';
 
 export default class extends Controller {
-  static targets = ['template', 'associations'];
+  static targets = ['template', 'associations', 'fields', 'newFields'];
 
   connect() {
-    console.log('Abyme Connect');
+    if (this.count) {
+      this.addDefaultAssociations();
+    }
   }
 
+  get count() {
+    return this.element.dataset.minCount || 0;
+  }
+  
   get position() {
     return this.associationsTarget.dataset.abymePosition === 'end' ? 'beforeend' : 'afterbegin';
   }
 
   add_association(event) {
-    event.preventDefault();
-
-    let html = this.templateTarget.innerHTML.replace(
-      /NEW_RECORD/g,
-      new Date().getTime()
-    );
-
-    if (html.match(/<template[\s\S]+<\/template>/)) {
-      const template = html
-        .match(/<template[\s\S]+<\/template>/)[0]
-        .replace(/(\[\d{12,}\])(\[[^\[\]]+\]"){1}/g, `[NEW_RECORD]$2`);
-
-      html = html.replace(/<template[\s\S]+<\/template>/g, template);
+    if (event) {
+      event.preventDefault();
+    }
+    // check for limit reached
+    if (this.element.dataset.limit && this.limit_check()) {
+      this.create_event('limit-reached')
+      return false
     }
 
-    this.create_event('before-add', html)
+    const html = this.build_html();
+    this.create_event('before-add');
     this.associationsTarget.insertAdjacentHTML(this.position, html);
-    this.create_event('after-add', html)
+    this.create_event('after-add');
   }
 
   remove_association(event) {
     event.preventDefault();
-
-    this.create_event('before-remove')
-    let wrapper = event.target.closest('.abyme--fields');
-    wrapper.querySelector("input[name*='_destroy']").value = 1;
-    wrapper.style.display = 'none';
-    this.create_event('after-remove')
+    this.create_event('before-remove');
+    this.mark_for_destroy(event);
+    this.create_event('after-remove');
   }
 
+  // LIFECYCLE EVENTS RELATED
+
   create_event(stage, html = null) {
-    const event = new CustomEvent(`abyme:${stage}`, { detail: {controller: this, content: html} })
-    this.element.dispatchEvent(event)
+    const event = new CustomEvent(`abyme:${stage}`, { detail: {controller: this, content: html} });
+    this.element.dispatchEvent(event);
     // WIP
-    this.dispatch(event, stage)
+    this.dispatch(event, stage);
   }
 
   // WIP : Trying to integrate event handling through controller inheritance
   dispatch(event, stage) {
-    if (stage === 'before-add' && this.abymeBeforeAdd) this.abymeBeforeAdd(event)
-    if (stage === 'after-add' && this.abymeAfterAdd) this.abymeAfterAdd(event)
-    if (stage === 'before-remove' && this.abymeBeforeRemove) this.abymeBeforeAdd(event)
-    if (stage === 'after-remove' && this.abymeAfterRemove) this.abymeAfterRemove(event)
+    if (stage === 'before-add' && this.abymeBeforeAdd) this.abymeBeforeAdd(event);
+    if (stage === 'after-add' && this.abymeAfterAdd) this.abymeAfterAdd(event);
+    if (stage === 'before-remove' && this.abymeBeforeRemove) this.abymeBeforeAdd(event);
+    if (stage === 'after-remove' && this.abymeAfterRemove) this.abymeAfterRemove(event);
   }
 
   abymeBeforeAdd(event) {
@@ -68,4 +68,54 @@ export default class extends Controller {
 
   abymeAfterRemove(event) {
   }
+
+  // UTILITIES
+
+  // build html
+  build_html() {
+    let html = this.templateTarget.innerHTML.replace(
+      /NEW_RECORD/g,
+      new Date().getTime()
+    );
+      
+    if (html.match(/<template[\s\S]+<\/template>/)) {
+      const template = html
+      .match(/<template[\s\S]+<\/template>/)[0]
+      .replace(/(\[\d{12,}\])(\[[^\[\]]+\]"){1}/g, `[NEW_RECORD]$2`);
+      
+      html = html.replace(/<template[\s\S]+<\/template>/g, template);
+    }
+
+    return html;
+  }
+    
+  // mark association for destroy
+  mark_for_destroy(event) {
+    let item = event.target.closest('.abyme--fields');
+    item.querySelector("input[name*='_destroy']").value = 1;
+    item.style.display = 'none';
+    item.classList.add('abyme--marked-for-destroy')
+  }
+
+  // check if associations limit is reached
+  limit_check() {
+    return (this.newFieldsTargets
+                .filter(item => !item.classList.contains('abyme--marked-for-destroy'))).length 
+                >= parseInt(this.element.dataset.limit)
+  }
+
+  // Add default blank associations at page load
+  async addDefaultAssociations() {
+    let i = 0
+    while (i < this.count) {
+      this.add_association()
+      i++
+      // Sleep function to ensure uniqueness of timestamp
+      await this.sleep(1);
+    }
+  }
+
+  sleep(ms) {
+    return new Promise(resolve => setTimeout(resolve, ms));
+  }
 }

data/lib/abyme/abyme_builder.rb

@@ -2,60 +2,31 @@ module Abyme
   class AbymeBuilder < ActionView::Base
     include ActionView
 
-    def initialize(association:, form:, lookup_context:, &block)
+    def initialize(association:, form:, lookup_context:, partial:, &block)
       @association = association
       @form = form
       @lookup_context = lookup_context
+      @partial = partial
       yield(self) if block_given?
     end
   
     def records(options = {})
-      persisted_records_for(@association, @form, options) do |form|
-        render_association_partial(form, options)
+      persisted_records_for(@association, @form, options) do |fields_for_association|
+        render_association_partial(fields_for_association, options)
       end
     end
     
     def new_records(options = {}, &block)
-      new_records_for(@association, @form, options) do |form|
-        render_association_partial(form, options)
+      new_records_for(@association, @form, options) do |fields_for_association|
+        render_association_partial(fields_for_association, options)
       end
     end
   
-    # def add_association(options = {}, &block)
-    #   action = 'click->abyme#add_association'
-    #   create_button(action, options, &block)
-    # end
-  
-    # def remove_association(options = {}, &block)
-    #   action = 'click->abyme#remove_association'
-    #   create_button(action, options, &block)
-    # end
-  
     private
 
-    def render_association_partial(form, options)
-      partial = options[:partial] || "shared/#{@association.to_s.singularize}_fields"
-      # ActionController::Base.render(partial: "shared/#{@association.to_s.singularize}_fields", locals: { f: form })
-      ActionController::Base.render(partial: partial, locals: { f: form })
+    def render_association_partial(fields, options)
+      partial = @partial || options[:partial] || "abyme/#{@association.to_s.singularize}_fields"
+      ActionController::Base.render(partial: partial, locals: { f: fields })
     end
-    
-    # def create_button(action, options, &block)
-    #   options[:attributes] = {} if options[:attributes].nil?
-    #   options[:tag] = :button if options[:tag].nil?
-  
-    #   if block_given?
-    #     concat content_tag(options[:tag], { data: { action: action }}.merge(options[:attributes])) do
-    #       # capture(&block)
-    #       yield
-    #     end
-    #   else
-    #     render content_tag(options[:tag], options[:content], {data: { action: action }}.merge(options[:attributes]))
-    #   end
-    # end
-  
-    # def formatize(association)
-    #   association.class.name.tableize
-    # end
-
   end
 end

data/lib/abyme/version.rb

@@ -1,8 +1,8 @@
 module Abyme
   module VERSION
     MAJOR = 0
-    MINOR = 1
-    PATCH = 3
+    MINOR = 2
+    PATCH = 0
 
     STRING = [MAJOR, MINOR, PATCH].join(".")
   end

data/lib/abyme/view_helpers.rb

@@ -1,32 +1,41 @@
-require 'abyme/abyme_builder'
-
 module Abyme
   module ViewHelpers
 
     def abymize(association, form, options = {}, &block)
-      content_tag(:div, data: { controller: 'abyme' }, id: "abyme--#{association}") do
+      content_tag(:div, data: { controller: 'abyme', limit: options[:limit], min_count: options[:min_count] }, id: "abyme--#{association}") do
         if block_given?
-          yield(Abyme::AbymeBuilder.new(association: association, form: form, lookup_context: self.lookup_context))
+          yield(Abyme::AbymeBuilder.new(
+            association: association, form: form, lookup_context: self.lookup_context, partial: options[:partial]
+            )
+          )
         else
           model = association.to_s.singularize.classify.constantize
           concat(persisted_records_for(association, form, options))
           concat(new_records_for(association, form, options)) 
-          concat(add_association(content: options[:add] || "Add #{model}"))
+          concat(add_association(content: options[:button_text] || "Add #{model}"))
         end
       end
     end
 
     def new_records_for(association, form, options = {}, &block)
-      content_tag(:div, data: { target: 'abyme.associations', association: association, abyme_position: options[:position] || :end }) do
+      options[:wrapper_html] ||= {}
+
+      wrapper_default = { 
+        data: { 
+          target: 'abyme.associations', 
+          association: association, 
+          abyme_position: options[:position] || :end 
+        } 
+      }
+
+      fields_default = { data: { target: 'abyme.fields abyme.newFields' } }
+
+      content_tag(:div, build_attributes(wrapper_default, options[:wrapper_html])) do
         content_tag(:template, class: "abyme--#{association.to_s.singularize}_template", data: { target: 'abyme.template' }) do
           form.fields_for association, association.to_s.classify.constantize.new, child_index: 'NEW_RECORD' do |f|
-            content_tag(:div, basic_markup(options[:html])) do
-              if block_given?
-                # Here, f is the fields_for ; f.object becomes association.new rather than the original form.object
-                yield(f)
-              else
-                render "shared/#{association.to_s.singularize}_fields", f: f
-              end
+            content_tag(:div, build_attributes(fields_default, basic_fields_markup(options[:fields_html], association))) do
+              # Here, if a block is passed, we're passing the association fields to it, rather than the form itself
+              block_given? ? yield(f) : render("abyme/#{association.to_s.singularize}_fields", f: f)
             end
           end
         end
@@ -34,29 +43,21 @@ module Abyme
     end
   
     def persisted_records_for(association, form, options = {})
-      if options[:collection]
-        records = options[:collection]
-      else
-        records = form.object.send(association)
-      end
+      records = options[:collection] || form.object.send(association)
+      options[:wrapper_html] ||= {}
+      fields_default = { data: { target: 'abyme.fields' } }
       
       if options[:order].present?
         records = records.order(options[:order])
-        
-        # GET INVALID RECORDS
+        # Get invalid records
         invalids = form.object.send(association).reject(&:persisted?)
-        
-        if invalids.any?
-          records = records.to_a.concat(invalids)
-        end
-      end
-
-      form.fields_for(association, records) do |f|
-        content_tag(:div, basic_markup(options[:html])) do
-          if block_given?
-            yield(f)
-          else
-            render "shared/#{association.to_s.singularize}_fields", f: f
+        records = records.to_a.concat(invalids) if invalids.any?
+      end 
+      
+      content_tag(:div, options[:wrapper_html]) do
+        form.fields_for(association, records) do |f|
+          content_tag(:div, build_attributes(fields_default, basic_fields_markup(options[:fields_html], association))) do
+            block_given? ? yield(f) : render("abyme/#{association.to_s.singularize}_fields", f: f)
           end
         end
       end
@@ -88,17 +89,27 @@ module Abyme
       end
     end
 
-    def basic_markup(html)
-
+    def basic_fields_markup(html, association = nil)
       if html && html[:class]
-        html[:class] = 'abyme--fields ' + html[:class]
+        html[:class] = "abyme--fields #{association.to_s.singularize}-fields #{html[:class]}" 
       else
         html ||= {}
-        html[:class] = 'abyme--fields'
+        html[:class] = "abyme--fields #{association.to_s.singularize}-fields"
       end
-
-      return html
+      html
     end
 
+    def build_attributes(default, attr)
+      # ADD NEW DATA ATTRIBUTES VALUES TO THE DEFAULT ONES (ONLY VALUES)
+      if attr[:data]
+        default[:data].each do |key, value|
+          default[:data][key] = "#{value} #{attr[:data][key]}".strip
+        end
+      # ADD NEW DATA ATTRIBUTES (KEYS & VALUES)
+        default[:data] = default[:data].merge(attr[:data].reject { |key, _| default[:data][key] })
+      end
+      # MERGE THE DATA ATTRIBUTES TO THE HASH OF HTML ATTRIBUTES
+      default.merge(attr.reject { |key, _| key == :data })
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: abyme
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Romain Sanson
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-10-13 00:00:00.000000000 Z
+date: 2020-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -60,6 +60,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".DS_Store"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
@@ -68,12 +69,13 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- abyme-0.1.2.gem
+- abyme-0.1.3.gem
 - abyme.gemspec
 - bin/console
 - bin/setup
 - javascript/abyme_controller.js
 - javascript/index.js
+- lib/.DS_Store
 - lib/abyme.rb
 - lib/abyme/abyme_builder.rb
 - lib/abyme/engine.rb