dynamic-fields-for 1.0.4 → 1.1.0

data/README.md

@@ -14,6 +14,7 @@ The main features are:
 * Simple and predictable interface and behavior;
 * Not requires 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)
@@ -106,6 +107,46 @@ DynamicFieldsFor supports SimpleForm:
   = f.submit
 ```
 
+## Not ActiveRecord models
+To use DynamicFieldsFor with not ActiveRecord, need to define two methods in your model, `{association}_soft_build` and `{association}_attributes=`:
+
+```ruby
+class EmailForm
+  include ActiveAttr::Model
+
+  attribute :recipients, type: Object, default: []
+
+  def recipients_attributes=(attributes)
+    self.recipients = attributes.values.map{ |attrs| recipients_soft_build(attrs) }
+  end
+
+  def recipients_soft_build(attrs = {})
+    Recipient.new(attrs)
+  end
+
+end
+
+class Recipient
+  include ActiveAttr::Model
+
+  attribute :email
+
+  validates :email,  presence: true
+end
+```
+
+Template will stay to be as usual:
+```haml
+= form_for resource do |f|
+  = f.fields_for :recipients, dynamic: true do |rf|
+    = rf.text_field :email
+    = rf.remove_fields_link 'Remove recipient'
+
+  = f.add_fields_link :recipients, 'Add recipient'
+
+  = f.submit
+```
+
 ## 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;

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

@@ -16,7 +16,10 @@ RubyFeatures.define 'dynamic_fields_for' do
 
         return fields_for_without_dynamic_fields(association, record_object, options, &block) unless options.delete(:dynamic)
 
-        new_object = @object.association(association).soft_build
+        soft_build_method_name = :"#{association}_soft_build"
+        new_object = @object.respond_to?(soft_build_method_name) ?
+          @object.send(soft_build_method_name) :
+          @object.association(association).soft_build
 
         options[:child_index] = 'dynamic_fields_index'
         remove_template = fields_for_without_dynamic_fields(association, new_object, options) do |f|

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

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

data/spec/features/dynamic_fields_for_spec.rb

@@ -9,16 +9,24 @@ describe DynamicFieldsFor do
       all('[name$="[role_name]"]')
     end
 
-    def remove_links
+    def remove_role_links
       all('a', text: 'Remove role')
     end
 
+    def email_inputs
+      all('[name$="[email]"]')
+    end
+
+    def remove_email_links
+      all('a', text: 'Remove recipient')
+    end
+
     def deal_with_dynamic_roles
-      expect{remove_links.last.click}.to change{remove_links.size}.from(3).to(2)
-      expect{2.times{ click_link 'Add role'}}.to change{remove_links.size}.to(4)
-      expect{remove_links.last.click}.to change{remove_links.size}.to(3)
-      expect{click_link 'Add role'}.to change{remove_links.size}.to(4)
-      expect{remove_links[1].click}.to change{remove_links.size}.to(3)
+      expect{remove_role_links.last.click}.to change{remove_role_links.size}.from(3).to(2)
+      expect{2.times{ click_link 'Add role'}}.to change{remove_role_links.size}.to(4)
+      expect{remove_role_links.last.click}.to change{remove_role_links.size}.to(3)
+      expect{click_link 'Add role'}.to change{remove_role_links.size}.to(4)
+      expect{remove_role_links[1].click}.to change{remove_role_links.size}.to(3)
 
       role_inputs.last(2).each_with_index do |element, index|
         element.set("new role #{index}")
@@ -56,9 +64,24 @@ describe DynamicFieldsFor do
 
           expect_result(user)
         end
+
       end
     end
 
+    it 'should work with ActiveAttr' do
+      visit '/email_forms/new'
+      3.times{ click_link 'Add recipient' }
+      remove_email_links.last.click
+
+      email_inputs.last(2).each_with_index do |element, index|
+        element.set("email#{index}@qwerty.com")
+      end
+
+      click_button 'Create Email form'
+
+      expect(page).to have_content('Emails was sent to email0@qwerty.com, email1@qwerty.com')
+    end
+
     it 'should not fail when remove link clicked but dynamic fields are not exists' do
       visit "/users/#{user.id}/edit_without_fields"
 
@@ -78,7 +101,7 @@ describe DynamicFieldsFor do
     it 'should remove fields with clean text' do
       visit "/users/#{user.id}/edit_with_clean_text"
       within('.clean-text-with-remove-link') do
-        remove_links.last.click
+        remove_role_links.last.click
         expect(page).to have_content(Array.new(2, 'clean text Remove role').push('Add role').join(' '))
       end
     end
@@ -88,7 +111,7 @@ describe DynamicFieldsFor do
       click_link 'Edit'
 
       within('#form_for') do
-        expect{click_link 'Add role'}.to change{remove_links.size}.from(3).to(4)
+        expect{click_link 'Add role'}.to change{remove_role_links.size}.from(3).to(4)
       end
 
     end

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

@@ -0,0 +1,9 @@
+class EmailFormsController < ApplicationController
+  before_filter :build_resource, only: [:new, :create]
+
+  private
+
+  def build_resource
+    @resource = EmailForm.new(params[:email_form] || {})
+  end
+end

data/spec/rails_app/app/models/email_form.rb

@@ -0,0 +1,14 @@
+class EmailForm
+  include ActiveAttr::Model
+
+  attribute :recipients, type: Object, default: []
+
+  def recipients_attributes=(attributes)
+    self.recipients = attributes.values.map{ |attrs| recipients_soft_build(attrs) }
+  end
+
+  def recipients_soft_build(attrs = {})
+    Recipient.new(attrs)
+  end
+
+end

data/spec/rails_app/app/models/recipient.rb

@@ -0,0 +1,7 @@
+class Recipient
+  include ActiveAttr::Model
+
+  attribute :email
+
+  validates :email,  presence: true
+end

data/spec/rails_app/app/views/email_forms/_form.html.haml

@@ -0,0 +1,8 @@
+= form_for resource do |f|
+  = f.fields_for :recipients, dynamic: true do |rf|
+    = rf.text_field :email
+    = rf.remove_fields_link 'Remove recipient'
+
+  = f.add_fields_link :recipients, 'Add recipient'
+
+  = f.submit

data/spec/rails_app/app/views/email_forms/create.html.haml

@@ -0,0 +1,2 @@
+Emails was sent to
+= @resource.recipients.map(&:email).join(', ')

data/spec/rails_app/app/views/email_forms/new.html.haml

@@ -0,0 +1 @@
+= render 'form', resource: @resource

data/spec/rails_app/config/routes.rb

@@ -1,4 +1,6 @@
 Rails.application.routes.draw do
+  resources :email_forms
+
   resources :users do
     member do
       get 'edit_without_fields'

data/spec/rails_app/log/development.log

@@ -3174,3 +3174,105 @@ Started GET "/assets/turbolinks.self.js?body=1" for 127.0.0.1 at 2015-05-26 21:3
 
 
 Started GET "/assets/dynamic-fields-for.self.js?body=1" for 127.0.0.1 at 2015-05-26 21:34:16 +0300
+
+
+Started GET "/" for 127.0.0.1 at 2015-06-18 15:06:53 +0300
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+Processing by Rails::WelcomeController#index as HTML
+  Rendered /Users/st/.rbenv/versions/1.9.3-p547/lib/ruby/gems/1.9.1/gems/railties-4.1.10/lib/rails/templates/rails/welcome/index.html.erb (1.8ms)
+Completed 200 OK in 25ms (Views: 7.8ms | ActiveRecord: 0.0ms)
+
+
+Started GET "/email_forms/new" for 127.0.0.1 at 2015-06-18 15:07:01 +0300
+Processing by EmailFormsController#new as HTML
+  Rendered email_forms/_form.html.haml (9.4ms)
+  Rendered email_forms/new.html.haml within layouts/application (12.3ms)
+Completed 200 OK in 239ms (Views: 168.7ms | ActiveRecord: 0.0ms)
+
+
+Started GET "/assets/jquery.self.js?body=1" for 127.0.0.1 at 2015-06-18 15:07:01 +0300
+
+
+Started GET "/assets/dynamic-fields-for.self.js?body=1" for 127.0.0.1 at 2015-06-18 15:07:01 +0300
+
+
+Started GET "/assets/turbolinks.self.js?body=1" for 127.0.0.1 at 2015-06-18 15:07:01 +0300
+
+
+Started GET "/assets/application.self.js?body=1" for 127.0.0.1 at 2015-06-18 15:07:01 +0300
+
+
+Started GET "/email_forms/new" for 127.0.0.1 at 2015-06-18 15:08:53 +0300
+Processing by EmailFormsController#new as HTML
+  Rendered email_forms/_form.html.haml (1.8ms)
+  Rendered email_forms/new.html.haml within layouts/application (2.3ms)
+Completed 200 OK in 14ms (Views: 11.4ms | ActiveRecord: 0.0ms)
+
+
+Started GET "/assets/jquery.self.js?body=1" for 127.0.0.1 at 2015-06-18 15:08:53 +0300
+
+
+Started GET "/assets/application.self.js?body=1" for 127.0.0.1 at 2015-06-18 15:08:53 +0300
+
+
+Started GET "/assets/dynamic-fields-for.self.js?body=1" for 127.0.0.1 at 2015-06-18 15:08:53 +0300
+
+
+Started GET "/assets/turbolinks.self.js?body=1" for 127.0.0.1 at 2015-06-18 15:08:53 +0300
+
+
+Started GET "/email_forms/new" for 127.0.0.1 at 2015-06-18 15:09:01 +0300
+Processing by EmailFormsController#new as HTML
+  Rendered email_forms/_form.html.haml (1.8ms)
+  Rendered email_forms/new.html.haml within layouts/application (2.4ms)
+Completed 200 OK in 12ms (Views: 11.3ms | ActiveRecord: 0.0ms)
+
+
+Started GET "/assets/jquery.self.js?body=1" for 127.0.0.1 at 2015-06-18 15:09:01 +0300
+
+
+Started GET "/assets/turbolinks.self.js?body=1" for 127.0.0.1 at 2015-06-18 15:09:01 +0300
+
+
+Started GET "/assets/dynamic-fields-for.self.js?body=1" for 127.0.0.1 at 2015-06-18 15:09:01 +0300
+
+
+Started GET "/assets/application.self.js?body=1" for 127.0.0.1 at 2015-06-18 15:09:01 +0300
+
+
+Started GET "/email_forms/new" for 127.0.0.1 at 2015-06-18 15:09:05 +0300
+Processing by EmailFormsController#new as HTML
+  Rendered email_forms/_form.html.haml (2.1ms)
+  Rendered email_forms/new.html.haml within layouts/application (2.7ms)
+Completed 200 OK in 14ms (Views: 13.2ms | ActiveRecord: 0.0ms)
+
+
+Started GET "/assets/jquery.self.js?body=1" for 127.0.0.1 at 2015-06-18 15:09:05 +0300
+
+
+Started GET "/assets/dynamic-fields-for.self.js?body=1" for 127.0.0.1 at 2015-06-18 15:09:05 +0300
+
+
+Started GET "/assets/turbolinks.self.js?body=1" for 127.0.0.1 at 2015-06-18 15:09:05 +0300
+
+
+Started GET "/assets/application.self.js?body=1" for 127.0.0.1 at 2015-06-18 15:09:05 +0300
+
+
+Started GET "/email_forms/new" for 127.0.0.1 at 2015-06-18 15:09:15 +0300
+Processing by EmailFormsController#new as HTML
+  Rendered email_forms/_form.html.haml (2.7ms)
+  Rendered email_forms/new.html.haml within layouts/application (3.2ms)
+Completed 200 OK in 13ms (Views: 12.6ms | ActiveRecord: 0.0ms)
+
+
+Started GET "/assets/jquery.self.js?body=1" for 127.0.0.1 at 2015-06-18 15:09:15 +0300
+
+
+Started GET "/assets/turbolinks.self.js?body=1" for 127.0.0.1 at 2015-06-18 15:09:15 +0300
+
+
+Started GET "/assets/dynamic-fields-for.self.js?body=1" for 127.0.0.1 at 2015-06-18 15:09:15 +0300
+
+
+Started GET "/assets/application.self.js?body=1" for 127.0.0.1 at 2015-06-18 15:09:15 +0300