dynamic_fieldsets 0.1.16 → 0.1.17

data/CHANGELOG

@@ -1,5 +1,23 @@
 == unreleased changes
 
+== 0.1.17
+* Handling for nested fieldsets dependencies and for 'parallele' fieldset dependencies
+* Wrote a js watcher for the show page, since previous solution is limited to a single fieldset. 
+* Fixed problems that came up for AND and OR dependencies during more complex testing.
+
+== 0.1.16
+* Added fieldset associator ids to fieldeset dependency hash so we can handle inter fieldset dependencies. 
+
+== 0.1.12
+* Removed blank option from selects, it was causing problems on submission
+  changed the way 'checked' radios are read to jquery
+
+== 0.1.11
+
+* Fixed dependencies: AND, OR, multiple, and nested working,
+  -textboxes are cleared when hidden (still need to handle inputs and selects)
+  All values are now evaluated when any change, for radios only the checked one is read
+
 == 0.1.10
 
 * Fixed a namespacing issue in the nested model helper where it was overriding the helper of another project with the same method name.

data/VERSION

@@ -1 +1 @@
-0.1.16
+0.1.17

data/app/helpers/dynamic_fieldsets_helper.rb

@@ -32,6 +32,8 @@ module DynamicFieldsetsHelper
     end
 
     args = {
+      :fsa => fsa,
+      :fieldset_child => fieldset_child,
       :value => values,
       :values => values
     }
@@ -83,46 +85,6 @@ module DynamicFieldsetsHelper
     return field_markup
   end
  
-  # Removes fieldset children that do not show in the edit form due to dependencies
-  # @param [Fieldset] fieldset The Fieldset to render
-  # @param [Hash] values Stored values for the fieldset
-  # @return [Array <FieldsetChild>] children that should render in show page
-  #
-  def hide_children(fieldset, values)
-    children = []
-    fieldset.fieldset_children.each do |child_field|
-      value = values[child_field.id]
-      dependent_on = DynamicFieldsets::DependencyGroup.where(:fieldset_child_id => child_field.id).first
-      if dependent_on.nil?
-        children << child_field.child
-      else
-        dependencies = dependent_on.dependency_clauses.collect(&:dependencies).flatten.uniq
-        dependencies.each do |dependency|
-          if values[dependency.fieldset_child_id].present?
-            dependent_on_type = dependency.fieldset_child.child.type
-            dependent_on_values = values[dependency.fieldset_child_id] 
-            check_values = []
-
-            if dependent_on_type == "DynamicFieldsets::CheckboxField" || dependent_on_type == "DynamicFieldsets::MultipleSelectField" 
-              dependent_on_values.each do |current_value|
-                check_values << current_value[:name]
-              end
-            else
-              check_values << (dependent_on_values.has_key?(:name) ? dependent_on_values[:name] : dependent_on_values[:value])
-            end
-            
-            check_values.each do |check|
-              if dependent_on.action == "show" && check == dependency.value
-                children << child_field.child
-              end
-            end
-          end
-        end
-      end
-    end
-    return children.uniq
-  end
- 
   # Builds HTML for the provided fieldset and its children.
   # @param [FieldsetAssociator] fsa parent FieldsetAssociator
   # @param [Fieldset] fieldset The Fieldset to render
@@ -132,8 +94,7 @@ module DynamicFieldsetsHelper
     lines = []
     lines.push render(:partial => "/dynamic_fieldsets/shared/fieldset_header", :locals => {:fieldset => fieldset})
 
-    # still have to add children that are fieldsets.. have not tested far enough to get into it
-    children = form_type == "show" ? hide_children(fieldset, values) : fieldset.children
+    children = fieldset.children
         
     # this returns field/fieldset objects rather than fieldset children
     # that is why this code looks like it is accessing odd objects
@@ -155,14 +116,14 @@ module DynamicFieldsetsHelper
   # @param [FieldsetAssociator] The fieldset associator for the dynamic fieldset to render
   # @return [String] The HTML for the entire dynamic fieldset
   def dynamic_fieldset_show_renderer(fsa)
-    return dynamic_fieldset_renderer(fsa, "show")
+    return dynamic_fieldset_renderer(fsa, "show") << javascript_renderer("show",fsa)
   end
 
   # Build HTML for a specific dynamic fieldset on a form page
   # @param [FieldsetAssociator] The fieldset associator for the dynamic fieldset to render
   # @return [String] The HTML for the entire dynamic fieldset
   def dynamic_fieldset_form_renderer(fsa)
