dynamic_fieldsets 0.0.16 → 0.1.0

data/app/views/dynamic_fieldsets/fields/edit.html.erb

@@ -1,6 +1,9 @@
 <h1>Editing field</h1>
 
-<%= render 'form' %>
+<%= form_for(@field, :as => :dynamic_fieldsets_field, :url => dynamic_fieldsets_field_path, :method => :put) do |f| %>
+  <%= render :partial => 'form', :locals => { :f => f } %>
+<% end %>
 
-<%= link_to 'Show', @field %> |
+
+<%= link_to 'Show', dynamic_fieldsets_field_path(@field) %> |
 <%= link_to 'Back', dynamic_fieldsets_fields_path %>

data/app/views/dynamic_fieldsets/fields/index.html.erb

@@ -12,7 +12,7 @@
 <% @fields.each do |field| %>
   <tr>
     <td><%= field.name %></td>
-    <td><%= field.field_type %></td>
+    <td><%= field.type %></td>
     <td><%= link_to 'Show', dynamic_fieldsets_field_path(field) %></td>
     <td><%= link_to 'Edit', edit_dynamic_fieldsets_field_path(field) %></td>
     <td><%= render :partial => "disable_field_form", :locals => { :field => field } %></td>

data/app/views/dynamic_fieldsets/fields/new.html.erb

@@ -1,6 +1,8 @@
 <h1>New field</h1>
 
-<%= render 'form' %>
+<%= form_for(@field) do |f| %>
+  <%= render :partial => 'form', :locals => { :f => f } %>
+<% end %>
 
 <% if params[:parent].nil? %>
   <%= link_to 'Back', dynamic_fieldsets_fields_path %>

data/app/views/dynamic_fieldsets/fields/show.html.erb

@@ -10,7 +10,7 @@
 
 <p>
   <b>Type:</b>
-  <%= @field.field_type %>
+  <%= @field.type %>
 </p>
 
 <% if @field.field_options.length > 0 %>

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

@@ -27,7 +27,7 @@
   <% fieldset_child = DynamicFieldsets::FieldsetChild.where( fieldset_id: fieldset.id, child_id: child.id, child_type: "DynamicFieldsets::Field" ).first %>
     <li id="child-<%= fieldset_child.id %>" class="field<%= ' required' if child.required? %>">
     <div>
-      <span class="fieldtype"><%= child.field_type %>:</span>
+      <span class="fieldtype"><%= child.type %>:</span>
       <span class="name"><%= child.label %></span>
       <span class="admin">
         <span class="show"><%= link_to 'Show', dynamic_fieldsets_field_path(child) %></span>

data/app/views/dynamic_fieldsets/form_partials/_checkbox_field.html.erb

@@ -0,0 +1,8 @@
+<div id='<%= id %>' name='<%= name %>'>
+  <% options.each do |option| %>
+    <label for='<%= option[:name] %>'>
+      <%= check_box_tag(option[:name], option[:value], option[:checked], option[:html_attributes]) %>  
+      <%= option[:label] %>
+    </label>
+  <% end %>
+</div>

data/app/views/dynamic_fieldsets/form_partials/_date_field.html.erb

@@ -0,0 +1 @@
+<%= date_select(object, method, date_options, attrs) %>

data/app/views/dynamic_fieldsets/form_partials/_datetime_field.html.erb

@@ -0,0 +1 @@
+<%= datetime_select(object, method, date_options, attrs) %>

data/app/views/dynamic_fieldsets/form_partials/_input_footer.html.erb

@@ -0,0 +1 @@
+</li>

data/app/views/dynamic_fieldsets/form_partials/_input_header.html.erb

@@ -0,0 +1,7 @@
+<li class='<%= classes %>' id='input-<%= DynamicFieldsets.config.form_field_prefix %><%= field.id %>-child-<%= fieldset_child.id %>'>
+  <label for ='<%=DynamicFieldsets.config.form_field_prefix %><%= field.id %>'>
+    <%= field.label %>
+    <% if field.required? %>
+      <abbr title='required'>*</abbr>
+    <% end %>
+  </label>

