dynamic_fieldsets 0.1.4 → 0.1.5

data/CHANGELOG

@@ -1,5 +1,14 @@
 == unreleased changes
 
+== 0.1.5
+
+* Fixed a missing association in the dependency model to the dependency clause model
+* Fixed a major issue in the dependency code where only the first dependency on the form would load
+* Added a new option to the model mixin called initialize_on_create.  When set to true, it creates the fieldset associators when the model instance is created.
+* Moved the fieldset header and footer to partials so they can be overridden
+
+== 0.1.4
+
 * Removed unloadable from the controllers because they were causing an issue when the controller generator was run
 * Updated the fieldset children manager page to show any type of field
 * Updated dependency system model validations so that they trigger correctly on create

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.5

data/app/helpers/dynamic_fieldsets_helper.rb

@@ -88,9 +88,8 @@ module DynamicFieldsetsHelper
   # @param [Hash] values Stored values for the fieldset
   # @return [Array] The HTML elements for the fieldset
   def fieldset_renderer(fsa, fieldset, values, form_type)
-    lines = ["<div id='fieldset-#{fieldset.id}' class='inputs'>"]
-    lines.push "<h3 class='name'>#{fieldset.name}</h3>"
-    lines.push "<ol>"
+    lines = []
+    lines.push render(:partial => "/dynamic_fieldsets/shared/fieldset_header", :locals => {:fieldset => fieldset})
 
     # this returns field/fieldset objects rather than fieldset children
     # that is why this code looks like it is accessing odd objects
@@ -103,8 +102,7 @@ module DynamicFieldsetsHelper
       end
     end
 
-    lines.push "</ol>"
-    lines.push "</div>"
+    lines.push render(:partial => "/dynamic_fieldsets/shared/fieldset_footer", :locals => {:fieldset => fieldset})
 
     return lines
   end

data/app/models/dynamic_fieldsets/dependency.rb

@@ -11,6 +11,7 @@ module DynamicFieldsets
     # Relations    
 
     belongs_to :fieldset_child
+    belongs_to :dependency_clause
 
     # Validations
     validates_presence_of :fieldset_child

data/app/models/dynamic_fieldsets/fieldset_associator.rb

@@ -72,46 +72,44 @@ module DynamicFieldsets
     end
 
 
-    # OMG COMMENT
+    # Converts the list of fields with dependencies generated by the look_for_dependents method into a hash
+    # The hash contains the actual dependencies for the list of fields that have them
     #
-    # TODO: Fill in actual comments
-    #
-    # @params - stuff
-    # @returns - other stuff
+    # @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_dependents(self.fieldset)
+
       output = {}
-      for fieldset_child in @fieldset_child_collection
+      fieldset_child_collection.each do |fieldset_child|
         output[fieldset_child.id] = {}
-        for dependency in fieldset_child.dependencies
+        fieldset_child.dependencies.each do |dependency|
           dependency_group = dependency.dependency_clause.dependency_group
           output[fieldset_child.id][dependency_group.id] = dependency_group.to_hash
         end
       end
-      output
+      return output
     end
  
 
-    # OMG COMMENT
+    # 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
     #
-    # TODO: Fill in actual comments
-    #
-    # @params - stuff
-    # @returns - other stuff
+    # @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)
-      for fieldset_child in parent_fieldset.fieldset_children
-        if (fieldset_child.child_type == "DynamicFieldsets::Field") && (!fieldset_child.dependencies.empty?)
-          @fieldset_child_collection.push(fieldset_child)
-          return
-        elsif (fieldset_child.child_type == "DynamicFieldsets::Field") && (fieldset_child.dependencies.empty?)
-          return
-        else
-          look_for_dependents(fieldset_child.child)
+      output = []
+      parent_fieldset.fieldset_children.each do |fieldset_child|
+        if fieldset_child.child_type == "DynamicFieldsets::Field"
+          if !fieldset_child.dependencies.empty?
+            output.push fieldset_child
+          # else then next
+          end
+        else # if child type is a fieldset, then recurse
+          output += look_for_dependents(fieldset_child.child)
         end
       end
