nested_form_fields 0.7.7 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7e9a9d80e8de459fc66f99524b4cd8745ee93f7b
-  data.tar.gz: 96091b9aac3a10ddf9cddc50f3ddd81b91610e07
+SHA256:
+  metadata.gz: cd4df0cf94166b6a42a70a0676168960735f6fd92d1cc07ba6c942495e4042e2
+  data.tar.gz: de6ca1333d9d98c2a965c1526c6cf17c43ccf617000cabbed1d279ab04c2fdb6
 SHA512:
-  metadata.gz: 55b8fe3a713f864adcceb97ceb0e6e976c52145fa3c93d855176d25725a83ff087e704783496703a4b135d5669fe9cb9b57091f2f645d6f4157cf3401c0df643
-  data.tar.gz: 3ad1d302024a32d97a5811f96821597d6069a88620824ec0c6bd85d3ced95d1c0614725a7d9e681af97ac67338bd38d08e043316c3d5f9762ac890ab5ea91143
+  metadata.gz: d91f11f1dadf41e12edd49d63a2eee4d126ceace8e0cf93eb6d595e2db28245ea61dbab4bffcf4ddf4307d816cda9e3ae08f33a2932056e3f512dbb3c9de9770
+  data.tar.gz: ec662c27318ba48fff3ef627fd94529a25872bca7c15e170640236be537657ff577b6d47838a5b2603d27284a7d8aeafde0198bac56287fd1a9acd2e2f66777c

data/.travis.yml

@@ -1,10 +1,10 @@
 rvm:
-  - 1.9.3
   - 2.0.0
   - 2.1.7
   - 2.2.3
+  - 2.3.2
 
-before_install: gem install bundler -v 1.11.2 
+before_install: gem install bundler -v 1.11.2
 
 before_script:
   - "export DISPLAY=:99.0"

data/README.md

@@ -14,15 +14,44 @@ It uses jQuery to dynamically add and remove nested associations.
 
 Add this line to your application's Gemfile:
 
-    gem 'nested_form_fields'
+```ruby
+gem 'nested_form_fields'
+```
 
 And then execute:
 
-    $ bundle
+```console
+$ bundle
+```
 
 In your application.js file add:
 
-    //= require nested_form_fields
+```javascript
+//= require nested_form_fields
+```
+
+### Rails 5.1+
+
+You will need to install jQuery as Rails dropped it from its default stack.
+
+Add to Gemfile:
+
+```ruby
+gem 'jquery-rails'
+```
+
+Execute:
+
+```console
+$ bundle
+```
+
+Add to application.js:
+
+```javascript
+//= require jquery3
+//= require jquery_ujs
+```
 
 ## Usage
 
@@ -80,7 +109,7 @@ f.add_nested_fields_link :videos, 'Add another funtastic video', class: 'btn btn
 You can supply a block to the `remove_nested_fields_link` and the `add_nested_fields_link` helpers, as you can with `link_to`:
 
 ```haml
-= ff.remove_nested_fields_link
+= ff.remove_nested_fields_link do
   Remove me %span.icon-trash
 ```
 
@@ -141,8 +170,8 @@ def user_params
     params.require(:user)
         .permit(:name,:email,videos_attributes:[:video_title,:_destroy,:id])
 #                            ^^^                 ^^^           ^^^
-#                            nested model attrs  
-#                                                             they will let you delete the nested model                    
+#                            nested model attrs
+#                                                             they will let you delete the nested model
 end
 ```
 
@@ -177,13 +206,24 @@ $(document).on "fields_added.nested_form_fields", (event, param) ->
       console.log "INFO: Fields were successfully added, callback not handled."
 ```
 
+You can pass any additional data to the event's callback. This may be useful if you trigger them programmatically. Example:
+
+```coffeescript
+# Trigger button click programmatically and pass an object `{hello: 'world'}`
+$('.add_nested_fields_link').trigger('click', [{hello: 'world'}])
+
+# Listen for the event
+$(document).on "fields_added.nested_form_fields", (event, param) ->
+  console.log param.additional_data #=> {hello: 'world'}
+```
+
 ## Index replacement string
 
-Sometimes your code needs to know what index it has when it is instantiated onto the page.   
-HTML data elements may need point to other form elements for instance.   This is needed for integration
-with rails3-jquery-autocomplete.  
+Sometimes your code needs to know what index it has when it is instantiated onto the page.
+HTML data elements may need to point to other form elements for instance. This is needed for integration
+with rails3-jquery-autocomplete.
 
