dynamic_fields_for_rails 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39ce07752b91f9b87a528d75977b9b8799e8d29b
-  data.tar.gz: 6a224cdbfc0211b7c5b024b1be2304b6f6c6fa8e
+  metadata.gz: 9e9c96aafaa7815eeb5d912b05545d2105bc1e0d
+  data.tar.gz: 5516ca291712045ed502ce6b65993f66c6885ac1
 SHA512:
-  metadata.gz: cd0c01e71cfc7a0a485dc6bc9a760a149ebd26824cc08cff4d0434f628f4b41752dcc8ba0dafcfbe268281e4b21e888e94b653335592909230e34ddd4ba4cea4
-  data.tar.gz: 876e4a5e905c4fd069c0843b1966f6b02bf08cfba83e83f0be6c553b9ec0f0e2bf89c2ac3676206fbdc902e88169fc86bed747b2a4ec3fa40bae34c28e5b2b1c
+  metadata.gz: 3ab5977c622212bc81202f2a39340cc2175323ca5e8d64a2fe377909185f7050d4dd589c74234aad3168debaa35cf6781acf026e23d18601eeaffdfae7f9ed1a
+  data.tar.gz: aeb17864856b38b3b600c12fb3d4ca3c57cb6aa1227f84a1bd156b3ff837df0f2f996df165971d70f3313a182987a94d9b238b13b5f9a0d899ecd32bc1277fcb

data/.travis.yml

@@ -0,0 +1,5 @@
+language: ruby
+rvm:
+  - 2.1.0
+notifications:
+  webhooks: https://mortik.slack.com/services/hooks/travis?token=aqp1ZDxk4YATzbB2XC8b36kn

data/Rakefile

@@ -10,5 +10,4 @@ Rake::TestTask.new(:test) do |t|
   t.verbose = false
 end
 
-
-task :default => :test
+task default: :test

data/app/assets/javascripts/dynamic_fields_for.coffee

@@ -3,8 +3,12 @@ $ ->
   $(document).off 'click', 'form .add_fields'
 
   $(document).on 'click', 'form .remove_fields', (event) ->
-    $(this).prev('input[type=hidden]').val('1')
-    $(this).closest('.fields').hide()
+    $deleteField = $(this).prev('input[type=hidden]')
+    if $deleteField.length > 0
+      $deleteField.val('1')
+      $(this).closest('.fields').hide()
+    else
+      $(this).closest('.fields').remove()
     $(document).trigger('dynamicFieldsFor.remove', @)
     event.preventDefault()
 

data/app/helpers/dynamic_fields_for_helper.rb

@@ -1,6 +1,5 @@
 # encoding: utf-8
 module DynamicFieldsForHelper
-
   def link_to_add_fields(form, association, options = {}, &block)
     partial = options[:partial] || nil
     name = options[:name] || nil
@@ -18,10 +17,10 @@ module DynamicFieldsForHelper
     end
     css_classes = css_classes(DynamicFieldsForRails.add_css_classes, css_classes)
     if block_given?
-    	link_to('#', class: css_classes, data: {id: id, fields: fields.gsub("\n", ""), target: target}, &block)
+      link_to('#', class: css_classes, data: { id: id, fields: fields.delete("\n"), target: target }, &block)
     else
-    	link_to(name, '#', class: css_classes, data: {id: id, fields: fields.gsub("\n", ""), target: target})
-  	end
+      link_to(name, '#', class: css_classes, data: { id: id, fields: fields.delete("\n"), target: target })
+    end
   end
 
   def link_to_delete_fields(fields, options = {}, &block)
@@ -29,14 +28,14 @@ module DynamicFieldsForHelper
     css_classes = options[:class] || nil
 
     link = []
-    link << fields.hidden_field(:_destroy)
+    link << fields.hidden_field(:_destroy) unless fields.object.new_record?
     css_classes = css_classes(DynamicFieldsForRails.delete_css_classes, css_classes)
