smartdown 0.0.2 → 0.0.3

data/README.md

@@ -78,15 +78,16 @@ question type.
 
 The next sections define the various question types
 
-### Multiple choice
+### Radio buttons
 
 ```markdown
-# Will you pass through UK Border Control?
+## Will you pass through UK Border Control?
 
 You might pass through UK Border Control even if you don't leave the airport -
 eg your bags aren't checked through and you need to collect them before transferring
 to your outbound flight.
 
+[choice: uk_border_control]
 * yes: Yes
 * no: No
 ```
@@ -94,28 +95,33 @@ to your outbound flight.
 ### Country (tbd)
 
 ```markdown
-# What passport do you have?
+## What passport do you have?
 
-[country]
+[country: passport_country]
 ```
 
 Presents a drop-down list of countries from the built-in list.
 
 Use front matter to exclude/include countries
 
-```
-exclude_countries: country1, country2
-include_countries: {country3: "Country 3", country4: "Country 4"}
+```markdown
+---
+passport_country: 
+  exclude_countries: country1, country2
+  include_countries: {country3: "Country 3", country4: "Country 4"}
+---
 
-[country]
+## What passport do you have?
+
+[country: passport_country]
 ```
 
 ### Date (tbd)
 
 ```markdown
-# What is the baby’s due date?
+## What is the baby’s due date?
 
-[d/m/y: -1...+1]
+[date: baby_due_date]
 ```
 
 Asks for a specific date in the given range. Ranges can be expressed as a relative number of years or absolute dates in YYYY-MM-DD format.
@@ -139,7 +145,7 @@ Asks for a numerical input which can have decimals and optional thousand-separat
 ### Salary (tbd)
 
 ```markdown
-[salary]
+[salary: salary_value]
 ```
 
 Asks for salary which can be expressed as either a weekly or monthly money amount. The user chooses between weekly/monthly
@@ -147,8 +153,9 @@ Asks for salary which can be expressed as either a weekly or monthly money amoun
 ### Checkbox (tbd)
 
 ```markdown
-# Will you pass through UK Border Control?
+## Will you pass through UK Border Control?
 
+[checkbox: uk_border_control]
 * [ ] yes: Yes
 * [ ] no: No
 ```
@@ -184,6 +191,13 @@ variable_name is 'string'
 variable_name in {this that the-other}
 ```
 
+### Date comparison predicates
+
+```
+date_variable_name >= '14/07/2014'
+date_variable_name < '14/07/2014'
+```
+
 ## Conditional blocks in outcomes (tbd)
 
 ## Processing model

data/bin/smartdown

@@ -17,6 +17,7 @@ if ARGV.size == 0
 else
   coversheet_path, *responses = ARGV
   begin
+    #TODO: use same object as smartdown-frontend will be using here
     input = Smartdown::Parser::DirectoryInput.new(coversheet_path)
     flow = Smartdown::Parser::FlowInterpreter.new(input).interpret
     engine = Smartdown::Engine.new(flow)
@@ -24,7 +25,7 @@ else
 
     puts "RESPONSES: " + end_state.get(:responses).join(" / ")
     puts "PATH: " + (end_state.get(:path) + [end_state.get(:current_node)]).join(" -> ")
-    node = flow.node(end_state.get(:current_node))
+    node = engine.evaluate_node(end_state)
     puts "# #{node.title}\n\n"
     node.questions.each do |q|
       pp q.choices

data/lib/smartdown/engine/node_presenter.rb

@@ -0,0 +1,38 @@
+require 'smartdown/engine/predicate_evaluator'
+
+module Smartdown
+  class Engine
+    class NodePresenter
+      def initialize(predicate_evaluator = nil)
+        @predicate_evaluator = predicate_evaluator || PredicateEvaluator.new
+      end
+
+      def present(node, state)
+        node.dup.tap do |new_node|
+          new_node.elements = resolve_conditionals(node.elements, state)
+        end
+      end
+
+    private
+      attr_accessor :predicate_evaluator
+
+      def evaluate(conditional, state)
+        if predicate_evaluator.evaluate(conditional.predicate, state)
+          conditional.true_case
+        else
+          conditional.false_case
+        end
+      end
+
+      def resolve_conditionals(elements, state)
+        elements.map do |element|
+          if element.is_a?(Smartdown::Model::Element::Conditional)
+            evaluate(element, state)
+          else
+            element
+          end
+        end.flatten
+      end
+    end
+  end
+end

