dynamic_fieldsets 0.1.9 → 0.1.10

data/.rspec

@@ -1 +1 @@
---colour
+--colour --profile

data/CHANGELOG

@@ -1,5 +1,9 @@
 == unreleased changes
 
+== 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.
+
 == 0.1.9
 
 * A whole bunch of updates to upgrade rails 3.1 compatibility

data/Gemfile.lock

@@ -135,7 +135,7 @@ GEM
       multi_json (~> 1.0.4)
       rubyzip
     sexp_processor (3.0.10)
-    shoulda (3.0.0)
+    shoulda (3.0.1)
       shoulda-context (~> 1.0.0)
       shoulda-matchers (~> 1.0.0)
     shoulda-context (1.0.0)

data/VERSION

@@ -1 +1 @@
-0.1.9
+0.1.10

data/app/helpers/dynamic_fieldsets/nested_model_helper.rb

@@ -1,18 +1,18 @@
 module DynamicFieldsets
   module NestedModelHelper
     # returns a link with an onclick call to remove_fields using link_to_function
-    def link_to_remove_fields(name, f)  
+    def df_link_to_remove_fields(name, f)  
       f.hidden_field(:_destroy) + link_to_function(name, {:onclick => "remove_fields(this)"})  
     end 
 
     # returns a link with an onclick call to add_fields
     # the field information is rendered from a partial and stored as a string until it is needed
-    def link_to_add_fields(name, f, association, method = "add_fields")  
+    def df_link_to_add_fields(name, f, association, method = "add_fields")  
       new_object = f.object.class.reflect_on_association(association).klass.new  
       fields = f.fields_for(association, new_object, :child_index => "new_#{association}") do |builder|  
         render(association.to_s.singularize + "_fields", {:f => builder, :obj => new_object})  
       end  
-      link_to_function(name, {:class => name.underscore.gsub(' ', '_'), :onclick => "#{method}(this, '#{association}', '#{escape_javascript(fields)}')"})
+      link_to_function(name, "#{method}(this, '#{association}', '#{escape_javascript(fields)}')", {:class => name.underscore.gsub(' ', '_')})
     end
   end
 end

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

@@ -33,7 +33,7 @@
     <%= render :partial => "field_option_fields", :locals => {:f => field_option_form} %>
   <% end %>
 <% end %>
-<p><%= link_to_add_fields "Add Field Option", f, :field_options %></p>
+<p><%= df_link_to_add_fields "Add Field Option", f, :field_options %></p>
 
 <div class="field">
   <%= f.label :required %>
@@ -49,14 +49,14 @@
     <%= render :partial => "field_default_fields", :locals => {:f => field_default_form, :obj => field_default} %>
   <% end %>
 <% end %>
-<p><%= link_to_add_fields "Add Default Value", f, :field_defaults %></p>
+<p><%= df_link_to_add_fields "Add Default Value", f, :field_defaults %></p>
 
 <% @field.field_html_attributes.each do |field_html_attribute| %>
   <%= f.fields_for :field_html_attributes, field_html_attribute do |field_html_attribute_form| %>
     <%= render :partial => "field_html_attribute_fields", :locals => {:f => field_html_attribute_form} %>
   <% end %>
 <% end %>
-<p><%= link_to_add_fields "Add Html Attribute", f, :field_html_attributes %></p>
+<p><%= df_link_to_add_fields "Add Html Attribute", f, :field_html_attributes %></p>
 
 <div class="actions">
   <%= f.submit %>

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

@@ -17,7 +17,7 @@
         <% end %>
       <% end %>
       <tr>
-        <td colspan='4'><%= link_to_add_fields "Add Rule", f, :dependencies, "add_fields_to_table" %></td>
+        <td colspan='4'><%= df_link_to_add_fields "Add Rule", f, :dependencies, "add_fields_to_table" %></td>
       </tr>
     </table>
     AND<br />

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

@@ -10,7 +10,7 @@
           <%= render :partial => "dependency_clause_fields", :locals => {:f => dependency_clause_form, :obj => dependency_clause} %>
         <% end %>
       <% end %>
