dynamic-fields-for 1.1.0 → 1.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: f6204fd4811cad2ba7c7d5aa03677c3eb3e145ed
+  data.tar.gz: ef51c7370fca9cbcc628a0cf260ff69c67920ade
+SHA512:
+  metadata.gz: d175c524a83222f4f8487bf7ec04c50f19fe20d9fa3f5062c9489c54149cbf948a00139bf35b24866d2e675fb077568647f3d7c85371795bb487b3eb549e3de7
+  data.tar.gz: f92f325cd60f61817e52adc7aae0ad893c604a48e8c4323274214c7b2616253cab5130b0fff0e6594719bcd1a4c7400004260edeb34c25b115cf137a1c44a8ee

data/README.md

@@ -5,27 +5,29 @@ DynamicFieldsFor
 [![Climate](https://codeclimate.com/github/stokarenko/dynamic-fields-for/badges/gpa.svg)](https://codeclimate.com/github/stokarenko/dynamic-fields-for)
 [![Coverage](https://codeclimate.com/github/stokarenko/dynamic-fields-for/badges/coverage.svg)](https://codeclimate.com/github/stokarenko/dynamic-fields-for/coverage)
 
-DynamicFieldsFor is a Rails plugin which provides the dynamic association fieldsets to your forms without a pain. And it does nothing more.
+DynamicFieldsFor is a Rails plugin which provides the dynamic association fieldsets to your forms without pain. And it does nothing else.
 
 The main features are:
-* Not breaks the HTML layout - no any wrappers, additional divs etc;
-* Works with fields block, i.e. not requires the separated partial for them;
-* Not provides new form helpers, but extend the existing one;
+* Doesn't break the HTML layout - no wrappers, additional divs etc;
+* Works with fields block, i.e. doesn't require the separated partial for them;
+* Doesn't provide new form helpers, but extends the existing one;
 * Simple and predictable interface and behavior;
-* Not requires any special HTML entities inside templates;
+* Doesn't require any special HTML entities inside templates;
 * Supports [Simple Form](https://github.com/plataformatec/simple_form).
 * Supports not ActiveRecord models
 
 ## Alternatives
-* [coccon](https://github.com/nathanvda/cocoon)
+* [cocoon](https://github.com/nathanvda/cocoon)
 * [Nested Form](https://github.com/ryanb/nested_form)
 
 ## Dependencies
-* Ruby >= 1.9.3
-* [rails](https://github.com/rails/rails) >= 3.2.13
+* Ruby >= 2.2.2
+* [rails](https://github.com/rails/rails) >= 5.0.0
 * [jquery-rails](https://github.com/rails/jquery-rails)
 * [activerecord-devkit](https://github.com/stokarenko/activerecord-devkit), `association_soft_build` feature
 
+For older versions of ruby and rails - please use gem version `1.1.0`.
+
 ## Getting started
 
 Add to your Gemfile:
@@ -56,7 +58,7 @@ class Role < ActiveRecod::Base
 end
 ```
 
-First, apply `inverse_of` to User's `:roles` associations, otherwise no chance to pass
+First, apply `inverse_of` to User's `:roles` associations, otherwise there is no chance to pass
 the validation of Role's user presence on user creation:
 ```ruby
 class User < ActiveRecord::Base
@@ -71,7 +73,7 @@ accepts_nested_attributes_for :roles, allow_destroy: true
 
 Skip `allow_destroy` definition if you don't need to use `remove_fields_link` helper).
 
-Take care about strong parameters in controller like that:
+Take care about strong parameters in controller like this:
 ```ruby
 params.require(:user).permit(roles_attributes: [:id, :_destroy])
 ```
@@ -108,7 +110,7 @@ DynamicFieldsFor supports SimpleForm:
 ```
 
 ## Not ActiveRecord models
-To use DynamicFieldsFor with not ActiveRecord, need to define two methods in your model, `{association}_soft_build` and `{association}_attributes=`:
+To use DynamicFieldsFor with not ActiveRecord, it's necessary to define two methods in your model, `{association}_soft_build` and `{association}_attributes=`:
 
 ```ruby
 class EmailForm
@@ -150,12 +152,12 @@ Template will stay to be as usual:
 ## JavaScript events
 There are the events which will be triggered on `add_fields_link` click, in actual order:
 * `dynamic-fields:before-add-into` touched to dynamic fields parent node;
-* `dynamic-fields:after-add` touched to each first-level elements which was inserted;
+* `dynamic-fields:after-add` touched to each first-level elements which were inserted;
 * `dynamic-fields:after-add-into` touched to dynamic fields parent node;
 
 Like that, these events will be triggered on `add_fields_link` click, in actual order:
 * `dynamic-fields:before-remove-from` touched to dynamic fields parent node;
-* `dynamic-fields:before-remove` touched to each first-level elements which going to be removed;
+* `dynamic-fields:before-remove` touched to each first-level elements which are going to be removed;
 * `dynamic-fields:after-remove-from` touched to dynamic fields parent node;
 
 Typical callback for dynamic fields parent node looks like:
@@ -165,7 +167,7 @@ $(document).on('dynamic-fields:after-add-into', function(event){
 })
 ```
 
-As for first-level elements, need to remember that compatible callbacks
+As for first-level elements, compatible callbacks
 will be triggered to each of them. To deal with this,
 use `$.find2` javascript helper, which provided by DynamicFieldsFor:
 ```js
@@ -174,7 +176,7 @@ $('#some_id').find2('.some_class');
 $('#some_id').find('.some_class').add($('#some_id').filter('.some_class'));
 ```
 
-Typical event callback first-level elements should looks like:
+Typical event callback first-level elements should look like:
 ```js
 $(document).on('dynamic-fields:after-add', function(event){
   $(event.target).find2('.datepicker').datetimepicker();

data/lib/dynamic-fields-for/feature.rb

@@ -4,17 +4,12 @@ RubyFeatures.define 'dynamic_fields_for' do
 
   apply_to 'ActionView::Helpers::FormBuilder' do
 
-    applied do
-      alias_method_chain :fields_for, :dynamic_fields
-      alias_method_chain :fields_for_nested_model, :dynamic_fields
-    end
-
-    instance_methods do
-      def fields_for_with_dynamic_fields(association, record_object = nil, options = {}, &block)
+    rewrite_instance_methods do
+      def fields_for(association, record_object = nil, options = {}, &block)
         #Inherit the native parameters adjustment
         options, record_object = record_object, nil if record_object.is_a?(Hash) && record_object.extractable_options?
 
-        return fields_for_without_dynamic_fields(association, record_object, options, &block) unless options.delete(:dynamic)
+        return super(association, record_object, options, &block) unless options.delete(:dynamic)
 
         soft_build_method_name = :"#{association}_soft_build"
         new_object = @object.respond_to?(soft_build_method_name) ?
@@ -22,16 +17,16 @@ RubyFeatures.define 'dynamic_fields_for' do
           @object.association(association).soft_build
 
         options[:child_index] = 'dynamic_fields_index'
-        remove_template = fields_for_without_dynamic_fields(association, new_object, options) do |f|
+        remove_template = super(association, new_object, options) do |f|
           f.hidden_field(:id, value: 'dynamic_fields_object_id') +
           f.hidden_field(:_destroy, value: true)
         end
 
         options[:dynamic_fields_id] = dynamic_fields_id(association)
-        add_template = fields_for_without_dynamic_fields(association, new_object, options, &block)
+        add_template = super(association, new_object, options, &block)
 
         options.delete(:child_index)
-        collection_output = fields_for_without_dynamic_fields(association, record_object, options, &block)
+        collection_output = super(association, record_object, options, &block)
 
         cover_by_anchors(
           {
@@ -44,6 +39,18 @@ RubyFeatures.define 'dynamic_fields_for' do
         )
       end
 
+      private
+
+      def fields_for_nested_model(name, object, fields_options, block)
+        cover_by_anchors_if(
+          fields_options.has_key?(:dynamic_fields_id),
+          {'item-begin' => fields_options[:dynamic_fields_id]},
+          super(name, object, fields_options, block)
+        )
+      end
+    end
+
+    instance_methods do
       def add_fields_link(association, label, options = {})
         @template.link_to(label, '#', dynamic_fields_data_options(add: dynamic_fields_id(association)).deep_merge(options))
       end
@@ -59,13 +66,6 @@ RubyFeatures.define 'dynamic_fields_for' do
         @template.link_to(label, '#', dynamic_fields_data_options(anchor_options).deep_merge(options))
       end
 
-      def fields_for_nested_model_with_dynamic_fields(name, object, fields_options, block)
-        cover_by_anchors_if(
-          fields_options.has_key?(:dynamic_fields_id),
-          {'item-begin' => fields_options[:dynamic_fields_id]},
-          fields_for_nested_model_without_dynamic_fields(name, object, fields_options, block)
-        )
-      end
 
       private
 

data/lib/dynamic-fields-for/version.rb

@@ -1,3 +1,3 @@
 module DynamicFieldsFor
-  VERSION = '1.1.0'.freeze
+  VERSION = '1.2.0'.freeze
 end

data/spec/rails_app/app/controllers/email_forms_controller.rb

@@ -1,5 +1,5 @@
 class EmailFormsController < ApplicationController
-  before_filter :build_resource, only: [:new, :create]
+  before_action :build_resource, only: [:new, :create]
 
   private
 

data/spec/rails_app/app/controllers/users_controller.rb

@@ -1,6 +1,6 @@
 class UsersController < ApplicationController
-  before_filter :build_resource, only: [:new, :create]
-  before_filter :load_resource, except: [:new, :create]
+  before_action :build_resource, only: [:new, :create]
+  before_action :load_resource, except: [:new, :create]
 
   def new
     3.times{ @resource.roles.build }
@@ -31,8 +31,6 @@ class UsersController < ApplicationController
   end
 
   def resource_params
-    DynamicFieldsFor.rails4? ?
-      params.fetch(:user, {}).permit(:user_name, roles_attributes: [:id, :role_name, :_destroy]) :
-      params[:user]
+    params.fetch(:user, {}).permit(:user_name, roles_attributes: [:id, :role_name, :_destroy])
   end
 end

data/spec/rails_app/config/application.rb

@@ -19,10 +19,5 @@ module RailsApp
     # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
     config.i18n.load_path += Dir[Rails.root.join('config', 'locales', "**", '*.{rb,yml}').to_s]
     # config.i18n.default_locale = :de
-
-    # Enable the asset pipeline
-    unless DynamicFieldsFor.rails4?
-      config.assets.enabled = true
-    end
   end
 end

data/spec/rails_app/config/boot.rb

@@ -1,9 +1,3 @@
-module DynamicFieldsFor
-  def self.rails4?
-    Rails.version.start_with? '4'
-  end
-end
-
 # Set up gems listed in the Gemfile.
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../../../Gemfile', __FILE__)
 

data/spec/rails_app/config/environments/production.rb

@@ -20,9 +20,7 @@ RailsApp::Application.configure do
   # config.action_dispatch.rack_cache = true
 
   # Disable Rails's static asset server (Apache or nginx will already do this).
-  DynamicFieldsFor.rails4? ?
-    config.serve_static_files = false :
-    config.serve_static_assets = false
+  config.public_file_server.enabled = false
 
   # Compress JavaScripts and CSS.
   config.assets.js_compressor = :uglifier

data/spec/rails_app/config/environments/test.rb

@@ -13,10 +13,8 @@ RailsApp::Application.configure do
   config.eager_load = false
 
   # Configure static asset server for tests with Cache-Control for performance.
-  DynamicFieldsFor.rails4? ?
-    config.serve_static_files = true :
-    config.serve_static_assets = true
-  config.static_cache_control = 'public, max-age=3600'
+  config.public_file_server.enabled = true
+  config.public_file_server.headers = { 'Cache-Control' => 'public, max-age=3600' }
 
   # Show full error reports and disable caching.
   config.consider_all_requests_local       = true

data/spec/rails_app/config/initializers/secret_token.rb

@@ -1,5 +1 @@
-if DynamicFieldsFor.rails4?
-  RailsApp::Application.config.secret_key_base = '8cec03a73bd1f8cdf2c519131bb5475775684177ce99c27c254e9617313950f06972cd0e027ea5627570b133f8d5385bd5aaec119351f65bec03a0facb0de559'
-else
-  RailsApp::Application.config.secret_token = '8cec03a73bd1f8cdf2c519131bb5475775684177ce99c27c254e9617313950f06972cd0e027ea5627570b133f8d5385bd5aaec119351f65bec03a0facb0de559'
-end
+RailsApp::Application.config.secret_key_base = '8cec03a73bd1f8cdf2c519131bb5475775684177ce99c27c254e9617313950f06972cd0e027ea5627570b133f8d5385bd5aaec119351f65bec03a0facb0de559'

data/spec/rails_app/db/migrate/001_create_tables.rb

@@ -1,4 +1,4 @@
-class CreateTables < ActiveRecord::Migration
+class CreateTables < ActiveRecord::Migration[4.2]
   def change
     create_table :users do |t|
       t.string :user_name