data/lib/smartdown/engine.rb

@@ -1,5 +1,6 @@
 require 'smartdown/engine/transition'
 require 'smartdown/engine/state'
+require 'smartdown/engine/node_presenter'
 
 module Smartdown
   class Engine
@@ -29,5 +30,10 @@ module Smartdown
         Transition.new(state, current_node, input).next_state
       end
     end
+
+    def evaluate_node(state)
+      current_node = flow.node(state.get(:current_node))
+      NodePresenter.new.present(current_node, state)
+    end
   end
 end

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

@@ -0,0 +1,7 @@
+module Smartdown
+  module Model
+    module Element
+      Conditional = Struct.new(:predicate, :true_case, :false_case)
+    end
+  end
+end

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

@@ -0,0 +1,37 @@
+require 'smartdown/parser/base'
+require 'smartdown/parser/node_parser'
+require 'smartdown/parser/predicates'
+
+module Smartdown
+  module Parser
+    module Element
+      class Conditional < Base
+        rule(:markdown_block_inside_conditional) {
+          str("$").absent? >> NodeParser.new.markdown_block
+        }
+
+        rule(:markdown_blocks_inside_conditional) {
+          markdown_block_inside_conditional.repeat(1,1) >> (newline.repeat(1) >> markdown_block_inside_conditional).repeat
+        }
+
+        rule(:else_clause) {
+          str("$ELSE") >> optional_space >> newline.repeat(2) >>
+            (markdown_blocks_inside_conditional.as(:false_case) >> newline).maybe
+        }
+
+        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 >>
+              str("$ENDIF") >> optional_space >> line_ending
+          ).as(:conditional)
+        }
+
+        root(:conditional_clause)
+      end
+    end
+  end
+end

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

@@ -4,6 +4,16 @@ module Smartdown
   module Parser
     module Element
       class MultipleChoiceQuestion < Base
+        rule(:multiple_choice_question_tag) {
+          str("[choice:") >>
+            optional_space >>
+            question_identifier.as(:identifier) >>
+            optional_space >>
+            str("]") >>
+            optional_space >>
+            line_ending
+        }
+
         rule(:option_definition_line) {
           bullet >>
             optional_space >>
@@ -15,7 +25,10 @@ module Smartdown
         }
 
         rule(:multiple_choice_question) {
-          (option_definition_line >> line_ending).repeat(1).as(:multiple_choice)
+          (
+            multiple_choice_question_tag >>
+            (option_definition_line >> line_ending).repeat(1).as(:options)
+          ).as(:multiple_choice)
         }
         root(:multiple_choice_question)
       end

data/lib/smartdown/parser/node_parser.rb

@@ -5,12 +5,14 @@ require 'smartdown/parser/element/start_button'
 require 'smartdown/parser/element/multiple_choice_question'
 require 'smartdown/parser/element/markdown_heading'
 require 'smartdown/parser/element/markdown_paragraph'
+require 'smartdown/parser/element/conditional'
 
 module Smartdown
   module Parser
     class NodeParser < Base
       rule(:markdown_block) {
-        Element::MarkdownHeading.new |
+        Element::Conditional.new |
+          Element::MarkdownHeading.new |
           Element::MultipleChoiceQuestion.new |
           Rules.new |
           Element::StartButton.new |
@@ -18,7 +20,7 @@ module Smartdown
       }
 
       rule(:markdown_blocks) {
-        markdown_block >> (newline.repeat(1) >> markdown_block).repeat
+        markdown_block.repeat(1, 1) >> (newline.repeat(1) >> markdown_block).repeat
       }
 
       rule(:body) {

data/lib/smartdown/parser/node_transform.rb

@@ -8,6 +8,7 @@ require 'smartdown/model/element/multiple_choice'
 require 'smartdown/model/element/start_button'
 require 'smartdown/model/element/markdown_heading'
 require 'smartdown/model/element/markdown_paragraph'
+require 'smartdown/model/element/conditional'
 require 'smartdown/model/predicate/equality'
 require 'smartdown/model/predicate/set_membership'
 require 'smartdown/model/predicate/named'
@@ -49,12 +50,34 @@ module Smartdown
         [value.to_s, label.to_s]
       }
 
