dynamic-fields-for 1.0.2 → 1.0.3

data/README.md

@@ -1,7 +1,7 @@
 DynamicFieldsFor
 ================
 [![Version](https://badge.fury.io/rb/dynamic-fields-for.svg)](http://badge.fury.io/rb/dynamic-fields-for)
-[![Build](https://travis-ci.org/stokarenko/dynamic-fields-for.svg)](https://travis-ci.org/stokarenko/dynamic-fields-for)
+[![Build](https://travis-ci.org/stokarenko/dynamic-fields-for.svg?branch=master)](https://travis-ci.org/stokarenko/dynamic-fields-for)
 [![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)
 
@@ -23,7 +23,7 @@ The main features are:
 * Ruby >= 1.9.3
 * [rails](https://github.com/rails/rails) >= 3.2.13
 * [jquery-rails](https://github.com/rails/jquery-rails)
-* [association-soft-build](https://github.com/stokarenko/association-soft-build)
+* [activerecord-devkit](https://github.com/stokarenko/activerecord-devkit), `association_soft_build` feature
 
 ## Getting started
 

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

@@ -0,0 +1,99 @@
+RubyFeatures.define 'dynamic_fields_for' do
+
+  dependency 'activerecord_devkit/association_soft_build'
+
+  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)
+        #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)
+
+        new_object = @object.association(association).soft_build
+
+        options[:child_index] = 'dynamic_fields_index'
+        remove_template = fields_for_without_dynamic_fields(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)
+
+        options.delete(:child_index)
+        collection_output = fields_for_without_dynamic_fields(association, record_object, options, &block)
+
+        cover_by_anchors(
+          {
+            begin: options[:dynamic_fields_id],
+            'add-template' => CGI.escapeHTML(add_template),
+            'remove-template' => CGI.escapeHTML(remove_template)
+          },
+          collection_output,
+          {end: options[:dynamic_fields_id]}
+        )
+      end
+
+      def add_fields_link(association, label, options = {})
+        @template.link_to(label, '#', dynamic_fields_data_options(add: dynamic_fields_id(association)).deep_merge(options))
+      end
+
+      def remove_fields_link(label, options = {})
+        anchor_options = {}.tap do |mem|
+          if @options.has_key?(:dynamic_fields_id)
+            mem[:remove] = @options[:dynamic_fields_id]
+            mem['remove-id'] = @object.id if @object.try(:persisted?)
+          end
+        end
+
+        @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
+
+      def dynamic_fields_id(association)
+        "#{self.object_id}-#{association}"
+      end
+
+      def dynamic_fields_data_options(anchor_options)
+        return nil if anchor_options.nil?
+
+        anchor_options.inject({data: {}}) do |mem, (key, value)|
+          mem[:data][:"dynamic-fields-#{key}"] = value.html_safe? ? value : value.html_safe
+          mem
+        end
+      end
+
+      def cover_by_anchors(begin_anchor_options, content, end_anchor_options = nil)
+        anchor(begin_anchor_options) + content + anchor(end_anchor_options)
+      end
+
+      def cover_by_anchors_if(condition, begin_anchor_options, content, end_anchor_options = nil)
+        condition ?
+          cover_by_anchors(begin_anchor_options, content, end_anchor_options) :
+          content
+      end
+
+      def anchor(anchor_options)
+        return ''.html_safe if anchor_options.nil?
+
+        @template.content_tag(:script, nil, dynamic_fields_data_options(anchor_options))
+      end
+    end
+  end
+end.apply

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

@@ -4,9 +4,7 @@ module DynamicFieldsFor
   class Engine < Rails::Engine
 
     initializer 'dynamic-fields-for.configure_rails_initialization' do
-      ActiveSupport.on_load :action_view do
-        ActionView::Helpers::FormBuilder.send :include, DynamicFieldsFor::FormHelper
-      end
+      require 'dynamic-fields-for/feature'
     end
   end
 end

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

@@ -1,3 +1,3 @@
 module DynamicFieldsFor
-  VERSION = '1.0.2'.freeze
+  VERSION = '1.0.3'.freeze
 end

data/lib/dynamic-fields-for.rb

@@ -1,9 +1,8 @@
 require 'dynamic-fields-for/version'
 require 'jquery-rails'
-require 'association-soft-build'
+require 'activerecord-devkit'
 
 module DynamicFieldsFor
-  autoload :FormHelper, 'dynamic-fields-for/form_helper'
 end
 
 require 'dynamic-fields-for/railtie'

data/spec/features/dynamic_fields_for_spec.rb

@@ -1,4 +1,4 @@
-describe DynamicFieldsFor::FormHelper do
+describe DynamicFieldsFor do
   describe '#fields_for' do
     def expect_result(user)
       expect(page).to have_button('Update User')

data/spec/rails_app/log/development.log

@@ -2478,3 +2478,28 @@ ActionView::Template::Error (undefined method `html_safe' for nil:NilClass):
   Rendered /Users/st/.rbenv/versions/1.9.3-p547/lib/ruby/gems/1.9.1/gems/actionpack-4.1.10/lib/action_dispatch/middleware/templates/rescues/_trace.html.erb (0.7ms)
   Rendered /Users/st/.rbenv/versions/1.9.3-p547/lib/ruby/gems/1.9.1/gems/actionpack-4.1.10/lib/action_dispatch/middleware/templates/rescues/_request_and_response.html.erb (0.5ms)
   Rendered /Users/st/.rbenv/versions/1.9.3-p547/lib/ruby/gems/1.9.1/gems/actionpack-4.1.10/lib/action_dispatch/middleware/templates/rescues/template_error.html.erb within rescues/layout (6.8ms)
+
+
+Started GET "/users/953441985/edit_without_fields" for 127.0.0.1 at 2015-05-10 14:26:19 +0300
+Processing by UsersController#edit_without_fields as HTML
+  Parameters: {"id"=>"953441985"}
+  User Load (0.1ms)  SELECT  "users".* FROM "users"  WHERE "users"."id" = ? LIMIT 1  [["id", 953441985]]
+  Rendered users/edit_without_fields.html.haml within layouts/application (1.1ms)
+Completed 500 Internal Server Error in 3ms (ActiveRecord: 0.1ms)
+
+ActionView::Template::Error (undefined method `html_safe' for nil:NilClass):
+    1: = link_to 'Edit', edit_user_path(@resource)
+    2: 
+    3: = form_for @resource do |f|
+    4:   = f.remove_fields_link 'Remove without fields'
+    5:   = f.add_fields_link :roles, 'Add without fields'
+    6:   = f.submit 'Update without fields'
+  app/views/users/edit_without_fields.html.haml:4:in `block in _app_views_users_edit_without_fields_html_haml___2220097102974969742_70283682653560'
+  app/views/users/edit_without_fields.html.haml:3:in `_app_views_users_edit_without_fields_html_haml___2220097102974969742_70283682653560'
+
+
+  Rendered /Users/st/.rbenv/versions/1.9.3-p547/lib/ruby/gems/1.9.1/gems/actionpack-4.1.10/lib/action_dispatch/middleware/templates/rescues/_trace.html.erb (0.7ms)
+  Rendered /Users/st/.rbenv/versions/1.9.3-p547/lib/ruby/gems/1.9.1/gems/actionpack-4.1.10/lib/action_dispatch/middleware/templates/rescues/_request_and_response.html.erb (0.5ms)
+  Rendered /Users/st/.rbenv/versions/1.9.3-p547/lib/ruby/gems/1.9.1/gems/actionpack-4.1.10/lib/action_dispatch/middleware/templates/rescues/template_error.html.erb within rescues/layout (8.1ms)
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"