dynamic_fieldsets 0.0.3 → 0.0.4

data/lib/generators/dynamic_fieldsets/templates/migrations/install_migration.rb

@@ -9,12 +9,19 @@ class <%= migration_class_name %> < ActiveRecord::Migration
       t.timestamps
     end
 
+    create_table :fieldset_children do |t|
+      t.integer :fieldset_id
+      t.integer :child_id
+      t.string :child_type
+      t.integer :order_num
+
+      t.timestamps
+    end
+
     create_table :fieldsets do |t|
       t.string :nkey, :null => false
       t.string :name
       t.text :description
-      t.integer :parent_fieldset_id
-      t.integer :order_num
 
       t.timestamps
     end
@@ -22,13 +29,11 @@ class <%= migration_class_name %> < ActiveRecord::Migration
     
     
     create_table :fields do |t|
-      t.integer :fieldset_id
       t.string :name
       t.string :label, :required => true
       t.string :field_type, :required => true
       t.boolean :required, :default => false
       t.boolean :enabled, :default => true
-      t.integer :order_num, :required => true
 
       t.timestamps
     end
@@ -58,17 +63,46 @@ class <%= migration_class_name %> < ActiveRecord::Migration
 
     create_table :field_records do |t|
       t.integer :fieldset_associator_id
-      t.integer :field_id
+      t.integer :fieldset_child_id
       t.text :value
+
+      t.timestamps
+    end
+
+    create_table :dependencies do |t|
+      t.integer :fieldset_child_id
+      t.string :value
+      t.string :relationship
+      t.integer :dependency_clause_id
+
+      t.timestamps 
+    end
+
+    create_table :dependency_clauses do |t|
+      t.integer :dependency_group_id
+
+      t.timestamps
+    end
+
+    create_table :dependency_groups do |t|
+      t.string :action
+      t.integer :fieldset_child_id
+      
+      t.timestamps
     end
   end
 
   def self.down
     drop_table :fieldsets
+    drop_table :fieldset_children
     drop_table :fields
     drop_table :field_options
     drop_table :field_defaults
     drop_table :field_html_attributes
     drop_table :field_records
+
+    drop_table :dependencies
+    drop_table :dependency_clauses
+    drop_table :dependency_group
   end
 end

data/spec/dummy/app/controllers/information_forms_controller.rb

@@ -42,6 +42,7 @@ class InformationFormsController < ApplicationController
   # POST /information_forms.xml
   def create
     @information_form = InformationForm.new(params[:information_form])
+    @information_form.set_fieldset_values( params )
 
     respond_to do |format|
       if @information_form.save
@@ -58,7 +59,7 @@ class InformationFormsController < ApplicationController
   # PUT /information_forms/1.xml
   def update
     @information_form = InformationForm.find(params[:id])
-    @information_form.dynamic_fieldset_values = params.select{ |key, value| key.match(/^fsa-/) }
+    @information_form.set_fieldset_values( params )
 
     respond_to do |format|
       if @information_form.update_attributes(params[:information_form])

data/spec/dummy/app/models/information_form.rb

@@ -1,3 +1,3 @@
 class InformationForm < ActiveRecord::Base
-  acts_as_dynamic_fieldset :child_form => {:fieldset => :information_fieldset}, :parent_form => {:fieldset => :information_fieldset}
+  acts_as_dynamic_fieldset :child_form => {:fieldset => :first}
 end

data/spec/dummy/app/views/information_forms/dynamic_view.html.erb

@@ -0,0 +1,18 @@
+<%= form_for(@information_form) do |f| %>
+  <% if @information_form.errors.any? %>
+    <div id="error_explanation">
+      <h2><%= pluralize(@information_form.errors.count, "error") %> prohibited this information_form from being saved:</h2>
+
+      <ul>
+      <% @information_form.errors.full_messages.each do |msg| %>
+        <li><%= msg %></li>
+      <% end %>
+      </ul>
+    </div>
+  <% end %>
+
+  <%= dynamic_fieldset_form_renderer(@information_form.child_form) %>
+  <div class="actions">
+    <%= f.submit %>
+  </div>
+<% end %>

data/spec/dummy/app/views/information_forms/show.html.erb

@@ -5,6 +5,7 @@
   <%= @information_form.name %>
 </p>
 
+
 <%= dynamic_fieldset_show_renderer(@information_form.child_form) %>
 
 <%= link_to 'Edit', edit_information_form_path(@information_form) %> |

data/spec/dummy/app/views/layouts/application.html.erb

