smartdown 0.8.1 → 0.8.2

data/README.md

@@ -128,6 +128,18 @@ Asks for an arbitrary text input.
 [salary: salary_value]
 ```
 
+## Aliases
+
+An alias lets you referrer to any question identifier by its question intentifer or its alias.
+
+```markdown
+## Are you Clark Kent?
+
+[choice: clark_kent, alias: superman]
+* yes: Yes
+* no: No
+```
+
 ## Next steps
 
 Markdown to be displayed as part of an outcome to direct the users to other information of potential interest to them.
@@ -228,6 +240,31 @@ Text if true
 $ENDIF
 ```
 
+Similarly, it is also possible to specify an elseif clause. These can be
+chained together indefinitely. It is also possible to keep an else
+clause at the end like so:
+
+```markdown
+$IF pred1?
+
+Text if pred1 true
+
+$ELSEIF pred2?
+
+Text if pred1 false and pred2 true
+
+$ELSEIF pred3?
+
+Text if pred1 and pred2 false, and pred3 true
+
+$ELSE
+
+Text if pred1, pred2, pred3 are false
+
+$ENDIF
+```
+
+
 ## Interpolation
 
 It's possible to interpolate values from calculations, responses to questions, plugins etc.

data/lib/smartdown/engine/conditional_resolver.rb

@@ -10,20 +10,22 @@ module Smartdown
     private
       def evaluate(conditional, state)
         if conditional.predicate.evaluate(state)
-          conditional.true_case
+          selected_branch = conditional.true_case
         else
-          conditional.false_case
+          selected_branch = conditional.false_case
         end
+        resolve_conditionals selected_branch, state
       end
 
       def resolve_conditionals(elements, state)
+        return unless elements
         elements.map do |element|
-          if element.is_a?(Smartdown::Model::Element::Conditional)
+          if element.is_a? Smartdown::Model::Element::Conditional
             evaluate(element, state)
           else
             element
           end
-        end.flatten
+        end.flatten.compact
       end
     end
   end

data/lib/smartdown/engine/transition.rb

@@ -33,10 +33,6 @@ module Smartdown
         node.start_button && node.start_button.start_node
       end
 
-      def input_variable_names_from_question
-        node.questions.map(&:name)
-      end
-
       def first_matching_rule(rules)
         catch(:match) do
           throw_first_matching_rule_in(rules)
@@ -63,8 +59,11 @@ module Smartdown
 
       def state_with_responses
         result = state.put(node.name, answers.map(&:to_s))
-        input_variable_names_from_question.each_with_index do |input_variable_name, index|
-          result = result.put(input_variable_name, answers[index])
+        node.questions.each_with_index do |question, index|
+          result = result.put(question.name, answers[index])
+          if question.alias
+            result = result.put(question.alias, answers[index])
+          end
         end
         result
       end

data/lib/smartdown/model/element/question/date.rb

@@ -4,7 +4,7 @@ module Smartdown
   module Model
     module Element
       module Question
-        class Date < Struct.new(:name)
+        class Date < Struct.new(:name, :alias)
           def answer_type
             Smartdown::Model::Answer::Date
           end

data/lib/smartdown/model/element/question/multiple_choice.rb

@@ -4,7 +4,7 @@ module Smartdown
   module Model
     module Element
       module Question
-        class MultipleChoice < Struct.new(:name, :choices)
+        class MultipleChoice < Struct.new(:name, :choices, :alias)
           def answer_type
             Smartdown::Model::Answer::MultipleChoice
           end

data/lib/smartdown/model/element/question/salary.rb

@@ -4,7 +4,7 @@ module Smartdown
   module Model
     module Element
       module Question
-        class Salary < Struct.new(:name)
+        class Salary < Struct.new(:name, :alias)
           def answer_type
             Smartdown::Model::Answer::Salary
           end

data/lib/smartdown/model/element/question/text.rb

@@ -4,7 +4,7 @@ module Smartdown
   module Model
     module Element
       module Question
-        class Text < Struct.new(:name)
+        class Text < Struct.new(:name, :alias)
           def answer_type
             Smartdown::Model::Answer::Text
           end

data/lib/smartdown/parser/base.rb

@@ -14,6 +14,8 @@ module Smartdown
       rule(:some_space) { space_char.repeat(1) }
       rule(:ws) { ws_char.repeat }
       rule(:non_ws) { non_ws.repeat }