-      <p><%= link_to_add_fields "Add Clause", f, :dependency_clauses %></p>
+      <p><%= df_link_to_add_fields "Add Clause", f, :dependency_clauses %></p>
     </div>
   </p>
 </div>

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

@@ -25,7 +25,7 @@
   <%= f.fields_for :dependency_group, @fieldset_child.dependency_group do |dependency_group_form| %>
     <%= render :partial => "dependency_group_fields", :locals => {:f => dependency_group_form, :obj => @fieldset_child.dependency_group} %>
   <% end %>
-  <p><%= link_to_add_fields "Add Dependency", f, :dependency_group %></p>
+  <p><%= df_link_to_add_fields "Add Dependency", f, :dependency_group %></p>
 
   <div class="actions">
     <%= f.submit %>

data/dynamic_fieldsets.gemspec

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

data/spec/dynamic_fieldsets_helper_spec.rb

@@ -6,6 +6,10 @@ describe DynamicFieldsetsHelper do
   include DynamicFieldsetsHelper
   include FieldsetHelper
 
+  before(:each) do
+    pending "total rewrite"
+  end
+
   describe "field_renderer method" do
     before(:each) do
       @fsa = mock_model FieldsetAssociator

data/spec/dynamic_fieldsets_in_model_spec.rb

@@ -4,6 +4,11 @@ include DynamicFieldsets
 
 describe DynamicFieldsetsInModel do
 
+  before(:each) do
+    pending "total rewrite"
+  end
+
+
   it "should respond to acts_as_dynamic_fieldset" do
     InformationForm.should respond_to :acts_as_dynamic_fieldset
   end

data/spec/field_with_field_options_spec.rb

@@ -46,4 +46,26 @@ describe FieldWithFieldOptions do
       it "needs tests"
     end
   end
+
+
+  describe "options" do
+    before do
+      pending "This code has been moved here from the field model"
+    end
+
+    it "should return options from the field options table if enabled" do
+      field = DynamicFieldsets::Field.new
+      field_option = mock_model(DynamicFieldsets::FieldOption)
+      field_option.stub!(:enabled).and_return(true)
+      field.should_receive(:field_options).and_return([field_option])
+      field.options.should include field_option
+    end
+    it "should not return disabled options from the field options table" do
+      field = DynamicFieldsets::Field.new
+      field_option = mock_model(DynamicFieldsets::FieldOption)
+      field_option.stub!(:enabled).and_return(false)
+      field.should_receive(:field_options).and_return([field_option])
+      field.options.should_not include field_option
+    end
+  end
 end

data/spec/field_with_multiple_answers_spec.rb

@@ -47,4 +47,22 @@ describe FieldWithMultipleAnswers do
       it "needs tests"
     end
   end
+
+  describe "defaults" do
+    before(:each) do
+      pending "this code has been moved from the field model"
+      @field = DynamicFieldsets::Field.new
+    end
+
+    it "should return an array if the type supports multiple options" do
+      @field.stub!(:options?).and_return(true)
+      @field.should_receive(:field_defaults).and_return(["default value"])
+      @field.defaults.should == ["default value"]
+    end
+
+    it "should return nil if the type does not support multiple options" do
+      @field.stub!(:options?).and_return(false)
+      @field.defaults.should be_nil
+    end
+  end
 end

data/spec/field_with_single_answer_spec.rb

@@ -48,4 +48,23 @@ describe DynamicFieldsets::FieldWithSingleAnswer do
       it "needs tests"
     end
   end
+
+  describe "default" do
+    before(:each) do
+      pending "this code has been moved from the field model"
+      @field = DynamicFieldsets::Field.new
+    end
+
+    it "should return a string if the type does not support multiple options" do
+      @field.stub!(:options?).and_return(false)
+      @field.should_receive(:field_defaults).and_return(["default value"])
+      @field.default.should == "default value"
+    end
+
+    it "should return nil if the type supports multiple options" do
+      @field.stub!(:options?).and_return(true)
+      @field.default.should be_nil
+    end
+  end 
+
 end