@@ -4,11 +4,19 @@
   <title>Dummy</title>
   <%= stylesheet_link_tag :all %>
   <%= javascript_include_tag :defaults %>
-  <%= javascript_include_tag "jquery.min" %>
+  <%= javascript_include_tag "jquery-1.6.2.min" %>
+  <%= javascript_include_tag "jquery-ui-1.8.15.custom.min" %>
+  <%= javascript_include_tag "jquery-ui-nestedSortable" %>
   <%= csrf_meta_tag %>
 </head>
 <body>
 
+<% unless flash[:notice].blank? %>
+  <div id='notice'>
+    <%= flash[:notice] %>
+  </div>
+<% end %>
+
 <%= yield %>
 
 </body>

data/spec/dummy/config/routes.rb

@@ -1,6 +1,6 @@
 Dummy::Application.routes.draw do
   resources :information_forms
-
+  
   # The priority is based upon order of creation:
   # first created -> highest priority.
 

data/spec/dummy/db/migrate/{20110726215814_create_dynamic_fieldsets_tables.rb → 20110809161724_create_dynamic_fieldsets_tables.rb}

@@ -9,12 +9,19 @@ class CreateDynamicFieldsetsTables < ActiveRecord::Migration
       t.timestamps
     end
 
+    create_table :fieldset_children do |t|
+      t.integer :fieldset_id
+      t.integer :child_id
+      t.string :child_type
+      t.integer :order_num
+
+      t.timestamps
+    end
+
     create_table :fieldsets do |t|
       t.string :nkey, :null => false
       t.string :name
       t.text :description
-      t.integer :parent_fieldset_id
-      t.integer :order_num
 
       t.timestamps
     end
@@ -22,13 +29,11 @@ class CreateDynamicFieldsetsTables < ActiveRecord::Migration
     
     
     create_table :fields do |t|
-      t.integer :fieldset_id
       t.string :name
       t.string :label, :required => true
       t.string :field_type, :required => true
       t.boolean :required, :default => false
       t.boolean :enabled, :default => true
-      t.integer :order_num, :required => true
 
       t.timestamps
     end
@@ -58,17 +63,46 @@ class CreateDynamicFieldsetsTables < ActiveRecord::Migration
 
     create_table :field_records do |t|
       t.integer :fieldset_associator_id
-      t.integer :field_id
+      t.integer :fieldset_child_id
       t.text :value
+
+      t.timestamps
+    end
+
+    create_table :dependencies do |t|
+      t.integer :fieldset_child_id
+      t.string :value
+      t.string :relationship
+      t.integer :dependency_clause_id
+
+      t.timestamps 
+    end
+
+    create_table :dependency_clauses do |t|
+      t.integer :dependency_group_id
+
+      t.timestamps
+    end
+
+    create_table :dependency_groups do |t|
+      t.string :action
+      t.integer :fieldset_child_id
+      
+      t.timestamps
     end
   end
 
   def self.down
     drop_table :fieldsets
+    drop_table :fieldset_children
     drop_table :fields
     drop_table :field_options
     drop_table :field_defaults
     drop_table :field_html_attributes
     drop_table :field_records
+
+    drop_table :dependencies
+    drop_table :dependency_clauses
+    drop_table :dependency_group
   end
 end

data/spec/dummy/db/schema.rb

@@ -10,7 +10,29 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20110727210451) do
+ActiveRecord::Schema.define(:version => 20110809161724) do
+
+  create_table "dependencies", :force => true do |t|
+    t.integer  "fieldset_child_id"
+    t.string   "value"
+    t.string   "relationship"
+    t.integer  "dependency_clause_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "dependency_clauses", :force => true do |t|
+    t.integer  "dependency_group_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "dependency_groups", :force => true do |t|
+    t.string   "action"
+    t.integer  "fieldset_child_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
 
   create_table "field_defaults", :force => true do |t|
     t.integer  "field_id"
@@ -36,19 +58,19 @@ ActiveRecord::Schema.define(:version => 20110727210451) do
   end
 
   create_table "field_records", :force => true do |t|
-    t.integer "fieldset_associator_id"
-    t.integer "field_id"
-    t.text    "value"
+    t.integer  "fieldset_associator_id"
+    t.integer  "fieldset_child_id"
+    t.text     "value"
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
   create_table "fields", :force => true do |t|
-    t.integer  "fieldset_id"
     t.string   "name"
     t.string   "label"
     t.string   "field_type"
-    t.boolean  "required",    :default => false
-    t.boolean  "enabled",     :default => true
-    t.integer  "order_num"
+    t.boolean  "required",   :default => false
+    t.boolean  "enabled",    :default => true
     t.datetime "created_at"
     t.datetime "updated_at"
   end