-      rule(:multiple_choice => subtree(:choices)) {
+      rule(:multiple_choice => {identifier: simple(:identifier), options: subtree(:choices)}) {
         Smartdown::Model::Element::MultipleChoice.new(
-          node_name, Hash[choices]
+          identifier, Hash[choices]
         )
       }
 
+      # Conditional with no content in true-case
+      rule(:conditional => {:predicate => subtree(:predicate)}) {
+        Smartdown::Model::Element::Conditional.new(predicate)
+      }
+
+      # Conditional with content in true-case
+      rule(:conditional => {
+             :predicate => subtree(:predicate),
+             :true_case => subtree(:true_case)
+           }) {
+        Smartdown::Model::Element::Conditional.new(predicate, true_case)
+      }
+
+      # Conditional with content in both true-case and false-case
+      rule(:conditional => {
+             :predicate => subtree(:predicate),
+             :true_case => subtree(:true_case),
+             :false_case => subtree(:false_case)
+           }) {
+        Smartdown::Model::Element::Conditional.new(predicate, true_case, false_case)
+      }
+
       rule(:equality_predicate => { varname: simple(:varname), expected_value: simple(:expected_value) }) {
         Smartdown::Model::Predicate::Equality.new(varname, expected_value)
       }

data/lib/smartdown/version.rb

@@ -1,3 +1,3 @@
 module Smartdown
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/engine/node_presenter_spec.rb

@@ -0,0 +1,60 @@
+require 'smartdown/engine/node_presenter'
+require 'smartdown/engine/state'
+
+describe Smartdown::Engine::NodePresenter do
+  subject(:node_presenter) { described_class.new }
+
+  context "a node with a conditional" do
+    let(:node) {
+      model_builder.node("outcome_no_visa_needed") do
+        conditional do
+          named_predicate "pred?"
+          true_case do
+            paragraph("True case")
+          end
+          false_case do
+            paragraph("False case")
+          end
+        end
+      end
+    }
+
+    context "pred is true" do
+      let(:state) {
+        Smartdown::Engine::State.new(
+          current_node: node.name,
+          pred?: true
+        )
+      }
+
+      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(node_presenter.present(node, state)).to eq(expected_node_after_presentation)
+      end
+    end
+
+    context "pred is false" do
+      let(:state) {
+        Smartdown::Engine::State.new(
+          current_node: node.name,
+          pred?: false
+        )
+      }
+
+      let(:expected_node_after_presentation) {
+        model_builder.node("outcome_no_visa_needed") do
+          paragraph("False case")
+        end
+      }
+
+      it "should resolve the conditional and preserve the 'False case' paragraph block" do
+        expect(node_presenter.present(node, state)).to eq(expected_node_after_presentation)
+      end
+    end
+  end
+end

data/spec/engine/state_spec.rb

@@ -19,7 +19,7 @@ describe Smartdown::Engine::State do
       expect { subject.get(:a) }.to raise_error(Smartdown::Engine::UndefinedValue)
     end
 
-    it "by string or symbol" do
+    it "is indifferent to symbols and strings" do
       expect(subject.get(:current_node)).to eq(:start_state)
       expect(subject.get("current_node")).to eq(:start_state)
     end
@@ -38,7 +38,7 @@ describe Smartdown::Engine::State do
       expect(new_state.get(:a)).to eq 1
     end
 
-    it "by string or symbol" do
+    it "is indifferent to symbols and strings" do
       s2 = subject.put(:b, 1)
       expect(s2.get(:b)).to eq(1)
       expect(s2.get("b")).to eq(1)

data/spec/engine_spec.rb

@@ -29,6 +29,18 @@ describe Smartdown::Engine do
           end
         end
       end
+
+      node("outcome_no_visa_needed") do
+        conditional do
+          named_predicate "pred?"
+          true_case do
+            paragraph("True case")
+          end
+          false_case do
+            paragraph("False case")
+          end
+        end
+      end
     end
   }
 
@@ -47,11 +59,13 @@ describe Smartdown::Engine do
     context "start button response only" do
       let(:responses) { %w{yes} }
 
-      it "is on what_passport_do_you_have?" do
+      it { should be_a(Smartdown::Engine::State) }
+
+      it "current_node of 'what_passport_do_you_have?'" do
         expect(subject.get(:current_node)).to eq("what_passport_do_you_have?")
       end
 
-      it "has recorded input" do
+      it "input recorded in state variable corresponding to node name" do
         expect(subject.get("check-uk-visa")).to eq("yes")
       end
     end
@@ -59,7 +73,7 @@ describe Smartdown::Engine do
     context "greek passport" do
       let(:responses) { %w{yes greek} }
 