data/spec/models/dependency_clause_spec.rb

@@ -1,6 +1,10 @@
 require 'spec_helper'
 
 describe DynamicFieldsets::DependencyClause do
+  before(:each) do
+    pending "total rewrite"
+  end
+
   it "should respond to dependency_group" do
     DynamicFieldsets::DependencyClause.new.should respond_to :dependency_group
   end

data/spec/models/dependency_group_spec.rb

@@ -2,6 +2,10 @@ require 'spec_helper'
 
 describe DynamicFieldsets::DependencyGroup do
   include DependencyGroupHelper
+  before(:each) do
+    pending "total rewrite"
+  end
+
 
   it "should respond to fieldset_child" do
     DynamicFieldsets::DependencyGroup.new.should respond_to :fieldset_child

data/spec/models/dependency_spec.rb

@@ -2,6 +2,10 @@ require 'spec_helper'
 
 describe DynamicFieldsets::Dependency do
   include DependencyHelper
+  before(:each) do
+    pending "total rewrite"
+  end
+
 
   it "should respond to fieldset_child" do
     DynamicFieldsets::Dependency.new.should respond_to :fieldset_child

data/spec/models/field_record_spec.rb

@@ -2,6 +2,10 @@ require 'spec_helper'
 
 describe DynamicFieldsets::FieldRecord do
   include FieldRecordHelper
+  before(:each) do
+    pending "total rewrite"
+  end
+
 
   it "should respond to field" do
     DynamicFieldsets::FieldRecord.new.should respond_to :field

data/spec/models/field_spec.rb

@@ -16,18 +16,6 @@ describe DynamicFieldsets::Field do
     it { should respond_to :enabled }
   end
 
-  describe "associations" do
-    before do
-      pending "shoulda installation"
-    end
-
-    it { should have_many :fieldset_children }
-    it { should have_many :parent_fieldsets }
-    it { should have_many :field_options }
-    it { should have_many :field_defaults }
-    it { should have_many :field_html_attributes }
-  end
-
   describe "validations" do
     before(:each) do
       @field = DynamicFieldsets::Field.new
@@ -59,65 +47,169 @@ describe DynamicFieldsets::Field do
       @field.required = false
       @field.should have(0).error_on(:required)
     end
-
-    # this validation now comes from the field option mixin
-    # whenever we get around to tests, this needs to be moved over.
-    # lets see how long this takes (JH 2-27-2012)
-    it "should require options if the type is one that requires options" do
-      pending "this needs to be moved to the field option mixin"
-      @field.type = "select"
-      @field.should have(1).error_on(:field_options)
-    end
   end
 
   # Scopes and Static Methods
 
   it { DynamicFieldsets::Field.should respond_to :descendants }
   describe ".descendants" do
-    it "should call super if cache classes is on"
-    it "should call the config if cache classes is off"
+    it "should call super if cache classes is on" do
+      ::Rails.application.config.stub(:cache_classes).and_return(true)
+      ActiveRecord::Base.should_receive(:descendants)
+      DynamicFieldsets::Field.descendants
+    end
+
+    it "should not call super if cache classes is off" do
+      ::Rails.application.config.stub(:cache_classes).and_return(false)
+      ActiveRecord::Base.should_not_receive(:descendants)
+      DynamicFieldsets::Field.descendants
+    end
+
+    it "should call the config if cache classes is off" do
+      ::Rails.application.config.stub(:cache_classes).and_return(false)
+      DynamicFieldsets.config.should_receive(:available_field_types).and_return([])
+      DynamicFieldsets::Field.descendants
+    end
   end
 
   it { DynamicFieldsets::Field.should respond_to :descendant_collection }
   describe ".descendant_collection" do