+      rule(:comma) { str(",") }
+      rule(:colon) { str(":") }
 
       rule(:whitespace_terminated_string) {
         non_ws_char >> (non_ws_char | space_char.repeat(1) >> non_ws_char).repeat
@@ -30,6 +32,16 @@ module Smartdown
       rule(:bullet) {
         match('[*-]')
       }
+
+      rule(:option_pair) {
+        comma >>
+        optional_space >>
+        identifier.as(:key) >>
+        colon >>
+        optional_space >>
+        identifier.as(:value) >>
+        optional_space
+      }
     end
   end
 end

data/lib/smartdown/parser/element/conditional.rb

@@ -19,13 +19,20 @@ module Smartdown
             (markdown_blocks_inside_conditional.as(:false_case) >> newline).maybe
         }
 
+        rule(:elseif_clause) {
+          str("$ELSEIF ") >> (Predicates.new.as(:predicate) >>
+          optional_space >> newline.repeat(2) >>
+          (markdown_blocks_inside_conditional.as(:true_case) >> newline).maybe >>
+          ((elseif_clause | else_clause).maybe)).as(:conditional).repeat(1,1).as(:false_case)
+        }
+
         rule(:conditional_clause) {
           (
             str("$IF ") >>
               Predicates.new.as(:predicate) >>
               optional_space >> newline.repeat(2) >>
               (markdown_blocks_inside_conditional.as(:true_case) >> newline).maybe >>
-              else_clause.maybe >>
+              (else_clause | elseif_clause).maybe >>
               str("$ENDIF") >> optional_space >> line_ending
           ).as(:conditional)
         }

data/lib/smartdown/parser/element/date_question.rb

@@ -10,6 +10,7 @@ module Smartdown
               optional_space >>
               question_identifier.as(:identifier) >>
               optional_space >>
+              option_pair.repeat.as(:option_pairs) >>
               str("]") >>
               optional_space >>
               line_ending

data/lib/smartdown/parser/element/multiple_choice_question.rb

@@ -9,6 +9,7 @@ module Smartdown
             optional_space >>
             question_identifier.as(:identifier) >>
             optional_space >>
+            option_pair.repeat.as(:option_pairs) >>
             str("]") >>
             optional_space >>
             line_ending

data/lib/smartdown/parser/element/salary_question.rb

@@ -10,6 +10,7 @@ module Smartdown
               optional_space >>
               question_identifier.as(:identifier) >>
               optional_space >>
+              option_pair.repeat.as(:option_pairs) >>
               str("]") >>
               optional_space >>
               line_ending

data/lib/smartdown/parser/element/text_question.rb

@@ -10,6 +10,7 @@ module Smartdown
               optional_space >>
               question_identifier.as(:identifier) >>
               optional_space >>
+              option_pair.repeat.as(:option_pairs) >>
               str("]") >>
               optional_space >>
               line_ending

data/lib/smartdown/parser/node_transform.rb

@@ -1,4 +1,5 @@
 require 'parslet/transform'
+require 'smartdown/parser/option_pairs_transform'
 require 'smartdown/model/node'
 require 'smartdown/model/front_matter'
 require 'smartdown/model/rule'
@@ -64,27 +65,33 @@ module Smartdown
         [url.to_s, label.to_s]
       }
 