@@ -62,12 +84,19 @@ ActiveRecord::Schema.define(:version => 20110727210451) do
     t.datetime "updated_at"
   end
 
+  create_table "fieldset_children", :force => true do |t|
+    t.integer  "fieldset_id"
+    t.integer  "child_id"
+    t.string   "child_type"
+    t.integer  "order_num"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
   create_table "fieldsets", :force => true do |t|
-    t.string   "nkey",               :null => false
+    t.string   "nkey",        :null => false
     t.string   "name"
     t.text     "description"
-    t.integer  "parent_fieldset_id"
-    t.integer  "order_num"
     t.datetime "created_at"
     t.datetime "updated_at"
   end

data/spec/dummy/features/field.feature

@@ -10,7 +10,6 @@ Feature: Managed fields
     When I fill in "test_field" for "Label"
     And I fill in "Test field" for "Name"
     And I select "textfield" from "Field type"
-    And I fill in "1" for "Order Number"
     And I press "Create Field"
     Then I should be on the field show page for that field
     And I should see "Successfully created a new field"
@@ -32,9 +31,15 @@ Feature: Managed fields
     Given a field exists
     And I record the data for that field
     And I am on the field index page
-    When I follow "Destroy"
+    When I press "Destroy"
     Then I should not see that field listed
 
+  Scenario: Should not be able to destroy a field in use
+    Given a field exists
+    And the field is in use
+    When I go to the field index page
+    Then I should see "Destroy" within "del"
+
   # this test should be a javascript test and actually test the javascript at some point
   Scenario: Additional field links on new page
     Given a field exists
@@ -52,3 +57,13 @@ Feature: Managed fields
     And I should see "Html attribute name"
     And I should see "Html attribute value"
 
+  Scenario: Enabling and disabling a field
+    Given a field exists
+    When I go to the field index page
+    Then I should see that field listed
+    When I press "Disable"
+    Then I should be on the field index page
+    And I should see "Successfully updated a new field." 
+    When I press "Enable"
+    Then I should be on the field index page
+    And I should see "Successfully updated a new field." 

data/spec/dummy/features/fieldset.feature

@@ -21,8 +21,6 @@ Feature: Managed fieldsets
     When I fill in "test_fieldset" for "Nkey"
     And I fill in "Test Fieldset" for "Name"
     And I fill in "This fieldset is being used for testing." for "Description"
-    And I select "Parent Fieldset" from "Parent fieldset"
-    And I fill in "1" for "Order Number"
     And I press "Create Fieldset"
     Then I should be on the fieldset show page for that fieldset
     And I should see "Successfully created a new fieldset"
@@ -42,27 +40,9 @@ Feature: Managed fieldsets
     And I should see "This fieldset has been repurposed"
 
   Scenario: Destroying a fieldset
+    Given I am pending
     Given a parent fieldset exists
     And I record the data for that fieldset
     And I am on the fieldset index page
     When I follow "Destroy"
     Then I should not see that fieldset listed
-
-  Scenario: Viewing child index page from the index page
-    Given a parent fieldset exists
-    And I am on the fieldset index page
-    When I follow "Children"
-    Then I should be on the fieldset child page for that fieldset
-
-  Scenario: Viewing a one generation fieldset's index page
-    And I am pending
-    Given a child fieldset exists
-    And I am on the child page of the parent fieldset
-    When I follow "Children"
-    Then I should be on the fieldset child page for that fieldset
-
-  Scenario: Viewing a fieldset's view page from the fieldset's child page
-    And I am pending
-    Given a parent fieldset exists
-
- 

data/spec/dummy/features/fieldset_children.feature

