Merge pull request #3 from whitesmith/feature/properly_parse_validati…

…on_conditions

[Feature] Properly parse Validation Conditions

lib/surveyor/models/validation_condition_methods.rb

@@ -11,7 +11,9 @@ module ValidationConditionMethods
       included do
         # Associations
         belongs_to :validation
-
+        belongs_to :question
+        belongs_to :answer
+
         if defined?(::ProtectedAttributes)
           attr_accessible(*PermittedParams.new.validation_condition_attributes)
         end

lib/surveyor/parser.rb

@@ -95,6 +95,7 @@ def method_missing(missing_method, *args, &block)
           resolve_question_correct_answers
           report_lost_and_duplicate_references
           report_missing_default_locale
+          resolve_validation_condition_references
           Surveyor::Parser.rake_trace("", -2)
           if context[:survey].save
             Surveyor::Parser.rake_trace "Survey saved."
@@ -189,6 +190,20 @@ def resolve_dependency_condition_references
         end
       end
     end
+
+    def resolve_validation_condition_references
+      self.context[:validation_conditions].each do |vc|
+        if (vc.question = self.context[:question_references][vc.question_reference]).nil?
+          self.context[:bad_references].push "q_#{vc.question_reference}"
+        end
+
+        self.context[:answer_references][vc.question_reference] ||= {}
+
+        if !vc.answer_reference.blank? and (vc.answer = self.context[:answer_references][vc.question_reference][vc.answer_reference]).nil?
+          self.context[:bad_references].push "q_#{vc.question_reference}, a_#{vc.answer_reference}"
+        end
+      end
+    end
   end
 end
 
@@ -219,6 +234,7 @@ def clear(context)
       :bad_references => [],
       :duplicate_references => [],
       :dependency_conditions => [],
+      :validation_conditions => [],
       :questions_with_correct_answers => {},
       :default_mandatory => false
     })
@@ -506,6 +522,10 @@ def parse_and_build(context, args, original_method, reference_identifier)
 
 # ValidationCondition model
 module SurveyorParserValidationConditionMethods
+  Surveyor::ValidationCondition.instance_eval do
+    attr_accessor :question_reference, :answer_reference
+  end
+
   def parse_and_build(context, args, original_method, reference_identifier)
     # clear context
     context.delete :validation_condition
@@ -516,6 +536,8 @@ def parse_and_build(context, args, original_method, reference_identifier)
       operator: a0 || "==",
       rule_key: reference_identifier
     }.merge(a1 || {})).validation_condition
+
     context[:validation].validation_conditions << context[:validation_condition] = self
+    context[:validation_conditions] << self
   end
 end

lib/surveyor/permitted_params.rb

@@ -82,7 +82,7 @@ def validation_condition
       strong_parameters.permit(*validation_condition_attributes)
     end
     def validation_condition_attributes
-      [:validation, :validation_id, :rule_key, :operator, :question_id, :answer_id, :datetime_value, :integer_value, :float_value, :unit, :text_value, :string_value, :response_other, :regexp]
+      [:validation, :validation_id, :rule_key, :operator, :question, :answer, :question_id, :answer_id, :datetime_value, :integer_value, :float_value, :unit, :text_value, :string_value, :response_other, :regexp, :question_reference, :answer_reference]
     end
 
     # response

lib/surveyor/version.rb

@@ -1,3 +1,3 @@
 module Surveyor
-  VERSION = "2.1.1"
+  VERSION = "2.1.2"
 end