+      return output
     end
-
   end
 end

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

@@ -0,0 +1,2 @@
+ </ol>
+</div>

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

@@ -0,0 +1,3 @@
+<div id='fieldset-<%=fieldset.id%>' class='inputs'>
+  <h3 class='name'><%=fieldset.name%></h3>
+  <ol>

data/dynamic_fieldsets.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "dynamic_fieldsets"
-  s.version = "0.1.4"
+  s.version = "0.1.5"
 
   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-03-06"
+  s.date = "2012-03-12"
   s.description = "Dynamic fieldsets for rails controllers"
   s.email = "jeremiah@cloudspace.com"
   s.extra_rdoc_files = [
@@ -90,6 +90,8 @@ Gem::Specification.new do |s|
     "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/_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/_nested_model_javascript.html.erb",
     "app/views/dynamic_fieldsets/show_partials/_show_incomplete.html.erb",

data/lib/dynamic_fieldsets/dynamic_fieldsets_in_model.rb

@@ -16,22 +16,32 @@ module DynamicFieldsets
       # fieldset as the key:
       # :child_form => {options}
       # Options:
-      # Fieldset: The unique name of the fieldset the class is associated with
-      # Multiple: Boolean value to allow multiple answer sets for the same fieldset in the class.
+      # fieldset (mandatory): The unique name of the fieldset the class is associated with
+      # multiple (optional): Boolean value to allow multiple answer sets for the same fieldset in the class.
       #   Deafult to false.  Not curently implemented (7-25-2011).
+      # initialize_on_create (optional): Create the fieldste associator after create
       #
       # @param [Hash] args A hash of arguments for the fieldsets.
       def acts_as_dynamic_fieldset(args)
         mattr_accessor :dynamic_fieldsets unless self.respond_to?(:dynamic_fieldsets)
         self.dynamic_fieldsets = {} unless self.dynamic_fieldsets.is_a?(Hash)
 
+        # default values for the arguments
+        # fieldset is mandatory
+        defaults = {
+          :multiple => false,
+          :initialize_on_create => false
+        }
+
         args.each_pair do |key, value|
-          self.dynamic_fieldsets[key] = value
+          value_with_defaults = defaults.merge(value)
+          self.dynamic_fieldsets[key] = value_with_defaults
         end
 
         # hacky system to save fieldset values
         # needs to be refactored and tested
         mattr_accessor :dynamic_fieldset_values unless self.respond_to?(:dynamic_fieldset_values)
+        after_create :initialize_fieldset_associators
         after_save :save_dynamic_fieldsets
 
         include DynamicFieldsets::DynamicFieldsetsInModel::InstanceMethods
@@ -39,6 +49,16 @@ module DynamicFieldsets
     end
 
     module InstanceMethods
+      
+      # If the fieldset is set to initialize_on_create, then attempt to create the fsa
+      def initialize_fieldset_associators
+        self.dynamic_fieldsets.each_pair do |key, options|
+          if options[:initialize_on_create]
+            fsa = fieldset_associator(key)
+            fsa.save if fsa.new_record?
+          end
+        end
+      end
 
       # Overrides the ActiveModel Validations run_validations! method
       # It additionally adds validations for the fields that are required
@@ -149,7 +169,7 @@ module DynamicFieldsets
         end
         return post
       end
-      
+
       # 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

metadata

@@ -2,7 +2,7 @@
 name: dynamic_fieldsets
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors: 
 - Jeremiah Hemphill
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-06 00:00:00 Z
+date: 2012-03-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
@@ -295,6 +295,8 @@ files:
 - 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/_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/_nested_model_javascript.html.erb
 - app/views/dynamic_fieldsets/show_partials/_show_incomplete.html.erb
@@ -429,7 +431,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -2714422766311375793
+      hash: -964161402791124361
       segments: 
       - 0
       version: "0"