-To enable string substitution with the current index use the magic string '__nested_field_for_replace_with_index__'
+To enable string substitution with the current index use the magic string `__nested_field_for_replace_with_index__`.
 
 ## Contributing
 

data/lib/assets/javascripts/nested_form_fields.js.coffee

@@ -2,12 +2,12 @@ window.nested_form_fields or= {}
 
 nested_form_fields.bind_nested_forms_links = () ->
   $('body').off("click", '.add_nested_fields_link')
-  $('body').on 'click', '.add_nested_fields_link', (event) ->
+  $('body').on 'click', '.add_nested_fields_link', (event, additional_data) ->
     $link = $(this)
     object_class = $link.data('object-class')
     association_path = $link.data('association-path')
     added_index = $(".nested_#{association_path}").length
-    $.event.trigger("fields_adding.nested_form_fields",{object_class: object_class, added_index: added_index, association_path: association_path});
+    $.event.trigger("fields_adding.nested_form_fields",{object_class: object_class, added_index: added_index, association_path: association_path, additional_data: additional_data});
     if $link.data('scope')
       $template = $("#{$link.data('scope')} ##{association_path}_template")
     else
@@ -33,13 +33,13 @@ nested_form_fields.bind_nested_forms_links = () ->
       $('#' + target).append($parsed_template)
     else
       $template.before( $parsed_template )
-    $parsed_template.trigger("fields_added.nested_form_fields", {object_class: object_class, added_index: added_index, association_path: association_path, event: event});
+    $parsed_template.trigger("fields_added.nested_form_fields", {object_class: object_class, added_index: added_index, association_path: association_path, event: event, additional_data: additional_data});
     false
 
   $('body').off("click", '.remove_nested_fields_link')
   $('body').on 'click', '.remove_nested_fields_link', ->
     $link = $(this)
-    return false unless $.rails.allowAction($link)
+    return false unless $.rails == undefined || $.rails.allowAction($link)
     object_class = $link.data('object-class')
     delete_association_field_name = $link.data('delete-association-field-name')
     removed_index = parseInt(delete_association_field_name.match('(\\d+\\]\\[_destroy])')[0].match('\\d+')[0])
@@ -51,7 +51,7 @@ nested_form_fields.bind_nested_forms_links = () ->
     else
       $nested_fields_container.before "<input type='hidden' name='#{delete_association_field_name}' value='1' />"
     $nested_fields_container.hide()
-    $nested_fields_container.find('input[required]:hidden').removeAttr('required')
+    $nested_fields_container.find('input[required]:hidden, select[required]:hidden, textarea[required]:hidden').removeAttr('required')
     $nested_fields_container.trigger("fields_removed.nested_form_fields",{object_class: object_class, delete_association_field_name: delete_association_field_name, removed_index: removed_index});
     false
 

data/lib/nested_form_fields.rb

@@ -73,12 +73,14 @@ module ActionView::Helpers
         wrapper_options = options[:wrapper_options].clone || {}
         if child._destroy == true
           wrapper_options[:style] = wrapper_options[:style] ? wrapper_options[:style] + ';' + 'display:none' : 'display:none'
+          output << destroy_hidden_field(association_name, index)
         end
-        output << nested_fields_wrapper(association_name, options[:wrapper_tag], options[:legend], wrapper_options) do
-          new_block = fields_for_nested_model("#{name}[#{options[:child_index] || nested_child_index(name)}]", child, options, block)
-          # do substitution in user defined blocks with the current index allows JS functions to have proper references
-          new_block.gsub('__nested_field_for_replace_with_index__', index.to_s).html_safe
+
+        # Build the wrapper + content and do substitution with the current index allows JS functions to have proper references
+        wrapped_block = nested_fields_wrapper(association_name, options[:wrapper_tag], options[:legend], wrapper_options) do
+          fields_for_nested_model("#{name}[#{options[:child_index] || nested_child_index(name)}]", child, options, block)
         end
+        output << wrapped_block.gsub('__nested_field_for_replace_with_index__', index.to_s).html_safe
       end
 
       output << nested_model_template(name, association_name, options, block)
@@ -114,7 +116,7 @@ module ActionView::Helpers
     end
 
     def association_path association_name