-      rule(:multiple_choice => {identifier: simple(:identifier), options: subtree(:choices)}) {
+
+      rule(:multiple_choice => {identifier: simple(:identifier), :option_pairs => subtree(:option_pairs), options: subtree(:choices)}) {
         Smartdown::Model::Element::Question::MultipleChoice.new(
-          identifier.to_s, Hash[choices]
+          identifier.to_s,
+          Hash[choices],
+          Smartdown::Parser::OptionPairs.transform(option_pairs).fetch('alias', nil),
         )
       }
 
-      rule(:date => {identifier: simple(:identifier)}) {
+      rule(:date => {identifier: simple(:identifier), :option_pairs => subtree(:option_pairs)}) {
         Smartdown::Model::Element::Question::Date.new(
-          identifier.to_s
+          identifier.to_s,
+          Smartdown::Parser::OptionPairs.transform(option_pairs).fetch('alias', nil)
         )
       }
 
-      rule(:salary => {identifier: simple(:identifier)}) {
+      rule(:salary => {identifier: simple(:identifier), :option_pairs => subtree(:option_pairs)}) {
         Smartdown::Model::Element::Question::Salary.new(
-          identifier.to_s
+          identifier.to_s,
+          Smartdown::Parser::OptionPairs.transform(option_pairs).fetch('alias', nil)
         )
       }
 
-      rule(:text => {identifier: simple(:identifier)}) {
+      rule(:text => {identifier: simple(:identifier), :option_pairs => subtree(:option_pairs)}) {
         Smartdown::Model::Element::Question::Text.new(
-          identifier.to_s
+          identifier.to_s,
+          Smartdown::Parser::OptionPairs.transform(option_pairs).fetch('alias', nil)
         )
       }
 
@@ -146,10 +153,10 @@ module Smartdown
         Smartdown::Model::Predicate::Function.new(name.to_s, [])
       }
 
-      rule(:comparison_predicate => { varname: simple(:varname), 
+      rule(:comparison_predicate => { varname: simple(:varname),
                                        value: simple(:value),
                                        operator: simple(:operator)
-                                     }) { 
+                                     }) {
         case operator
         when "<="
           Smartdown::Model::Predicate::Comparison::LessOrEqual.new(varname.to_s, value.to_s)

data/lib/smartdown/parser/option_pairs_transform.rb

@@ -0,0 +1,11 @@
+module Smartdown
+  module Parser
+    module OptionPairs
+      def self.transform(option_pairs)
+        Hash[option_pairs.map { |option_pair|
+          option_pair.values.map(&:to_s)
+        }]
+      end
+    end
+  end
+end

data/lib/smartdown/version.rb

@@ -1,3 +1,3 @@
 module Smartdown
-  VERSION = "0.8.1"
+  VERSION = "0.8.2"
 end

data/spec/acceptance/flow_spec.rb

@@ -123,6 +123,10 @@ describe Smartdown::Api::Flow do
         specify { expect(flow.state("y",["lion", "no", "no"]).accepted_responses).to eq ["lion", "no", "no"] }
         specify { expect(flow.state("y",["lion", "no", "no"]).current_answers).to eq [] }
       end
+
+      context "with aliased identifier overwritten with later answer" do
+        specify { expect(flow.state("y",["bulldog", "lion", "no", "no"]).current_node.name).to eq "outcome_untrained_with_lions" }
+      end
     end
   end
 

data/spec/engine/conditional_resolver_spec.rb

@@ -57,4 +57,86 @@ describe Smartdown::Engine::ConditionalResolver do
       end
     end
   end
+  context "a node with nested conditionals" do
+    let(:node) {
+      model_builder.node("outcome_no_visa_needed") do
+        conditional do
+          named_predicate "pred1?"
+          true_case do
+            paragraph("True case")
+          end
+          false_case do
+            conditional do
+              named_predicate "pred2?"
+              true_case do
+                paragraph("False True case")
+              end
+            end
+          end
+        end
+      end
+    }
+
+    context "first pred is true" do
+      let(:state) {
+        Smartdown::Engine::State.new(
+          current_node: node.name,
+          pred1?: true,
+          pred2?: "Doesn't matter"
+        )
+      }
+
+      let(:expected_node_after_presentation) {
+        model_builder.node("outcome_no_visa_needed") do
+          paragraph("True case")
+        end
+      }
+
+      it "should resolve the conditional and preserve the 'True case' paragraph block" do
+        expect(conditional_resolver.call(node, state)).to eq(expected_node_after_presentation)
+      end
+    end
+
+
+    context "first pred is false" do
+      context "second pred is true" do
+        let(:state) {
+          Smartdown::Engine::State.new(
+            current_node: node.name,
+            pred1?: false,
+            pred2?: true
+          )
+        }
+
+        let(:expected_node_after_presentation) {
+          model_builder.node("outcome_no_visa_needed") do
+            paragraph("False True case")
+          end
+        }
+
+        it "should resolve the conditional and preserve the 'True case' paragraph block" do
+          expect(conditional_resolver.call(node, state)).to eq(expected_node_after_presentation)
+        end
+      end
+
+      context "second pred is false" do
+        let(:state) {
+          Smartdown::Engine::State.new(
+            current_node: node.name,
+            pred1?: false,
+            pred2?: false
+          )
+        }
+
+        let(:expected_node_after_presentation) {
+          model_builder.node("outcome_no_visa_needed") do
+          end
+        }
+
+        it "should resolve the conditional and resolve no false case to be empty" do
+          expect(conditional_resolver.call(node, state)).to eq(expected_node_after_presentation)
+        end
+      end
+    end
+  end
 end

data/spec/engine_spec.rb

@@ -24,7 +24,8 @@ describe Smartdown::Engine do
                 greek: "Greek",
                 british: "British",
                 usa: "USA"
-            }
+            },
+            "passport_type?"
         )
         next_node_rules do
           rule do
@@ -181,6 +182,10 @@ describe Smartdown::Engine do
         it "has recorded input" do
           expect(subject.get("what_passport_do_you_have?")).to eq("greek")
         end
+
+        it "recorded input is accessiable via question alias" do
+          expect(subject.get("passport_type?")).to eq("greek")
+        end
       end
 
       context "USA passport" do

data/spec/fixtures/acceptance/animal-example-multiple/questions/question_1.txt

@@ -4,12 +4,14 @@
 
 Text before the options.
 
-[choice: question_1]
+[choice: question_1, alias: type_of_feline]
 * lion: Lion
 * tiger: Tiger
 * cat: Cat
+* bulldog: Bulldog
 
 This is an optional note after question.
 
+* type_of_feline is 'bulldog' => question_4
 * question_1 in {lion tiger} => question_2
 * otherwise => outcome_safe_pet

data/spec/fixtures/acceptance/animal-example-multiple/questions/question_2.txt

@@ -17,7 +17,7 @@ Think very carefully again.
 * maybe: I've been to a zoo once
 * no: No
 
-* question_1 is 'lion'
+* type_of_feline is 'lion'
   * trained_for_lions is 'yes' => question_3
   * otherwise => outcome_untrained_with_lions
 * otherwise

data/spec/fixtures/acceptance/animal-example-multiple/questions/question_4.txt

@@ -0,0 +1,10 @@
+# That's not a cat!!
+
+# Which cat do you actually have you
+
+[choice: question_1, alias: type_of_feline]
+* lion: Lion
+* tiger: Tiger
+* cat: Cat
+
+* type_of_feline in {lion tiger cat} => question_2

data/spec/parser/element/conditional_spec.rb

@@ -102,7 +102,6 @@ SOURCE
         }
       end
     end
-  end
 
   context "simple IF-ELSE" do
     let(:source) { <<-SOURCE
@@ -150,5 +149,185 @@ SOURCE
     end
   end
 
+  context "simple ELSE-IF" do
+    let(:source) { <<-SOURCE
+$IF pred1?
+
+#{true1_body}
+
+$ELSEIF pred2?
+
+#{true2_body}
+
+$ENDIF
+SOURCE
+    }
+
+    context "with one-line true case" do
+      let(:true1_body) { "Text if first predicate is true" }
+      let(:true2_body) { "Text if first predicate is false and the second is true" }
+
+
+      it {
+        should parse(source).as(
+          conditional: {
+            predicate: {named_predicate: "pred1?"},
+            true_case: [{p: "#{true1_body}\n"}],
+            false_case: [{conditional: {
+              predicate: {named_predicate: "pred2?"},
+              true_case: [{p: "#{true2_body}\n"}],
+            }}]
+          }
+        )
+      }
+
+        describe "transformed" do
+          subject(:transformed) {
+            Smartdown::Parser::NodeInterpreter.new(node_name, source, parser: parser).interpret
+          }
+
+          it {
+            should eq(
+              Smartdown::Model::Element::Conditional.new(
+                Smartdown::Model::Predicate::Named.new("pred1?"),
+                [Smartdown::Model::Element::MarkdownParagraph.new(true1_body + "\n")],
+                [Smartdown::Model::Element::Conditional.new(
+                  Smartdown::Model::Predicate::Named.new("pred2?"),
+                  [Smartdown::Model::Element::MarkdownParagraph.new(true2_body + "\n")]
+                )]
+              )
+            )
+          }
+        end
+      end
+    end
+  end
+
+  context "double ELSE-IF" do
+    let(:source) { <<-SOURCE
+$IF pred1?
+
+#{true1_body}
+
+$ELSEIF pred2?
+
+#{true2_body}
+
+$ELSEIF pred3?
+
+#{true3_body}
+
+$ENDIF
+SOURCE
+    }
+
+    context "with one-line true case" do
+      let(:true1_body) { "Text if first predicate is true" }
+      let(:true2_body) { "Text if first predicate is false and the second is true" }
+      let(:true3_body) { "Text if first and second predicates are false and the third is true" }
+
+      it {
+        should parse(source).as(
+          conditional: {
+            predicate: {named_predicate: "pred1?"},
+            true_case: [{p: "#{true1_body}\n"}],
+            false_case: [{conditional: {
+              predicate: {named_predicate: "pred2?"},
+              true_case: [{p: "#{true2_body}\n"}],
+              false_case: [{conditional: {
+                predicate: {named_predicate: "pred3?"},
+                true_case: [{p: "#{true3_body}\n"}],
+              }}]
+            }}]
+          }
+        )
+      }
+
+      describe "transformed" do
+        subject(:transformed) {
+          Smartdown::Parser::NodeInterpreter.new(node_name, source, parser: parser).interpret
+        }
+
+        it {
+          should eq(
+            Smartdown::Model::Element::Conditional.new(
+              Smartdown::Model::Predicate::Named.new("pred1?"),
+              [Smartdown::Model::Element::MarkdownParagraph.new(true1_body + "\n")],
+              [Smartdown::Model::Element::Conditional.new(
+                Smartdown::Model::Predicate::Named.new("pred2?"),
+                [Smartdown::Model::Element::MarkdownParagraph.new(true2_body + "\n")],
+                  [Smartdown::Model::Element::Conditional.new(
+                    Smartdown::Model::Predicate::Named.new("pred3?"),
+                    [Smartdown::Model::Element::MarkdownParagraph.new(true3_body + "\n")]
+                  )]
+              )]
+            )
+          )
+        }
+      end
+    end
+  end
+
+  context "ELSE-IF with an ELSE" do
+    let(:source) { <<-SOURCE
+$IF pred1?
+
+#{true1_body}
+
+$ELSEIF pred2?
+
+#{true2_body}
+
+$ELSE
+
+#{false_body}
+
+$ENDIF
+SOURCE
+    }
+
+    context "with one-line true case" do
+      let(:true1_body) { "Text if first predicate is true" }
+      let(:true2_body) { "Text if first predicate is false and the second is true" }
+      let(:false_body) { "Text both predicates are false" }
+
+
+      it {
+        should parse(source).as(
+          conditional: {
+            predicate: {named_predicate: "pred1?"},
+            true_case: [{p: "#{true1_body}\n"}],
+            false_case: [{conditional: {
+              predicate: {named_predicate: "pred2?"},
+              true_case: [{p: "#{true2_body}\n"}],
+              false_case: [{p: "#{false_body}\n"}]
+            }}]
+          }
+        )
+      }
+
+
+      describe "transformed" do
+        subject(:transformed) {
+          Smartdown::Parser::NodeInterpreter.new(node_name, source, parser: parser).interpret
+        }
+
+        it {
+          should eq(
+            Smartdown::Model::Element::Conditional.new(
+              Smartdown::Model::Predicate::Named.new("pred1?"),
+              [Smartdown::Model::Element::MarkdownParagraph.new(true1_body + "\n")],
+              [Smartdown::Model::Element::Conditional.new(
+                Smartdown::Model::Predicate::Named.new("pred2?"),
+                [Smartdown::Model::Element::MarkdownParagraph.new(true2_body + "\n")],
+                [Smartdown::Model::Element::MarkdownParagraph.new(false_body + "\n")]
+              )]
+            )
+          )
+        }
+      end
+
+    end
+  end
 end
 

data/spec/parser/element/date_question_spec.rb

@@ -12,6 +12,7 @@ describe Smartdown::Parser::Element::DateQuestion do
       should parse(source).as(
         date: {
           identifier: "date_of_birth",
+          option_pairs: [],
         }
       )
     end
@@ -25,4 +26,31 @@ describe Smartdown::Parser::Element::DateQuestion do
       it { should eq(Smartdown::Model::Element::Question::Date.new("date_of_birth")) }
     end
   end
+
+  context "with question tag and an alias" do
+    let(:source) { "[date: date_of_birth, alias: date_for_adoption_or_birth]" }
+
+    it "parses" do
+      should parse(source).as(
+        date: {
+          identifier: "date_of_birth",
+          option_pairs: [
+            {
+              key: 'alias',
+              value: 'date_for_adoption_or_birth',
+            }
+          ]
+        }
+      )
+    end
+
+    describe "transformed" do
+      let(:node_name) { "my_node" }
+      subject(:transformed) {
+        Smartdown::Parser::NodeInterpreter.new(node_name, source, parser: parser).interpret
+      }
+
+      it { should eq(Smartdown::Model::Element::Question::Date.new("date_of_birth", "date_for_adoption_or_birth")) }
+    end
+  end
 end

data/spec/parser/element/multiple_choice_question_spec.rb

@@ -21,7 +21,8 @@ describe Smartdown::Parser::Element::MultipleChoiceQuestion do
           options: [
             {value: "yes", label: "Yes"},
             {value: "no", label: "No"}
-          ]
+          ],
+          option_pairs: [],
         }
       )
     end
