smartdown 0.6.0 → 0.7.0

data/README.md

@@ -10,8 +10,6 @@ The language is designed to look like
 to allow expression of logical rules, questions and conditional blocks of
 text.
 
-It's a work-in-progress so some of the features described in this readme haven't been implemented yet. These are indicated with (tbd).
-
 ## Overview
 
 A single smartdown flow has a cover sheet, a set of questions, a set of
@@ -34,9 +32,9 @@ flow:
    |   |-- medical_y.txt
    |   `-- ...
    |-- scenarios
-   |   |-- 1.test
-   |   |-- 2.test
-   |   `-- 3.test
+   |   |-- 1.txt
+   |   |-- 2.txt
+   |   `-- 3.txt
    |-- questions
    |   |-- planning_to_leave_airport.txt
    |   |-- purpose_of_visit.txt
@@ -108,30 +106,6 @@ to your outbound flight.
 * no: No
 ```
 
-### Country (tbd)
-
-```markdown
-## What passport do you have?
-
-[country: passport_country]
-```
-
-Presents a drop-down list of countries from the built-in list.
-
-Use front matter to exclude/include countries
-
-```markdown
----
-passport_country:
-  exclude_countries: country1, country2
-  include_countries: {country3: "Country 3", country4: "Country 4"}
----
-
-## What passport do you have?
-
-[country: passport_country]
-```
-
 ### Date
 
 ```markdown
@@ -148,30 +122,12 @@ passport_country:
 
 Asks for an arbitrary text input.
 
-### Money (tbd)
-
-```markdown
-[money]
-```
-
-Asks for a numerical input which can have decimals and optional thousand-separating commas.
-
 ### Salary
 
 ```markdown
 [salary: salary_value]
 ```
 
-### Checkbox (tbd)
-
-```markdown
-## Will you pass through UK Border Control?
-
-[checkbox: uk_border_control]
-* [ ] 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.
@@ -305,20 +261,36 @@ More copy...
 Where `snippet_name` is in a `snippets/` directory in the flow root with a `.txt`
 extension, eg `my-flow-name/snippets/my_snippet.txt`.
 
-The contents of `my_snippet` will be inseted into the outcome/question.
+The contents of `my_snippet` will be inserted into the outcome/question.
+
+## Scenarios
+
+Scenarios are meant to be run as test to check that a Smartdown flow behaves
+in a certain way given some input data.
 
-## Named predicates (tbd)
+###Scenario files
 
-Named predicates
+There can be as many scenario files as one wishes, with no restriction on name. Each
+scenario file should contain scenarios written as documented below.
 
-## Plugin API (tbd)
+###Format
 
-A plugin API will be provided to allow more complex calculations to be defined
-in an external ruby class.
+Each scenario is made of:
+* a description (optional)
+* list of questions pages (each question page starts with a -), inside which questions to answers are defined
+* name of the outcome
+
+```
+# Description
+- name_of_q1_p1: answer_to_q1_p1
+- name_of_q1_p2: answer_to_q1_p2
+  name_of_q2_p2: answer_to_q2_p2
+outcome_the_result
+```
 
 ## Software design
 
