census 0.4.2 → 0.4.3

data/VERSION

@@ -1 +1 @@
-0.4.2
+0.4.3

data/app/models/choice.rb

@@ -1,6 +1,8 @@
 class Choice < ActiveRecord::Base
 
   belongs_to :question, :inverse_of => :choices
+
+  acts_as_list
   default_scope :order => :position
   
   validates_presence_of :value,

data/app/models/question.rb

@@ -1,6 +1,8 @@
 class Question < ActiveRecord::Base
 
   belongs_to :data_group, :inverse_of => :questions
+
+  acts_as_list
   default_scope :order => :position
   
   has_many :choices, :dependent => :destroy, :inverse_of => :question
@@ -10,7 +12,7 @@ class Question < ActiveRecord::Base
   
   validates_presence_of :prompt,
                         :data_group
-                 
+               
   def sql_transform(column_name = '?')
     data_type_definition.sql_transform.call(column_name)
   end

data/generators/census/templates/factories.rb

@@ -1,3 +1,7 @@
+Factory.sequence :question do |n|
+  "Question #{n}"
+end
+
 Factory.define :answer do |answer|
   answer.association :question
   answer.association :user
@@ -15,7 +19,7 @@ end
 
 Factory.define :question do |question|
   question.association  :data_group
-  question.prompt       'Enter your response'
+  question.prompt       { Factory.next :question }
   question.multiple     false
   question.other        false
 end

data/lib/census/user_data.rb

@@ -3,43 +3,77 @@ module Census
 
     def initialize(user, data_group = nil)
       @user = user
-      
-      if data_group
-        @questions = {}
-        define_question_methods(data_group)
+      @data_group = data_group
+      reload
+    end
+    
+    def reload
+      if @data_group
+        @questions = []
+        define_question_methods(@data_group)
       else
-        @data_groups = Hash.new { |h,v| h[v] = {} }
+        @data_groups = []
         define_data_group_methods
       end
     end
     
+    def name
+      @data_group.name if @data_group
+    end
+    
     def [](key)
       if @data_groups
-        @data_groups[key]
+        find_data_group(key)
       else
-        @user.first_answer_for(@questions[key]).formatted_data if @questions[key]
+        question = find_question(key)
+        @user.first_answer_for(question).formatted_data if question
       end
     end
 
     def []=(key, value)
       if @data_groups
-        @data_groups[key] = value
+        raise ArgumentError, "Can't be invoked on a Data Group"
       else
-        @user.first_answer_for(@questions[key]).update_attribute(:data, @questions[key].format_data(value).to_s) if @questions[key]
+        question = find_question(key)
+        @user.first_answer_for(question).update_attribute(:data, question.format_data(value).to_s) if question
       end
     end
+
+    def each_pair
+      self.keys.each{ |key| yield key, self.send(key.parameterize.underscore.to_sym) }
+    end
+    
+    
+    protected
+    
     
+    def keys
+      if @data_groups
+        @data_groups.map(&:name)
+      else
+        @questions.map(&:prompt)
+      end
+    end
+        
     
     private
+
     
+    def find_data_group(name)
+      @data_groups.select {|group| group.name == name}.first
+    end
     
+    def find_question(prompt)
+      @questions.select {|question| question.prompt == prompt}.first
+    end
+        
     def define_data_group_methods
       DataGroup.all.each do |group|
-        @data_groups[group.name] = Census::UserData.new(@user, group)
+        @data_groups << Census::UserData.new(@user, group)
         
         (class << self; self; end).class_eval do
           define_method group.name.parameterize.underscore do
-            @data_groups[group.name]
+            find_data_group(group.name)
           end
         end
       end
@@ -47,7 +81,7 @@ module Census
     
     def define_question_methods(data_group)
       data_group.questions.each do |question|
-        @questions[question.prompt] = question
+        @questions << question
         
         (class << self; self; end).class_eval do
           define_method question.prompt.parameterize.underscore do

data/test/models/choice_test.rb

@@ -17,6 +17,8 @@ class ChoiceTest < ActiveSupport::TestCase
 
     should_allow_mass_assignment_of :value
     