@@ -36,6 +37,43 @@ describe Smartdown::Parser::Element::MultipleChoiceQuestion do
     end
   end
 
+  context "with question tag and alias" do
+    let(:source) {
+      [
+        "[choice: yes_or_no, alias: no_or_yes]",
+        "* yes: Yes",
+        "* no: No"
+      ].join("\n")
+    }
+
+    it "parses" do
+      should parse(source).as(
+        multiple_choice: {
+          identifier: "yes_or_no",
+          options: [
+            {value: "yes", label: "Yes"},
+            {value: "no", label: "No"},
+          ],
+          option_pairs: [
+            {
+              key: 'alias',
+              value: 'no_or_yes',
+            }
+          ],
+        }
+      )
+    end
+
+    describe "transformed" do
+      let(:node_name) { "my_node" }
+      subject(:transformed) {
+        Smartdown::Parser::NodeInterpreter.new(node_name, source, parser: parser).interpret
+      }
+
+      it { should eq(Smartdown::Model::Element::Question::MultipleChoice.new("yes_or_no", {"yes"=>"Yes", "no"=>"No"}, "no_or_yes")) }
+    end
+  end
+
   context "without question tag" do
     let(:source) {
       [

data/spec/parser/element/salary_question_spec.rb

@@ -10,10 +10,11 @@ describe Smartdown::Parser::Element::SalaryQuestion do
 
     it "parses" do
       should parse(source).as(
-                 salary: {
-                     identifier: "mother_salary",
-                 }
-             )
+        salary: {
+          identifier: "mother_salary",
+          option_pairs:[],
+        }
+      )
     end
 
     describe "transformed" do
@@ -25,4 +26,32 @@ describe Smartdown::Parser::Element::SalaryQuestion do
       it { should eq(Smartdown::Model::Element::Question::Salary.new("mother_salary")) }
     end
   end
+
+  context "with question tag and alias" do
+    let(:source) { "[salary: mother_salary, alias: mums_salary]" }
+
+    it "parses" do
+      should parse(source).as(
+        salary: {
+          identifier: "mother_salary",
+          option_pairs: [
+            {
+              key: 'alias',
+              value: 'mums_salary',
+            }
+          ]
+        }
+      )
+    end
+
+    describe "transformed" do
+      let(:node_name) { "my_node" }
+      subject(:transformed) {
+        Smartdown::Parser::NodeInterpreter.new(node_name, source, parser: parser).interpret
+      }
+
+      it { should eq(Smartdown::Model::Element::Question::Salary.new("mother_salary", "mums_salary")) }
+    end
+  end
+
 end

data/spec/parser/element/text_question_spec.rb

@@ -10,10 +10,11 @@ describe Smartdown::Parser::Element::TextQuestion do
 
     it "parses" do
       should parse(source).as(
-                 text: {
-                     identifier: "hometown",
-                 }
-             )
+        text: {
+          identifier: "hometown",
+          option_pairs: [],
+        },
+      )
     end
 
     describe "transformed" do