-The software design can be seen in this diagram:
+The initial plan for software design can be seen in this diagram:
 
 ![Software design](https://raw.githubusercontent.com/alphagov/smartdown/master/doc/design.png)
 

data/lib/smartdown/api/flow.rb

@@ -4,13 +4,18 @@ require 'smartdown/api/state'
 require 'smartdown/api/coversheet'
 require 'smartdown/api/question_page'
 require 'smartdown/api/outcome'
+require 'smartdown/parser/scenario_sets_interpreter'
 
 module Smartdown
   module Api
     class Flow
+
+      attr_reader :scenario_sets
+
       def initialize(smartdown_input, initial_state = {})
         @smartdown_flow = Smartdown::Parser::FlowInterpreter.new(smartdown_input).interpret
         @engine = Smartdown::Engine.new(@smartdown_flow, initial_state)
+        @scenario_sets = Smartdown::Parser::ScenarioSetsInterpreter.new(smartdown_input).interpret
       end
 
       def state(started, responses)

data/lib/smartdown/api/previous_question.rb

@@ -5,19 +5,19 @@ module Smartdown
 
       def_delegators :@question, :title, :options
 
-      attr_reader :response, :question
+      attr_reader :answer, :question
 
       def initialize(elements, response)
-        @response = response
-        if elements.find{|element| element.is_a? Smartdown::Model::Element::Question::MultipleChoice}
+        if element = elements.find{|element| element.is_a? Smartdown::Model::Element::Question::MultipleChoice}
           @question = MultipleChoice.new(elements)
-        elsif elements.find{|element| element.is_a? Smartdown::Model::Element::Question::Date}
+        elsif element = elements.find{|element| element.is_a? Smartdown::Model::Element::Question::Date}
           @question = DateQuestion.new(elements)
-        elsif elements.find{|element| element.is_a? Smartdown::Model::Element::Question::Salary}
+        elsif element = elements.find{|element| element.is_a? Smartdown::Model::Element::Question::Salary}
           @question = SalaryQuestion.new(elements)
-        elsif elements.find{|element| element.is_a? Smartdown::Model::Element::Question::Text}
+        elsif element = elements.find{|element| element.is_a? Smartdown::Model::Element::Question::Text}
           @question = TextQuestion.new(elements)
         end
+        @answer = element.answer_type.new(response, element) if element
       end
 
     end

data/lib/smartdown/api/previous_question_page.rb

@@ -22,8 +22,12 @@ module Smartdown
         @responses = responses
       end
 
+      def answers
+        questions.map(&:answer)
+      end
+
       def questions
-        elements.slice_before do |element|
+        @questions ||= elements.slice_before do |element|
           element.is_a? Smartdown::Model::Element::MarkdownHeading
         end.each_with_index.map do |question_element_group, index|
           Smartdown::Api::PreviousQuestion.new(question_element_group, responses[index])

data/lib/smartdown/api/question.rb

@@ -10,6 +10,10 @@ module Smartdown
         elements.first.content
       end
 
+      def name
+        elements.find{ |element| element.class.to_s.include?("Smartdown::Model::Element::Question") }.name
+      end
+
       def body
         elements_before_smartdown = elements[1..-1].take_while{|element| !smartdown_element?(element)}
         build_govspeak(elements_before_smartdown)

data/lib/smartdown/api/state.rb

@@ -12,6 +12,16 @@ module Smartdown
         @responses = responses
       end
 
+      def answers
+        previous_question_pages(responses).map { |previous_question_page|
+          previous_question_page.answers
+        }.flatten
+      end
+
+      def previous_question_pages(responses)
+        @previous_question_pages ||= build_question_pages(responses)
+      end
+
       def started?
         !current_node.is_a? Smartdown::Api::Coversheet
       end
@@ -20,12 +30,6 @@ module Smartdown
         current_node.is_a? Smartdown::Api::Outcome
       end
 
-      def previous_question_pages(responses)
-        previous_questionpage_smartdown_nodes.map do |smartdown_questionpage_node|
-          Smartdown::Api::PreviousQuestionPage.new(smartdown_questionpage_node, responses)
-        end
-      end
-
       def current_question_number
         responses.count + 1
       end
@@ -34,6 +38,14 @@ module Smartdown
 
       attr_reader :smartdown_state, :previous_questionpage_smartdown_nodes
 
+      def build_question_pages(responses)
+        resp = responses.dup
+        previous_questionpage_smartdown_nodes.map do |smartdown_questionpage_node|
+          page_questions = resp.take(smartdown_questionpage_node.questions.count)
+          resp = resp.drop(smartdown_questionpage_node.questions.count)
+          Smartdown::Api::PreviousQuestionPage.new(smartdown_questionpage_node, page_questions)
+        end
+      end
     end
   end
 end

data/lib/smartdown/model/answer/base.rb

@@ -5,7 +5,7 @@ module Smartdown
         extend Forwardable
         include Comparable
 
-        def_delegators :value, :to_s, :to_i, :to_f, :+, :-, :*, :/
+        def_delegators :value, :to_s, :humanize, :to_i, :to_f, :+, :-, :*, :/
 
         def value_type
           ::String

data/lib/smartdown/model/answer/multiple_choice.rb

@@ -7,6 +7,10 @@ module Smartdown
         def value_type
           ::String
         end
+
+        def humanize
+          question.choices.fetch(value)
+        end
       end
     end
   end

data/lib/smartdown/model/answer/salary.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require_relative "base"
 
 module Smartdown
@@ -14,6 +15,11 @@ module Smartdown
           "#{'%.2f' % amount_per_period} per #{period}"
         end
 
+        def humanize
+          whole, decimal = separate_by_comma(amount_per_period)
+          "£#{whole}.#{decimal} per #{period}"
+        end
+
       private
         def parse_value(value)
           @amount_per_period, @period = value.split(/-|\W*per\W*/)
@@ -31,6 +37,15 @@ module Smartdown
             amount_per_period
           end
         end
+
+        def separate_by_comma(number)
+          left, right = ('%.2f' % number).split('.')
+          left.gsub!(/(\d)(?=(\d\d\d)+(?!\d))/) do |digit_to_delimit|
+            "#{digit_to_delimit},"
+          end
+          right = "%02d" % right.to_i
+          [left, right]
+        end
       end
     end
   end

data/lib/smartdown/model/scenarios/question.rb

@@ -0,0 +1,7 @@
+module Smartdown
+  module Model
+    module Scenarios
+      Question = Struct.new(:name, :answer)
+    end
+  end
+end

data/lib/smartdown/model/scenarios/scenario.rb

@@ -0,0 +1,7 @@
+module Smartdown
+  module Model
+    module Scenarios
+      Scenario = Struct.new(:description, :question_groups, :outcome)
+    end
+  end
+end

data/lib/smartdown/model/scenarios/scenario_set.rb

@@ -0,0 +1,7 @@
+module Smartdown
+  module Model
+    module Scenarios
+      ScenarioSet = Struct.new(:name, :scenarios)
+    end
+  end
+end

data/lib/smartdown/parser/directory_input.rb

@@ -19,7 +19,7 @@ module Smartdown
         read_dir("outcomes")
       end
 
-      def scenarios
+      def scenario_sets
         read_dir("scenarios")
       end
 
@@ -32,7 +32,7 @@ module Smartdown
           coversheet: coversheet.to_s,
           questions: questions.map(&:to_s),
           outcomes: outcomes.map(&:to_s),
-          scenarios: scenarios.map(&:to_s)
+          scenario_sets: scenario_sets.map(&:to_s)
         }
       end
 

