dynamic_fieldsets 0.0.16 → 0.1.0

data/.rdebugrc

@@ -0,0 +1,3 @@
+set autolist
+set autoeval
+set autoreload

data/.rspec

@@ -0,0 +1 @@
+--colour

data/CHANGELOG

@@ -1,3 +1,10 @@
+== 0.1.0
+
+* Major change to the structure of the code.  Fields now use single table inheritance to determine different functionality
+* Added views for each field
+* Added a config file and generator
+* Broke a huge number of tests, pended them, then didn't have enough time to rewrite them
+
 == 0.0.16
 
 * Updated the migration generator with indices.  

data/Gemfile

@@ -1,22 +1,31 @@
 source "http://rubygems.org"
 
-gem "rails", ">=3.0.7"
+gem "rails", "~> 3.0.7"
 
-group :development do
+group :development, :test do
   gem "capybara", ">= 0.4.0"
   gem "sqlite3"
   gem 'ruby-debug19'
+  gem "bundler", "~> 1.0.0"
+  gem "jeweler", "~> 1.6.3"
+  gem "json"
+
+  # rspec
   gem "rspec", "~> 2.6.0"
   gem "rspec-rails", "~>2.6.1"
-  gem "yard", "~> 0.6.0"
+  gem "shoulda", "~> 3.0.0"
+  gem "ruby_parser", "~> 2.3.1"  # outputs parsetrees
+  gem "ZenTest"
+  gem "autotest-rails"
+
+  # cucumber
   gem "cucumber", ">= 0"
   gem "cucumber-rails"
   gem "database_cleaner"
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.6.3"
-  gem "rcov", ">= 0"
-  gem "json"
 
-  # hudson ci
+  # documentation
+  gem "yard", "~> 0.6.0"
+
+  # jenkins/hudson ci
   gem "ci_reporter"
 end

data/Gemfile.lock

@@ -1,13 +1,14 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    ZenTest (4.6.2)
     abstract (1.0.0)
-    actionmailer (3.0.7)
-      actionpack (= 3.0.7)
-      mail (~> 2.2.15)
-    actionpack (3.0.7)
-      activemodel (= 3.0.7)
-      activesupport (= 3.0.7)
+    actionmailer (3.0.11)
+      actionpack (= 3.0.11)
+      mail (~> 2.2.19)
+    actionpack (3.0.11)
+      activemodel (= 3.0.11)
+      activesupport (= 3.0.11)
       builder (~> 2.1.2)
       erubis (~> 2.6.6)
       i18n (~> 0.5.0)
@@ -15,50 +16,52 @@ GEM
       rack-mount (~> 0.6.14)
       rack-test (~> 0.5.7)
       tzinfo (~> 0.3.23)
-    activemodel (3.0.7)
-      activesupport (= 3.0.7)
+    activemodel (3.0.11)
+      activesupport (= 3.0.11)
       builder (~> 2.1.2)
       i18n (~> 0.5.0)
-    activerecord (3.0.7)
-      activemodel (= 3.0.7)
-      activesupport (= 3.0.7)
-      arel (~> 2.0.2)
+    activerecord (3.0.11)
+      activemodel (= 3.0.11)
+      activesupport (= 3.0.11)
+      arel (~> 2.0.10)
       tzinfo (~> 0.3.23)
-    activeresource (3.0.7)
-      activemodel (= 3.0.7)
-      activesupport (= 3.0.7)
-    activesupport (3.0.7)
+    activeresource (3.0.11)
+      activemodel (= 3.0.11)
+      activesupport (= 3.0.11)
+    activesupport (3.0.11)
     archive-tar-minitar (0.5.2)
     arel (2.0.10)
+    autotest-rails (4.1.2)
+      ZenTest (~> 4.5)
     builder (2.1.2)
-    capybara (1.0.0)
+    capybara (1.1.2)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
-      selenium-webdriver (~> 0.2.0)
+      selenium-webdriver (~> 2.0)
       xpath (~> 0.1.4)
-    childprocess (0.1.9)
+    childprocess (0.3.1)
       ffi (~> 1.0.6)
-    ci_reporter (1.6.5)
+    ci_reporter (1.7.0)
       builder (>= 2.1.2)
-    columnize (0.3.4)
-    cucumber (1.0.1)
+    columnize (0.3.6)
+    cucumber (1.1.9)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.2)
-      gherkin (~> 2.4.5)
+      gherkin (~> 2.9.0)
       json (>= 1.4.6)
