dynamic_fieldsets 0.0.3 → 0.0.4

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

@@ -0,0 +1,255 @@
+<script type='text/javascript'>
+
+// The only inputs we care about are visible... not hidden
+var allInputs = $(":input:not(:hidden)");
+
+/***************************************************************************
+   
+  field-[group_field]-child-[group_fsc] - just want the last value from the
+  input's id. This function rips it.
+
+  input - called upon the input that just called the change()
+  returns [integer] - the group_fsc id from the end of the id
+
+***************************************************************************/
+
+function grab_fsc_id(field, field_type) {
+	switch(field_type)
+	{
+		case 'text':
+			var id_array = field.attr('id').split('-');
+			return id_array[id_array.length-1];
+		case 'radio':
+			var id_array = field.closest("div").attr("id").split('-');
+			return id_array[id_array.length-1];
+		case 'textarea':
+			var id_array = field.attr('id').split('-');
+			return id_array[id_array.length-1];
+		case 'checkbox':
+			var id_array = field.closest("div").attr("id").split('-');
+			return id_array[id_array.length-1];
+		case 'select':
+			var id_array = field.attr('id').split('-');
+			return id_array[id_array.length-1];
+		case 'multi-select':	
+			var id_array = field.attr('id').split('-');
+			return id_array[id_array.length-1];
+		default:
+			return ''
+	}
+};
+
+/***************************************************************************
+
+  evaluate() does the logical computing between two values with a given
+  relationship.
+
+  params [entered_value] - The current value of the input that called the
+    change()
+  params [relationship] - The relationship of the dependency that the
+    input that called the change() is tied to
+  params [value] - The value that we are testing against for the dependency
+    that the input that called the change() is tied to
+  returns [bool] - The boolean value by comparing the entered_value against
+    the value using the relationship.
+
+**************************************************************************/
+
+function evaluate(entered_value, relationship, value) {
+	switch(relationship)
+	{
+                /* CHANGE THIS if the model changes on which relationships
+                   are allowed.                                           */
+		case 'equals':
+			return entered_value == value;
+		case 'not equals':
+			return entered_value != value;
+		case 'includes':
+			return jQuery.inArray(value, entered_value) != -1;
+		case 'not includes':
+			return jQuery.inArray(value, entered_value) == -1;
+		case 'blank':
+			return entered_value == "";
+		case 'not blank':
+			return entered_value != "";
+		default:
+			return false;
+	}
+};
+
+/*************************************************************************
+
+  group_action() responds to the results of evaluate() to enact the
+  appropriate action upon the group_field of the dependency_group.
+
+  params [success_flag] - Either set to succeed or failure to indicate
+    the results of evaluate()
+  params [action] - Either set to show or enable.
+  params [group_field] - The field tied to the dependency_group that is
+    to experience the action based off of the success of evaluate()
+  returns - changes the group_field
+
+*************************************************************************/
+
+function group_action(success_flag, action, group_field) {
+
+	/* CHANGE THIS if the model change on which actions are allowed */
+
+	if (success_flag == true){
+		switch(action)
+		{
+			case 'show':
+				$('#input-' + group_field).show();
+			case 'enable':
+				$('#' + group_field + ' :input').removeAttr('disabled');
+		}
+	} else {
+		switch(action)
+		{
+			case 'show':
+				$('#input-' + group_field).hide();
+			case 'enable':
+				$('#' + group_field + ' :input').attr('disabled', true);
+		}
+	}
+};
+
+function grab_value(field, field_type) {
+	switch(field_type)
+	{
+		case 'text':
+			return field.attr('value').toLowerCase();
+		case 'radio':
+			if (field.val() == $(':checked').val())
+			{
+				field_val = field.attr('id').split('-').slice(2);
+				return field_val.join(" ").toLowerCase();
+			}
+		case 'textarea':
+			return field.val();
+		case 'checkbox':
+			var value_ray = [];
+			var field_ray = [];
+			var sibling_ray = field.closest('div').children().children();
+			var checked_ray = $('input:checked');
+			value_ray = getIntersect(sibling_ray, checked_ray) 
+			for (var element in value_ray) {
+				field_ray.push(value_ray[element].id.split('-').slice(2)[0]);
+			}
+			return field_ray;
+		case 'select':
+			return $('#' + field.attr('id') + ' option:selected').text().toLowerCase();
+		case 'multi-select':
+			var value_ray = $('#' + field.attr('id') + ' option:selected');
+			var field_ray = []
+			for (var element in value_ray)
+			{
+				var temp = value_ray[element].text;
+				if (typeof(temp) == "string") { field_ray.push(temp.toLowerCase()); }
+			}
+			return field_ray;
+		default:
+			return '';
+	}
+};
+
+function grab_type(field) {
+	if (field.attr('type') != undefined)
+	{
+		return field.attr('type')
+	}
+	else if ($('textarea#'+field.attr('id')).length > 0)
+	{
+		return "textarea";
+	}
+	else if ($('select#'+field.attr('id')).length > 0)
+	{
+		if (field.attr('multiple') == "multiple")
+		{
+			return "multi-select";
+		}
+		else {
+			return "select";
+		}
+	}
+	else
+	{
+		return "invalid";
+	}
+}
+
+function getIntersect(arr1, arr2) {
+    var temp = [];
+    for(var i = 0; i < arr1.length; i++){
+        for(var k = 0; k < arr2.length; k++){
+            if(arr1[i] == arr2[k]){
+                temp.push( arr1[i]);
+                break;
+            }
+        }
+    }
+    return temp;
+}
+
+/***********************************************************************
+ 
+  This watches for ANY change that may take place on the page. It then
+  pushes the object through grab_fsc_id to get an id we can check against
+  the json_holder. If it's in there, it then grabs all the related data,
+  checks the current value against the expected value through the 
+  evaluate() function and then goes through the needed action AFTER
+  checking each dependency and dependency_clause.
+ 
+***********************************************************************/
+
+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)
+	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;
+
+			// As each dependency clause is AND'd together, we'll assume it'll be
+			// true until short circuited into being false.`
+			var group_break_flag = true;
+			group:
+			for (var clause in json_holder[fieldset_child_id][group]["clause"]) {
+				// As each clause ORs dependencies together, we'll assume it'll be
+				// false until short circuited into being true.
+				var clause_break_flag = false;
+				clause:
+				for (var dependency in json_holder[fieldset_child_id][group]["clause"][clause])
+				{
+					var relationship = json_holder[fieldset_child_id][group]["clause"][clause][dependency]['relationship'];
+					var value = json_holder[fieldset_child_id][group]["clause"][clause][dependency]['value'].toLowerCase();
+					// Short circuit from looking at each dependency in the case
+					// we determine a true dependency (OR)
+					if (evaluate(entered_value, relationship, value)) {
+						clause_break_flag = true;
+						break clause;
+					}
+				}
+
+				// Short circuit from looking at each clause in the case we determine
+				// a false dependency (AND)
+				if (clause_break_flag == false) {
+					group_break_flag = false;
+					break group;
+				}
+			}
+			// If successful, group_break_flag will pass true into group_action
+			group_action(group_break_flag, action, group_field);
+			
+		}
+
+	}
+
+})
+.change();
+
+</script>

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