data/lib/smartdown/parser/input_set.rb

@@ -1,14 +1,14 @@
 module Smartdown
   module Parser
     class InputSet
-      attr_reader :coversheet, :questions, :outcomes, :snippets, :scenarios
+      attr_reader :coversheet, :questions, :outcomes, :snippets, :scenario_sets
 
       def initialize(params = {})
         @coversheet = params[:coversheet]
         @questions = params[:questions]
         @outcomes = params[:outcomes]
         @snippets = params[:snippets]
-        @scenarios = params[:scenarios]
+        @scenario_sets = params[:scenario_sets]
       end
     end
 

data/lib/smartdown/parser/scenario_sets_interpreter.rb

@@ -0,0 +1,68 @@
+require "smartdown/model/scenarios/scenario_set"
+require "smartdown/model/scenarios/scenario"
+require "smartdown/model/scenarios/question"
+
+module Smartdown
+  module Parser
+    class ScenarioSetsInterpreter
+
+      def initialize(smartdown_input)
+        @smartdown_input = smartdown_input
+      end
+
+      def interpret
+        @smartdown_input.scenario_sets.map { |scenario_set| interpret_scenario_set(scenario_set) }
+      end
+
+    private
+      def interpret_scenario_set(scenario_set)
+        Smartdown::Model::Scenarios::ScenarioSet.new(
+          scenario_set.name,
+          scenario_set.read.split("\n\n").map { |scenario_string| interpret_scenario(scenario_string) }
+        )
+      end
+
+      def interpret_scenario(scenario_string)
+        scenario_lines = scenario_string.split("\n")
+        if scenario_lines.first.start_with?("#")
+          description = scenario_lines.first[1..-1].strip
+          scenario_lines = scenario_lines[1..-1]
+        end
+        outcome = scenario_lines.last
+        question_pages = group_questions_by_page(scenario_lines[0..-2])
+        question_groups = question_pages.map { |question_page| interpret_question_page(question_page) }
+        Smartdown::Model::Scenarios::Scenario.new(
+          description,
+          question_groups,
+          outcome,
+        )
+      end
+
+      def group_questions_by_page(scenario_lines)
+        result = []
+        scenario_lines.each do |scenario_line|
+          if scenario_line.start_with?("-")
+            result << [scenario_line[1..-1]]
+          else
+            result.last << scenario_line
+          end
+        end
+        result
+      end
+
+      def interpret_question_page(question_page)
+        question_page.map { |question|
+          interpret_question(question)
+        }
+      end
+
+      def interpret_question(question_string)
+        name, answer = question_string.split(":").map(&:strip)
+        Smartdown::Model::Scenarios::Question.new(
+          name,
+          answer,
+        )
+      end
+    end
+  end
+end

data/lib/smartdown/parser/snippet_pre_parser.rb

@@ -17,7 +17,7 @@ module Smartdown
           questions: input_data.questions.map { |question_data| parse_node_input(question_data) },
           outcomes: input_data.outcomes.map { |outcome_data| parse_node_input(outcome_data) },
           snippets: input_data.snippets,
-          scenarios: input_data.scenarios,
+          scenario_sets: input_data.scenario_sets,
         })
       end
 

data/lib/smartdown/version.rb

@@ -1,3 +1,3 @@
 module Smartdown
-  VERSION = "0.6.0"
+  VERSION = "0.7.0"
 end

data/spec/acceptance/flow_spec.rb