-      term-ansicolor (>= 1.0.5)
-    cucumber-rails (1.0.2)
-      capybara (>= 1.0.0)
-      cucumber (~> 1.0.0)
-      nokogiri (>= 1.4.6)
-    database_cleaner (0.6.7)
-    diff-lcs (1.1.2)
+      term-ansicolor (>= 1.0.6)
+    cucumber-rails (1.3.0)
+      capybara (>= 1.1.2)
+      cucumber (>= 1.1.8)
+      nokogiri (>= 1.5.0)
+    database_cleaner (0.7.1)
+    diff-lcs (1.1.3)
     erubis (2.6.6)
       abstract (>= 1.0.0)
-    ffi (1.0.9)
-    gherkin (2.4.5)
+    ffi (1.0.11)
+    gherkin (2.9.0)
       json (>= 1.4.6)
     git (1.2.5)
     i18n (0.5.0)
@@ -66,8 +69,7 @@ GEM
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    json (1.5.3)
-    json_pure (1.5.3)
+    json (1.6.5)
     linecache19 (0.5.12)
       ruby_core_source (>= 0.1.4)
     mail (2.2.19)
@@ -75,29 +77,32 @@ GEM
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.16)
+    mime-types (1.17.2)
+    multi_json (1.0.4)
     nokogiri (1.5.0)
-    polyglot (0.3.1)
-    rack (1.2.3)
+    polyglot (0.3.3)
+    rack (1.2.5)
     rack-mount (0.6.14)
       rack (>= 1.0.0)
     rack-test (0.5.7)
       rack (>= 1.0)
-    rails (3.0.7)
-      actionmailer (= 3.0.7)
-      actionpack (= 3.0.7)
-      activerecord (= 3.0.7)
-      activeresource (= 3.0.7)
-      activesupport (= 3.0.7)
+    rails (3.0.11)
+      actionmailer (= 3.0.11)
+      actionpack (= 3.0.11)
+      activerecord (= 3.0.11)
+      activeresource (= 3.0.11)
+      activesupport (= 3.0.11)
       bundler (~> 1.0)
-      railties (= 3.0.7)
-    railties (3.0.7)
-      actionpack (= 3.0.7)
-      activesupport (= 3.0.7)
+      railties (= 3.0.11)
+    railties (3.0.11)
+      actionpack (= 3.0.11)
+      activesupport (= 3.0.11)
       rake (>= 0.8.7)
+      rdoc (~> 3.4)
       thor (~> 0.14.4)
-    rake (0.9.2)
-    rcov (0.9.9)
+    rake (0.9.2.2)
+    rdoc (3.12)
+      json (~> 1.4)
     rspec (2.6.0)
       rspec-core (~> 2.6.0)
       rspec-expectations (~> 2.6.0)
@@ -121,18 +126,27 @@ GEM
       ruby-debug-base19 (>= 0.11.19)
     ruby_core_source (0.1.5)
       archive-tar-minitar (>= 0.5.2)
-    rubyzip (0.9.4)
-    selenium-webdriver (0.2.2)
-      childprocess (>= 0.1.9)
-      ffi (>= 1.0.7)
-      json_pure
+    ruby_parser (2.3.1)
+      sexp_processor (~> 3.0)
+    rubyzip (0.9.6.1)
+    selenium-webdriver (2.19.0)
+      childprocess (>= 0.2.5)
+      ffi (~> 1.0.9)
+      multi_json (~> 1.0.4)
       rubyzip
-    sqlite3 (1.3.3)
-    term-ansicolor (1.0.5)
+    sexp_processor (3.0.10)
+    shoulda (3.0.0)
+      shoulda-context (~> 1.0.0)
+      shoulda-matchers (~> 1.0.0)
+    shoulda-context (1.0.0)
+    shoulda-matchers (1.0.0)
+    sqlite3 (1.3.5)
+    term-ansicolor (1.0.7)
     thor (0.14.6)
-    treetop (1.4.9)
+    treetop (1.4.10)
+      polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.29)
+    tzinfo (0.3.31)
     xpath (0.1.4)
       nokogiri (~> 1.3)
     yard (0.6.8)
@@ -141,6 +155,8 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  ZenTest
+  autotest-rails
   bundler (~> 1.0.0)
   capybara (>= 0.4.0)
   ci_reporter
@@ -149,10 +165,11 @@ DEPENDENCIES
   database_cleaner
   jeweler (~> 1.6.3)
   json