@@ -0,0 +1,35 @@
+<script>
+<%# Sorry for these duplicated functions %>
+function remove_fields(link) {
+  $(link).prev("input[type=hidden]").val("1");
+  $(link).closest(".fields").hide();
+  $(link).parent().hide();
+}
+
+function remove_fields_and_parent_fields(link)  {
+  $(link).prev("input[type=hidden]").val("1");
+  $(link).closest(".fields").hide();
+  $(link).parent().parent().hide();
+}
+
+function remove_fields_from_table(link)  {
+  $(link).prev("input[type=hidden]").val("1");
+  $(link).closest(".fields").hide();
+  $(link).parent().parent().hide();
+  //also remove the next row
+  $(link).parent().parent().next().hide();
+}
+
+function add_fields(link, association, content) {
+  var new_id = new Date().getTime();
+  var regexp = new RegExp("new_" + association, "g");
+  $(link).parent().before(content.replace(regexp, new_id));
+}
+
+function add_fields_to_table(link, association, content)  {
+  var new_id = new Date().getTime();
+  var regexp = new RegExp("new_" + association, "g");
+  $(link).parent().parent().before(content.replace(regexp, new_id));
+}
+</script>
+

data/config/routes.rb

@@ -1,9 +1,20 @@
 Rails.application.routes.draw do
   namespace :dynamic_fieldsets do
     resources :fieldset_associators
