nested_fields 0.2.0 → 0.2.1

data/Gemfile.lock

@@ -2,7 +2,7 @@ GEM
   remote: http://rubygems.org/
   specs:
     git (1.2.5)
-    jeweler (1.5.1)
+    jeweler (1.5.2)
       bundler (~> 1.0.0)
       git (>= 1.2.5)
       rake

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/app/helpers/nested_fields_helper.rb

@@ -1,22 +1,20 @@
 module NestedFieldsHelper
-  def nested_fields_for(f, association, nested_partial=nil)
+  def nested_fields_for(f, association, options={}, &block)
     reflection = f.object.class.reflect_on_association(association)
     is_has_one = reflection.macro == :has_one
-    nested_partial ||= "#{is_has_one ? association.to_s.pluralize : association}/fields"
+    options[:nested_partial] ||= "#{is_has_one ? association.to_s.pluralize : association}/fields"
 
     add = add_nested_fields_path :association => association,
                                  :builder => f.class,
-                                 :nested_partial => nested_partial,
+                                 :nested_partial => options[:nested_partial],
                                  :parent_class => f.object.class,
                                  :parent_form => f.object_name
 
-
     partial = "nested_fields/#{'singular_' if is_has_one}nested_fieldset"
 
-    locals = {:add_url => add,
-              :association => association,
-              :f => f,
-              :nested_partial => nested_partial}
+    locals = {:add_url => add, :association => association, :f => f}
+
+    locals.merge!(options)
 
     if is_has_one
       associate = f.object.send(association);
@@ -29,6 +27,10 @@ module NestedFieldsHelper
       end
     end
 
-    render partial, locals
+    if block_given?
+      render :layout => partial, :locals => locals, &block
+    else
+      render partial, locals
+    end
   end
 end

data/app/views/nested_fields/_block.html.erb

@@ -1,8 +1,8 @@
-<div class="nested_fields">
+<%= content_tag :div, :class => :nested_fields, :style => ('display:none' if f.object._destroy) do %>
   <a href="#" class="remove_nested_fields">Remove</a>
 
   <div class="nested_fields_inputs">
     <%= render nested_partial, :f => f %>
     <%= f.hidden_field :_destroy %>
   </div>
-</div>
+<% end %>

data/app/views/nested_fields/_nested_fieldset.html.erb

@@ -1,5 +1,11 @@
-<fieldset id="<%= association %>" class="nested_fieldset">
-  <legend><%= association.to_s.titleize %></legend>
+<% if local_assigns[:positioned_by] %>
+  <fieldset class="nested_fieldset positioned" data-positioned-by="<%= positioned_by %>">
+<% else %>
+  <fieldset class="nested_fieldset">
+<% end %>
+  <legend><%= local_assigns[:legend] || association.to_s.titleize %></legend>
+
+  <%= yield %>
 
   <a href="#" class="add_nested_fields" data-url="<%= add_url %>">Add</a>
 

data/app/views/nested_fields/_singular_nested_fieldset.html.erb

@@ -1,10 +1,12 @@
-<fieldset id="<%= association %>" class="nested_fieldset">
-  <legend><%= association.to_s.titleize %></legend>
+<fieldset class="nested_fieldset">
+  <legend><%= local_assigns[:legend] || association.to_s.titleize %></legend>
+
+  <%= yield %>
 
   <%= f.fields_for association, associate, :builder => f.class do |nested_f| %>
     <label class="nested_one_label">
       <%= check_box_tag "has_#{association}", nil, !local_assigns[:has_zero], :class => :nested_fields_has_one %>
-      <%= "Has #{association.to_s.titleize}?" %>
+      Has <%= association.to_s.titleize %>?
     </label>
 
     <%= nested_f.hidden_field :_destroy, :class => :destroy_nested_one, :value => local_assigns[:has_zero] ? 'true' : 'false' %>

data/nested_fields.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{nested_fields}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jason Murad"]
-  s.date = %q{2010-12-21}
+  s.date = %q{2011-01-22}
   s.description = %q{Unobtrusive dynamic nested forms}
   s.email = %q{jason@thriess.com}
   s.extra_rdoc_files = [

data/public/javascripts/nested_fields.js

@@ -28,3 +28,21 @@ $('.nested_fields_has_one').live('change', function() {
   $(hidden_field).val($(hidden_field).val() == 'true' ? 'false' : 'true');
   $(this).closest('.nested_fieldset').find('.nested_one').toggle();
 });
+
+function reposition(nested_fieldset, pos_fld) {
+  $(nested_fieldset).find('> .nested_fields').each(function(i, nested_fields) {
+    $(nested_fields).find('input[id$="' + pos_fld + '"]').val(i);
+  });
+}
+
+$('.nested_fieldset').live('nested_fields_ready', function() {
+  var pos_fld = this.getAttribute('data-positioned-by');
+
+  if (pos_fld) {
+    reposition(this, pos_fld);
+
+    if (!$(this).hasClass('ui-sortable')) {
+      $(this).sortable({update: function() { reposition(this, pos_fld); }});
+    }
+  }
+});

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Jason Murad
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-21 00:00:00 -05:00
+date: 2011-01-22 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -115,7 +115,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1304071014241017198
+      hash: -3511116076311787627
       segments: 
       - 0
       version: "0"