-      "#{object_name.gsub('][','_').gsub(/_attributes/,'').sub('[','_').sub(']','')}_#{association_name}"
+      "#{object_name.to_s.gsub('][','_').gsub(/_attributes/,'').sub('[','_').sub(']','')}_#{association_name}"
     end
 
     def index_placeholder association_name
@@ -132,6 +134,11 @@ module ActionView::Helpers
       end
     end
 
+    def destroy_hidden_field(association_name, index)
+      @template.hidden_field "#{object_name}[#{association_name}_attributes][#{index}]",
+                             :_destroy, value: 1
+    end
+
     def add_default_classes_to_wrapper_options(association_name, wrapper_options)
       default_classes = ["nested_fields", "nested_#{association_path(association_name)}"]
       wrapper_options[:class] = wrapper_options[:class].is_a?(String) ? wrapper_options[:class].split(" ") : wrapper_options[:class].to_a

data/lib/nested_form_fields/version.rb

@@ -1,3 +1,3 @@
 module NestedFormFields
-  VERSION = "0.7.7"
+  VERSION = "0.8.3"
 end

data/nested_form_fields.gemspec

@@ -21,13 +21,16 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'coffee-rails', '>= 3.2.1'
   gem.add_dependency 'jquery-rails'
 
-  gem.add_development_dependency 'rspec-rails', '~> 2.9'
+  gem.add_development_dependency 'rspec-rails', '~> 3.5'
+  gem.add_development_dependency 'nokogiri', '1.6.8.1'
   gem.add_development_dependency 'assert_difference'
   gem.add_development_dependency 'capybara'
-  gem.add_development_dependency 'selenium-webdriver'
-  gem.add_development_dependency 'sqlite3'
+  gem.add_development_dependency 'geckodriver-helper'
+  gem.add_development_dependency 'selenium-webdriver', '> 3.0.5'
+  gem.add_development_dependency 'sqlite3', '~> 1.3.6'
   gem.add_development_dependency 'haml', '>= 3.1.5'
-  gem.add_development_dependency 'haml-rails'
+  gem.add_development_dependency 'haml-rails', '~> 0.4.0'
   gem.add_development_dependency 'sass-rails', '~> 3.2.3'
   gem.add_development_dependency 'test-unit', '1.2.3'
+  gem.add_development_dependency 'public_suffix', '~> 1.4.6'
 end

data/spec/spec_helper.rb

@@ -9,6 +9,10 @@ ENV["RAILS_ENV"] = 'test'
 require_relative "dummy/config/environment"
 
 require 'rspec/rails'
+
+# prevent Test::Unit's AutoRunner from executing during RSpec's rake task see https://github.com/rspec/rspec-rails/issues/1171
+Test::Unit.run = true if defined?(Test::Unit) && Test::Unit.respond_to?(:run=)
+
 require 'assert_difference'
 require 'sqlite3'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nested_form_fields
 version: !ruby/object:Gem::Version
-  version: 0.7.7
+  version: 0.8.3
 platform: ruby
 authors:
 - Nico Ritsche
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-06 00:00:00.000000000 Z
+date: 2020-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -58,14 +58,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.9'
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.9'
+        version: '3.5'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.6.8.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.6.8.1
 - !ruby/object:Gem::Dependency
   name: assert_difference
   requirement: !ruby/object:Gem::Requirement
@@ -95,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: selenium-webdriver
+  name: geckodriver-helper
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -108,20 +122,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: selenium-webdriver
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: 3.0.5
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: 3.0.5
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.6
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
@@ -140,16 +168,16 @@ dependencies:
   name: haml-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: sass-rails
   requirement: !ruby/object:Gem::Requirement
@@ -178,6 +206,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.2.3
+- !ruby/object:Gem::Dependency
+  name: public_suffix
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.4.6
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.4.6
 description: |-
   Rails gem for dynamically adding and removing nested has_many association fields in a form.
                            Uses jQuery and supports multiple nesting levels. Requires Ruby 1.9+ and the asset pipeline.
@@ -194,8 +236,6 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- lib/assets/.DS_Store
-- lib/assets/javascripts/.DS_Store
 - lib/assets/javascripts/nested_form_fields.js.coffee
 - lib/nested_form_fields.rb
 - lib/nested_form_fields/version.rb
@@ -271,8 +311,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.0.4
 signing_key: 
 specification_version: 4
 summary: Rails gem for dynamically adding and removing nested has_many association