-    return dynamic_fieldset_renderer(fsa, "form") << javascript_renderer(fsa)
+    return dynamic_fieldset_renderer(fsa, "form") << javascript_renderer("form",fsa)
   end
 
   # Builds HTML for a specific dynamic fieldset in a form.
@@ -184,15 +145,21 @@ module DynamicFieldsetsHelper
   #
   # @params [FieldsetAssociator] The fieldset associator for the dynamic fieldset to render
   # @return [String] The javascript variable that shows what fields have dependencies
-  def javascript_renderer(fsa)
+  def javascript_renderer(form_type, fsa)
     unless fsa.id == nil
       rendered_javascript = "<script type='text/javascript'> 
-      if ( typeof dynamic_fieldsets_dependencies == 'undefined' ){
-        var dynamic_fieldsets_dependencies = #{fsa.dependency_child_hash.to_json}; 
-      } else {
-        $.extend(dynamic_fieldsets_dependencies, #{fsa.dependency_child_hash.to_json}); 
-      }</script>"
-      rendered_javascript += render "dynamic_fieldsets/shared/javascript_watcher"
+        if ( typeof dynamic_fieldsets_dependencies == 'undefined' ){
+          var dynamic_fieldsets_dependencies = #{fsa.dependency_child_hash.to_json}; 
+        } else {
+          $.extend(dynamic_fieldsets_dependencies, #{fsa.dependency_child_hash.to_json}); 
+        }</script>"
+      
+      if form_type == "form"
+        rendered_javascript += render "dynamic_fieldsets/shared/form_javascript_watcher"
+      elsif form_type == "show"
+        rendered_javascript += render "dynamic_fieldsets/shared/show_javascript_watcher"
+      end 
+      
       return rendered_javascript.html_safe
     else
       return ""

data/app/models/dynamic_fieldsets/field.rb

@@ -148,11 +148,15 @@ module DynamicFieldsets
     # @return [Hash] Information needed for the show partial, don't know what I need yet
     def show_partial_locals(args)
       # these should be incredibly temporary
-      {
+      output = {
         :value => args[:value],
         :values => args[:values],
         :label => self.label,
+        :object => "#{DynamicFieldsets::config.form_fieldset_associator_prefix}#{args[:fsa].id}",
+        :method => "#{DynamicFieldsets::config.form_field_prefix}#{args[:fieldset_child].id}",
       }
+      output[:id] = "#{output[:object]}_#{output[:method]}"
+      return output
     end
 
     # given a value hash for a field, return the part that needs to be shown on the show page

data/app/models/dynamic_fieldsets/fieldset.rb

@@ -91,7 +91,7 @@ module DynamicFieldsets
           fieldset_child_id = fieldset_child_key.gsub(/^#{DynamicFieldsets.config.form_field_prefix}/, "")
           fieldset_child = fieldset_children.select { |child| child.id == fieldset_child_id.to_i }.first
           # this could potentially hit a fieldset and cause problems
-          fieldset_child.child.update_field_records(fsa, fieldset_child, value)
+          fieldset_child.child.update_field_records(fsa, fieldset_child, value) if fieldset_child.present?
         end
       end
     end

data/app/models/dynamic_fieldsets/fieldset_associator.rb

@@ -72,12 +72,12 @@ module DynamicFieldsets
     end
 
 
-    # Converts the list of fields with dependencies generated by the look_for_dependents method into a hash
+    # Converts the list of fields with dependencies generated by the look_for_dependent_ons method into a hash
     # The hash contains the actual dependencies for the list of fields that have them
     #
     # @return [Hash] dependent fields for fields in the fieldset
     def dependency_child_hash
-      fieldset_child_collection = look_for_dependents(self.fieldset)
+      fieldset_child_collection = look_for_dependent_ons(self.fieldset)
 
       output = {}
       fieldset_child_collection.each do |fieldset_child|
@@ -85,29 +85,46 @@ module DynamicFieldsets
         fieldset_child.dependencies.each do |dependency|
           dependency_group = dependency.dependency_clause.dependency_group
           output[fieldset_child.id][dependency_group.id] = dependency_group.to_hash
-          output[fieldset_child.id][dependency_group.id][:fieldset_associators] = dependency_group.fieldset_child.fieldset.fieldset_associators.collect(&:id)
+          fieldset = dependency_group.fieldset_child.fieldset
+          if fieldset.fieldset_associators.collect(&:id).present?
+            output[fieldset_child.id][dependency_group.id][:fieldset_associators] = fieldset.fieldset_associators.collect(&:id)
+          else
+            output[fieldset_child.id][dependency_group.id][:fieldset_associators] = find_parent_fsa(fieldset).collect(&:id)
+          end
         end
       end
       return output
     end
- 
 
-    # Gets a list of fields in the given fieldset that have dependencies
+    # Gets finds 'ancestor' fieldset with fsa in case of nested fieldset when generating dependency hash
+    # we need an fsa in the dependencies hash (used for cross-fsa dependencies) AU 08-16-13
+    #
+    # @param [Fieldset] fieldset
+    # @return [Array <FieldsetAssociator>] fsa's associated to parent fieldset
+    #
+    def find_parent_fsa(fieldset)
+      if fieldset.fieldset_associators.present?
+        return fieldset.fieldset_associators
+      else
+        return find_parent_fsa(fieldset.parent)
+      end
+    end
+
+    # Gets a list of fields in the given Fieldset That Have Dependencies
     # I am not exactly sure why this method is necessary (JH 3-8-2012)
     # It seems like we could just make the dependency_child_hash method run recursively
     #
     # @param parent_fieldset [DynamicFieldsets::Fieldset] The fieldset to check inside of
     # @return [Array] The list of fields with dependencies
-    def look_for_dependents(parent_fieldset)
+    def look_for_dependent_ons(parent_fieldset)
       output = []
       parent_fieldset.fieldset_children.each do |fieldset_child|
         if fieldset_child.child_type == "DynamicFieldsets::Field"
           if fieldset_child.dependencies.present?
             output.push fieldset_child
-          # else then next
           end
         else # if child type is a fieldset, then recurse
-          output += look_for_dependents(fieldset_child.child)
+          output += look_for_dependent_ons(fieldset_child.child)
         end
       end
       return output

data/app/models/dynamic_fieldsets/fieldset_child.rb

@@ -98,7 +98,7 @@ module DynamicFieldsets
     # Scopes and Static Methods
 
     scope :ordered, order( 'order_num asc' )
-
+    
     # Methods
 
     # @return [ActiveRecord::Relation] Collection of FieldsetChildren that are direct descendents; ascending order.

data/app/views/dynamic_fieldsets/fieldset_children/_dependency_fields.html.erb

@@ -1,5 +1,5 @@
 <tr>
-  <td><%= f.select :fieldset_child_id, options_for_select(DynamicFieldsets::FieldsetChild.all.select { |x| x.child.type != "DynamicFieldsets::InstructionField" }.collect { |c| [c.child.name, c.id]}, obj.fieldset_child_id)%></td>
+  <td><%= f.select :fieldset_child_id, options_for_select(DynamicFieldsets::FieldsetChild.select { |x| x.child_type == "DynamicFieldsets::Field" && x.child.type != "DynamicFieldsets::InstructionField" }.collect { |c| [c.child.name, c.id]}, obj.fieldset_child_id)%></td>
   <td><%= f.select :relationship, DynamicFieldsets::Dependency::RELATIONSHIP_LIST %></td>
   <td><%= f.text_field :value %></td>
   <td>

data/app/views/dynamic_fieldsets/fieldsets/_child.html.erb

@@ -31,7 +31,7 @@
       <span class="name"><%= child.label %></span>
       <span class="admin">
         <span class="show"><%= link_to 'Show', dynamic_fieldsets_field_path(child) %></span>
-        <span class="edit"><%= link_to "Edit Dependency", edit_dynamic_fieldsets_fieldset_child_path(child) %></span>
+        <span class="edit"><%= link_to "Edit Dependency", edit_dynamic_fieldsets_fieldset_child_path(fieldset_child) %></span>
         <span class="edit"><%= link_to 'Edit Field', edit_dynamic_fieldsets_field_path(child) %></span>
         <span class="destroy"><%= button_to 'Remove', dynamic_fieldsets_remove_fieldset_child_path(fieldset_child), :method => :post %></span>
       </span>

data/app/views/dynamic_fieldsets/shared/{_javascript_watcher.html.erb → _form_javascript_watcher.html.erb}

@@ -1,7 +1,7 @@
 <script type='text/javascript'>
 
 // The only inputs we care about are visible... not hidden
-var all_inputs = $(":input:not(:hidden)[id^=fsa]").add("p[id^='fsa']");
+var all_inputs = $(":input:not(:hidden)[id^=fsa]").add("p[id^='fsa']").add("textarea[id^='fsa']");
 
 //Return the fieldset child id for the input
 //This uniquely associated the fieldset child with the fieldset associator
@@ -61,7 +61,7 @@ function get_input_value(field, type) {
       }
       return output;
 		case 'checkbox':
-      return $('input[name="' + field.attr('name') + '"]:checked').map(function(index,option) { 
+      return field.parent().parent().find(':checked').map(function(index,option) { 
         return $.trim($(option).parent('label').text())
       });
 		case 'select':
@@ -110,7 +110,7 @@ all_inputs.change( function() {
       var all_fieldset_child_id = get_fieldset_child_id($(input), all_type)
       user_inputs[all_fieldset_child_id] = get_input_value($(input), all_type);
     });
-    
+
     if (fieldset_child_id in dynamic_fieldsets_dependencies) {
       $.each(dynamic_fieldsets_dependencies[fieldset_child_id], function(index, group)  {
         fieldset_associator_ids = dynamic_fieldsets_dependencies[fieldset_child_id][index]["fieldset_associators"]; 
@@ -139,7 +139,7 @@ function update_dependency_group_for_fieldset_child(fieldset_child_id, group, us
 function all_dependency_clauses_true(fieldset_child_id, group, user_inputs)  {
   for(var key in group["clause"])  {
     var clause = group["clause"][key]
-    if(!at_least_one_dependency_true(fieldset_child_id, clause, user_inputs))  {
+    if(!at_least_one_dependency_true(clause, user_inputs))  {
       return false;
     }
   }
@@ -151,16 +151,13 @@ function all_dependency_clauses_true(fieldset_child_id, group, user_inputs)  {
 //Only return false if all are false
 //It looks to see what dependencies inside the clause should actually be tested (AU 08-07-13)
 //  If dependency doesn't match current field, it looks up the correct stored input to compare
-function at_least_one_dependency_true(fieldset_child_id, clause, user_inputs)  {
+function at_least_one_dependency_true(clause, user_inputs)  {
   for(var key in clause)  {
     var dependency = clause[key]
+    var fieldset_child_id = dependency["fieldset_child_id"]
     if( evaluate_dependency(user_inputs[fieldset_child_id], dependency["relationship"], dependency["value"]) ){
       return true
-    } else if( fieldset_child_id != dependency['fieldset_child_id'] ) { 
-      if( evaluate_dependency(user_inputs[dependency['fieldset_child_id']], dependency['relationship'], dependency['value']) ){
-        return true
-      }
-    }
+    } 
   }
   return false
 }
@@ -202,7 +199,8 @@ function evaluate_dependency(user_value, relationship, stored_value) {
 // group_field: the field to update (generally not the field that triggered the change)
 function dependency_action(success_flag, action, group_fields, counter) {
   $.each(group_fields, function(index, group_field){
-    if (success_flag){
+    if( $('[id$='+group_field+']').size() > 0 ) {
+      if (success_flag){
         switch(action)
         {
           case 'show':
@@ -210,65 +208,63 @@ function dependency_action(success_flag, action, group_fields, counter) {
           case 'enable':
             $('#' + group_field + ' :input').removeAttr('disabled');
         }
-    
-    } else {
-      switch(action)
-      {
-        case 'show':
-          $('[id$=' + group_field +']').hide();
-        case 'enable':
-          $('#' + group_field + ' :input').attr('disabled', true);
-      }
       
-      clear_unused_fields(group_field)
+      } else {
+        switch(action)
+        {
+          case 'show':
+            $('[id$=' + group_field +']').hide();
+          case 'enable':
+            $('#' + group_field + ' :input').attr('disabled', true);
+        }
+        clear_unused_field(group_field)
 
-      //save from infinite recursion, only goes as deep as there are dependency groups
-      if( counter < Object.keys(dynamic_fieldsets_dependencies).length ) {
-        nested_dependencies(success_flag, action, group_field, counter)
-      }	
+        nested_dependencies(success_flag, action, group_field)
+      }
     }
   });
 };
 
-function clear_unused_fields(group_field) {
-  field = $('[id$='+group_field+']').children(':input');
-  type = get_field_type(field);
-  switch(type)
-	{
-		case 'text':
-		case 'textarea':
-			field.val("");
-		case 'radio':
-			if (field.attr('checked') == 'checked') {
-			} 
-		case 'checkbox':
-      //$('input[name="' + field.attr('name') + '"]:checked').map(function(index,option) { 
-      //});
-		case 'select':
-			//field.find(':selected').text();
-		case 'multi-select':
-      //return field.find(':selected').map(function(index, option)  {
-      //});
-	}
+//clears fields that are being hidden
+function clear_unused_field(group_field) {
+  fields = $('[id$='+group_field+'] :input')
+  fields.each( function(index, field) { 
+    field = $(field)
+    type = get_field_type(field);
+    switch(type)
+    {
+      case 'text':
+      case 'textarea':
+        field.val("");
+      case 'radio':
+      case 'checkbox':
+        if (field.attr('checked') == 'checked') {
+          field.removeAttr('checked')
+        } 
+      case 'select':
+      case 'multi-select':
+    }
+  });
 };
 
 //looks through dependency hash to find dependent fields that may need to be hidden (AU 08-07-13)
-function nested_dependencies(success_flag, action, group_field, counter) {
+function nested_dependencies(success_flag, action, group_field) {
   var dependent_on = group_field.split("-").pop();
   for( var key in dynamic_fieldsets_dependencies ) {
     var child = dynamic_fieldsets_dependencies[key]
     for( var keyg in child ) {
-      //ignore own group since dependents won't be here
-      if( keyg != dependent_on ) {
-        var group_search = child[keyg]
-        for( var keyc in group_search["clause"] ) {
-          var clause = group_search["clause"][keyc]
-          for( var keyd in clause ) {
-            var dependency = clause[keyd]
-            if ( dependency["fieldset_child_id"] == dependent_on ) {
-              var dependent_id = group_field.replace(dependent_on, group_search["fieldset_child_id"])
-              dependency_action(success_flag, action, dependent_id, counter+1)
-            }
+      var group_search = child[keyg]
+      for( var keyc in group_search["clause"] ) {
+        var clause = group_search["clause"][keyc]
+        for( var keyd in clause ) {
+          var dependency = clause[keyd]
+          //select dependent by comparing who the dependency belongs to
+          if ( dependency["fieldset_child_id"] == dependent_on ) {
+            var fsa = group_field.split("_")[0]
+            var field = group_field.split("_")[1]
+            var dependent_id = field.replace(dependent_on, group_search["fieldset_child_id"])
+            var full_dep_id = fsa+"_"+dependent_id
+            dependency_action(success_flag, action, [full_dep_id])
           }
         }
       }

data/app/views/dynamic_fieldsets/shared/_show_javascript_watcher.html.erb

@@ -0,0 +1,138 @@
+<script type='text/javascript'>
+
+var all_divs = $("div :not(:hidden)[id^=fsa]").add("p[id^='fsa']");
+
+function hide_fields(){
+  var values = {}
+  $.each(all_divs, function(index, div){
+    var div_id = $(div).attr('id');
+    var fieldset_child_id = div_id.substring(div_id.length-1);
+    var fsa_id = div_id.split("_")[0].split("-")[1]
+
+    if($(div).is("p")){
+      values[fieldset_child_id] = div.innerHTML
+    } else {
+      if($(div).attr('type') == 'single'){
+        values[fieldset_child_id] = $(div).find('span').find('span').text()
+      } else {
+        values[fieldset_child_id] = $(div).find('li').map(function(index, li){
+          return $(div).find('span').find('span').text()
+        });
+      }
+    }
+
+    var dependency_group = dynamic_fieldsets_dependencies[fieldset_child_id];
+    if((typeof dependency_group) != "undefined"){
+      $.each(dependency_group, function(index, group){
+        var fieldset_associator_ids = group['fieldset_associators'];
+        evaluate_dependencies(fieldset_child_id, group, values, fieldset_associator_ids)
+      }) 
+    }
+  });
+}
+
+function evaluate_dependencies(fieldset_child_id, group, values, fieldset_associator_ids)  {
+  var action = group['action'];
+  var group_fsc_id = group['fieldset_child_id'];
+  var group_field_id = group['field_id'];
+  var group_fields = []
+  $.each(fieldset_associator_ids, function(index, fsa_id) {
+    group_fields[index] = '<%= DynamicFieldsets.config.form_fieldset_associator_prefix %>' + fsa_id + '_' + '<%=DynamicFieldsets.config.form_field_prefix %>' + group_fsc_id;
+  });
+  dependency_action(all_dependency_clauses_true(fieldset_child_id, group, values), action, group_fields, 0 )
+}
+
+function all_dependency_clauses_true(fieldset_child_id, group, values)  {
+  for(var key in group["clause"])  {
+    var clause = group["clause"][key]
+    if(!at_least_one_dependency_true(clause, values))  {
+      return false;
+    }
+  }
+  return true;
+}
+
+function at_least_one_dependency_true(clause, values)  {
+  for(var key in clause)  {
+    var dependency = clause[key]
+    var fieldset_child_id = dependency["fieldset_child_id"]
+    if( evaluate_dependency(values[fieldset_child_id], dependency["relationship"], dependency["value"]) ){
+      return true
+    }
+  }
+  return false
+}
+
+function evaluate_dependency(user_value, relationship, stored_value) {
+	switch(relationship)
+	{
+		case 'equals':
+			return user_value == stored_value;
+		case 'not equals':
+			return user_value != stored_value;
+		case 'includes':
+			return $.inArray(stored_value, user_value) != -1;
+		case 'not includes':
+			return $.inArray(stored_value, user_value) == -1;
+		case 'blank':
+			return user_value == "";
+		case 'not blank':
+			return user_value != "";
+		default:
+			return false;
+	}
+};
+
+function dependency_action(success_flag, action, group_fields, counter) {
+  $.each(group_fields, function(index, group_field){
+    if (success_flag){
+      switch(action)
+      {
+        case 'show':
+          $('[id$=' + group_field +']').show();
+        case 'enable':
+          $('#' + group_field + ' :input').removeAttr('disabled');
+      }
+    
+    } else {
+      switch(action)
+      {
+        case 'show':
+          $('[id$=' + group_field +']').hide();
+        case 'enable':
+          $('#' + group_field + ' :input').attr('disabled', true);
+      }
+      
+      //save from infinite recursion, only goes as deep as there are dependency groups
+      if( counter < Object.keys(dynamic_fieldsets_dependencies).length ) {
+        nested_dependencies(success_flag, action, group_field, counter)
+      }	
+    }
+  });
+};
+
+function nested_dependencies(success_flag, action, group_field, counter) {
+  var dependent_on = group_field.split("-").pop();
+  for( var key in dynamic_fieldsets_dependencies ) {
+    var child = dynamic_fieldsets_dependencies[key]
+    for( var keyg in child ) {
+      //ignore own group since dependents won't be here
+      if( keyg != dependent_on ) {
+        var group_search = child[keyg]
+        for( var keyc in group_search["clause"] ) {
+          var clause = group_search["clause"][keyc]
+          for( var keyd in clause ) {
+            var dependency = clause[keyd]
+            if ( dependency["fieldset_child_id"] == dependent_on ) {
+              var dependent_id = group_field.replace(dependent_on, group_search["fieldset_child_id"])
+              dependency_action(success_flag, action, [dependent_id], counter+1)
+            }
+          }
+        }
+      }
+    }
+  }
+};
+
+hide_fields();
+</script>

data/app/views/dynamic_fieldsets/show_partials/_show_instruction.html.erb

@@ -1 +1 @@
-<p><%= label %></p>
+<p id='<%= id %>'><%= label %></p>

data/app/views/dynamic_fieldsets/show_partials/_show_multiple_answers.html.erb

@@ -1,4 +1,4 @@
-<div class='dynamic_fieldsets field'>
+<div id='<%= id %>' class='dynamic_fieldsets field' type='multiple'>
   <span class='label'><%= label %></label>
   <% if values.nil? || values.empty? %>
     <em class='empty'>No answer given</em>

data/app/views/dynamic_fieldsets/show_partials/_show_single_answer.html.erb

@@ -1,4 +1,4 @@
-<div class='dynamic_fieldsets field'>
+<div id='<%= id %>' class='dynamic_fieldsets field' type='single'>
   <span class='label'><%= label %></label>
   <% if value.nil? || value.empty? %>
     <em class='empty'>No answer given</em>

data/dynamic_fieldsets.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "dynamic_fieldsets"
-  s.version = "0.1.16"
+  s.version = "0.1.17"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jeremiah Hemphill", "Ethan Pemble", "John Carter"]
-  s.date = "2013-08-15"
+  s.date = "2013-09-10"
   s.description = "Dynamic fieldsets for rails controllers"
   s.email = "jeremiah@cloudspace.com"
   s.extra_rdoc_files = [
@@ -92,8 +92,9 @@ Gem::Specification.new do |s|
     "app/views/dynamic_fieldsets/form_partials/_textarea_field.html.erb",
     "app/views/dynamic_fieldsets/shared/_fieldset_footer.html.erb",
     "app/views/dynamic_fieldsets/shared/_fieldset_header.html.erb",
-    "app/views/dynamic_fieldsets/shared/_javascript_watcher.html.erb",
+    "app/views/dynamic_fieldsets/shared/_form_javascript_watcher.html.erb",
     "app/views/dynamic_fieldsets/shared/_nested_model_javascript.html.erb",
+    "app/views/dynamic_fieldsets/shared/_show_javascript_watcher.html.erb",
     "app/views/dynamic_fieldsets/show_partials/_show_incomplete.html.erb",
     "app/views/dynamic_fieldsets/show_partials/_show_incomplete_footer.html.erb",
     "app/views/dynamic_fieldsets/show_partials/_show_incomplete_header.html.erb",

data/spec/dummy/app/models/information_form.rb

@@ -1,5 +1,6 @@
 class InformationForm < ActiveRecord::Base
   # important note: for this to work, there needs to have a fieldset with an nkey of "first" in the db
   # so that DynamicFieldsets::Fieldset.find_by_nkey("first") returns a fieldset
-  acts_as_dynamic_fieldset :child_form => {:fieldset => :first}
+  acts_as_dynamic_fieldset :child_form => {:fieldset => :first, :initialize_on_create => true}
+  acts_as_dynamic_fieldset :child_form2 => {:fieldset => :second, :initialize_on_create => true}
 end

data/spec/dummy/app/views/information_forms/_form.html.erb

@@ -16,6 +16,7 @@
     <%= f.text_field :name %>
   </div>
   <%= dynamic_fieldset_form_renderer(@information_form.child_form) %>
+  <%= dynamic_fieldset_form_renderer(@information_form.child_form2) %>
   <div class="actions">
     <%= f.submit %>
   </div>

data/spec/dummy/app/views/information_forms/show.html.erb

@@ -7,6 +7,7 @@
 
 
 <%= dynamic_fieldset_show_renderer(@information_form.child_form) %>
+<%= dynamic_fieldset_show_renderer(@information_form.child_form2) %>
 
 <%= link_to 'Edit', edit_information_form_path(@information_form) %> |
 <%= link_to 'Back', information_forms_path %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynamic_fieldsets
 version: !ruby/object:Gem::Version
-  version: 0.1.16
+  version: 0.1.17
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-15 00:00:00.000000000 Z
+date: 2013-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -384,8 +384,9 @@ files:
 - app/views/dynamic_fieldsets/form_partials/_textarea_field.html.erb
 - app/views/dynamic_fieldsets/shared/_fieldset_footer.html.erb
 - app/views/dynamic_fieldsets/shared/_fieldset_header.html.erb
-- app/views/dynamic_fieldsets/shared/_javascript_watcher.html.erb
+- app/views/dynamic_fieldsets/shared/_form_javascript_watcher.html.erb
 - app/views/dynamic_fieldsets/shared/_nested_model_javascript.html.erb
+- app/views/dynamic_fieldsets/shared/_show_javascript_watcher.html.erb
 - app/views/dynamic_fieldsets/show_partials/_show_incomplete.html.erb
 - app/views/dynamic_fieldsets/show_partials/_show_incomplete_footer.html.erb
 - app/views/dynamic_fieldsets/show_partials/_show_incomplete_header.html.erb
@@ -520,7 +521,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 433715359672350075
+      hash: -1940297788818609247
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: