ask 0.1.2 → 0.2.0

data/app/models/answer.rb

@@ -7,7 +7,6 @@ class Answer < ActiveRecord::Base
   belongs_to :choice
 
   validates_presence_of :question_id
-  validates_presence_of :answer, :if=>lambda{|answer| !answer.question.is_a?(ChecklistQuestion) && answer.question.required }
 
   default_scope joins(:question).order('questions.position')
   scope :for_answerer, lambda{|answerer| where(:answerer_type => answerer.class.to_s, :answerer_id => answerer.id)}

data/app/models/question.rb

@@ -5,7 +5,8 @@ class Question < ActiveRecord::Base
   TYPES = ['TextQuestion', 'EssayQuestion', 'ChooseOneQuestion', 'ChecklistQuestion', 'FormSection']  
   
   belongs_to :asker, :polymorphic => true
-  has_many :choices, :dependent=>:destroy
+  has_many :choices, :dependent => :destroy
+  has_many :answers, :dependent => :destroy
 
   acts_as_list :scope=>:asker
 
@@ -16,6 +17,7 @@ class Question < ActiveRecord::Base
   validates_inclusion_of :type, :in=>TYPES
 
   default_scope :order => :position
+  scope :required, where(:required => true)
 
   def attributes_protected_by_default
     default = [ self.class.primary_key ]

data/lib/ask/acts_as_answerer.rb

@@ -66,6 +66,16 @@ module Ask
         
         qa
       end
+      
+      private
+      
+      def validate_required_questions
+        event.questions.required.each do |question|
+          if answers.select{|a| a.question_id == question.id}.all?{|a| a.answer.blank?}
+            errors[:base] << "\"#{question.name}\" is required"
+          end
+        end
+      end
     end
     
   end
@@ -80,5 +90,7 @@ class ActiveRecord::Base
     
     attr_accessible :answers_attributes
     accepts_nested_attributes_for :answers, :allow_destroy=>true
+    
+    validate :validate_required_questions
   end
 end

data/lib/ask/version.rb

@@ -1,3 +1,3 @@
 module Ask
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ask
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &75041660 !ruby/object:Gem::Requirement
+  requirement: &76676110 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *75041660
+  version_requirements: *76676110
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &75040890 !ruby/object:Gem::Requirement
+  requirement: &76674970 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *75040890
+  version_requirements: *76674970
 - !ruby/object:Gem::Dependency
   name: acts_as_list
-  requirement: &75040300 !ruby/object:Gem::Requirement
+  requirement: &76697550 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 0.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *75040300
+  version_requirements: *76697550
 - !ruby/object:Gem::Dependency
   name: rails_autolink
-  requirement: &75039610 !ruby/object:Gem::Requirement
+  requirement: &76697180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 1.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *75039610
+  version_requirements: *76697180
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &75039140 !ruby/object:Gem::Requirement
+  requirement: &76696580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *75039140
+  version_requirements: *76696580
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &75038580 !ruby/object:Gem::Requirement
+  requirement: &76695530 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *75038580
+  version_requirements: *76695530
 description: Allow your site's maintainers to easily create forms.
 email:
 - adam@obledesign.com