@@ -25,4 +26,32 @@ describe Smartdown::Parser::Element::TextQuestion do
       it { should eq(Smartdown::Model::Element::Question::Text.new("hometown")) }
     end
   end
+
+  context "with question tag and alias" do
+    let(:source) { "[text: hometown, alias: birthplace]" }
+
+    it "parses" do
+      should parse(source).as(
+        text: {
+          identifier: "hometown",
+          option_pairs:[
+            {
+              key: 'alias',
+              value: 'birthplace',
+            }
+          ]
+        }
+      )
+    end
+
+    describe "transformed" do
+      let(:node_name) { "my_node" }
+      subject(:transformed) {
+        Smartdown::Parser::NodeInterpreter.new(node_name, source, parser: parser).interpret
+      }
+
+      it { should eq(Smartdown::Model::Element::Question::Text.new("hometown", "birthplace")) }
+    end
+  end
+
 end

data/spec/parser/node_parser_spec.rb

@@ -75,7 +75,8 @@ SOURCE
             options: [
               {value: "yes", label: "Yes"},
               {value: "no", label: "No"}
-            ]}
+            ],
+            option_pairs: []}
           }
         ]
       })
@@ -106,7 +107,8 @@ SOURCE
             options: [
               {value: "yes", label: "Yes"},
               {value: "no", label: "No"}
-            ]}
+            ],
+            option_pairs: []}
           },
           {h1: "Next node rules"},
           {next_node_rules: [{rule: {predicate: {named_predicate: "pred1?"}, outcome: "outcome"}}]}