-    if block_given?
-      link << link_to('#', class: css_classes, title: name, &block)
-    else
-      link << link_to(name, '#', class: css_classes)
-    end
-    return link.join('').html_safe
+    link << if block_given?
+              link_to('#', class: css_classes, title: name, &block)
+            else
+              link_to(name, '#', class: css_classes)
+            end
+    link.join('').html_safe
   end
 
   protected

data/dynamic_fields_for_rails.gemspec

@@ -8,20 +8,20 @@ Gem::Specification.new do |spec|
   spec.version       = DynamicFieldsForRails::VERSION
   spec.authors       = ["Marten Klitzke"]
   spec.email         = ["m.klitzke@gmail.com"]
-  spec.description   = %q{Dynamic fields helper for Rails.}
-  spec.summary       = %q{Helper for nested forms with dynamic fields.}
+  spec.description   = 'Dynamic fields helper for Rails.'
+  spec.summary       = 'Helper for nested forms with dynamic fields.'
   spec.homepage      = "https://github.com/mortik/dynamic_fields_for_rails"
   spec.license       = "MIT"
 
-  spec.files         = `git ls-files`.split($/)
+  spec.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "mocha"
-  spec.add_development_dependency "sqlite3"
+  spec.add_development_dependency "rake", '~> 0'
+  spec.add_development_dependency "mocha", '~> 0'
+  spec.add_development_dependency "sqlite3", '~> 0'
 
   spec.add_dependency "rails", '>= 3.0.0', '< 5.0'
 end

data/lib/dynamic_fields_for_rails.rb

@@ -1,7 +1,7 @@
 require "dynamic_fields_for_rails/version"
 
 module DynamicFieldsForRails
-	class Engine < Rails::Engine
+  class Engine < Rails::Engine
   end
 
   mattr_accessor :add_css_classes

data/lib/dynamic_fields_for_rails/version.rb

@@ -1,3 +1,3 @@
 module DynamicFieldsForRails
-  VERSION = "0.6.0"
+  VERSION = "0.6.1".freeze
 end

data/test/config/active_record.rb

@@ -1,3 +1,4 @@
+# rubocop:disable ClassAndModuleChildren
 class ActiveRecord::Base
   mattr_accessor :shared_connection
   @@shared_connection = nil
@@ -6,4 +7,4 @@ class ActiveRecord::Base
     @@shared_connection || retrieve_connection
   end
 end
-ActiveRecord::Base.shared_connection = ActiveRecord::Base.connection
+ActiveRecord::Base.shared_connection = ActiveRecord::Base.connection

data/test/dummy/app/models/child.rb

@@ -1,2 +1,2 @@
 class Child < ActiveRecord::Base
-end
+end

data/test/dummy/app/models/parent.rb

@@ -1,4 +1,4 @@
 class Parent < ActiveRecord::Base
-	has_many :children
+  has_many :children
   accepts_nested_attributes_for :children, allow_destroy: true
-end
+end

data/test/dummy/config.ru

@@ -1,4 +1,4 @@
 # This file is used by Rack-based servers to start the application.
 
-require ::File.expand_path('../config/environment',  __FILE__)
+require ::File.expand_path('../config/environment', __FILE__)
 run Dummy::Application

data/test/dummy/config/boot.rb

@@ -7,4 +7,4 @@ if File.exist?(gemfile)
   Bundler.setup
 end
 
-$:.unshift File.expand_path('../../../../lib', __FILE__)
+$LOAD_PATH.unshift File.expand_path('../../../../lib', __FILE__)

data/test/dummy/config/environments/development.rb

@@ -22,4 +22,3 @@ Dummy::Application.configure do
   # Only use best-standards-support built into browsers
   config.action_dispatch.best_standards_support = :builtin
 end
-

data/test/dummy/config/environments/test.rb

@@ -16,7 +16,7 @@ Dummy::Application.configure do
   config.action_dispatch.show_exceptions = false
 
   # Disable request forgery protection in test environment