+
     resources :fieldsets
+    match "/fieldsets/roots" => "fieldsets#roots"
     match "/fieldsets/:id/children" => "fieldsets#children", :as => :children_dynamic_fieldsets_fieldset
+    match "/fieldsets/:id/children/reorder" => "fieldsets#reorder"
+    match "/fieldsets/new(/:parent)" => "fieldsets#new", :as => :new_dynamic_fieldsets_fieldset
+    match "fieldsets/:id/associate_child" => "fieldsets#associate_child", :as => :associate_child_to_fieldset
+
     resources :fields
+    match "/fields/new(/:parent)" => "fields#new", :as => :new_dynamic_fieldsets_field
+    match "/fields/:id/enable" => "fields#enable", :as => "enable_field", :method => :post
+
+    resources :fieldset_children
+    match "/fieldset_children/:id/remove" => "fieldset_children#remove", :as => :remove_fieldset_child, :method => :post
   end
 
 end

data/dynamic_fieldsets.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dynamic_fieldsets}
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = [%q{Jeremiah Hemphill}, %q{Ethan Pemble}]
-  s.date = %q{2011-07-28}
+  s.authors = [%q{Jeremiah Hemphill}, %q{Ethan Pemble}, %q{John Carter}]
+  s.date = %q{2011-08-25}
   s.description = %q{Dynamic fieldsets for rails controllers}
   s.email = %q{jeremiah@cloudspace.com}
   s.extra_rdoc_files = [
@@ -25,9 +25,15 @@ Gem::Specification.new do |s|
     "VERSION",
     "app/controllers/dynamic_fieldsets/fields_controller.rb",
     "app/controllers/dynamic_fieldsets/fieldset_associators_controller.rb",
+    "app/controllers/dynamic_fieldsets/fieldset_children_controller.rb",
     "app/controllers/dynamic_fieldsets/fieldsets_controller.rb",
     "app/helpers/dynamic_fieldsets/fields_helper.rb",
+    "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/dependency.rb",
+    "app/models/dynamic_fieldsets/dependency_clause.rb",
+    "app/models/dynamic_fieldsets/dependency_group.rb",
     "app/models/dynamic_fieldsets/field.rb",
     "app/models/dynamic_fieldsets/field_default.rb",
     "app/models/dynamic_fieldsets/field_html_attribute.rb",
@@ -35,6 +41,8 @@ Gem::Specification.new do |s|
     "app/models/dynamic_fieldsets/field_record.rb",
     "app/models/dynamic_fieldsets/fieldset.rb",
     "app/models/dynamic_fieldsets/fieldset_associator.rb",
+    "app/models/dynamic_fieldsets/fieldset_child.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",
     "app/views/dynamic_fieldsets/fields/_field_option_fields.html.erb",
@@ -45,12 +53,23 @@ Gem::Specification.new do |s|
     "app/views/dynamic_fieldsets/fields/show.html.erb",
     "app/views/dynamic_fieldsets/fieldset_associators/index.html.erb",
     "app/views/dynamic_fieldsets/fieldset_associators/show.html.erb",
+    "app/views/dynamic_fieldsets/fieldset_children/_dependency_clause_fields.html.erb",
+    "app/views/dynamic_fieldsets/fieldset_children/_dependency_fields.html.erb",
+    "app/views/dynamic_fieldsets/fieldset_children/_dependency_group_fields.html.erb",
+    "app/views/dynamic_fieldsets/fieldset_children/_form.html.erb",
+    "app/views/dynamic_fieldsets/fieldset_children/edit.html.erb",
+    "app/views/dynamic_fieldsets/fieldsets/_associate_child.html.erb",
+    "app/views/dynamic_fieldsets/fieldsets/_child.html.erb",
     "app/views/dynamic_fieldsets/fieldsets/_form.html.erb",
     "app/views/dynamic_fieldsets/fieldsets/children.html.erb",
     "app/views/dynamic_fieldsets/fieldsets/edit.html.erb",
     "app/views/dynamic_fieldsets/fieldsets/index.html.erb",
     "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/shared/_javascript_watcher.html.erb",
+    "app/views/dynamic_fieldsets/shared/_nested_model_javascript.html.erb",
+    "config/.routes.rb.swp",
     "config/routes.rb",
     "dynamic_fieldsets.gemspec",
     "lib/dynamic_fieldsets.rb",
@@ -68,6 +87,7 @@ Gem::Specification.new do |s|
     "spec/dummy/app/helpers/information_forms_helper.rb",
     "spec/dummy/app/models/information_form.rb",
     "spec/dummy/app/views/information_forms/_form.html.erb",
+    "spec/dummy/app/views/information_forms/dynamic_view.html.erb",
     "spec/dummy/app/views/information_forms/edit.html.erb",
     "spec/dummy/app/views/information_forms/index.html.erb",
     "spec/dummy/app/views/information_forms/new.html.erb",
@@ -88,16 +108,20 @@ Gem::Specification.new do |s|
     "spec/dummy/config/initializers/session_store.rb",
     "spec/dummy/config/locales/en.yml",
     "spec/dummy/config/routes.rb",
-    "spec/dummy/db/migrate/20110726215814_create_dynamic_fieldsets_tables.rb",
     "spec/dummy/db/migrate/20110727210451_create_information_forms.rb",
+    "spec/dummy/db/migrate/20110809161724_create_dynamic_fieldsets_tables.rb",
     "spec/dummy/db/schema.rb",
     "spec/dummy/features/field.feature",
     "spec/dummy/features/fieldset.feature",
     "spec/dummy/features/fieldset_associator.feature",
+    "spec/dummy/features/fieldset_children.feature",
+    "spec/dummy/features/javascript_tests.feature",
     "spec/dummy/features/step_definitions/debugging_steps.rb",
     "spec/dummy/features/step_definitions/field_steps.rb",
     "spec/dummy/features/step_definitions/fieldset_associator_steps.rb",
+    "spec/dummy/features/step_definitions/fieldset_children_steps.rb",
     "spec/dummy/features/step_definitions/fieldset_steps.rb",
+    "spec/dummy/features/step_definitions/javascript_steps.rb",
     "spec/dummy/features/step_definitions/web_steps.rb",
     "spec/dummy/features/support/env.rb",
     "spec/dummy/features/support/paths.rb",
@@ -107,6 +131,9 @@ Gem::Specification.new do |s|
     "spec/dummy/public/500.html",
     "spec/dummy/public/favicon.ico",
     "spec/dummy/public/javascripts/application.js",
+    "spec/dummy/public/javascripts/jquery-1.6.2.min.js",
+    "spec/dummy/public/javascripts/jquery-ui-1.8.15.custom.min.js",
+    "spec/dummy/public/javascripts/jquery-ui-nestedSortable.js",
     "spec/dummy/public/javascripts/jquery.min.js",
     "spec/dummy/public/stylesheets/.gitkeep",
     "spec/dummy/public/stylesheets/scaffold.css",
@@ -115,24 +142,31 @@ Gem::Specification.new do |s|
     "spec/dynamic_fieldsets_in_model_spec.rb",
     "spec/dynamic_fieldsets_spec.rb",
     "spec/integration/navigation_spec.rb",
+    "spec/models/dependency_clause_spec.rb",
+    "spec/models/dependency_group_spec.rb",
+    "spec/models/dependency_spec.rb",
     "spec/models/field_default_spec.rb",
     "spec/models/field_html_attribute_spec.rb",
     "spec/models/field_option_spec.rb",
     "spec/models/field_record_spec.rb",
     "spec/models/field_spec.rb",
     "spec/models/fieldset_associator_spec.rb",
+    "spec/models/fieldset_child_spec.rb",
     "spec/models/fieldset_spec.rb",
     "spec/reports/SPEC-ActsAsMultipartForm.xml",
     "spec/reports/SPEC-MultipartForm-InProgressForm-validations.xml",
     "spec/reports/SPEC-MultipartForm-InProgressForm.xml",
     "spec/reports/SPEC-Navigation.xml",
     "spec/spec_helper.rb",
+    "spec/support/dependency_group_helper.rb",
+    "spec/support/dependency_helper.rb",
     "spec/support/field_default_helper.rb",
     "spec/support/field_helper.rb",
     "spec/support/field_html_attribute_helper.rb",
     "spec/support/field_option_helper.rb",
     "spec/support/field_record_helper.rb",
     "spec/support/fieldset_associator_helper.rb",
+    "spec/support/fieldset_child_helper.rb",
     "spec/support/fieldset_helper.rb"
   ]
   s.homepage = %q{http://github.com/jeremiahishere/dynamic_fieldsets}
@@ -158,6 +192,7 @@ Gem::Specification.new do |s|
       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<ci_reporter>, [">= 0"])
     else
       s.add_dependency(%q<rails>, ["= 3.0.7"])
