cookbook 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed17e18fbc21b1e5cd13d56061cbfb70cfa37390463f3b066c00216d990f791d
-  data.tar.gz: 6f027dbee389ea0ed9b33ded8a68aeaa9a941a1ee74b7ccb23600e555105ee5e
+  metadata.gz: 2959709e5e50fec64984caac992b47de183442c12ce5388b37d476434e1155dc
+  data.tar.gz: 0b8861cf190ec4da06ac43dc6dee23ccc360c2251a427e4a7fcfc9369b32283f
 SHA512:
-  metadata.gz: 4944c3707a8612da91fee783427a50500de9bc3a03f3ae13395f29fb2124175222fb2f22f0f0de28df92bdf15444ed02e359e91c5f5d26ef2a5371c93d36b60a
-  data.tar.gz: ed9430324055b96146b3480f570403e42117e77d5a7594805e01f1391076d5e3739e163f0d0a6868f50d7a7bc5546c09ca905df5b4b744fe9470d10bff7e7fce
+  metadata.gz: dc961bc7d3a9396de7265eeb271b17ff4c500b6c4c40f5187bfa721702017c7fdf0c70ca453951d792cf5fbf1ea1ada3753548bfedce74e517331be5cb8d13be
+  data.tar.gz: 41ceed87fb03aa183e10f4e1ddab2e2de7e147343d7af48a0dc225dcfd38878aca4ecc727e223986ed6aa146a8469c799f61745c2d938c9c1c9c7099bba64a62

data/VERSION

@@ -1 +1 @@
-0.1.5
+0.1.6

data/app/assets/javascript/cookbook/addFields.js

@@ -0,0 +1,41 @@
+class addFields {
+  // This executes when the function is instantiated.
+  constructor() {
+    this.links = document.querySelectorAll('.add_fields')
+    this.iterateLinks()
+  }
+
+  iterateLinks() {
+    // If there are no links on the page, stop the function from executing.
+    if (this.links.length === 0) return
+    // Loop over each link on the page. A page could have multiple nested forms.
+    this.links.forEach(link => {
+      link.addEventListener('click', e => {
+        this.handleClick(link, e)
+      })
+    })
+  }
+
+  handleClick(link, e) {
+    // Stop the function from executing if a link or event were not passed into the function.
+    if (!link || !e) return
+    // Prevent the browser from following the URL.
+    e.preventDefault()
+    // Save a unique timestamp to ensure the key of the associated array is unique.
+    let time = new Date().getTime()
+    // Save the data id attribute into a variable. This corresponds to `new_object.object_id`.
+    let linkId = link.dataset.id
+    // Create a new regular expression needed to find any instance of the `new_object.object_id` used in the fields data attribute if there's a value in `linkId`.
+    let regexp = linkId ? new RegExp(linkId, 'g') : null
+    // Replace all instances of the `new_object.object_id` with `time`, and save markup into a variable if there's a value in `regexp`.
+    let newFields = regexp ? link.dataset.fields.replace(regexp, time) : null
+    // Add the new markup to the form if there are fields to add.
+    newFields ? link.insertAdjacentHTML('beforebegin', newFields) : null
+    // Tell it new fields are there
+    const event = new Event('cookbook:add_fields')
+    window.dispatchEvent(event);
+  }
+}
+
+// Wait for turbolinks to load, otherwise `document.querySelectorAll()` won't work
+window.addEventListener('load', () => new addFields())

data/app/assets/javascript/cookbook/application.js

@@ -0,0 +1,2 @@
+//= require cookbook/addFields
+//= require cookbook/removeFields

data/app/assets/javascript/cookbook/removeFields.js

@@ -0,0 +1,36 @@
+class removeFields {
+  // This executes when the function is instantiated.
+  constructor() {
+    this.iterateLinks()
+  }
+
+  iterateLinks() {
+    document.querySelectorAll('.remove_fields').forEach(link => {
+      link.addEventListener('click', e => {
+        this.handleClick(link, e)
+      })
+    })
+  }
+
+  handleClick(link, e) {
+    // Stop the function from executing if a link or event were not passed into the function.
+    if (!link || !e) return
+    // Prevent the browser from following the URL.
+    e.preventDefault()
+    // Find the parent wrapper for the set of nested fields.
+    let fieldParent = link.closest('.nested-fields')
+    // If there is a parent wrapper, find the hidden delete field.
+    let deleteField = fieldParent
+      ? fieldParent.querySelector('input[type="hidden"]')
+      : null
+    // If there is a delete field, update the value to `1` and hide the corresponding nested fields.
+    if (deleteField) {
+      deleteField.value = 1
+      fieldParent.style.display = 'none'
+    }
+  }
+}
+
+// Wait for turbolinks to load, otherwise `document.querySelectorAll()` won't work
+window.addEventListener('load', () => new removeFields())
+window.addEventListener('cookbook:add_fields', () => new removeFields())

data/app/helpers/cookbook/application_helper.rb

@@ -15,6 +15,45 @@ module Cookbook
       render 'cookbook/fields', form: form, usables: build_usables(form.object)
     end
 