-  config.action_controller.allow_forgery_protection    = false
+  config.action_controller.allow_forgery_protection = false
 
   # Tell Action Mailer not to deliver emails to the real world.
   # The :test delivery method accumulates sent emails in the

data/test/dummy/config/initializers/session_store.rb

@@ -1,6 +1,6 @@
 # Be sure to restart your server when you modify this file.
 
-Dummy::Application.config.session_store :cookie_store, :key => '_dummy_session'
+Dummy::Application.config.session_store :cookie_store, key: '_dummy_session'
 
 # Use the database for sessions instead of the cookie-based default,
 # which shouldn't be used to store highly confidential information

data/test/dummy/db/migrate/20130423140255_create_parents.rb

@@ -1,8 +1,5 @@
 class CreateParents < ActiveRecord::Migration
   def change
-    create_table :parents do |t|
-
-      t.timestamps
-    end
+    create_table :parents, &:timestamps
   end
 end

data/test/dummy/db/migrate/20130423140307_create_children.rb

@@ -1,7 +1,7 @@
 class CreateChildren < ActiveRecord::Migration
   def change
     create_table :children do |t|
-    	t.integer :parent_id
+      t.integer :parent_id
       t.timestamps
     end
   end

data/test/dummy/db/schema.rb

@@ -11,17 +11,15 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20130423140307) do
-
-  create_table "children", :force => true do |t|
+ActiveRecord::Schema.define(version: 20_130_423_140_307) do
+  create_table "children", force: true do |t|
     t.integer  "parent_id"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
   end
 
-  create_table "parents", :force => true do |t|
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
+  create_table "parents", force: true do |t|
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
   end
-
 end

data/test/dummy/script/rails

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 # This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
 
-APP_PATH = File.expand_path('../../config/application',  __FILE__)
-require File.expand_path('../../config/boot',  __FILE__)
+APP_PATH = File.expand_path('../../config/application', __FILE__)
+require File.expand_path('../../config/boot', __FILE__)
 require 'rails/commands'

data/test/dynamic_fields_for_helper_test.rb

@@ -4,4 +4,4 @@ class DynamicFieldsForHelperTest < ActiveSupport::TestCase
   test "truth" do
     assert_kind_of Module, DynamicFieldsForHelper
   end
-end
+end

data/test/link_to_add_fields_test.rb

@@ -5,30 +5,30 @@ class LinkToAddFieldsTest < ActionView::TestCase
 
   include DynamicFieldsForHelper
 
- 	def form_for(*)
+  def form_for(*)
     @output_buffer = super
   end
 
-	def setup
-		@parent = Parent.create
-		@parent.children.build
-	end
+  def setup
+    @parent = Parent.create
+    @parent.children.build
+  end
 
-	test "generates a add fields link" do
-		form_for(@parent, url: '/') do |form|
-			link_to_add_fields(form, 'children', name: "Test")
-		end
+  test "generates a add fields link" do
+    form_for(@parent, url: '/') do |form|
+      link_to_add_fields(form, 'children', name: "Test")
+    end
 