-      it "is on what_passport_do_you_have?" do
+      it "is on outcome_no_visa_needed" do
         expect(subject.get(:current_node)).to eq("outcome_no_visa_needed")
       end
 
@@ -76,4 +90,23 @@ describe Smartdown::Engine do
       end
     end
   end
+
+  describe "#evaluate_node" do
+    let(:current_state) {
+      start_state
+        .put(:current_node, "outcome_no_visa_needed")
+        .put(:pred?, true)
+    }
+
+    let(:expected_node_after_conditional_resolution) {
+      model_builder.node("outcome_no_visa_needed") do
+        paragraph("True case")
+      end
+    }
+
+    it "evaluates the current node of the given state, resolving any conditionals" do
+      expect(engine.evaluate_node(current_state)).to eq(expected_node_after_conditional_resolution)
+    end
+  end
+
 end

data/spec/fixtures/acceptance/one-question/questions/q1.txt

@@ -5,5 +5,6 @@ Body text line 1.
 Body text
 para 2.
 
+[choice: q1]
 * yes: Yes
 * no: No

data/spec/fixtures/acceptance/question-and-outcome/questions/q1.txt

@@ -5,5 +5,6 @@ Body text line 1.
 Body text
 para 2.
 
+[choice: q1]
 * yes: Yes
 * no: No

data/spec/parser/element/conditional_spec.rb

@@ -0,0 +1,154 @@
+require 'smartdown/parser/element/conditional'
+require 'smartdown/parser/node_interpreter'
+
+describe Smartdown::Parser::Element::Conditional do
+
+  subject(:parser) { described_class.new }
+  let(:node_name) { "my_node" }
+
+  context "simple IF" do
+    let(:source) { <<-SOURCE
+$IF pred1?
+
+#{true_body}
+
+$ENDIF
+SOURCE
+    }
+
+    context "with one-line true case" do
+      let(:true_body) { "Text if true" }
+
+      it {
+        should parse(source).as(
+          conditional: {
+            predicate: {named_predicate: "pred1?"},
+            true_case: [{p: "#{true_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(true_body + "\n")]
+            )
+          )
+        }
+      end
+
+    end
+
+    context "with multi-line true case" do
+      let(:one_line) { "Text if true" }
+      let(:true_body) { "#{one_line}\n\n#{one_line}" }
+
+      it {
+        should parse(source).as(
+          conditional: {
+            predicate: {named_predicate: "pred1?"},
+            true_case: [{p: "#{one_line}\n"}, {p: "#{one_line}\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(one_line + "\n"),
+                Smartdown::Model::Element::MarkdownParagraph.new(one_line + "\n")
+              ]
+            )
+          )
+        }
+      end
+    end
+
+    context "with empty true case case" do
+      let(:true_body) { "" }
+
+      it {
+        should parse(source).as(
+          conditional: {
+            predicate: {named_predicate: "pred1?"}
+          }
+        )
+      }
+
+      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?")
+            )
+          )
+        }
+      end
+    end
+  end
+
+  context "simple IF-ELSE" do
+    let(:source) { <<-SOURCE
+$IF pred1?
+
+#{true_body}
+
+$ELSE
+
+#{false_body}
+
+$ENDIF
+SOURCE
+    }
+
+    context "with one-line true case" do
+      let(:true_body) { "Text if true" }
+      let(:false_body) { "Text if false" }
+
+      it {
+        should parse(source).as(
+          conditional: {
+            predicate: {named_predicate: "pred1?"},
+            true_case: [{p: "#{true_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(true_body + "\n")],
+              [Smartdown::Model::Element::MarkdownParagraph.new(false_body + "\n")]
+            )
+          )
+        }
+      end
+    end
+  end
+
+end
+

data/spec/parser/element/multiple_choice_question_spec.rb

@@ -4,28 +4,48 @@ require 'smartdown/parser/node_interpreter'
 
 describe Smartdown::Parser::Element::MultipleChoiceQuestion do
   subject(:parser) { described_class.new }
-  let(:source) {
-    [
-      "* yes: Yes",
-      "* no: No"
-    ].join("\n")
-  }
 
-  it "parses" do
-    should parse(source).as(
-      multiple_choice: [
-        {value: "yes", label: "Yes"},
-        {value: "no", label: "No"}
-      ]
-    )
+  context "with question tag" do
+    let(:source) {
+      [
+        "[choice: yes_or_no]",
+        "* 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"}
+          ]
+        }
+      )
+    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::MultipleChoice.new("yes_or_no", {"yes"=>"Yes", "no"=>"No"})) }
+    end
   end
 