@@ -0,0 +1,67 @@
+require 'smartdown/api/flow'
+
+describe Smartdown::Api::Flow do
+
+  def fixture(name)
+    File.dirname(__FILE__) + "/../fixtures/acceptance/#{name}/#{name}.txt"
+  end
+
+  let(:input) { Smartdown::Parser::DirectoryInput.new(fixture("animal-example-simple")) }
+  subject(:flow) { Smartdown::Api::Flow.new(input) }
+
+  context "flow with one question per page" do
+    it "has two scenario_sets" do
+      expect(flow.scenario_sets.size).to eq(2)
+    end
+
+    it "has scenario_set names" do
+      expect(flow.scenario_sets.map(&:name)).to match_array(["lions", "tigers_and_cats"])
+    end
+
+    it "has scenarios with description, questions and outcome" do
+      tigers_and_cats_scenario_set = flow.scenario_sets.find { |scenario_set| scenario_set.name == "tigers_and_cats" }
+      expect(tigers_and_cats_scenario_set.scenarios.size).to eq(1)
+      expect(tigers_and_cats_scenario_set.scenarios.first.description).to eq("User has a cat")
+      expect(tigers_and_cats_scenario_set.scenarios.first.question_groups.size).to eq(1)
+      expect(tigers_and_cats_scenario_set.scenarios.first.outcome).to eq("outcome_safe_pet")
+    end
+
+    it "has scenario questions with name and answer" do
+      tigers_and_cats_scenario_set = flow.scenario_sets.find { |scenario_set| scenario_set.name == "tigers_and_cats" }
+      tigers_and_cats_scenario = tigers_and_cats_scenario_set.scenarios.first
+      expect(tigers_and_cats_scenario.question_groups.first.first.name).to eq("question_1")
+      expect(tigers_and_cats_scenario.question_groups.first.first.answer).to eq("cat")
+    end
+  end
+
+  context "flow with two questions per page" do
+    let(:input) { Smartdown::Parser::DirectoryInput.new(fixture("animal-example-multiple")) }
+    it "has two scenario_sets" do
+      expect(flow.scenario_sets.size).to eq(2)
+    end
+
+    it "has scenario_set names" do
+      expect(flow.scenario_sets.map(&:name)).to match_array(["lions", "tigers_and_cats"])
+    end
+
+    it "has scenarios with description, questions and outcome" do
+      tigers_and_cats_scenario_set = flow.scenario_sets.find { |scenario_set| scenario_set.name == "lions" }
+      expect(tigers_and_cats_scenario_set.scenarios.size).to eq(4)
+      expect(tigers_and_cats_scenario_set.scenarios.first.description).to eq("User has trained with lions, not with tigers")
+      expect(tigers_and_cats_scenario_set.scenarios.first.question_groups.size).to eq(2)
+      expect(tigers_and_cats_scenario_set.scenarios.first.outcome).to eq("outcome_trained_with_lions")
+    end
+
+    it "has scenario questions with name and answer" do
+      tigers_and_cats_scenario_set = flow.scenario_sets.find { |scenario_set| scenario_set.name == "lions" }
+      tigers_and_cats_scenario = tigers_and_cats_scenario_set.scenarios.first
+      expect(tigers_and_cats_scenario.question_groups[1][0].name).to eq("trained_for_lions")
+      expect(tigers_and_cats_scenario.question_groups[1][0].answer).to eq("yes")
+      expect(tigers_and_cats_scenario.question_groups[1][1].name).to eq("trained_for_tigers")
+      expect(tigers_and_cats_scenario.question_groups[1][1].answer).to eq("no")
+    end
+  end
+
+end
+
+

data/spec/api/previous_question_spec.rb

@@ -0,0 +1,25 @@
+require 'smartdown/api/previous_question'
+require 'smartdown/api/multiple_choice'
+
+describe Smartdown::Api::PreviousQuestion do
+
+  subject(:previous_question) { Smartdown::Api::PreviousQuestion.new(elements, response)}
+  let(:elements) { [ multiple_choice_element ] }
+  let(:multiple_choice_element) { Smartdown::Model::Element::Question::MultipleChoice.new }
+  let(:response) { double(:response) }
+  let(:multiple_choice_class) { double(:multiple_choice_class, :new => nil) }
+  let(:answer_type) { double(:answer_type) }
+
+  describe "#question" do
+    it "is of the correct type" do
+      expect(previous_question.question).to be_instance_of(Smartdown::Api::MultipleChoice)
+    end
+  end
+
+  describe "#answer" do
+    it "is of the correct type" do
+      expect(previous_question.answer).to be_instance_of(Smartdown::Model::Answer::MultipleChoice)
+    end
+  end
+
+end

data/spec/api/state_spec.rb

@@ -0,0 +1,23 @@
+require 'smartdown/api/state'
+
+describe Smartdown::Api::State do
+
+  subject(:state) { Smartdown::Api::State.new(current_node, previous_questionpage_smartdown_nodes, responses)}
+  let(:current_node) { double(:current_node) }
+  let(:previous_questionpage_smartdown_nodes) { [question_page_node_1, question_page_node_2] }
+  let(:question_page_node_1) { double(:question_page_node_1, :questions => [double, double]) }
+  let(:question_page_node_2) { double(:question_page_node_2, :questions => [double]) }
+  let(:responses) { ["a", "b", "c"] }
+  let(:previous_question_page_class) { double(:previous_question_page_class, :new => nil)}
+
+  describe "#previous_question_pages" do
+    it "creates question pages with their corresponding responses" do
+      stub_const("Smartdown::Api::PreviousQuestionPage", previous_question_page_class)
+      state.previous_question_pages(responses)
+      expect(Smartdown::Api::PreviousQuestionPage).to have_received(:new)
+                                                  .with(question_page_node_1, ["a", "b"])
+      expect(Smartdown::Api::PreviousQuestionPage).to have_received(:new)
+                                                  .with(question_page_node_2, ["c"])
+    end
+  end
+end

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