-    it "should call descendants"
-    it "should convert the class names to humanized strings"
+    it "should call descendants" do
+      DynamicFieldsets::Field.should_receive(:descendants).and_return([])
+      DynamicFieldsets::Field.descendant_collection
+    end
+
+    it "should convert the class names to humanized strings" do
+      output = DynamicFieldsets::Field.descendant_collection
+      output.should include ["Checkbox field", "DynamicFieldsets::CheckboxField"]
+      output.should include ["Text field", "DynamicFieldsets::TextField"]
+    end
+  end
+
+  describe ".display_type" do
+    it "should humanize and remove the namespace" do
+      @field.stub(:type).and_return("DynamicFieldsets::TextField")
+      @field.display_type.should == "Text field"
+    end
   end
 
   describe "form partial methods" do
     it { should respond_to :form_partial }
     describe ".form_partial" do
-      it "needs tests"
+      it "should use the underscored model name" do
+        @field.form_partial.should == "/dynamic_fieldsets/form_partials/field"
+      end
     end
 
     it { should respond_to :form_header_partial }
     describe ".form_header_partial" do
-      it "needs tests"
+      it "should use the generic input_header partial" do
+        @field.form_header_partial.should == "/dynamic_fieldsets/form_partials/input_header"
+      end
     end
 
     it { should respond_to :use_form_header_partial? }
     describe ".use_form_header_partial?" do
-      it "needs tests"
+      it "should default to true" do
+        @field.use_form_header_partial?.should be_true
+      end
     end
 
     it { should respond_to :form_footer_partial }
     describe ".form_footer_partial" do
-      it "needs tests"
+      it "should use the generic input_footer partial" do
+        @field.form_footer_partial.should == "/dynamic_fieldsets/form_partials/input_footer"
+      end
     end
 
     it { should respond_to :use_form_footer_partial? }
     describe ".use_form_footer_partial?" do
-      it "needs tests"
+      it "should default to true" do
+        @field.use_form_footer_partial?.should be_true
+      end
     end
 
     it { should respond_to :form_partial_locals }
     describe ".form_partial_locals" do
-      it "needs tests"
+      before(:each) do
+        @fsa = DynamicFieldsets::FieldsetAssociator.new
+        @fsa.stub(:id).and_return(1)
+
+        @fieldset_child = DynamicFieldsets::FieldsetAssociator.new
+        @fieldset_child.stub(:id).and_return(2)
+
+        @arguments = {
+          :fsa => @fsa,
+          :fieldset_child => @fieldset_child,
+        }
+      end
+
+      it "should include these keys in the output" do
+        output = @field.form_partial_locals(@arguments)
+        expected_keys = [:fsa, :fieldset_child, :attrs, :object, :method, :name, :id]
+        expected_keys.each do |key|
+          output.keys.should include key
+        end
+      end
+
+      it "fsa should match the fsa in the args" do
+        output = @field.form_partial_locals(@arguments)
+        output[:fsa] = @fsa
+      end
+
+      it "fieldset_child should match the fieldset_child in the args" do
+        output = @field.form_partial_locals(@arguments)
+        output[:fieldset_child] = @fieldset_child
+      end
+
+      it "attrs should call html_attribute_hash" do
+        @field.should_receive(:html_attribute_hash).and_return({:hello => "world"})
+        output = @field.form_partial_locals(@arguments)
+        output[:attrs].should == {:hello => "world"}
+      end
+
+      it "object should use the config option and fsa id" do
+        DynamicFieldsets::config.should_receive(:form_fieldset_associator_prefix).and_return("hello")
+        @fsa.should_receive(:id).and_return(10)
+
+        output = @field.form_partial_locals(@arguments)
+        output[:object].should == "hello10"
+      end
+
+      it "method should use the config option and fieldset child id" do
+        DynamicFieldsets::config.should_receive(:form_field_prefix).and_return("hello")
+        @fieldset_child.should_receive(:id).and_return(10)
+
+        output = @field.form_partial_locals(@arguments)
+        output[:method].should == "hello10"
+      end 
+
+      it "name should match object[method]" do
+        output = @field.form_partial_locals(@arguments)
+        output[:name].should == "#{output[:object]}[#{output[:method]}]"
+      end
+
+      it "id should match object_method" do
+        output = @field.form_partial_locals(@arguments)
+        output[:id].should == "#{output[:object]}_#{output[:method]}"
+      end
     end
 
     it { should respond_to :html_attribute_hash }
     describe ".html_attribute_hash" do