data/app/views/dynamic_fieldsets/form_partials/_instruction_field.html.erb

@@ -0,0 +1 @@
+<p><%= label %></p>

data/app/views/dynamic_fieldsets/form_partials/_multiple_select_field.html.erb

@@ -0,0 +1 @@
+<%= select_tag(name, options_from_collection_for_select( collection, :id, :name, selected_ids ), attrs) %>

data/app/views/dynamic_fieldsets/form_partials/_radio_field.html.erb

@@ -0,0 +1,8 @@
+<div id='<%= name %>'>
+  <% options.each do |option| %>
+    <label for='<%= option[:name] %>'>
+      <%= radio_button_tag(option[:name], option[:value], option[:checked], option[:html_attributes]) %>  
+      <%= option[:label] %>
+    </label>
+  <% end %>
+</div>

data/app/views/dynamic_fieldsets/form_partials/_select_field.html.erb

@@ -0,0 +1 @@
+<%= select_tag(name, options_from_collection_for_select( collection, :id, :name, selected_id ), attrs) %>

data/app/views/dynamic_fieldsets/form_partials/_text_field.html.erb

@@ -0,0 +1 @@
+<%= text_field object, method, attrs %>

data/app/views/dynamic_fieldsets/form_partials/_textarea_field.html.erb

@@ -0,0 +1 @@
+<%= text_area_tag(name, content, attrs) %>

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

@@ -13,8 +13,8 @@ var allInputs = $(":input:not(:hidden)");
 
 ***************************************************************************/
 