@@ -0,0 +1,25 @@
+meta_description: Animals eh?
+satisfies_need: 100982
+status: draft
+
+# A simple example of smartdown
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat.
+
+Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+
+## Before you start, you will need
+
+* To know the kind of feline you have
+* Any animal training certification documents
+
+[start: question_1]
+
+## Devolved body
+
+Which is really just body content after the start button

data/spec/fixtures/acceptance/animal-example-multiple/outcomes/outcome_safe_pet.txt

@@ -0,0 +1,69 @@
+# You picked a safe pet
+
+Good call.
+
+# Markdown/Govspeak examples
+
+## H2 example
+
+With answers, that are smart. Down with that?
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+
+### H3 example
+
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+
+## List
+
+* one
+* two
+* three
+
+## List 2
+
+- A
+- B
+- C
+
+## List 3
+
++ Up
++ Down
++ Left
++ Right
+
+^This is an information callout.^
+
+%This is a warning callout - use it when there’s a risk of getting a fine or going to prison.%
+
+$E
+**Example**
+Your income for the last tax year was £30,000. You think your income will drop to £20,000 this tax year. Enter £22,500 into the calculator.
+$E
+
+{::highlight-answer}
+The VAT rate is *20%*
+{:/highlight-answer}
+
+
+$C
+**Student Finance England**
+Telephone: 0845 300 5090
+Minicom: 0845 604 4434
+[Find out about call charges](http://www.gov.uk/call-charges)
+$C
+
+$A
+Hercules House
+Hercules Road
+London SE1 7DU
+$A
+
+$D
+[Download the 'Example application form' (PDF, 35KB)](http://example.com/ "Example form")
+$D

data/spec/fixtures/acceptance/animal-example-multiple/outcomes/outcome_tigers_are_fine.txt

@@ -0,0 +1,9 @@
+# Tigers are fine
+
+You haven't trained with tigers, but you'll be alright, probably.
+
+[next_steps]
+###You bought a tiger? Seriously?
+
+[Your nearest hospital](https://gov.uk/hospital)
+[end_next_steps]

data/spec/fixtures/acceptance/animal-example-multiple/outcomes/outcome_trained_with_lions.txt

@@ -0,0 +1,3 @@
+# You've trained with lions
+
+You'll be alright, you won't forget your training for another %{years_until_training_forgotten(training_date)} years.

data/spec/fixtures/acceptance/animal-example-multiple/outcomes/outcome_trained_with_tigers.txt

@@ -0,0 +1,3 @@
+# You've trained with tigers
+
+Grrrrreat!

data/spec/fixtures/acceptance/animal-example-multiple/outcomes/outcome_untrained_with_lions.txt

@@ -0,0 +1,3 @@
+# You're not trained with lions
+
+Nice to know you.

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

@@ -0,0 +1,15 @@
+# What type of feline do you have?
+
+# Check the serial number by the tail.
+
+Text before the options.
+
+[choice: question_1]
+* lion: Lion
+* tiger: Tiger
+* cat: Cat
+
+This is an optional note after question.
+
+* question_1 in {lion tiger} => question_2
+* otherwise => outcome_safe_pet

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

@@ -0,0 +1,25 @@
+# How good is your big cat training?
+
+# Are you trained for lions?
+
+Think very carefully.
+
+[choice: trained_for_lions]
+* yes: Yes
+* no: No
+
+# Are you trained for tigers?
+
+Think very carefully again.
+
+[choice: trained_for_tigers]
+* yes: Yes
+* maybe: I've been to a zoo once
+* no: No
+
+* question_1 is 'lion'
+  * trained_for_lions is 'yes' => question_3
+  * otherwise => outcome_untrained_with_lions
+* otherwise
+  * trained_for_tigers is 'yes' => question_3
+  * otherwise => outcome_tigers_are_fine

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

@@ -0,0 +1,12 @@
+# Training date?
+
+When did you do your %{question_1} training?
+
+[date: training_date]
+
+* question_1 is 'lion'
+  * trained_for_lions is 'yes' => outcome_trained_with_lions
+  * otherwise => outcome_untrained_with_lions
+* otherwise
+  * trained_for_tigers is 'yes' => outcome_trained_with_tigers
+  * otherwise => outcome_tigers_are_fine

data/spec/fixtures/acceptance/animal-example-multiple/scenarios/lions.txt

@@ -0,0 +1,23 @@
+#User has trained with lions, not with tigers
+- question_1: lion
+- trained_for_lions: yes
+  trained_for_tigers: no
+outcome_trained_with_lions
+
+#User has trained with lions and tigers
+- question_1: lion
+- trained_for_lions: yes
+  trained_for_lions: yes
+outcome_can_outrun_a_lion
+
+#User has trained neither with lions, nor with tigers
+- question_1: lion
+- trained_for_lions: no
+  trained_for_tigers: no
+outcome_untrained_with_lions
+
+#User has trained with tigers, not with lions
+- question_1: lion
+- trained_for_lions: no
+  trained_for_tigers: yes
+outcome_untrained_with_lions

data/spec/fixtures/acceptance/animal-example-multiple/scenarios/tigers_and_cats.txt

@@ -0,0 +1,3 @@
+#User has a cat
+- question_1: cat
+outcome_safe_pet

data/spec/fixtures/acceptance/animal-example-simple/outcomes/outcome_can_outrun_a_lion.txt

@@ -0,0 +1,3 @@
+# You can outrun a lion
+
+You'll be alright, I think.

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

@@ -6,5 +6,5 @@
 
 * question_1 is 'lion'
   * trained_for_lions is 'yes' => outcome_trained_with_lions
-  * otherwise => outcome_untrained_with_lions
+  * otherwise => question_3
 * otherwise => outcome_tigers_are_fine

data/spec/fixtures/acceptance/animal-example-simple/questions/question_3.txt

@@ -0,0 +1,7 @@
+# How fast can you run?
+
+[text: how_fast]
+
+* how_fast is 'fast' => outcome_can_outrun_a_lion
+* otherwise => outcome_untrained_with_lions
+

data/spec/fixtures/acceptance/animal-example-simple/scenarios/lions.txt

@@ -0,0 +1,16 @@
+# User has trained with lions
+- question_1: lion
+- trained_for_lions: yes
+outcome_trained_with_lions
+
+# User has not trained with lions but can run fast
+- question_1: lion
+- trained_for_lions: no
+- how_fast: fast
+outcome_can_outrun_a_lion
+
+# User has not trained with lions and runs very slowly
+- question_1: lion
+- trained_for_lions: no
+- how_fast: very slowly
+outcome_untrained_with_lions

data/spec/fixtures/acceptance/animal-example-simple/scenarios/tigers_and_cats.txt

@@ -0,0 +1,3 @@
+# User has a cat
+- question_1: cat
+outcome_safe_pet

data/spec/model/answer/multiple_choice_spec.rb

@@ -0,0 +1,18 @@
+# encoding: utf-8
+require 'smartdown/model/answer/multiple_choice'
+
+describe Smartdown::Model::Answer::MultipleChoice do
+
+  subject(:answer) { described_class.new("answer", multiple_choice_question) }
+  let(:multiple_choice_question) {
+    Smartdown::Model::Element::Question::MultipleChoice.new("question",
+                                                            {"answer" => "Beautiful answer"}
+    )
+  }
+
+  describe "#humanize" do
+    it "returns the humanized answer" do
+      expect(answer.humanize).to eq "Beautiful answer"
+    end
+  end
+end

data/spec/model/answer/salary_spec.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'smartdown/model/answer/date'
 require 'smartdown/model/element/question/date'
 
@@ -13,6 +14,40 @@ describe Smartdown::Model::Answer::Salary do
     expect(instance.to_s).to eql("500.00 per week")
   end
 
+  describe "#humanize" do
+    it "declares itself in the initial format provided" do
+      expect(instance.humanize).to eql("£500.00 per week")
+    end
+
+    context "amounts over 999" do
+      let(:salary_string) { "15000-week" }
+      it "adds commas" do
+        expect(instance.humanize).to eql("£15,000.00 per week")
+      end
+    end
+
+    context "amounts with .525 decimal part" do
+      let(:salary_string) { "15000.525-week" }
+      it "adds commas" do
+        expect(instance.humanize).to eql("£15,000.52 per week")
+      end
+    end
+
+    context "amounts with .555 decimal part" do
+      let(:salary_string) { "15000.555-week" }
+      it "adds commas" do
+        expect(instance.humanize).to eql("£15,000.56 per week")
+      end
+    end
+
+    context "amounts with .556 decimal part" do
+      let(:salary_string) { "15000.556-week" }
+      it "adds commas" do
+        expect(instance.humanize).to eql("£15,000.56 per week")
+      end
+    end
+  end
+
   context "declared by week" do
     let(:salary_string) { "500-week" }
     specify { expect(instance.value).to eql 500.0 * 52 }

data/spec/parser/directory_input_spec.rb

@@ -40,11 +40,11 @@ describe Smartdown::Parser::DirectoryInput do
     end
   end
 
-  describe "#scenarios" do
+  describe "#scenario_sets" do
     it "returns an InputFile for every file in the scenarios folder" do
-      expect(input.scenarios).to match([instance_of(Smartdown::Parser::InputFile)])
-      expect(input.scenarios.first.name).to eq("s1")
-      expect(input.scenarios.first.read).to eq("scenario one\n")
+      expect(input.scenario_sets).to match([instance_of(Smartdown::Parser::InputFile)])
+      expect(input.scenario_sets.first.name).to eq("s1")
+      expect(input.scenario_sets.first.read).to eq("scenario one\n")
     end
   end
 

data/spec/support/flow_input_interface.rb

@@ -2,6 +2,6 @@ shared_examples "flow input interface" do
   it { should respond_to(:coversheet) }
   it { should respond_to(:questions) }
   it { should respond_to(:outcomes) }
-  it { should respond_to(:scenarios) }
+  it { should respond_to(:scenario_sets) }
   it { should respond_to(:snippets) }
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smartdown
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
   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: &18240820 !ruby/object:Gem::Requirement
+  requirement: &14489700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.6.1
   type: :runtime
   prerelease: false
-  version_requirements: *18240820
+  version_requirements: *14489700
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &18238780 !ruby/object:Gem::Requirement
+  requirement: &14488200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 3.0.0
   type: :development
   prerelease: false
-  version_requirements: *18238780
+  version_requirements: *14488200
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &18237320 !ruby/object:Gem::Requirement
+  requirement: &14504920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18237320
+  version_requirements: *14504920
 - !ruby/object:Gem::Dependency
   name: gem_publisher
-  requirement: &18235860 !ruby/object:Gem::Requirement
+  requirement: &14504180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18235860
+  version_requirements: *14504180
 description: 
 email: david.heath@digital.cabinet-office.gov.uk
 executables:
@@ -73,6 +73,7 @@ files:
 - lib/smartdown/parser/directory_input.rb
 - lib/smartdown/parser/rules.rb
 - lib/smartdown/parser/node_parser.rb
+- lib/smartdown/parser/scenario_sets_interpreter.rb
 - lib/smartdown/parser/element/date_question.rb
 - lib/smartdown/parser/element/salary_question.rb
 - lib/smartdown/parser/element/conditional.rb
@@ -105,6 +106,9 @@ files:
 - lib/smartdown/engine/transition.rb
 - lib/smartdown/engine/interpolator.rb
 - lib/smartdown/engine/errors.rb
+- lib/smartdown/model/scenarios/question.rb
+- lib/smartdown/model/scenarios/scenario_set.rb
+- lib/smartdown/model/scenarios/scenario.rb
 - lib/smartdown/model/flow.rb
 - lib/smartdown/model/predicate/named.rb
 - lib/smartdown/model/predicate/set_membership.rb
@@ -142,6 +146,7 @@ files:
 - README.md
 - spec/acceptance/parsing_spec.rb
 - spec/acceptance/smartdown_cli_spec.rb
+- spec/acceptance/flow_spec.rb
 - spec/parser/directory_input_spec.rb
 - spec/parser/integration/cover_sheet_spec.rb
 - spec/parser/base_spec.rb
@@ -162,6 +167,8 @@ files:
 - spec/parser/snippet_pre_parser_spec.rb
 - spec/support/flow_input_interface.rb
 - spec/support/model_builder.rb
+- spec/api/state_spec.rb
+- spec/api/previous_question_spec.rb
 - spec/spec_helper.rb
 - spec/engine/state_spec.rb
 - spec/engine/interpolator_spec.rb
@@ -175,13 +182,28 @@ files:
 - spec/fixtures/acceptance/question-and-outcome/question-and-outcome.txt
 - spec/fixtures/acceptance/question-and-outcome/outcomes/o1.txt
 - spec/fixtures/acceptance/question-and-outcome/questions/q1.txt
+- spec/fixtures/acceptance/animal-example-simple/scenarios/tigers_and_cats.txt
+- spec/fixtures/acceptance/animal-example-simple/scenarios/lions.txt
 - spec/fixtures/acceptance/animal-example-simple/outcomes/outcome_untrained_with_lions.txt
 - spec/fixtures/acceptance/animal-example-simple/outcomes/outcome_tigers_are_fine.txt
+- spec/fixtures/acceptance/animal-example-simple/outcomes/outcome_can_outrun_a_lion.txt
 - spec/fixtures/acceptance/animal-example-simple/outcomes/outcome_safe_pet.txt
 - spec/fixtures/acceptance/animal-example-simple/outcomes/outcome_trained_with_lions.txt
 - spec/fixtures/acceptance/animal-example-simple/animal-example-simple.txt
+- spec/fixtures/acceptance/animal-example-simple/questions/question_3.txt
 - spec/fixtures/acceptance/animal-example-simple/questions/question_1.txt
 - spec/fixtures/acceptance/animal-example-simple/questions/question_2.txt
+- spec/fixtures/acceptance/animal-example-multiple/scenarios/tigers_and_cats.txt
+- spec/fixtures/acceptance/animal-example-multiple/scenarios/lions.txt
+- spec/fixtures/acceptance/animal-example-multiple/outcomes/outcome_trained_with_tigers.txt
+- spec/fixtures/acceptance/animal-example-multiple/outcomes/outcome_untrained_with_lions.txt
+- spec/fixtures/acceptance/animal-example-multiple/outcomes/outcome_tigers_are_fine.txt
+- spec/fixtures/acceptance/animal-example-multiple/outcomes/outcome_safe_pet.txt
+- spec/fixtures/acceptance/animal-example-multiple/outcomes/outcome_trained_with_lions.txt
+- spec/fixtures/acceptance/animal-example-multiple/animal-example-multiple.txt
+- 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/cover-sheet/cover-sheet.txt
 - spec/fixtures/acceptance/one-question/one-question.txt
 - spec/fixtures/acceptance/one-question/questions/q1.txt
@@ -193,6 +215,7 @@ files:
 - spec/model/node_spec.rb
 - spec/model/flow_spec.rb
 - spec/model/answer/money_spec.rb
+- spec/model/answer/multiple_choice_spec.rb
 - spec/model/answer/text_spec.rb
 - spec/model/answer/base_spec.rb
 - spec/model/answer/salary_spec.rb
@@ -218,7 +241,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4119241983513724352
+      hash: -1023483134513177718
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -227,7 +250,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4119241983513724352
+      hash: -1023483134513177718
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.11
@@ -237,6 +260,7 @@ summary: Interactive question-answer flows using markdown-like external DSL
 test_files:
 - spec/acceptance/parsing_spec.rb
 - spec/acceptance/smartdown_cli_spec.rb
+- spec/acceptance/flow_spec.rb
 - spec/parser/directory_input_spec.rb
 - spec/parser/integration/cover_sheet_spec.rb
 - spec/parser/base_spec.rb
@@ -257,6 +281,8 @@ test_files:
 - spec/parser/snippet_pre_parser_spec.rb
 - spec/support/flow_input_interface.rb
 - spec/support/model_builder.rb
+- spec/api/state_spec.rb
+- spec/api/previous_question_spec.rb
 - spec/spec_helper.rb
 - spec/engine/state_spec.rb
 - spec/engine/interpolator_spec.rb
@@ -270,13 +296,28 @@ test_files:
 - spec/fixtures/acceptance/question-and-outcome/question-and-outcome.txt
 - spec/fixtures/acceptance/question-and-outcome/outcomes/o1.txt
 - spec/fixtures/acceptance/question-and-outcome/questions/q1.txt
+- spec/fixtures/acceptance/animal-example-simple/scenarios/tigers_and_cats.txt
+- spec/fixtures/acceptance/animal-example-simple/scenarios/lions.txt
 - spec/fixtures/acceptance/animal-example-simple/outcomes/outcome_untrained_with_lions.txt
 - spec/fixtures/acceptance/animal-example-simple/outcomes/outcome_tigers_are_fine.txt
+- spec/fixtures/acceptance/animal-example-simple/outcomes/outcome_can_outrun_a_lion.txt
 - spec/fixtures/acceptance/animal-example-simple/outcomes/outcome_safe_pet.txt
 - spec/fixtures/acceptance/animal-example-simple/outcomes/outcome_trained_with_lions.txt
 - spec/fixtures/acceptance/animal-example-simple/animal-example-simple.txt
+- spec/fixtures/acceptance/animal-example-simple/questions/question_3.txt
 - spec/fixtures/acceptance/animal-example-simple/questions/question_1.txt
 - spec/fixtures/acceptance/animal-example-simple/questions/question_2.txt
+- spec/fixtures/acceptance/animal-example-multiple/scenarios/tigers_and_cats.txt
+- spec/fixtures/acceptance/animal-example-multiple/scenarios/lions.txt
+- spec/fixtures/acceptance/animal-example-multiple/outcomes/outcome_trained_with_tigers.txt
+- spec/fixtures/acceptance/animal-example-multiple/outcomes/outcome_untrained_with_lions.txt
+- spec/fixtures/acceptance/animal-example-multiple/outcomes/outcome_tigers_are_fine.txt
+- spec/fixtures/acceptance/animal-example-multiple/outcomes/outcome_safe_pet.txt
+- spec/fixtures/acceptance/animal-example-multiple/outcomes/outcome_trained_with_lions.txt
+- spec/fixtures/acceptance/animal-example-multiple/animal-example-multiple.txt
+- 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/cover-sheet/cover-sheet.txt
 - spec/fixtures/acceptance/one-question/one-question.txt
 - spec/fixtures/acceptance/one-question/questions/q1.txt
@@ -288,6 +329,7 @@ test_files:
 - spec/model/node_spec.rb
 - spec/model/flow_spec.rb
 - spec/model/answer/money_spec.rb
+- spec/model/answer/multiple_choice_spec.rb
 - spec/model/answer/text_spec.rb
 - spec/model/answer/base_spec.rb
 - spec/model/answer/salary_spec.rb