-  rails (>= 3.0.7)
-  rcov
+  rails (~> 3.0.7)
   rspec (~> 2.6.0)
   rspec-rails (~> 2.6.1)
   ruby-debug19
+  ruby_parser (~> 2.3.1)
+  shoulda (~> 3.0.0)
   sqlite3
   yard (~> 0.6.0)

data/README.rdoc

@@ -2,7 +2,7 @@
 
 User defined fieldsets for dynamic questions in forms.
 
-I recommend not using this until a 0.1 release.
+I recommend not using this until a 1.0 release.
 
 = how to use
 

data/VERSION

@@ -1 +1 @@
-0.0.16
+0.1.0

data/app/controllers/dynamic_fieldsets/fields_controller.rb

@@ -55,9 +55,10 @@ module DynamicFieldsets
     # POST /dynamic_fieldsets/fields
     def create
       parent_id = params[:parent]
-      @field = DynamicFieldsets::Field.new(params[:dynamic_fieldsets_field])
+      @field = params[:dynamic_fieldsets_field][:type].constantize.new(params[:dynamic_fieldsets_field])
 
       respond_to do |format|
+        
         if @field.save
           if !parent_id.empty?
             parent = DynamicFieldsets::Fieldset.find_by_id(parent_id)
@@ -66,7 +67,7 @@ module DynamicFieldsets
             #relation.child = @field
             #relation.save
           end
-          format.html { redirect_to(@field, :notice => 'Successfully created a new field.') }
+          format.html { redirect_to(dynamic_fieldsets_field_path(@field), :notice => 'Successfully created a new field.') }
         else
           format.html { render :action => "new" }
         end
@@ -75,11 +76,11 @@ module DynamicFieldsets
 
     # PUT /dynamic_fieldsets/fields/1
     def update
-      @field = DynamicFieldsets::Field.find(params[:id])
+      @field = params[:dynamic_fieldsets_field][:type].constantize.find(params[:id])
 
       respond_to do |format|
         if @field.update_attributes(params[:dynamic_fieldsets_field])
-          format.html { redirect_to(@field, :notice => 'Successfully updated a field.') }
+          format.html { redirect_to(dynamic_fieldsets_field_path(@field), :notice => 'Successfully updated a field.') }
         else
           format.html { render :action => "edit" }
         end

data/app/helpers/dynamic_fieldsets_helper.rb

@@ -27,30 +27,24 @@ module DynamicFieldsetsHelper
   def field_show_renderer(fsa, fieldset_child, values = [])
     field = fieldset_child.child
     lines = []
-    lines.push "<div class='dynamic_fieldsets field'>"
-    lines.push "<span class='label'>#{field.label}</span>"
-    lines.push "<span class='value'>"
-    if values
-      if field.field_type == "multiple_select" || field.field_type == "checkbox"
-        values.each do |value|
-          lines.push field.options.select { |opt| opt.id == value }.first.name + "<br />"
-        end
-      elsif field.field_type == "select" || field.field_type == "radio"
-        lines.push field.options.select { |opt| opt.id == values }.first.name
-        # this might be easier on the db
-        # lines.push DynamicFieldsets::FieldOption.find(values).name
-      else
-        lines.push values
-      end
-    else
-      lines.push "<em class='empty'>No answer given</em>"
+
+    if field.use_show_header_partial?
+      lines.push render(:partial => field.show_header_partial )
     end
-    lines.push "</span>"
-    lines.push "</div>"
+
+    args = {
+      :value => values,
+      :values => values
+    }
+    lines.push render(:partial => field.show_partial, :locals => field.show_partial_locals(args) )
+
+    if field.use_show_footer_partial?
+      lines.push render(:partial => field.show_footer_partial )
+    end
+
     return lines
   end
 
-
   # Builds HTML for the provided field for a form.
   # @param [FieldsetAssociator] fsa parent FieldsetAssociator
   # @param [FieldsetChild] fieldset_child The FieldsetChild to render
@@ -58,96 +52,34 @@ module DynamicFieldsetsHelper
   # @return [Array] The HTML elements for the field
   def field_form_renderer(fsa, fieldset_child, values = [])
     field = fieldset_child.child
-    classes  = "#{field.field_type} "
+    # maybe turn this into an instance method
+    classes  = "#{field.type.gsub("DynamicFieldsets::", "").underscore.downcase} "
     classes += ( field.required ? 'required' : 'optional' )
     
