dynamic_fieldsets 0.1.3 → 0.1.4

data/CHANGELOG

@@ -1,5 +1,12 @@
 == unreleased changes
 
+* 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
+* Fixed selected value for the fieldset_child_id on fieldset child dependency edit page dependency_fields partial
+* Improved the behavior of the field option finder on the field default model
+* Updated the field record validator to handle the field child classes
+
 == 0.1.3 
 
 * Fixed a typo in the generated config

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/app/controllers/dynamic_fieldsets/fields_controller.rb

@@ -1,7 +1,6 @@
 module DynamicFieldsets
   class FieldsController < ApplicationController
     include FieldsHelper
-    unloadable
 
     # GET /dynamic_fieldsets/fields
     def index

data/app/controllers/dynamic_fieldsets/fieldset_associators_controller.rb

@@ -2,7 +2,6 @@
 # Allows users to view but not create or edit fieldset associators
 module DynamicFieldsets
   class FieldsetAssociatorsController < ApplicationController
-    unloadable
 
     # show all fieldset associators
     def index

data/app/controllers/dynamic_fieldsets/fieldset_children_controller.rb

@@ -3,7 +3,6 @@ module DynamicFieldsets
   # Most of this is done through the fieldsets#children action
   # Dependencies are done here
   class FieldsetChildrenController < ApplicationController
-    unloadable
     
     # this view doesn't exist
     def index

data/app/models/dynamic_fieldsets/dependency.rb

@@ -11,16 +11,11 @@ module DynamicFieldsets
     # Relations    
 
     belongs_to :fieldset_child
-    belongs_to :dependency_clause
 
     # Validations
-    validates_presence_of :fieldset_child_id
-
-    # This validation should really be on
-    # It is off due to a bug (?) in the nested attributes 
-    # where the dependency clause id is not set when it creates the dependency
-    # validates_presence_of :dependency_clause_id
-    
+    validates_presence_of :fieldset_child
+    # hack to make saving through nested attributes work
+    validates_presence_of :dependency_clause, :on => :update
     validates_inclusion_of :relationship, :in => RELATIONSHIP_LIST
 
     # Returns a full list of the options for relationship_list

data/app/models/dynamic_fieldsets/dependency_clause.rb

@@ -9,7 +9,8 @@ module DynamicFieldsets
     has_many :dependencies
     accepts_nested_attributes_for :dependencies, :allow_destroy => true
 
-    validates_presence_of :dependency_group_id
+    # hack to make saving through nested attributes work
+    validates_presence_of :dependency_group, :on => :update
 
     # Evaluates the depdendencies in the claus by ORing them together
     # Short circuit evaluation returns true as soon as possible

data/app/models/dynamic_fieldsets/field_default.rb

@@ -22,7 +22,7 @@ module DynamicFieldsets
     # http://www.youtube.com/watch?v=BeP6CpUnfc0 
     def convert_option_name_to_id
       if field.uses_field_options?
-        option = FieldOption.find_by_name(self.value)
+        option = FieldOption.where(:name => self.value, :field => self.field).first
         self.value = option.id unless option.nil?
       end
     end

data/app/models/dynamic_fieldsets/field_record.rb

@@ -14,7 +14,8 @@ module DynamicFieldsets
     # make sure the fieldset child has the type field
     # does not explicitly check to make sure the fieldset_child exists, still have to validate presence
     def type_of_fieldset_child
-      if self.fieldset_child && !self.fieldset_child.child.is_a?(DynamicFieldsets::Field)
+      # yet another casualty of me not understanding how the objects are getting duplicated in development (JH 3-6-2012)
+      if self.fieldset_child && !self.fieldset_child.child.class.superclass.to_s.eql?("DynamicFieldsets::Field")
         self.errors.add(:fieldset_child, "The fieldset child must refer to a Field object")
       end
     end

data/app/models/dynamic_fieldsets/fieldset_child.rb

@@ -122,7 +122,7 @@ module DynamicFieldsets
       output = {}
       if child.class == DynamicFieldsets::Fieldset
         return child.get_values_using_fsa(fsa)
-      elsif child.class.superclass == DynamicFieldsets::Field
+      elsif child.class.superclass == DynamicFieldsets::Field || child.class.superclass.to_s == DynamicFieldsets::Field.to_s
         return child.get_values_using_fsa_and_fsc(fsa, self) 
       else
         # I am not sure if we need to use child.superclass equals Field due to the sti

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

@@ -1,6 +1,6 @@
 <tr>
-  <td><%= f.select :fieldset_child_id, options_for_select(DynamicFieldsets::FieldsetChild.all.collect { |c| [c.child.name, c.id]})%></td>
-  <td><%= f.select :relationship, obj.relationship_list %></td>
+  <td><%= f.select :fieldset_child_id, options_for_select(DynamicFieldsets::FieldsetChild.all.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>
     <%= f.hidden_field :_destroy %>

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

@@ -23,7 +23,7 @@
       </ol>
     <% end %>
     </li>
-  <% elsif child.is_a? DynamicFieldsets::Field then %>
+  <% else %>
   <% 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>

data/dynamic_fieldsets.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "dynamic_fieldsets"
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   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-02"
+  s.date = "2012-03-06"
   s.description = "Dynamic fieldsets for rails controllers"
   s.email = "jeremiah@cloudspace.com"
   s.extra_rdoc_files = [

metadata

@@ -2,7 +2,7 @@
 name: dynamic_fieldsets
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors: 
 - Jeremiah Hemphill
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-02 00:00:00 Z
+date: 2012-03-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
@@ -429,7 +429,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -2479662043084122620
+      hash: -2714422766311375793
       segments: 
       - 0
       version: "0"