+    # This method creates a link with `data-id` `data-fields` attributes. These attributes are used to create new instances of the nested fields through Javascript.
+    def cookbook_link_to_add_fields(name, f, association, partial = nil)
+
+      # Takes an object (@person) and creates a new instance of its associated model (:addresses)
+      # To better understand, run the following in your terminal:
+      # rails c --sandbox
+      # @person = Person.new
+      # new_object = @person.send(:addresses).klass.new
+      new_object = f.object.send(association).klass.new
+
+      # Saves the unique ID of the object into a variable.
+      # This is needed to ensure the key of the associated array is unique. This is makes parsing the content in the `data-fields` attribute easier through Javascript.
+      # We could use another method to achive this.
+      id = new_object.object_id
+
+      # https://api.rubyonrails.org/ fields_for(record_name, record_object = nil, fields_options = {}, &block)
+      # record_name = :addresses
+      # record_object = new_object
+      # fields_options = { child_index: id }
+      # child_index` is used to ensure the key of the associated array is unique, and that it matched the value in the `data-id` attribute.
+      # `person[addresses_attributes][child_index_value][_destroy]`
+      fields = f.fields_for(association, new_object, child_index: id) do |builder|
+
+        # `association.to_s.singularize + "_fields"` ends up evaluating to `address_fields`
+        # The render function will then look for `views/people/_address_fields.html.erb`
+        # The render function also needs to be passed the value of 'builder', because `views/people/_address_fields.html.erb` needs this to render the form tags.
+        partial.nil? ? render(association.to_s.singularize + "_fields", f: builder) : render(partial, f: builder)
+      end
+
+      # This renders a simple link, but passes information into `data` attributes.
+      # This info can be named anything we want, but in this case we chose `data-id:` and `data-fields:`.
+      # The `id:` is from `new_object.object_id`.
+      # The `fields:` are rendered from the `fields` blocks.
+      # We use `gsub("\n", "")` to remove anywhite space from the rendered partial.
+      # The `id:` value needs to match the value used in `child_index: id`.
+      link_to(name, '#', class: "add_fields button button-action", data: {id: id, fields: fields.gsub("\n", "")})
+
+    end
+
     private
 
     def build_usables(object)

data/app/views/cookbook/_fields.html.haml

@@ -1,11 +1,11 @@
-= javascript_include_tag 'vanilla_nested'
+= javascript_include_tag 'cookbook/application'
 - if Cookbook.configuration.include_cookbook_css == true
   = stylesheet_link_tag 'cookbook/application'
 - usables.each do |usable|
   %fieldset.used_in{class: usable.plural_class}
     %legend
       %h3= usable.title
-    = link_to_add_nested form, usable.uses_sym, "##{usable.plural_class}", partial: 'cookbook/uses/fields', link_text: "Add #{usable.singular_title}", link_classes: 'button button-action'
     %div{id: usable.plural_class}
       = form.fields_for usable.uses_sym do |g|
-        = render 'cookbook/uses/fields', form: g, usable: usable
+        = render 'cookbook/use_fields', f: g, usable: usable
+    = cookbook_link_to_add_fields "Add #{usable.singular_title}", form, usable.uses_sym, 'cookbook/use_fields'

data/app/views/cookbook/_use_fields.html.haml

@@ -0,0 +1,22 @@
+%fieldset.nested-fields
+  :ruby
+    table_sym = f.object_name.gsub(/[^\[]+\[([^\]]+)_uses_attributes\].*/, "\\1").pluralize
+    model = table_sym.to_s.classify.constantize
+    collection = if Cookbook.configuration.authorize_with == :cancancan
+                   model.accessible_by(current_ability, :select)
+                 else
+                   model.all
+                 end
+  %legend
+    %h4
+      = model.model_name.human
+  = f.hidden_field :_destroy
+  = f.hidden_field :use_of_type, value: model.model_name.to_s
+  = f.input :use_of_id, collection: collection, as: :select, label_method: model.label_method, value_method: :id, selected: f.object.use_of_id, include_blank: "Select #{model.model_name.human}"
+  = f.input :quantity_minimum
+  = f.input :quantity_maximum
+  = f.input :unit
+  = f.input :sort
+  = f.input :preparation, hint: 'like "crushed" or "greased"'
+  = f.input :note, hint: 'like "to taste"'
+  = link_to "Remove", '#', class: 'remove_fields button button-danger'

data/cookbook.gemspec

@@ -2,11 +2,11 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: cookbook 0.1.5 ruby lib
+# stub: cookbook 0.1.6 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "cookbook".freeze
-  s.version = "0.1.5"
+  s.version = "0.1.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.metadata = { "source_code_uri" => "http://github.com/gemvein/cookbook" } if s.respond_to? :metadata=
@@ -30,14 +30,17 @@ Gem::Specification.new do |s|
     "README.md",
     "Rakefile",
     "VERSION",
+    "app/assets/javascript/cookbook/addFields.js",
+    "app/assets/javascript/cookbook/application.js",
+    "app/assets/javascript/cookbook/removeFields.js",
     "app/assets/stylesheets/cookbook/application.scss",
     "app/controllers/concerns/cookbook/params.rb",
     "app/helpers/cookbook/application_helper.rb",
     "app/models/cookbook/use.rb",
     "app/views/cookbook/_fields.html.haml",
+    "app/views/cookbook/_use_fields.html.haml",
     "app/views/cookbook/_used_in.html.haml",
     "app/views/cookbook/_uses_of.html.haml",
-    "app/views/cookbook/uses/_fields.html.haml",
     "bin/rails",
     "config/initializers/simple_form.rb",
     "config/locales/simple_form.en.yml",

data/lib/cookbook.rb

@@ -19,7 +19,6 @@ module Cookbook
   require 'haml-rails'
   require 'sass-rails'
   require 'simple_form'
-  require 'vanilla_nested'
   require 'cancancan' if Cookbook.configuration.authorize_with == :cancancan
 end
 

data/spec/dummy/app/javascript/packs/application.js

@@ -13,4 +13,5 @@
 //= require rails-ujs
 //= require activestorage
 //= require cookbook
+//= require ../../../../../app/assets/javascripts/cookbook
 //= require_tree .