-    field_markup = ["<li class='#{classes}' id='input-field-#{field.id}-child-#{fieldset_child.id}'>"]
-    
-    if !field.field_type.eql?('instruction')
-      field_markup.push "<label for='field-#{field.id}'>"
-      field_markup.push "#{field.label}: "
-      field_markup.push "<abbr title='required'>*</abbr>" if field.required?
-      field_markup.push "</label>"
+    field_markup = []
+    if field.use_form_header_partial?
+      field_markup.push render(:partial => field.form_header_partial, :locals => {
+          :classes => classes,
+          :field => field,
+          :fieldset_child => fieldset_child
+        })
     end
-    
-    attrs = { :id => "field-#{field.id}-child-#{fieldset_child.id}" }
-    field.field_html_attributes.each{ |a| attrs.merge! a.attribute_name.to_sym => a.value } if !field.field_html_attributes.empty?
-    
-    case field.field_type.to_sym
-    when :select
-      selected = populate(field,values).to_i # should return the ID of the saved or default option
-      field_markup.push select_tag "fsa-#{fsa.id}[field-#{fieldset_child.id}]", options_from_collection_for_select( field.options, :id, :name, selected ), attrs
-      
-    when :multiple_select
-      attrs.merge! multiple: true
-      opts = populate( field, values )
-      opts = [opts] if !opts.is_a? Array
-      selected = opts.map( &:to_i ) if !opts.empty? # array of option IDs, saved > default
-      field_markup.push select_tag "fsa-#{fsa.id}[field-#{fieldset_child.id}]", options_from_collection_for_select( field.options, :id, :name, selected ), attrs
-      
-    when :radio
-      field_markup.push "<div id='field-#{field.id}-child-#{fieldset_child.id}'>"
-      field.options.each do |option|
-        attrs[:id] = "field-#{field.id}-#{option.name.parameterize}"
-        these_attrs = attrs
-        these_attrs = attrs.merge checked: true if populate(field,values).to_i.eql? option.id
-        field_markup.push "<label for='#{these_attrs[:id]}'>"
-        field_markup.push radio_button "fsa-#{fsa.id}", "field-#{fieldset_child.id}", option.id, these_attrs
-        field_markup.push "#{option.name}"
-        field_markup.push "</label>"
-      end
-      field_markup.push "</div>"
-      
-    when :checkbox
-      field_markup.push "<div id='field-#{field.id}-child-#{fieldset_child.id}'>"
-      attrs[:name] = "fsa-#{fsa.id}[field-#{fieldset_child.id}][]"
-      opts = populate( field, values )
-      checked = []
-      checked = opts.map( &:to_i ) if !opts.empty? # array of option IDs, saved > default
-      field.options.each do |option|
-        attrs[:id] = "field-#{field.id}-#{option.name.underscore}"
-        field_markup.push "<label for='#{attrs[:id]}'>"
-        field_markup.push check_box_tag "#{attrs[:name]}", "#{option.id}", checked.include?(option.id), attrs
-        field_markup.push "#{option.name}"
-        field_markup.push "</label>"
-      end
-      field_markup.push "</div>"
-      
-    when :textfield
-      attrs.merge!( {:value => populate( field, values )} )
-      field_markup.push text_field "fsa-#{fsa.id}", "field-#{fieldset_child.id}", attrs
       
-    when :textarea
-      attrs.merge! cols: '40' if !attrs.include? :cols
-      attrs.merge! rows: '6' if !attrs.include? :rows
-      attrs.merge! name: "fsa-#{fsa.id}[field-#{fieldset_child.id}]"
-      tag = "<textarea"
-      attrs.each{ |att,val| tag += " #{att}=\"#{val}\"" }
-      tag += ">"
-      tag += populate( field, values )
-      tag += "</textarea>"
-      field_markup.push tag
-      
-    when :date
-      date_options = { start_year: Time.now.year - 70 }
-      setdate = populate( field, values ) # date string if saved or default
-      date_options.merge! default: Time.parse( setdate ) if !setdate.empty?
-      # attrs.reject!{ |k| k.eql? :id }
-      field_markup.push date_select "fsa-#{fsa.id}", "field-#{fieldset_child.id}", date_options, attrs
-      
-    when :datetime
-      date_options = { start_year: Time.now.year - 70 }
-      setdate = populate( field, values ) # datetime string if saved or default
-      date_options.merge! default: Time.parse( setdate ) if !setdate.empty?
-      # attrs.reject!{ |k| k.eql? :id }
-      field_markup.push datetime_select "fsa-#{fsa.id}", "field-#{fieldset_child.id}", date_options, attrs
-      
-    when :instruction
-      field_markup.push "<p>#{field.label}</p>"
-      
-    end # case field.field_type
+    attrs = field.html_attribute_hash
     