data/spec/parser/option_pairs_transform_spec.rb

@@ -0,0 +1,36 @@
+require 'smartdown/parser/option_pairs_transform'
+
+describe Smartdown::Parser::OptionPairs do
+  describe '.transform' do
+    subject(:transform) { Smartdown::Parser::OptionPairs.transform(input) }
+
+    context 'blank array' do
+      let(:input) { [] }
+      it 'returns empty hash' do
+        expect(transform).to eql({})
+      end
+    end
+
+    context 'single array of option pairs hash passed' do
+      let(:input) { [{key: 'dog', value: 'woof'}] }
+      it 'returns hash containing key value pairs' do
+        expect(transform).to eql({'dog' => 'woof'})
+      end
+    end
+
+    context 'single array of option pairs hash passed' do
+      let(:input) { [{key: 'dog', value: 'woof'}, {key: 'cat', value: 'meow'}] }
+      it 'returns hash containing key value pairs' do
+        expect(transform).to eql({'dog' => 'woof', 'cat' => 'meow'})
+      end
+    end
+
+    context 'single array of option pairs hash passed value not string' do
+      let(:input) { [{key: 'number', value: 1}] }
+      it 'returns hash containing key value pairs calling after calling .to_s' do
+        expect(transform).to eql({'number' => '1'})
+      end
+    end
+
+  end
+end