-  describe "transformed" do
-    let(:node_name) { "my_node" }
-    subject(:transformed) {
-      Smartdown::Parser::NodeInterpreter.new(node_name, source, parser: parser).interpret
+  context "without question tag" do
+    let(:source) {
+      [
+        "* yes: Yes",
+        "* no: No"
+      ].join("\n")
     }
 
-    it { should eq(Smartdown::Model::Element::MultipleChoice.new(node_name, {"yes"=>"Yes", "no"=>"No"})) }
+    it "is not parsable" do
+      should_not parse(source)
+    end
   end
 end

data/spec/parser/node_parser_spec.rb

@@ -60,6 +60,7 @@ SOURCE
 <<SOURCE
 # This is my title
 
+[choice: my_question]
 * yes: Yes
 * no: No
 SOURCE
@@ -69,10 +70,13 @@ SOURCE
       should parse(source).as({
         body: [
           {h1: "This is my title"},
-          {multiple_choice: [
-            {value: "yes", label: "Yes"},
-            {value: "no", label: "No"}
-          ]}
+          {multiple_choice: {
+            identifier: "my_question",
+            options: [
+              {value: "yes", label: "Yes"},
+              {value: "no", label: "No"}
+            ]}
+          }
         ]
       })
     end
@@ -83,6 +87,7 @@ SOURCE
 <<SOURCE
 # This is my title
 
+[choice: my_question]
 * yes: Yes
 * no: No
 
@@ -96,10 +101,13 @@ SOURCE
       should parse(source).as({
         body: [
           {h1: "This is my title"},
-          {multiple_choice: [
-            {value: "yes", label: "Yes"},
-            {value: "no", label: "No"}
-          ]},
+          {multiple_choice: {
+            identifier: "my_question",
+            options: [
+              {value: "yes", label: "Yes"},
+              {value: "no", label: "No"}
+            ]}
+          },
           {h1: "Next node rules"},
           {next_node_rules: [{rule: {predicate: {named_predicate: "pred1?"}, outcome: "outcome"}}]}
         ]
@@ -115,7 +123,7 @@ SOURCE
       let(:expected_elements) {
         [
           Smartdown::Model::Element::MarkdownHeading.new("This is my title"),
-          Smartdown::Model::Element::MultipleChoice.new(node_name, "yes"=>"Yes", "no"=>"No"),
+          Smartdown::Model::Element::MultipleChoice.new("my_question", "yes"=>"Yes", "no"=>"No"),
           Smartdown::Model::Element::MarkdownHeading.new("Next node rules"),
           Smartdown::Model::NextNodeRules.new([
             Smartdown::Model::Rule.new(Smartdown::Model::Predicate::Named.new("pred1?"), "outcome")
@@ -130,4 +138,32 @@ SOURCE
       it { should eq(expected_node_model) }
     end
   end
+
+  describe "body with conditional" do
+    let(:source) {
+<<SOURCE
+$IF pred1?
+
+Text when true
+
+$ELSE
+
+Text when false
+
+$ENDIF
+SOURCE
+     }
+
+    it {
+      should parse(source).as({
+        body: [
+          {conditional: {
+            predicate: {named_predicate: "pred1?"},
+            true_case: [{p: "Text when true\n"}],
+            false_case: [{p: "Text when false\n"}]
+          }}
+        ]
+      })
+    }
+  end
 end

data/spec/support/model_builder.rb

@@ -4,6 +4,7 @@ require 'smartdown/model/element/markdown_heading'
 require 'smartdown/model/element/markdown_paragraph'
 require 'smartdown/model/element/start_button'
 require 'smartdown/model/element/multiple_choice'
+require 'smartdown/model/element/conditional'
 require 'smartdown/model/next_node_rules'
 require 'smartdown/model/rule'
 require 'smartdown/model/predicate/named'
@@ -67,6 +68,34 @@ class ModelBuilder
     @rules.last
   end
 
+  def conditional(&block)
+    @predicate = nil
+    @true_case = nil
+    @false_case = nil
+    @elements ||= []
+    instance_eval(&block) if block_given?
+    @elements << Smartdown::Model::Element::Conditional.new(@predicate, @true_case, @false_case)
+    @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
+  end
+
+  def false_case(&block)
+    @outer_elements = @elements
+    @elements = []
+    instance_eval(&block) if block_given?
+    @false_case = @elements
+    @elements = @outer_elements
+    @false_case
+  end
+
   def named_predicate(name)
     @predicate = Smartdown::Model::Predicate::Named.new(name)
   end
@@ -76,8 +105,12 @@ class ModelBuilder
   end
 
   module DSL
+    def model_builder
+      ModelBuilder.new
+    end
+
     def build_flow(name, &block)
-      ModelBuilder.new.flow(name, &block)
+      model_builder.flow(name, &block)
     end
   end
 end

data/spec/support_specs/model_builder_spec.rb

@@ -62,6 +62,32 @@ describe ModelBuilder do
     end
   end
 
+  describe "#conditional" do
+    let(:expected) {
+      Smartdown::Model::Element::Conditional.new(
+        Smartdown::Model::Predicate::Named.new("pred?"),
+        [Smartdown::Model::Element::MarkdownParagraph.new("True case")],
+        [Smartdown::Model::Element::MarkdownParagraph.new("False case")]
+      )
+    }
+
+    subject(:model) {
+      builder.conditional do
+        named_predicate "pred?"
+        true_case do
+          paragraph("True case")
+        end
+        false_case do
+          paragraph("False case")
+        end
+      end
+    }
+
+    it "builds a conditional" do
+      should eq(expected)
+    end
+  end
+
   describe "#rule" do
     let(:predicate) { Smartdown::Model::Predicate::Named.new("my_pred") }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smartdown
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -91,6 +91,7 @@ files:
 - lib/smartdown/parser/directory_input.rb
 - lib/smartdown/parser/rules.rb
 - lib/smartdown/parser/node_parser.rb
+- lib/smartdown/parser/element/conditional.rb
 - lib/smartdown/parser/element/markdown_paragraph.rb
 - lib/smartdown/parser/element/start_button.rb
 - lib/smartdown/parser/element/front_matter.rb
@@ -98,6 +99,7 @@ files:
 - lib/smartdown/parser/element/markdown_heading.rb
 - lib/smartdown/parser/flow_interpreter.rb
 - lib/smartdown/version.rb
+- lib/smartdown/engine/node_presenter.rb
 - lib/smartdown/engine/state.rb
 - lib/smartdown/engine/transition.rb
 - lib/smartdown/engine/predicate_evaluator.rb
@@ -108,6 +110,7 @@ files:
 - lib/smartdown/model/predicate/equality.rb
 - lib/smartdown/model/node.rb
 - lib/smartdown/model/front_matter.rb
+- lib/smartdown/model/element/conditional.rb
 - lib/smartdown/model/element/markdown_paragraph.rb
 - lib/smartdown/model/element/start_button.rb
 - lib/smartdown/model/element/markdown_heading.rb
@@ -126,6 +129,7 @@ files:
 - spec/parser/rules_spec.rb
 - spec/parser/predicates_spec.rb
 - spec/parser/element/multiple_choice_question_spec.rb
+- spec/parser/element/conditional_spec.rb
 - spec/parser/element/start_button_parser_spec.rb
 - spec/parser/element/markdown_paragraph_spec.rb
 - spec/parser/element/markdown_heading_spec.rb
@@ -134,6 +138,7 @@ files:
 - spec/support/model_builder.rb
 - spec/spec_helper.rb
 - spec/engine/state_spec.rb
+- spec/engine/node_presenter_spec.rb
 - spec/engine/predicate_evaluator_spec.rb
 - spec/engine/transition_spec.rb
 - spec/fixtures/directory_input/scenarios/s1.txt
@@ -166,7 +171,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3653828789997533623
+      hash: 1408391630094207002
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -175,7 +180,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3653828789997533623
+      hash: 1408391630094207002
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -191,6 +196,7 @@ test_files:
 - spec/parser/rules_spec.rb
 - spec/parser/predicates_spec.rb
 - spec/parser/element/multiple_choice_question_spec.rb
+- spec/parser/element/conditional_spec.rb
 - spec/parser/element/start_button_parser_spec.rb
 - spec/parser/element/markdown_paragraph_spec.rb
 - spec/parser/element/markdown_heading_spec.rb
@@ -199,6 +205,7 @@ test_files:
 - spec/support/model_builder.rb
 - spec/spec_helper.rb
 - spec/engine/state_spec.rb
+- spec/engine/node_presenter_spec.rb
 - spec/engine/predicate_evaluator_spec.rb
 - spec/engine/transition_spec.rb
 - spec/fixtures/directory_input/scenarios/s1.txt