census 0.4.3 → 0.4.4

data/VERSION

@@ -1 +1 @@
-0.4.3
+0.4.4

data/lib/census/user_data.rb

@@ -25,8 +25,7 @@ module Census
       if @data_groups
         find_data_group(key)
       else
-        question = find_question(key)
-        @user.first_answer_for(question).formatted_data if question
+        answer_for(find_question(key))
       end
     end
 
@@ -34,8 +33,7 @@ module Census
       if @data_groups
         raise ArgumentError, "Can't be invoked on a Data Group"
       else
-        question = find_question(key)
-        @user.first_answer_for(question).update_attribute(:data, question.format_data(value).to_s) if question
+        set_answer_for(find_question(key), value)
       end
     end
 
@@ -66,6 +64,27 @@ module Census
     def find_question(prompt)
       @questions.select {|question| question.prompt == prompt}.first
     end
+
+    def answer_for(question)
+      if question
+        if question.multiple?
+          @user.all_answers_for(question).map(&:formatted_data)
+        else
+          @user.first_answer_for(question).formatted_data
+        end
+      end
+    end
+
+    def set_answer_for(question, value)
+      if question
+        if question.multiple? && value.kind_of?(Array)
+          @user.all_answers_for(question).each { |a| a.destroy }
+          value.each { |v| @user.answers.build(:question => question, :data => v) }
+        else
+          @user.first_answer_for(question).update_attribute(:data, question.format_data(value).to_s)
+        end
+      end
+    end
         
     def define_data_group_methods
       DataGroup.all.each do |group|
@@ -85,11 +104,11 @@ module Census
         
         (class << self; self; end).class_eval do
           define_method question.prompt.parameterize.underscore do
-            @user.first_answer_for(question).formatted_data
+            answer_for(question)
           end
 
           define_method "#{question.prompt.parameterize.underscore}=" do |value|
-            @user.first_answer_for(question).update_attribute(:data, question.format_data(value).to_s)
+            set_answer_for(question, value)
           end
         end
       end

data/test/models/user_test.rb

@@ -12,10 +12,18 @@ class UserTest < ActiveSupport::TestCase
       @data_group = Factory(:data_group, :name => 'Physical Attributes')
       @question1 = Factory(:question, :prompt => 'Hair Color', :data_group => @data_group)
       @question2 = Factory(:question, :prompt => 'Weight', :data_type => 'Number', :data_group => @data_group)
+      @question3 = Factory(:question, :prompt => 'Favorite Color', :multiple => true, :data_group => @data_group)
+      @red = Factory(:choice, :question => @question3, :value => 'Red')
+      @green = Factory(:choice, :question => @question3, :value => 'Green')
+      @blue = Factory(:choice, :question => @question3, :value => 'Blue')
+      @yellow = Factory(:choice, :question => @question3, :value => 'Yellow')
 
       @user = Factory(:user)
-      @user.answers << Factory(:answer, :question => @question1, :data => 'Brown')
-      @user.answers << Factory(:answer, :question => @question2, :data => '150')
+      Factory(:answer, :question => @question1, :data => 'Brown', :user => @user)
+      Factory(:answer, :question => @question2, :data => '150', :user => @user)
+      Factory(:answer, :question => @question3, :data => 'Blue', :user => @user)
+      Factory(:answer, :question => @question3, :data => 'Green', :user => @user)
+      @user.reload
     end
     
     context 'using auto-generated methods' do
@@ -27,6 +35,10 @@ class UserTest < ActiveSupport::TestCase
       should 'return integer values for numeric data types' do
         assert_equal 150, @user.census_data.physical_attributes.weight
       end
+
+      should 'return an array of values for questions with multiple answers' do
+        assert_equal ['Blue', 'Green'], @user.census_data.physical_attributes.favorite_color
+      end
       
     end
 
@@ -40,6 +52,10 @@ class UserTest < ActiveSupport::TestCase
         assert_equal 150, @user.census_data['Physical Attributes']['Weight']
       end
       
+      should 'return an array of values for questions with multiple answers' do
+        assert_equal ['Blue', 'Green'], @user.census_data['Physical Attributes']['Favorite Color']
+      end
+
     end
     
     context 'using expose_census_data' do
@@ -47,6 +63,7 @@ class UserTest < ActiveSupport::TestCase
       setup do
         @user.class.expose_census_data('Physical Attributes', 'Hair Color', :hair_color)
         @user.class.expose_census_data('Physical Attributes', 'Weight', :weight)