@@ -0,0 +1,50 @@
+Feature: Managed fieldset children
+
+  Scenario: Viewing child index page from the index page
+    Given a parent fieldset exists
+    And I am on the fieldset index page
+    When I follow "Children"
+    Then I should be on the fieldset child page for that fieldset
+
+  Scenario: Viewing a one generation fieldset's index page
+    Given I am pending
+    Given a child fieldset exists
+    And I am on the fieldset children page for the parent fieldset
+    When I follow "Children"
+    Then I should be on the fieldset child page for that fieldset
+
+  Scenario: Viewing a fieldset's view page from the fieldset's child page
+    Given a child fieldset exists
+    And I am on the fieldset children page for the parent fieldset
+    When I follow "Show"
+    Then I should be on the child fieldset show page
+    And I should see the data for that fieldset
+
+  Scenario: Viewing a field's edit page from the fieldset's child page
+    Given a child fieldset exists
+    And I am on the fieldset children page for the parent fieldset
+    When I follow "Edit"
+    Then I should be on the fieldset edit page for that fieldset
+
+  Scenario: Viewing a field and a fieldset from the fieldset's child page
+    Given I am pending
+    Given a child field and fieldset exists
+    And I am on the fieldset children page for the parent fieldset
+    Then I should see the child field information
+    And I should see the child fieldset information
+
+  Scenario: Automatically setting fieldset when creating a new child field from the child page
+    Given I am pending
+    Given a parent fieldset exists
+    And I am on the fieldset child page for that fieldset
+    When I follow "New Child - Field" 
+    Then I should be on the field new page
+    And the Parent Fieldset should be selected for "Fieldset"
+
+  Scenario: Automatically setting fieldset when creating a new child fieldset from the child page
+    Given I am pending
+    Given a parent fieldset exists
+    And I am on the fieldset child page for that fieldset
+    When I follow "New Child - Fieldset"
+    Then I should be on the fieldset new page
+    And the Parent Fieldset should be selected for "Parent fieldset"

data/spec/dummy/features/javascript_tests.feature

@@ -0,0 +1,91 @@
+# If these tests ever, break please delete them
+# They are for demosntrating javsacript testing only
+Feature: How to test with and without javascript
+
+  # If you use a javascript tag, Selenium will be loaded and used to test the page
+  # Normal javascript will run in a firefox browser
+  @javascript
+  Scenario: Creating a field option
+    Given I am on the field new page
+    And I should not see "remove" within "a"
+    When I follow "Add Field Option"
+    Then I should see "remove" within "a"
+
+  # If you don't use javascript, no javascript will be run because we are using a simulated browser
+  # In this case, clicking on the link will not do anything
+  Scenario: Creating a field option
+    Given I am on the field new page
+    And I should not see "remove" within "a"
+    When I follow "Add Field Option"
+    Then I should not see "remove" within "a"
+
+
+  # Please do not delete these tests, they are for dependencies. [hex]
+  # Not all of these steps are fully tested, but I should not see the instructions
+  # and I should see the instructions are written. They seem like they should be good, but not tested.
+
+  @javascript
+  Scenario: Checking textfield dependency
+    Given I am pending
+    And there is a dependency on a textfield with "I like tests"
+    And I am on the information forms edit page
+    # Not made yet
+    When I fill in the field with "I don't like tests"
+    Then I should not see the instructions
+    When I fill in the field with "I like tests"
+    Then I should see the instructions
+
+  @javascript
+  Scenario: Checking radio button dependency
+    Given I am pending
+    And there is a dependency on a radio
+    And I am on the information forms edit page
+    # Not made yet
+    When I select the radio button "Radio Button A"
+    Then I should not see the instructions
+    When I select the radio button "Radio Button B"
+    Then I should see the instructions
+
+  @javascript
+  Scenario: Checking textarea dependency
+    Given I am pending
+    And there is a dependency on a textarea with "I like tests"
+    And I am on the information forms edit page
+    # Not made yet
+    When I fill in the area with "I don't like tests"
+    Then I should not see the instructions
+    When I fill in the area with "I like tests"
+    Then I should see the instructions
+
+  @javascript
+  Scenario: Checking checkbox dependency
+    Given I am pending
+    And there is a dependency on a checkbox
+    And I am on the information forms edit page
+    # Not made yet
+    When I check the checkbox "Checkbox A"
+    Then I should not see the instructions
+    When I check the checkbox "Checkbox B"
+    Then I should see the instructions
+
+  @javascript
+  Scenario: Checking select dependency
+    Given I am pending
+    And there is a dependency on a select
+    And I am on the information forms edit page
+    # Not made yet
+    When I select the select option "Select Option A"
+    Then I should not see the instructions
+    When I select the select option "Select Option B"
+    Then I should see the instructions
+
+  @javascript
+  Scenario: Checking multiple select dependency
+    Given I am pending
+    And there is a dependency on a multi-select
+    And I am on the information forms edit page
+    # Not made yet
+    When I select the select option "Select Option A"
+    Then I should not see the instructions
+    When I select the select option "Select Option B"
+    Then I should see the instructions

data/spec/dummy/features/step_definitions/field_steps.rb

@@ -3,11 +3,19 @@ Given /^a field exists$/ do
     :name => "Test field",
     :label => "Test field",
     :field_type => "textfield",
-    :order_num => 1,
     :enabled => true,
     :required => true)
 end
 