-		assert_match /<a(.*)class=\"add_fields(.*)\"(.*)>Test<\/a>/, @output_buffer
-	end
+    assert_match(%r{<a(.*)class=\"add_fields(.*)\"(.*)>Test<\/a>}, @output_buffer)
+  end
 
-	test "generates a add fields link with block if it is given" do
-		form_for(@parent, url: '/') do |form|
-			link_to_add_fields form, 'children' do
-				content_tag "div", "Test"
-			end
-		end
+  test "generates a add fields link with block if it is given" do
+    form_for(@parent, url: '/') do |form|
+      link_to_add_fields form, 'children' do
+        content_tag "div", "Test"
+      end
+    end
 
-		assert_match /<a(.*)class=\"add_fields(.*)\"(.*)><div>Test<\/div><\/a>/, @output_buffer
-	end
+    assert_match(%r{<a(.*)class=\"add_fields(.*)\"(.*)><div>Test<\/div><\/a>}, @output_buffer)
+  end
 end

data/test/link_to_delete_fields_test.rb

@@ -5,36 +5,36 @@ class LinkToDeleteFieldsTest < ActionView::TestCase
 
   include DynamicFieldsForHelper
 
- 	def form_for(*)
+  def form_for(*)
     @output_buffer = super
   end
 
-	def setup
-		@parent = Parent.create
-		@parent.children.build
-	end
-
-	test "generates a delete fields link" do
-		form_for(@parent, url: '/') do |form|
-			form.fields_for :children, @parent.children do |fields|
-				link_to_delete_fields(fields, name: "Test")
-			end
-		end
-
-		assert_match /<input(.*)name=\"parent\[children_attributes\](.*)\[_destroy\]\"(.*)value=\"false\" \/>/, @output_buffer
-		assert_match /<a(.*)class=\"remove_fields(.*)\"(.*)>Test<\/a>/, @output_buffer
-	end
-
-	test "generates a deletes fields link with block if it is given" do
-		form_for(@parent, url: '/') do |form|
-			form.fields_for :children, @parent.children do |fields|
-				link_to_delete_fields fields do
-					content_tag "div", "Test"
-				end
-			end
-		end
-
-		assert_match /<input(.*)name=\"parent\[children_attributes\](.*)\[_destroy\]\"(.*)value=\"false\" \/>/, @output_buffer
-		assert_match /<a(.*)class=\"remove_fields(.*)\"(.*)><div>Test<\/div><\/a>/, @output_buffer
-	end
+  def setup
+    @parent = Parent.create
+    @parent.children.build
+  end
+
+  test "generates a delete fields link" do
+    form_for(@parent, url: '/') do |form|
+      form.fields_for :children, @parent.children do |fields|
+        link_to_delete_fields(fields, name: "Test")
+      end
+    end
+
+    assert_match(%r{<input(.*)name=\"parent\[children_attributes\](.*)\[_destroy\]\"(.*)value=\"false\" \/>}, @output_buffer)
+    assert_match(%r{<a(.*)class=\"remove_fields(.*)\"(.*)>Test<\/a>}, @output_buffer)
+  end
+
+  test "generates a deletes fields link with block if it is given" do
+    form_for(@parent, url: '/') do |form|
+      form.fields_for :children, @parent.children do |fields|
+        link_to_delete_fields fields do
+          content_tag "div", "Test"
+        end
+      end
+    end
+
+    assert_match(%r{<input(.*)name=\"parent\[children_attributes\](.*)\[_destroy\]\"(.*)value=\"false\" \/>}, @output_buffer)
+    assert_match(%r{<a(.*)class=\"remove_fields(.*)\"(.*)><div>Test<\/div><\/a>}, @output_buffer)
+  end
 end

data/test/test_helper.rb

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'bundler/setup'
 
 ENV['RAILS_ENV'] = 'test'
-require File.expand_path('../dummy/config/environment.rb',  __FILE__)
+require File.expand_path('../dummy/config/environment.rb', __FILE__)
 require "rails/test_help"
 require "mocha/setup"
 require "active_support/test_case"
@@ -10,8 +10,8 @@ require "active_support/inflector"
 
 Rails.backtrace_cleaner.remove_silencers!
 
-ENGINE_RAILS_ROOT=File.join(File.dirname(__FILE__), '../')
+ENGINE_RAILS_ROOT = File.join(File.dirname(__FILE__), '../')
 
 # Load support files
 Dir[File.join(ENGINE_RAILS_ROOT, 'test/support/**/*.rb')].each { |f| require f }
-Dir[File.join(ENGINE_RAILS_ROOT, 'test/config/**/*.rb')].each { |f| require f }
+Dir[File.join(ENGINE_RAILS_ROOT, 'test/config/**/*.rb')].each { |f| require f }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dynamic_fields_for_rails
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Marten Klitzke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-18 00:00:00.000000000 Z
+date: 2016-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -28,42 +28,42 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -94,6 +94,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -172,7 +173,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Helper for nested forms with dynamic fields.