data/spec/support/model_builder.rb

@@ -53,10 +53,10 @@ class ModelBuilder
     @elements.last
   end
 
-  def multiple_choice(name, options)
+  def multiple_choice(name, options, question_alias=nil)
     @elements ||= []
     options_with_string_keys = ::Hash[options.map {|k,v| [k.to_s, v]}]
-    @elements << Smartdown::Model::Element::Question::MultipleChoice.new(name, options_with_string_keys)
+    @elements << Smartdown::Model::Element::Question::MultipleChoice.new(name, options_with_string_keys, question_alias)
     @elements.last
   end
 
@@ -81,52 +81,46 @@ class ModelBuilder
   end
 
   def rule(predicate = nil, outcome = nil, &block)
-    @predicate = predicate
-    @outcome = outcome
+    @predicate = [predicate].compact
+    @outcome = [outcome].compact
     @rules ||= []
     instance_eval(&block) if block_given?
-    @rules << Smartdown::Model::Rule.new(@predicate, @outcome)
+    @rules << Smartdown::Model::Rule.new(@predicate.pop, @outcome.pop)
     @rules.last
   end
 
   def conditional(&block)
-    @predicate = nil
-    @true_case = nil
-    @false_case = nil
+    @predicate ||= []
+    @true_case ||= []
+    @false_case ||= []
     @elements ||= []
     instance_eval(&block) if block_given?
-    @elements << Smartdown::Model::Element::Conditional.new(@predicate, @true_case, @false_case)
+    @elements << Smartdown::Model::Element::Conditional.new(@predicate.pop, [@true_case.pop], [@false_case.pop])
     @elements.last
   end
 
   def true_case(&block)
-    @outer_elements = @elements
-    @elements = []
     instance_eval(&block) if block_given?
-    @true_case = @elements
-    @elements = @outer_elements
-    @true_case
+    @true_case << @elements.pop
+    @true_case.last
   end
 
   def false_case(&block)
-    @outer_elements = @elements
-    @elements = []
     instance_eval(&block) if block_given?
-    @false_case = @elements
-    @elements = @outer_elements
-    @false_case
+    @false_case << @elements.pop
+    @false_case.last
   end
 
   def named_predicate(name)
-    @predicate = Smartdown::Model::Predicate::Named.new(name)
+    @predicate << Smartdown::Model::Predicate::Named.new(name)
   end
 
   def set_membership_predicate(varname, values)
-    @predicate = Smartdown::Model::Predicate::SetMembership.new(varname, values)
+    @predicate << Smartdown::Model::Predicate::SetMembership.new(varname, values)
   end
 
   def outcome(name)
-    @outcome = name
+    @outcome << name
   end
 
   module DSL

data/spec/support_specs/model_builder_spec.rb

