Skip to content

Problem with parser when dependency condition on a text field #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Gusaar wants to merge 1 commit into
base: master
Choose a base branch
from
+9 −1
Open

Problem with parser when dependency condition on a text field #6

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion lib/surveyor/parser.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,14 @@ def parse(str)
# This method_missing does all the heavy lifting for the DSL
def method_missing(missing_method, *args, &block)
method_name, reference_identifier = missing_method.to_s.split("_", 2)

# Quick fix to allow validations and dependencies on a single question.
if method_name == 'validation'
context[:last] = 'validation'
elsif method_name == 'dependency'
context[:last] = 'dependency'
end

type = full(method_name)
Surveyor::Parser.raise_error( "\"#{type}\" is not a surveyor method." )if !%w(survey survey_translation survey_section question_group question dependency dependency_condition answer validation validation_condition).include?(type)

Expand Down Expand Up @@ -113,7 +121,7 @@ def full(method_name)
when /^q$|^label$|^image$/; "question"
when /^a$/; "answer"
when /^d$/; "dependency"
when /^c(ondition)?$/; context[:validation] ? "validation_condition" : "dependency_condition"
when /^c(ondition)?$/; context[:last] == 'validation' ? "validation_condition" : "dependency_condition"
when /^v$/; "validation"
when /^dc(ondition)?$/; "dependency_condition"
when /^vc(ondition)?$/; "validation_condition"
Expand Down