@@ -173,6 +208,7 @@ Gem::Specification.new do |s|
       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<ci_reporter>, [">= 0"])
     end
   else
@@ -189,6 +225,7 @@ Gem::Specification.new do |s|
     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<ci_reporter>, [">= 0"])
   end
 end

data/lib/dynamic_fieldsets/dynamic_fieldsets_in_model.rb

@@ -39,27 +39,154 @@ module DynamicFieldsets
     end
 
     module InstanceMethods
+
+      # Overrides the ActiveModel Validations run_validations! method
+      # It additionally adds validations for the fields that are required
+      #
+      # I am not sure if this is the correct place to put this.  Seems like a reasonable one.
+      #
+      # @return [Boolean] The result of run_validations! with the extra errors added, should be true if errors.empty? 
+      def run_validations!
+        run_dynamic_fieldset_validations!
+        super
+      end
+
+      # Iterates over the fieldset associator's children and adds errors
+      def run_dynamic_fieldset_validations!
+        # for each fsa
+        self.dynamic_fieldsets.keys.each do |key|
+          fsa = self.fieldset_associator(key)
+          run_fieldset_child_validations!(fsa.id, fsa.fieldset)
+        end
+      end
+      
+      # Checks if a fieldset child is required and adds an error if it's value is blank
+      # Adds errors to the sel.errors array, does not return them
+      #
+      # @param [Integer] fsa_id The id for the fieldset associator the child belongs to
+      # @param [Field or Fieldset] child The child of the fieldset associator
+      def run_fieldset_child_validations!(fsa_id, child)
+        if child.is_a?(DynamicFieldsets::Fieldset)
+          # if a fieldset, then recurse
+          child.children.each do |grand_child|
+            run_fieldset_child_validations!(fsa_id, grand_child)
+          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
+          if !self.dynamic_fieldset_values.has_key?(fsa_tag_id) || !self.dynamic_fieldset_values[fsa_tag_id].has_key?(field_tag_id)
+            self.errors.add(:base, child.label + " is required and the input is missing")
+          else
+            # get the value
+            value = self.dynamic_fieldset_values[fsa_tag_id][field_tag_id]
+            if child.required?
+              # empty works on array or string, so simplifying here
+              self.errors.add(:base, child.label + " is required") if value.nil? || value.empty?
+            end
+          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
+        end
+      end
+      
+      # Stores the dynamic fieldset values
+      def set_fieldset_values( params )
+        values = params.select{ |key| key.match(/^fsa-/) }
+        values.keys.each do |key|
+          set_date_to_mysql( values[key] )
+        end
+        self.dynamic_fieldset_values = values
+      end
+      
+      # This turns your date fields into a MySQL-happy single format.  This modifies the hash.
+      # @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 )
+        # 'dates' is an array of the "field-ID"s that have multiple date fields of the format field(1i), field(2i), ...
+        # e.g. [ "field-4", "field-7" ]
+        dates = post.select{ |k| k =~ /\([0-9]i\)/ }.keys.map{ |k| k.gsub /\([0-9]i\)/, '' }.uniq
+        dates.each do |field|
+          datefield  = ''
+          datefield +=          post.delete( "#{field}(1i)" ) # year
+          datefield += '-'
+          datefield += '%02d' % post.delete( "#{field}(2i)" ) # month
+          datefield += '-'
+          datefield += '%02d' % post.delete( "#{field}(3i)" ) # day
+          if post.keys.include? "#{field}(4i)" then
+            datefield += ' '
+            datefield += '%02d' % post.delete( "#{field}(4i)" ) # hour
+            datefield += ':'
+            datefield += '%02d' % post.delete( "#{field}(5i)" ) # minute
+            datefield += ':'
+            datefield += '00' # second
+          end
+          # adding the formatted string to the hash to be saved.
+          post.merge! field => datefield
+        end
+        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
+      
       def save_dynamic_fieldsets