+        @user.class.expose_census_data('Physical Attributes', 'Favorite Color', :favorite_color)
       end
       
       should 'return string values for string data types' do
@@ -57,6 +74,10 @@ class UserTest < ActiveSupport::TestCase
         assert_equal 150, @user.weight
       end
             
+      should 'return an array of values for questions with multiple answers' do
+        assert_equal ['Blue', 'Green'], @user.favorite_color
+      end
+
     end
 
     context 'using each_pair' do
@@ -70,9 +91,10 @@ class UserTest < ActiveSupport::TestCase
 
       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_contains ['Hair Color', 'Weight', 'Favorite Color'], key
           assert_equal 'Brown', value if key == 'Hair Color'
           assert_equal 150, value if key == 'Weight'
+          assert_equal ['Blue', 'Green'], value if key == 'Favorite Color'
         end
       end
     
@@ -86,6 +108,11 @@ class UserTest < ActiveSupport::TestCase
       @data_group = Factory(:data_group, :name => 'Physical Attributes')
       @question1 = Factory(:question, :prompt => 'Hair Color', :data_group => @data_group)
       @question2 = Factory(:question, :prompt => 'Weight', :data_type => 'Number', :data_group => @data_group)
+      @question3 = Factory(:question, :prompt => 'Favorite Color', :multiple => true, :data_group => @data_group)
+      @red = Factory(:choice, :question => @question3, :value => 'Red')
+      @green = Factory(:choice, :question => @question3, :value => 'Green')
+      @blue = Factory(:choice, :question => @question3, :value => 'Blue')
+      @yellow = Factory(:choice, :question => @question3, :value => 'Yellow')
 
       @user = Factory(:user)
     end
@@ -101,6 +128,11 @@ class UserTest < ActiveSupport::TestCase
         @user.census_data.physical_attributes.weight = 210
         assert_equal 210, @user.first_answer_for(@question2).formatted_data
       end
+
+      should 'accept arrays for questions that allow multiple answers' do
+        @user.census_data.physical_attributes.favorite_color = ['Yellow', 'Red']
+        assert_equal ['Yellow', 'Red'], @user.all_answers_for(@question3).map(&:formatted_data)
+      end
       
     end
 
@@ -116,6 +148,11 @@ class UserTest < ActiveSupport::TestCase
         assert_equal 210, @user.first_answer_for(@question2).formatted_data
       end
       
+      should 'accept arrays for questions that allow multiple answers' do
+        @user.census_data["Physical Attributes"]["Favorite Color"] = ['Yellow', 'Red']
+        assert_equal ['Yellow', 'Red'], @user.all_answers_for(@question3).map(&:formatted_data)
+      end
+      
     end
     
     context 'using expose_census_data' do
@@ -123,6 +160,7 @@ class UserTest < ActiveSupport::TestCase
       setup do
         @user.class.expose_census_data('Physical Attributes', 'Hair Color', :hair_color)
         @user.class.expose_census_data('Physical Attributes', 'Weight', :weight)
+        @user.class.expose_census_data('Physical Attributes', 'Favorite Color', :favorite_color)
       end
       
       should 'allow string values for string data types' do
@@ -135,6 +173,11 @@ class UserTest < ActiveSupport::TestCase
         assert_equal 210, @user.first_answer_for(@question2).formatted_data
       end
             
+      should 'accept arrays for questions that allow multiple answers' do
+        @user.favorite_color = ['Yellow', 'Red']
+        assert_equal ['Yellow', 'Red'], @user.all_answers_for(@question3).map(&:formatted_data)
+      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 => 20100602175828) do
+ActiveRecord::Schema.define(:version => 20100630131015) do
 
   create_table "answers", :force => true do |t|
     t.integer "question_id"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: census
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 7
   prerelease: false
   segments: 
   - 0
   - 4
-  - 3
-  version: 0.4.3
+  - 4
+  version: 0.4.4
 platform: ruby
 authors: 
 - Mark Kendall
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-02 00:00:00 -04:00
+date: 2010-06-30 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/20100602175828_create_census_tables.rb
+- test/rails_root/db/migrate/20100630131015_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/20100602175828_create_census_tables.rb
+- test/rails_root/db/migrate/20100630131015_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