-      it "needs tests"
+      it "should call field_html_attributes" do
+        @field.should_receive(:field_html_attributes).and_return([])
+        @field.html_attribute_hash
+      end
+
+      it "should pull the attribute names and values and put them in a hash" do
+        @attr = DynamicFieldsets::FieldHtmlAttribute.new
+        @attr.stub(:attribute_name => "key")
+        @attr.stub(:value => "value")
+
+        @field.stub(:field_html_attributes).and_return([@attr])
+        @field.html_attribute_hash.should == {:key => "value"}
+      end
     end
   end
 
@@ -125,37 +217,76 @@ describe DynamicFieldsets::Field do
 
     it { should respond_to :show_partial }
     describe ".show_partial" do
-      it "needs tests"
+      it "should default to the missing partial partial" do
+        @field.show_partial.should == "/dynamic_fieldsets/show_partials/show_incomplete"
+      end
     end
 
     it { should respond_to :show_header_partial }
     describe ".show_header_partial" do
-      it "needs tests"
+      it "should default to the incomplete header partial" do
+        @field.show_header_partial.should == "/dynamic_fieldsets/show_partials/show_incomplete_header"
+      end
     end
 
     it { should respond_to :use_show_header_partial? }
     describe ".use_show_header_partial?" do
-      it "needs tests"
+      it "should default to false" do
+        @field.use_show_header_partial?.should be_false
+      end
     end
 
     it { should respond_to :show_footer_partial }
     describe ".show_footer_partial" do
-      it "needs tests"
+      it "should default to the incomplete footer partial" do
+        @field.show_footer_partial.should == "/dynamic_fieldsets/show_partials/show_incomplete_footer"
+      end
     end
 
     it { should respond_to :use_show_footer_partial? }
     describe ".use_show_footer_partial?" do
-      it "needs tests"
+      it "should default to false" do
+        @field.use_show_footer_partial?.should be_false
+      end
     end
 
     it { should respond_to :show_partial_locals }
     describe ".show_partial_locals" do
-      it "needs tests"
-    end
-
+      before(:each) do
+        @arguments = { 
+          :value => "hello",
+          :value => ["hello", "world"]
+        }
+      end
+      
+      it "should include value in the output" do
+        output = @field.show_partial_locals(@arguments)
+        output[:value].should == @arguments[:value]
+      end
+
+      it "should include values in the output" do
+        output = @field.show_partial_locals(@arguments)
+        output[:values].should == @arguments[:values]
+      end
+
+      it "should call label and include it in the output" do
+        @field.should_receive(:label).and_return("hello")
+        output = @field.show_partial_locals(@arguments)
+        output[:label].should == "hello"
+      end
+    end
+
+    # note that this gets overriden based on the number of answers
     it { should respond_to :get_value_for_show }
     describe ".get_value_for_show" do
-      it "needs tests"
+      it "should return nil if the value is nil" do
+        @field.get_value_for_show(nil).should be_nil
+      end
+
+      it "should return the value of the value key otherwise" do
+        val = { :value => "hello" }
+        @field.get_value_for_show(val).should == "hello"
+      end
     end
   end
 
@@ -171,6 +302,7 @@ describe DynamicFieldsets::Field do
       @field.should_receive(:field_defaults).and_return(["default value"])
       @field.has_defaults?.should be_true
     end
+
     it "should return false if the field default has no values" do
       @field.should_receive(:field_defaults).and_return([])
       @field.has_defaults?.should be_false
@@ -215,17 +347,37 @@ describe DynamicFieldsets::Field do
 
   it { should respond_to :collect_default_values }
   describe ".collect_default_values" do
-    it "needs tests"
+    it "should call field_defaults" do
+      @field.should_receive(:field_defaults).and_return([])
+      @field.collect_default_values
+    end
+
+    it "should collect the values of the returned defaults" do
+      @field.stub(:field_defaults).and_return([{:value => "hello" }])
+      @field.collect_default_values.should == ["hello"]
+    end
   end
 
   it { should respond_to :get_values_using_fsa_and_fsc }
   describe ".get_values_using_fsa_and_fsc" do