-        if !self.dynamic_fieldset_values.nil?
-          self.dynamic_fieldset_values.keys.each do |key|
+        values = self.dynamic_fieldset_values
+        if !values.nil?
+          values.keys.each do |key|
             if key.start_with?("fsa-")
               key_id = key.gsub(/^fsa-/, "")
-              fsa = DynamicFieldsets::FieldsetAssociator.find_by_id(key_id)
-              self.dynamic_fieldset_values[key].keys.each do |sub_key|
+
+              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-/, "")
-                  field_record = DynamicFieldsets::FieldRecord.where(:fieldset_associator_id => fsa.id, :field_id => sub_key_id).first
-                  if field_record.nil?
-                    field_record = DynamicFieldsets::FieldRecord.create(:fieldset_associator_id => fsa.id, :field_id => sub_key_id, :value => self.dynamic_fieldset_values[key][sub_key])
-                  else
-                    field_record.value = self.dynamic_fieldset_values[key][sub_key]
-                    field_record.save
+                  
+                  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
             end
@@ -130,14 +257,14 @@ module DynamicFieldsets
       def fieldset_associator(sym)
         if match_fieldset_associator?(sym)
           fsa = DynamicFieldsets::FieldsetAssociator.find_by_fieldset_model_parameters(
-            :fieldset_model_id => self.id, 
+            :fieldset_model_id => self.id,
             :fieldset_model_type => self.class.name, 
             :fieldset_model_name => sym,
             :fieldset => self.dynamic_fieldsets[sym][:fieldset]).first
           if fsa.nil?
-            fsa = DynamicFieldsets::FieldsetAssociator.create(
-            :fieldset_model_id => self.id, 
-            :fieldset_model_type => self.class.name, 
+            fsa = DynamicFieldsets::FieldsetAssociator.new(
+            :fieldset_model_id => self.id,
+            :fieldset_model_type => self.class.name,
             :fieldset_model_name => sym.to_s,
             :fieldset => DynamicFieldsets::Fieldset.find_by_nkey(self.dynamic_fieldsets[sym][:fieldset]))
           end