-    field_markup.push "</li>"
+    attributes = {
+      :fsa => fsa,
+      :fieldset_child => fieldset_child,
+      :values => values,
+      :value => values
+    }
+
+    field_markup.push render(:partial => field.form_partial, :locals => field.form_partial_locals(attributes))
+    
+    if field.use_form_footer_partial?
+      field_markup.push render(:partial => field.form_footer_partial)
+    end
+
     return field_markup
   end
   
@@ -160,14 +92,18 @@ module DynamicFieldsetsHelper
     lines = ["<div id='fieldset-#{fieldset.id}' class='inputs'>"]
     lines.push "<h3 class='name'>#{fieldset.name}</h3>"
     lines.push "<ol>"
+
+    # this returns field/fieldset objects rather than fieldset children
+    # that is why this code looks like it is accessing odd objects
     fieldset.children.each do |child|
-      if child.is_a? DynamicFieldsets::Field then
-        fieldset_child = DynamicFieldsets::FieldsetChild.where( :child_id => child.id, :fieldset_id => fieldset.id, :child_type => child.class.name ).first
-        lines += field_renderer( fsa, fieldset_child, values[fieldset_child.id], form_type )
-      else # child.is_a? Fieldset
+      if child.is_a? DynamicFieldsets::Fieldset
         lines += fieldset_renderer( fsa, child, values, form_type )
+      else # one of many possible types of child
+        fieldset_child = DynamicFieldsets::FieldsetChild.where( :child_id => child.id, :fieldset_id => fieldset.id, :child_type => "DynamicFieldsets::Field" ).first
+        lines += field_renderer( fsa, fieldset_child, values[fieldset_child.id], form_type )
       end
     end
+
     lines.push "</ol>"
     lines.push "</div>"
 
@@ -192,9 +128,9 @@ module DynamicFieldsetsHelper
   # @param [FieldsetAssociator] The fieldset associator for the dynamic fieldset to render
   # @return [String] The HTML for the entire dynamic fieldset
   def dynamic_fieldset_renderer(fsa, form_type)
-    rendered_dynamic_fieldset = "<div id='fsa-#{fsa.id}'>\n"
-    rendered_dynamic_fieldset += "<input type='hidden' name='fsa-#{fsa.id}[fieldset_id]' value='#{fsa.fieldset_id}' />\n"
-    rendered_dynamic_fieldset += "<input type='hidden' name='fsa-#{fsa.id}[fieldset_model_name]' value='#{fsa.fieldset_model_name}' />\n"
+    rendered_dynamic_fieldset = "<div id='#{DynamicFieldsets.config.form_fieldset_associator_prefix}#{fsa.id}'>\n"
+    rendered_dynamic_fieldset += "<input type='hidden' name='#{DynamicFieldsets.config.form_fieldset_associator_prefix}#{fsa.id}[fieldset_id]' value='#{fsa.fieldset_id}' />\n"
+    rendered_dynamic_fieldset += "<input type='hidden' name='#{DynamicFieldsets.config.form_fieldset_associator_prefix}#{fsa.id}[fieldset_model_name]' value='#{fsa.fieldset_model_name}' />\n"
     fieldset_renderer( fsa, fsa.fieldset, fsa.field_values, form_type ).each do |line|
       rendered_dynamic_fieldset += line + "\n"
     end
@@ -202,25 +138,6 @@ module DynamicFieldsetsHelper
 
     return rendered_dynamic_fieldset.html_safe
   end
-  
-  # Gives precedence to saved values; returns default values if empty
-  # @param [Field] field Field to populate
-  # @param [String] value Possibly saved values
-  # @return The saved or default value(s)
-  # I know this is messy; this is what happens when we are past deadline.
-  def populate(field, value)
-    if value.nil? || (value.is_a?(Array) && value.empty?)
-      if field.field_defaults.length == 0
-        return ""
-      elsif field.field_defaults.length > 1
-        return field.field_defaults.collect{ |d| d[:value] }
-      else
-        return field.field_defaults.first.value
-      end
-    else
-      return value
-    end
-  end
 
   # Method that returns the javascript in string format to be pushed on with the rest of the
   # generated form