+    should_act_as_list
+    
   end
   
 end

data/test/models/question_test.rb

@@ -23,6 +23,8 @@ class QuestionTest < ActiveSupport::TestCase
                                     :other
                                     
     should_accept_nested_attributes_for :choices
+    
+    should_act_as_list
 
     should "return a default sql transform" do
       assert '"?"', @question.sql_transform

data/test/models/user_test.rb

@@ -58,6 +58,25 @@ class UserTest < ActiveSupport::TestCase
       end
             
     end
+
+    context 'using each_pair' do
+      
+      should 'retrieve data groups and their question lists when called directly on census_data' do
+        @user.census_data.each_pair do |key, value|
+          assert_contains ['Physical Attributes'], key
+          assert value.kind_of?(Census::UserData)
+        end
+      end
+
+      should 'retrieve pairs of questions and answers when called for a data group' do
+        @user.census_data['Physical Attributes'].each_pair do |key, value|
+          assert_contains ['Hair Color', 'Weight'], key
+          assert_equal 'Brown', value if key == 'Hair Color'
+          assert_equal 150, value if key == 'Weight'
+        end
+      end
+    
+    end
     
   end
 
@@ -119,5 +138,26 @@ class UserTest < ActiveSupport::TestCase
     end
     
   end
+  
+  context 'Enumerating answers with each_pair' do
+    
+    setup do
+      @data_group = Factory(:data_group)
+      10.times {|i| Factory(:question, :prompt => i.to_s, :data_group => @data_group)}
+      @user = Factory(:user)
+    end
+    
+    should 'maintain the correct order for questions' do
+      assert_equal ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9"],
+        @user.census_data[@data_group.name].each_pair {|key, value| key}
+      
+      @data_group.questions.first.move_to_bottom
+      @user.census_data.reload
+      
+      assert_equal ["1", "2", "3", "4", "5", "6", "7", "8", "9", "0"],
+        @user.census_data[@data_group.name].each_pair {|key, value| key}
+    end
+
+  end
 
 end

data/test/rails_root/db/schema.rb

@@ -9,7 +9,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20100526201135) do
+ActiveRecord::Schema.define(:version => 20100602175828) do
 
   create_table "answers", :force => true do |t|
     t.integer "question_id"

data/test/rails_root/test/factories/census.rb

@@ -1,3 +1,7 @@
+Factory.sequence :question do |n|
+  "Question #{n}"
+end
+
 Factory.define :answer do |answer|
   answer.association :question
   answer.association :user
@@ -15,7 +19,7 @@ end
 
 Factory.define :question do |question|
   question.association  :data_group
-  question.prompt       'Enter your response'
+  question.prompt       { Factory.next :question }
   question.multiple     false
   question.other        false
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: census
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: false
   segments: 
   - 0
   - 4
-  - 2
-  version: 0.4.2
+  - 3
+  version: 0.4.3
 platform: ruby
 authors: 
 - Mark Kendall
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-26 00:00:00 -04:00
+date: 2010-06-02 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -151,7 +151,7 @@ files:
 - test/rails_root/config/initializers/new_rails_defaults.rb
 - test/rails_root/config/initializers/session_store.rb
 - test/rails_root/config/routes.rb
-- test/rails_root/db/migrate/20100526201135_create_census_tables.rb
+- test/rails_root/db/migrate/20100602175828_create_census_tables.rb
 - test/rails_root/db/schema.rb
 - test/rails_root/test/factories/census.rb
 - test/rails_root/test/performance/browsing_test.rb
@@ -215,7 +215,7 @@ test_files:
 - test/rails_root/config/initializers/new_rails_defaults.rb
 - test/rails_root/config/initializers/session_store.rb
 - test/rails_root/config/routes.rb
-- test/rails_root/db/migrate/20100526201135_create_census_tables.rb
+- test/rails_root/db/migrate/20100602175828_create_census_tables.rb
 - test/rails_root/db/schema.rb
 - test/rails_root/test/factories/census.rb
 - test/rails_root/test/performance/browsing_test.rb