-function grab_fsc_id(field, field_type) {
-	switch(field_type)
+function grab_fsc_id(field, type) {
+	switch(type)
 	{
 		case 'text':
 			var id_array = field.attr('id').split('-');
@@ -114,8 +114,8 @@ function group_action(success_flag, action, group_field) {
 	}
 };
 
-function grab_value(field, field_type) {
-	switch(field_type)
+function grab_value(field, type) {
+	switch(type)
 	{
 		case 'text':
 			return field.attr('value').toLowerCase();
@@ -204,15 +204,15 @@ function getIntersect(arr1, arr2) {
 
 allInputs.change( function() {
 	var field = $(this);
-	var field_type = grab_type(field);
-	var fieldset_child_id = grab_fsc_id(field, field_type);
-	var entered_value = grab_value(field, field_type)
+	var type = grab_type(field);
+	var fieldset_child_id = grab_fsc_id(field, type);
+	var entered_value = grab_value(field, type)
 	if (fieldset_child_id in json_holder) {
 		for (var group in json_holder[fieldset_child_id]) {
 			var action = json_holder[fieldset_child_id][group]['action'];
 			var group_fsc_id = json_holder[fieldset_child_id][group]['fieldset_child_id'];
 			var group_field_id = json_holder[fieldset_child_id][group]['field_id'];
-			var group_field = 'field-' + group_field_id + '-child-' + group_fsc_id;
+			var group_field = '<%= DynamicFieldsets.config.form_field_prefix %>' + group_field_id + '-child-' + group_fsc_id;
 
 			// As each dependency clause is AND'd together, we'll assume it'll be
 			// true until short circuited into being false.`

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

@@ -0,0 +1 @@
+<p>This field type needs to set the show_partial to an existing partial.</p>

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

@@ -0,0 +1,2 @@
+<p>This footer needs to be overridden by setting show_footer_partial in your child Field class.</p>
+

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

@@ -0,0 +1 @@
+<p>This footer needs to be overridden by setting show_header_partial in your child Field class.</p>

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

@@ -0,0 +1 @@
+<p><%= label %></p>

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

@@ -0,0 +1,13 @@
+<div class='dynamic_fieldsets field'>
+  <span class='label'><%= label %></label>
+  <% if values.nil? || values.empty? %>
+    <em class='empty'>No answer given</em>
+  <% else %>
+    <ul>
+      <% values.each do |value| %>
+        <span class='value'><%= value %></span>
+      <% end %>
+    </ul>
+  <% end %>
+</div>
+

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

@@ -0,0 +1,8 @@
+<div class='dynamic_fieldsets field'>
+  <span class='label'><%= label %></label>
+  <% if value.nil? || value.empty? %>
+    <em class='empty'>No answer given</em>
+  <% else %>
+    <span class='value'><%= value %></span>
+  <% end %>
+</div>

data/autotest/discover.rb

@@ -0,0 +1,2 @@
+# Autotest.add_discovery { "rails" }
+Autotest.add_discovery { "rspec2" }

data/dynamic_fieldsets.gemspec

@@ -5,17 +5,19 @@
 
 Gem::Specification.new do |s|
   s.name = "dynamic_fieldsets"
-  s.version = "0.0.16"
+  s.version = "0.1.0"
 
   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 = "2012-02-13"
+  s.date = "2012-02-28"
   s.description = "Dynamic fieldsets for rails controllers"
   s.email = "jeremiah@cloudspace.com"
   s.extra_rdoc_files = [
     "README.rdoc"
   ]
   s.files = [
+    ".rdebugrc",
+    ".rspec",
     "CHANGELOG",
     "Gemfile",
     "Gemfile.lock",
@@ -31,6 +33,10 @@ Gem::Specification.new do |s|
     "app/helpers/dynamic_fieldsets/fieldset_children_helper.rb",
     "app/helpers/dynamic_fieldsets/nested_model_helper.rb",
     "app/helpers/dynamic_fieldsets_helper.rb",
+    "app/models/dynamic_fieldsets.rb",
+    "app/models/dynamic_fieldsets/checkbox_field.rb",
+    "app/models/dynamic_fieldsets/date_field.rb",
+    "app/models/dynamic_fieldsets/datetime_field.rb",
     "app/models/dynamic_fieldsets/dependency.rb",
     "app/models/dynamic_fieldsets/dependency_clause.rb",
     "app/models/dynamic_fieldsets/dependency_group.rb",
@@ -42,6 +48,12 @@ Gem::Specification.new do |s|
     "app/models/dynamic_fieldsets/fieldset.rb",
     "app/models/dynamic_fieldsets/fieldset_associator.rb",
     "app/models/dynamic_fieldsets/fieldset_child.rb",
+    "app/models/dynamic_fieldsets/instruction_field.rb",
+    "app/models/dynamic_fieldsets/multiple_select_field.rb",
+    "app/models/dynamic_fieldsets/radio_field.rb",
+    "app/models/dynamic_fieldsets/select_field.rb",
+    "app/models/dynamic_fieldsets/text_field.rb",
+    "app/models/dynamic_fieldsets/textarea_field.rb",
     "app/views/dynamic_fieldsets/fields/_disable_field_form.html.erb",
     "app/views/dynamic_fieldsets/fields/_field_default_fields.html.erb",
     "app/views/dynamic_fieldsets/fields/_field_html_attribute_fields.html.erb",
@@ -67,8 +79,26 @@ Gem::Specification.new do |s|
     "app/views/dynamic_fieldsets/fieldsets/new.html.erb",
     "app/views/dynamic_fieldsets/fieldsets/reorder.html.erb",
     "app/views/dynamic_fieldsets/fieldsets/show.html.erb",
+    "app/views/dynamic_fieldsets/form_partials/_checkbox_field.html.erb",
+    "app/views/dynamic_fieldsets/form_partials/_date_field.html.erb",
+    "app/views/dynamic_fieldsets/form_partials/_datetime_field.html.erb",
+    "app/views/dynamic_fieldsets/form_partials/_input_footer.html.erb",
+    "app/views/dynamic_fieldsets/form_partials/_input_header.html.erb",
+    "app/views/dynamic_fieldsets/form_partials/_instruction_field.html.erb",
+    "app/views/dynamic_fieldsets/form_partials/_multiple_select_field.html.erb",
+    "app/views/dynamic_fieldsets/form_partials/_radio_field.html.erb",
+    "app/views/dynamic_fieldsets/form_partials/_select_field.html.erb",
+    "app/views/dynamic_fieldsets/form_partials/_text_field.html.erb",
+    "app/views/dynamic_fieldsets/form_partials/_textarea_field.html.erb",
     "app/views/dynamic_fieldsets/shared/_javascript_watcher.html.erb",
     "app/views/dynamic_fieldsets/shared/_nested_model_javascript.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",
+    "app/views/dynamic_fieldsets/show_partials/_show_instruction.html.erb",
+    "app/views/dynamic_fieldsets/show_partials/_show_multiple_answers.html.erb",
+    "app/views/dynamic_fieldsets/show_partials/_show_single_answer.html.erb",
+    "autotest/discover.rb",
     "config/.routes.rb.swp",
     "config/routes.rb",
     "dynamic_fieldsets.gemspec",
@@ -76,6 +106,9 @@ Gem::Specification.new do |s|
     "lib/dynamic_fieldsets/config.rb",
     "lib/dynamic_fieldsets/dynamic_fieldsets_in_model.rb",
     "lib/dynamic_fieldsets/engine.rb",
+    "lib/dynamic_fieldsets/field_with_field_options.rb",
+    "lib/dynamic_fieldsets/field_with_multiple_answers.rb",
+    "lib/dynamic_fieldsets/field_with_single_answer.rb",
     "lib/dynamic_fieldsets/railtie.rb",
     "lib/generators/dynamic_fieldsets/controllers_generator.rb",
     "lib/generators/dynamic_fieldsets/install_generator.rb",
@@ -104,6 +137,7 @@ Gem::Specification.new do |s|
     "spec/dummy/config/environments/production.rb",
     "spec/dummy/config/environments/test.rb",
     "spec/dummy/config/initializers/backtrace_silencers.rb",
+    "spec/dummy/config/initializers/dynamic_fieldsets.rb",
     "spec/dummy/config/initializers/inflections.rb",
     "spec/dummy/config/initializers/mime_types.rb",
     "spec/dummy/config/initializers/secret_token.rb",
@@ -143,7 +177,13 @@ Gem::Specification.new do |s|
     "spec/dynamic_fieldsets_helper_spec.rb",
     "spec/dynamic_fieldsets_in_model_spec.rb",
     "spec/dynamic_fieldsets_spec.rb",
+    "spec/field_with_field_options_spec.rb",
+    "spec/field_with_multiple_answers_spec.rb",
+    "spec/field_with_single_answer_spec.rb",
     "spec/integration/navigation_spec.rb",
+    "spec/models/checkbox_field_spec.rb",
+    "spec/models/date_field_spec.rb",
+    "spec/models/datetime_field_spec.rb",
     "spec/models/dependency_clause_spec.rb",
     "spec/models/dependency_group_spec.rb",
     "spec/models/dependency_spec.rb",
@@ -155,6 +195,11 @@ Gem::Specification.new do |s|
     "spec/models/fieldset_associator_spec.rb",
     "spec/models/fieldset_child_spec.rb",
     "spec/models/fieldset_spec.rb",
+    "spec/models/instruction_field_spec.rb",
+    "spec/models/multiple_select_field_spec.rb",
+    "spec/models/radio_field_spec.rb",
+    "spec/models/text_field_spec.rb",
+    "spec/models/textarea_field_spec.rb",
     "spec/spec_helper.rb",
     "spec/support/dependency_group_helper.rb",
     "spec/support/dependency_helper.rb",
@@ -177,53 +222,62 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rails>, [">= 3.0.7"])
+      s.add_runtime_dependency(%q<rails>, ["~> 3.0.7"])
       s.add_development_dependency(%q<capybara>, [">= 0.4.0"])
       s.add_development_dependency(%q<sqlite3>, [">= 0"])
       s.add_development_dependency(%q<ruby-debug19>, [">= 0"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.6.3"])
+      s.add_development_dependency(%q<json>, [">= 0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.6.0"])
       s.add_development_dependency(%q<rspec-rails>, ["~> 2.6.1"])
-      s.add_development_dependency(%q<yard>, ["~> 0.6.0"])
+      s.add_development_dependency(%q<shoulda>, ["~> 3.0.0"])
+      s.add_development_dependency(%q<ruby_parser>, ["~> 2.3.1"])
+      s.add_development_dependency(%q<ZenTest>, [">= 0"])
+      s.add_development_dependency(%q<autotest-rails>, [">= 0"])
       s.add_development_dependency(%q<cucumber>, [">= 0"])
       s.add_development_dependency(%q<cucumber-rails>, [">= 0"])
       s.add_development_dependency(%q<database_cleaner>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.6.3"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
-      s.add_development_dependency(%q<json>, [">= 0"])
+      s.add_development_dependency(%q<yard>, ["~> 0.6.0"])
       s.add_development_dependency(%q<ci_reporter>, [">= 0"])
     else
-      s.add_dependency(%q<rails>, [">= 3.0.7"])
+      s.add_dependency(%q<rails>, ["~> 3.0.7"])
       s.add_dependency(%q<capybara>, [">= 0.4.0"])
       s.add_dependency(%q<sqlite3>, [">= 0"])
       s.add_dependency(%q<ruby-debug19>, [">= 0"])
+      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.6.3"])
+      s.add_dependency(%q<json>, [">= 0"])
       s.add_dependency(%q<rspec>, ["~> 2.6.0"])
       s.add_dependency(%q<rspec-rails>, ["~> 2.6.1"])
-      s.add_dependency(%q<yard>, ["~> 0.6.0"])
+      s.add_dependency(%q<shoulda>, ["~> 3.0.0"])
+      s.add_dependency(%q<ruby_parser>, ["~> 2.3.1"])
+      s.add_dependency(%q<ZenTest>, [">= 0"])
+      s.add_dependency(%q<autotest-rails>, [">= 0"])
       s.add_dependency(%q<cucumber>, [">= 0"])
       s.add_dependency(%q<cucumber-rails>, [">= 0"])
       s.add_dependency(%q<database_cleaner>, [">= 0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.6.3"])
-      s.add_dependency(%q<rcov>, [">= 0"])
-      s.add_dependency(%q<json>, [">= 0"])
+      s.add_dependency(%q<yard>, ["~> 0.6.0"])
       s.add_dependency(%q<ci_reporter>, [">= 0"])
     end
   else
-    s.add_dependency(%q<rails>, [">= 3.0.7"])
+    s.add_dependency(%q<rails>, ["~> 3.0.7"])
     s.add_dependency(%q<capybara>, [">= 0.4.0"])
     s.add_dependency(%q<sqlite3>, [">= 0"])
     s.add_dependency(%q<ruby-debug19>, [">= 0"])
+    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.6.3"])
+    s.add_dependency(%q<json>, [">= 0"])
     s.add_dependency(%q<rspec>, ["~> 2.6.0"])
     s.add_dependency(%q<rspec-rails>, ["~> 2.6.1"])
-    s.add_dependency(%q<yard>, ["~> 0.6.0"])
+    s.add_dependency(%q<shoulda>, ["~> 3.0.0"])
+    s.add_dependency(%q<ruby_parser>, ["~> 2.3.1"])
+    s.add_dependency(%q<ZenTest>, [">= 0"])
+    s.add_dependency(%q<autotest-rails>, [">= 0"])
     s.add_dependency(%q<cucumber>, [">= 0"])
     s.add_dependency(%q<cucumber-rails>, [">= 0"])
     s.add_dependency(%q<database_cleaner>, [">= 0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.6.3"])
-    s.add_dependency(%q<rcov>, [">= 0"])
-    s.add_dependency(%q<json>, [">= 0"])
+    s.add_dependency(%q<yard>, ["~> 0.6.0"])
     s.add_dependency(%q<ci_reporter>, [">= 0"])
   end
 end

data/lib/dynamic_fieldsets/config.rb

@@ -0,0 +1,45 @@
+# this file was stolen from kaminari
+require 'active_support/configurable'
+
+module DynamicFieldsets
+
+  # create new configs by passing a block with the config assignment
+  def self.configure(&block)
+    yield @config ||= DynamicFieldsets::Configuration.new
+  end
+
+  def self.config
+    @config
+  end
+
+  # setup config data
+  class Configuration
+    include ActiveSupport::Configurable
+    config_accessor :available_field_types
+    config_accessor :form_fieldset_associator_prefix
+    config_accessor :form_field_prefix
+
+    def param_name
+      config.param_name.respond_to?(:call) ? config.param_name.call() : config.param_name
+    end
+  end
+
+  # setup default options
+  # this should match the generator config that goes in the initializer file
+  configure do |config|
+    config.available_field_types = [ 
+      "DynamicFieldsets::CheckboxField", 
+      "DynamicFieldsets::DateField", 
+      "DynamicFieldsets::DatetimeField", 
+      "DynamicFieldsets::InstructionField", 
+      "DynamicFieldsets::MultipleSelectField", 
+      "DynamicFieldsets::RadioField", 
+      "DynamicFieldsets::SelectField", 
+      "DynamicFieldsets::TextField", 
+      "DynamicFieldsets::TextareaField"
+    ]
+    config.form_fieldset_associator_prefix = "fsa-"
+    config.form_field_prefix = "field-"
+  end
+end
+

data/lib/dynamic_fieldsets/dynamic_fieldsets_in_model.rb

@@ -59,7 +59,7 @@ module DynamicFieldsets
         # for each fsa
         self.dynamic_fieldsets.keys.each do |key|
           fsa = self.fieldset_associator(key)
-          fsa_tag_id = "fsa-" + fsa.id.to_s
+          fsa_tag_id = DynamicFieldsets.config.form_fieldset_associator_prefix + fsa.id.to_s
 
           # check if the values are set, if it matches the current fsa, and if it matches the current fieldset
           if !self.dynamic_fieldset_values.nil? && self.dynamic_fieldset_values.has_key?(fsa_tag_id) && self.dynamic_fieldset_values[fsa_tag_id][:fieldset_model_name] == key
@@ -81,8 +81,8 @@ module DynamicFieldsets
           end
         elsif child.is_a?(DynamicFieldsets::Field)
           # if a child, check if the params value is set, check if it is required, check if it satisfies condition
-          fsa_tag_id = "fsa-" + fsa_id.to_s
-          field_tag_id = "field-" + child.id.to_s
+          fsa_tag_id = DynamicFieldsets.config.form_fieldset_associator_prefix + fsa_id.to_s
+          field_tag_id = DynamicFieldsets.config.form_field_prefix + child.id.to_s
           if !self.dynamic_fieldset_values[fsa_tag_id].has_key?(field_tag_id)
             self.errors.add(:base, child.label + " is missing from the form data")
           else
@@ -95,17 +95,18 @@ module DynamicFieldsets
           end
         else
           # found a major problem, not sure how to get here
-          puts "found a child that wasn't a field or fieldset" + child.inspect
+          throw "found a child that wasn't a field or fieldset" + child.inspect
         end
       end
       
       # Stores data from the controller into the dynamic_fieldset_values instance variable
+      # Also combines the date and time fields into a single field
       #
       # @param [Hash] params The parameters from the controller that include fsa tags
       def set_fieldset_values( params )
-        values = params.select{ |key| key.match(/^fsa-/) }
+        values = params.select{ |key| key.match(/^#{DynamicFieldsets.config.form_fieldset_associator_prefix}/) }
         values.keys.each do |key|
-          set_date_to_mysql( values[key] )
+          values[key] = set_date_to_mysql( values[key] )
         end
         self.dynamic_fieldset_values = values
       end
@@ -116,6 +117,12 @@ module DynamicFieldsets
       # time conversions.  If the query receives a string instead of a time object, time zone information
       # may be saved incorrectly. (1-25-2012)
       #
+      # At some point this should be moved to the date_field and datetime_field models.  Right now, it needs
+      # to stay here because we are taking the values from the form and iterating over the keys.  This
+      # will not work because the date information is stored int 3-5 keys.  We need to change the form
+      # data parser to get a list of expected field and iterate over them, looking for the values in the 
+      # form post.  That is a big change that we don't have time for now. (JH 2-27-2012)
+      #
       # @param [Hash] post The post parameters that include date fields like date(1i), date(2i), ...
       # @return [Hash] The modified hash containing one key-pair value in YYYY-MM-DD[ hh:mm] format.
       def set_date_to_mysql( post )
@@ -143,73 +150,41 @@ module DynamicFieldsets
         return post
       end
       
-      
-      # hacky system to save fieldset values
-      # needs to be refactored and tested
-      #
-      # among other things, it can edit field records for random fsas if the wrong information comes from the controller
-      
+      # Given the form values, finds the keys that correspond to fieldsets
+      # then passes the value for the key to the fieldset associator object for saving into individual field records
       def save_dynamic_fieldsets
         values = self.dynamic_fieldset_values
         if !values.nil?
           values.keys.each do |key|
-            if key.start_with?("fsa-")
-              key_id = key.gsub(/^fsa-/, "")
-
-              if key_id.eql? ""
-              then fsa = DynamicFieldsets::FieldsetAssociator.create(
-                :fieldset_id => values[key][:fieldset_id],
-                :fieldset_model_id => self.id,
-                :fieldset_model_type => self.class.name,
-                :fieldset_model_name => values[key][:fieldset_model_name] )
-              else fsa = DynamicFieldsets::FieldsetAssociator.find_by_id key_id
-              end
-                
-              values[key].keys.each do |sub_key| # EACH FIELD
-                if sub_key.start_with?("field-")
-                  sub_key_id = sub_key.gsub(/^field-/, "")
-                  
-                  this_value = values[key][sub_key]
-                  if this_value.is_a? Array
-                  then # multiple values
-                    field_records = DynamicFieldsets::FieldRecord.where(:fieldset_associator_id => fsa.id, :fieldset_child_id => sub_key_id)
-                    
-                    this_value.each do |value|
-                      if field_records.select{ |record| record.value.eql? value }.empty? # record does not exist?
-                        #ADD
-                        DynamicFieldsets::FieldRecord.create( :fieldset_associator_id => fsa.id,
-                                                              :fieldset_child_id => sub_key_id,
-                                                              :value => value)
-                      end
-                    end
-                    field_records.each do |record|
-                      if !this_value.include? record.value then
-                        #DELETE
-                        record.destroy
-                      else
-                        #KEEP
-                      end
-                    end
-                    
-                  else # single value
-                    # retrieve record
-                    field_record = DynamicFieldsets::FieldRecord.where(:fieldset_associator_id => fsa.id, :fieldset_child_id => sub_key_id).first
-                    if field_record.nil? # create record
-                      field_record = DynamicFieldsets::FieldRecord.create(:fieldset_associator_id => fsa.id, :fieldset_child_id => sub_key_id, :value => this_value)
-                    else # update record
-                      field_record.value = this_value
-                      field_record.save
-                    end
-                  end
-                  
-                end
-              end
+            if key.start_with?(DynamicFieldsets.config.form_fieldset_associator_prefix)
+              save_fsa(key, values[key])
             end
           end
         end
         self.dynamic_fieldset_values = nil
       end
 
+      # save all of the fields and fieldsets in the values hash for this fieldset associator
+      #
+      # @param [String] The key that includes the fieldset associator's id
+      # @param [Hash] fsa_values An array of input information from the form
+      def save_fsa(key, fsa_values)
+        key_id = key.gsub(/^#{DynamicFieldsets.config.form_fieldset_associator_prefix}/, "")
+
+        if(key_id == "")
+          fsa = DynamicFieldsets::FieldsetAssociator.create(
+            :fieldset_id => fsa_values[:fieldset_id],
+            :fieldset_model_id => self.id,
+            :fieldset_model_type => self.class.name,
+            :fieldset_model_name => fsa_values[:fieldset_model_name] 
+          )
+        else 
+          fsa = DynamicFieldsets::FieldsetAssociator.find_by_id key_id
+        end
+
+        fsa.update_fieldset_records_with_form_information(fsa_values)
+      end
+
       # Matches methods that match named_fieldset and named_fieldset_fieldset
       # Or calls super
       #