-    it "needs tests"
+    it "should return nil (must be overriden)" do
+      # just passing nils because the args are not needed in the test
+      @field.get_values_using_fsa_and_fsc(nil, nil).should be_nil
+    end
   end
 
   it { should respond_to :collect_field_records_by_fsa_and_fsc }
   describe ".collect_field_records_by_fsa_and_fsc" do
-    it "needs tests"
+    it "should return an array of field record values" do
+      record = mock_model(DynamicFieldsets::FieldRecord)
+      record.stub(:value).and_return("hello")
+
+      DynamicFieldsets::FieldRecord.stub!(:where).and_return([record])
+
+      fsa = mock_model(DynamicFieldsets::FieldsetAssociator)
+      fsc = mock_model(DynamicFieldsets::FieldsetChild)
+      @field.collect_field_records_by_fsa_and_fsc(fsa, fsc).should == [{ :value => "hello" }]
+    end
   end
 
   it { should respond_to :update_field_records }
@@ -234,61 +386,4 @@ describe DynamicFieldsets::Field do
       lambda { @field.update_field_records }.should raise_exception
     end
   end
-
-  describe "options" do
-    before do
-      pending "This code has been moved to the field option mixin"
-    end
-
-    it "should return options from the field options table if enabled" do
-      field = DynamicFieldsets::Field.new
-      field_option = mock_model(DynamicFieldsets::FieldOption)
-      field_option.stub!(:enabled).and_return(true)
-      field.should_receive(:field_options).and_return([field_option])
-      field.options.should include field_option
-    end
-    it "should not return disabled options from the field options table" do
-      field = DynamicFieldsets::Field.new
-      field_option = mock_model(DynamicFieldsets::FieldOption)
-      field_option.stub!(:enabled).and_return(false)
-      field.should_receive(:field_options).and_return([field_option])
-      field.options.should_not include field_option
-    end
-  end
-
-  describe "default" do
-    before(:each) do
-      pending "this code has been moved to the single answer mixin"
-      @field = DynamicFieldsets::Field.new
-    end
-
-    it "should return a string if the type does not support multiple options" do
-      @field.stub!(:options?).and_return(false)
-      @field.should_receive(:field_defaults).and_return(["default value"])
-      @field.default.should == "default value"
-    end
-
-    it "should return nil if the type supports multiple options" do
-      @field.stub!(:options?).and_return(true)
-      @field.default.should be_nil
-    end
-  end 
-
-  describe "defaults" do
-    before(:each) do
-      pending "this code has been moved to the multiple answer mixin"
-      @field = DynamicFieldsets::Field.new
-    end
-
-    it "should return an array if the type supports multiple options" do
-      @field.stub!(:options?).and_return(true)
-      @field.should_receive(:field_defaults).and_return(["default value"])
-      @field.defaults.should == ["default value"]
-    end
-
-    it "should return nil if the type does not support multiple options" do
-      @field.stub!(:options?).and_return(false)
-      @field.defaults.should be_nil
-    end
-  end
 end

data/spec/models/fieldset_associator_spec.rb

@@ -2,6 +2,10 @@ require 'spec_helper'
 
 describe DynamicFieldsets::FieldsetAssociator do
   include FieldsetAssociatorHelper
+  before(:each) do
+    pending "total rewrite"
+  end
+
   
   it "should respond to fieldset" do
     DynamicFieldsets::FieldsetAssociator.new.should respond_to :fieldset

metadata

@@ -2,7 +2,7 @@
 name: dynamic_fieldsets
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.9
+  version: 0.1.10
 platform: ruby
 authors: 
 - Jeremiah Hemphill
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-06 00:00:00 Z
+date: 2012-05-30 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
@@ -431,7 +431,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 4570078976153453742
+      hash: -1949793338758347934
       segments: 
       - 0
       version: "0"