@@ -15,7 +15,7 @@ describe ModelBuilder do
     let(:node2) {
       Smartdown::Model::Node.new("what_passport_do_you_have?", [
         Smartdown::Model::Element::MarkdownHeading.new("What passport do you have?"),
-        Smartdown::Model::Element::Question::MultipleChoice.new("what_passport_do_you_have?", {"greek" => "Greek", "british" => "British"}),
+        Smartdown::Model::Element::Question::MultipleChoice.new("what_passport_do_you_have?", {"greek" => "Greek", "british" => "British"}, "passport_type?"),
         Smartdown::Model::NextNodeRules.new([
           Smartdown::Model::Rule.new(
             Smartdown::Model::Predicate::Named.new("eea_passport?"),
@@ -44,7 +44,8 @@ describe ModelBuilder do
             {
               greek: "Greek",
               british: "British"
-            }
+            },
+            "passport_type?"
           )
           next_node_rules do
             rule do
@@ -89,6 +90,42 @@ describe ModelBuilder do
     it "builds a conditional" do
       should eq(expected)
     end
+
+    context "nested conditionals" do
+      let(:expected) {
+        Smartdown::Model::Element::Conditional.new(
+          Smartdown::Model::Predicate::Named.new("pred1?"),
+          [Smartdown::Model::Element::MarkdownParagraph.new("True case")],
+          [Smartdown::Model::Element::Conditional.new(
+            Smartdown::Model::Predicate::Named.new("pred2?"),
+            [Smartdown::Model::Element::MarkdownParagraph.new("False True case")],
+            [Smartdown::Model::Element::MarkdownParagraph.new("False False case")]
+          )]
+        )
+      }
+
+      subject(:model) {
+        builder.conditional do
+          named_predicate "pred1?"
+          true_case do
+            paragraph("True case")
+          end
+          false_case do
+            conditional do
+              named_predicate "pred2?"
+              true_case do
+                paragraph("False True case")
+              end
+              false_case do
+                paragraph("False False case")
+              end
+            end
+          end
+        end
+      }
+
+      it { should eq(expected) }
+    end
   end
 
   describe "#rule" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smartdown
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2014-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet
-  requirement: &15145500 !ruby/object:Gem::Requirement
+  requirement: &5594140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.6.1
   type: :runtime
   prerelease: false
-  version_requirements: *15145500
+  version_requirements: *5594140
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &15144780 !ruby/object:Gem::Requirement
+  requirement: &5593360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 3.0.0
   type: :development
   prerelease: false
-  version_requirements: *15144780
+  version_requirements: *5593360
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &15144020 !ruby/object:Gem::Requirement
+  requirement: &5592880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15144020
+  version_requirements: *5592880
 - !ruby/object:Gem::Dependency
   name: gem_publisher
-  requirement: &15143120 !ruby/object:Gem::Requirement
+  requirement: &5592080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15143120
+  version_requirements: *5592080
 description: 
 email: david.heath@digital.cabinet-office.gov.uk
 executables:
@@ -85,6 +85,7 @@ files:
 - lib/smartdown/parser/element/markdown_heading.rb
 - lib/smartdown/parser/element/text_question.rb
 - lib/smartdown/parser/flow_interpreter.rb
+- lib/smartdown/parser/option_pairs_transform.rb
 - lib/smartdown/api/date_question.rb
 - lib/smartdown/api/coversheet.rb
 - lib/smartdown/api/question.rb
@@ -163,6 +164,7 @@ files:
 - spec/parser/element/front_matter_spec.rb
 - spec/parser/element/salary_question_spec.rb
 - spec/parser/element/text_question_spec.rb
+- spec/parser/option_pairs_transform_spec.rb
 - spec/parser/node_parser_spec.rb
 - spec/parser/snippet_pre_parser_spec.rb
 - spec/support/flow_input_interface.rb
@@ -204,6 +206,7 @@ files:
 - spec/fixtures/acceptance/animal-example-multiple/questions/question_3.txt
 - spec/fixtures/acceptance/animal-example-multiple/questions/question_1.txt
 - spec/fixtures/acceptance/animal-example-multiple/questions/question_2.txt
+- spec/fixtures/acceptance/animal-example-multiple/questions/question_4.txt
 - spec/fixtures/acceptance/cover-sheet/cover-sheet.txt
 - spec/fixtures/acceptance/one-question/one-question.txt
 - spec/fixtures/acceptance/one-question/questions/q1.txt
@@ -242,7 +245,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1564980358341002898
+      hash: -1665618218665725274
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -251,7 +254,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1564980358341002898
+      hash: -1665618218665725274
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.11
@@ -278,6 +281,7 @@ test_files:
 - spec/parser/element/front_matter_spec.rb
 - spec/parser/element/salary_question_spec.rb
 - spec/parser/element/text_question_spec.rb
+- spec/parser/option_pairs_transform_spec.rb
 - spec/parser/node_parser_spec.rb
 - spec/parser/snippet_pre_parser_spec.rb
 - spec/support/flow_input_interface.rb
@@ -319,6 +323,7 @@ test_files:
 - spec/fixtures/acceptance/animal-example-multiple/questions/question_3.txt
 - spec/fixtures/acceptance/animal-example-multiple/questions/question_1.txt
 - spec/fixtures/acceptance/animal-example-multiple/questions/question_2.txt
+- spec/fixtures/acceptance/animal-example-multiple/questions/question_4.txt
 - spec/fixtures/acceptance/cover-sheet/cover-sheet.txt
 - spec/fixtures/acceptance/one-question/one-question.txt
 - spec/fixtures/acceptance/one-question/questions/q1.txt