+Given /^the field is in use$/ do
+  @field = DynamicFieldsets::Field.last
+  if DynamicFieldsets::Fieldset.all.empty?
+    Given %{a fieldset exists}
+  end
+  @fsc = DynamicFieldsets::FieldsetChild.create(:child => @field, :fieldset_id => DynamicFieldsets::Fieldset.last.id)
+end
+
+
 Given /^field options, defaults, and attributes exist for that field$/ do
   @field = DynamicFieldsets::Field.last
   DynamicFieldsets::FieldOption.create(:field => @field, :name => "Field option value")
@@ -17,10 +25,8 @@ end
 
 Then /^I should see that field listed$/ do
   @field = DynamicFieldsets::Field.last
-  page.should have_content(@field.fieldset.name) if @field.fieldset
   page.should have_content(@field.name)
   page.should have_content(@field.field_type)
-  page.should have_content(@field.order_num)
 end
 
 Then /^I should see the data for that field$/ do
@@ -28,7 +34,6 @@ Then /^I should see the data for that field$/ do
   page.should have_content(@field.name)
   page.should have_content(@field.label)
   page.should have_content(@field.field_type)
-  page.should have_content(@field.order_num)
   page.should have_content(@field.enabled)
   page.should have_content(@field.required)
 
@@ -59,5 +64,4 @@ end
 Then /^I should not see that field listed$/ do
   page.should_not have_content(@field.name)
   page.should_not have_content(@field.field_type)
-  page.should_not have_content(@field.order_num)
 end

data/spec/dummy/features/step_definitions/fieldset_associator_steps.rb

@@ -1,5 +1,7 @@
 Given /^an information form exists$/ do
-  @information_form = InformationForm.create(:name => "Test information form")
+  # note that we are ignoring validations for this in case the fieldset has required fields
+  @information_form = InformationForm.new(:name => "Test information form")
+  @information_form.save(:validate => false)
 end
 
 Given /^a fieldset associator exists$/ do

data/spec/dummy/features/step_definitions/fieldset_children_steps.rb

@@ -0,0 +1,65 @@
+def create_parent_fieldset
+  parent_fieldset = DynamicFieldsets::Fieldset.create(
+    :name => "Parent Fieldset",
+    :nkey => "parent_fieldset",
+    :description => "A test parent fieldset")
+  return parent_fieldset
+end
+
+def create_child_fieldset(parent, order_num = 1)
+  child_fieldset = DynamicFieldsets::Fieldset.create(
+    :name => "Child Fieldset",
+    :nkey => "child_fieldset",
+    :description => "A test child fieldset")
+  DynamicFieldsets::FieldsetChild.create(:fieldset => parent, :child => child_fieldset, :order_num => order_num)
+  return child_fieldset
+end
+
+def create_child_field(parent, order_num = 1)
+  child_field = DynamicFieldsets::Field.create(
+    :name => "Child Field",
+    :label => "Child Field",
+    :field_type => "textfield",
+    :enabled => true,
+    :required => true)
+  DynamicFieldsets::FieldsetChild.create(:fieldset => parent, :child => child_field, :order_num => order_num)
+  return child_field
+end
+
+Given(/^a parent fieldset exists$/) do
+  @parent_fieldset = create_parent_fieldset
+end
+
+Given(/^a child fieldset exists$/) do
+  @parent_fieldset = create_parent_fieldset
+  @child_fieldset = create_child_fieldset(@parent_fieldset, 1)
+end
+
+Given /^a child field exists$/ do
+  @parent_fieldset = create_parent_fieldset
+  @child_field = create_child_field(@parent_fieldset, 1) 
+end
+
+Given /^a child field and fieldset exists$/ do
+  @parent_fieldset = create_parent_fieldset 
+  @child_field = create_child_field(@parent_fieldset, 1) 
+  @child_fieldset = create_child_fieldset(@parent_fieldset, 2) 
+end
+
+Then(/^the Parent Fieldset should be selected for "([^"]*)"$/) do |field|
+  pending "this step does not make sense in the new system."
+  value = DynamicFieldsets::Fieldset.last.name
+  page.has_xpath?("//option[@selected = 'selected' and contains(string(), value)]").should be_true
+end
+
+Then /^I should see the child field information$/ do
+  @child_field = DynamicFieldsets::Field.last
+  page.should have_content(@child_field.name)
+  page.should have_content(@child_field.field_type)
+end
+
+Then /^I should see the child fieldset information$/ do
+  @child_fieldset = DynamicFieldsets::Fieldset.last
+  page.should have_content(@child_fieldset.name)
+  page.should have_content(@child_fieldset.description)
+end