smartdown 0.2.0 → 0.2.1

data/README.md

@@ -132,7 +132,7 @@ passport_country:
 [country: passport_country]
 ```
 
-### Date (tbd)
+### Date
 
 ```markdown
 ## What is the baby’s due date?
@@ -140,8 +140,6 @@ passport_country:
 [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.
-
 ### Value (tbd)
 
 ```markdown
@@ -158,14 +156,12 @@ Asks for an arbitrary text input.
 
 Asks for a numerical input which can have decimals and optional thousand-separating commas.
 
-### Salary (tbd)
+### Salary
 
 ```markdown
 [salary: salary_value]
 ```
 
-Asks for salary which can be expressed as either a weekly or monthly money amount. The user chooses between weekly/monthly
-
 ### Checkbox (tbd)
 
 ```markdown

data/lib/smartdown/api/date_question.rb

@@ -0,0 +1,8 @@
+require 'smartdown/api/question'
+
+module Smartdown
+  module Api
+    class DateQuestion < Question
+    end
+  end
+end

data/lib/smartdown/api/flow.rb

@@ -69,6 +69,10 @@ module Smartdown
         nodes.select{ |node| node.is_a? Smartdown::Api::Outcome}
       end
 
+      def coversheet
+        @coversheet ||= Smartdown::Api::Coversheet.new(@smartdown_flow.coversheet)
+      end
+
     private
 
       def transform_node(node)
@@ -85,10 +89,6 @@ module Smartdown
         end
       end
 
-      def coversheet
-        @coversheet ||= Smartdown::Api::Coversheet.new(@smartdown_flow.coversheet)
-      end
-
       def front_matter
         @front_matter ||= coversheet.front_matter
       end

data/lib/smartdown/api/node.rb

@@ -9,12 +9,12 @@ module Smartdown
         headings = node_elements.select { |element|
           element.is_a? Smartdown::Model::Element::MarkdownHeading
         }
-        @title = headings.first.content.to_s if headings.first
         nb_questions = node_elements.select{ |element|
-          element.is_a? Smartdown::Model::Element::Question::MultipleChoice
+          element.class.to_s.include?("Smartdown::Model::Element::Question")
         }.count
         if headings.count > nb_questions
           node_elements.delete(headings.first) #Remove page title
+          @title = headings.first.content.to_s
         end
         @elements = node_elements
         @front_matter = node.front_matter

data/lib/smartdown/api/previous_question.rb

@@ -5,12 +5,16 @@ module Smartdown
 
       def_delegators :@question, :title, :options
 
-      attr_reader :response
+      attr_reader :response, :question
 
       def initialize(elements, response)
         @response = response
         if 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}
+          @question = DateQuestion.new(elements)
+        elsif elements.find{|element| element.is_a? Smartdown::Model::Element::Question::Salary}
+          @question = SalaryQuestion.new(elements)
         end
       end
 

data/lib/smartdown/api/previous_question_page.rb

@@ -13,7 +13,7 @@ module Smartdown
         }
         @title = headings.first.content.to_s if headings.first
         nb_questions = node_elements.select{ |element|
-          element.is_a? Smartdown::Model::Element::Question::MultipleChoice
+          element.class.to_s.include?("Smartdown::Model::Element::Question")
         }.count
         if headings.count > nb_questions
           node_elements.delete(headings.first) #Remove page title

data/lib/smartdown/api/question_page.rb

@@ -1,4 +1,6 @@
 require 'smartdown/api/multiple_choice'
+require 'smartdown/api/date_question'
+require 'smartdown/api/salary_question'
 
 module Smartdown
   module Api
@@ -9,6 +11,10 @@ module Smartdown
         end.map do |question_element_group|
           if question_element_group.find{|element| element.is_a? Smartdown::Model::Element::Question::MultipleChoice}
             Smartdown::Api::MultipleChoice.new(question_element_group)
+          elsif question_element_group.find{|element| element.is_a? Smartdown::Model::Element::Question::Date}
+            Smartdown::Api::DateQuestion.new(question_element_group)
+          elsif question_element_group.find{|element| element.is_a? Smartdown::Model::Element::Question::Salary}
+            Smartdown::Api::SalaryQuestion.new(question_element_group)
           end
         end
       end

data/lib/smartdown/api/salary_question.rb

@@ -0,0 +1,8 @@
+require 'smartdown/api/question'
+
+module Smartdown
+  module Api
+    class SalaryQuestion < Question
+    end
+  end
+end

data/lib/smartdown/engine/predicate_evaluator.rb

@@ -14,6 +14,10 @@ module Smartdown
           ->(state) { predicate.values.include?(state.get(predicate.varname)) }
         when Smartdown::Model::Predicate::Named
           ->(state) { state.get(predicate.name) }
+        when Smartdown::Model::Predicate::Comparison::Base
+          ->(state) { predicate.evaluate(state.get(predicate.varname)) }
+        when Smartdown::Model::Predicate::Combined
+          ->(state) { predicate.predicates.map { |p| evaluate(p, state) }.all? }
         else
           raise "Unknown predicate type #{predicate.class}"
         end

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

@@ -0,0 +1,9 @@
+module Smartdown
+  module Model
+    module Element
+      module Question
+        Date = Struct.new(:name)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,9 @@
+module Smartdown
+  module Model
+    module Element
+      module Question
+        Salary = Struct.new(:name)
+      end
+    end
+  end
+end

data/lib/smartdown/model/predicate/combined.rb

@@ -0,0 +1,7 @@
+module Smartdown
+  module Model
+    module Predicate
+      Combined = Struct.new(:predicates)
+    end
+  end
+end

data/lib/smartdown/model/predicate/comparison/base.rb

@@ -0,0 +1,9 @@
+module Smartdown
+  module Model
+    module Predicate
+      module Comparison
+        Base = Struct.new(:varname, :value)
+      end
+    end
+  end
+end

data/lib/smartdown/model/predicate/comparison/greater.rb

@@ -0,0 +1,20 @@
+require 'smartdown/model/predicate/comparison/base'
+require 'date'
+
+module Smartdown
+  module Model
+    module Predicate
+      module Comparison
+        class Greater < Base
+          def evaluate(variable)
+            if /(\d{4})-(\d{1,2})-(\d{1,2})/.match(value)
+              Date.parse(variable) > Date.parse(value)
+            else
+              variable > value
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/smartdown/model/predicate/comparison/greater_or_equal.rb

@@ -0,0 +1,20 @@
+require 'smartdown/model/predicate/comparison/base'
+require 'date'
+
+module Smartdown
+  module Model
+    module Predicate
+      module Comparison
+        class GreaterOrEqual < Base
+          def evaluate(variable)
+            if /(\d{4})-(\d{1,2})-(\d{1,2})/.match(value)
+              Date.parse(variable) >= Date.parse(value)
+            else
+              variable >= value
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/smartdown/model/predicate/comparison/less.rb

@@ -0,0 +1,20 @@
+require 'smartdown/model/predicate/comparison/base'
+require 'date'
+
+module Smartdown
+  module Model
+    module Predicate
+      module Comparison
+        class Less < Base
+          def evaluate(variable)
+            if /(\d{4})-(\d{1,2})-(\d{1,2})/.match(value)
+              Date.parse(variable) < Date.parse(value)
+            else
+              variable < value
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/smartdown/model/predicate/comparison/less_or_equal.rb

@@ -0,0 +1,20 @@
+require 'smartdown/model/predicate/comparison/base'
+require 'date'
+
+module Smartdown
+  module Model
+    module Predicate
+      module Comparison
+        class LessOrEqual < Base
+          def evaluate(variable)
+            if /(\d{4})-(\d{1,2})-(\d{1,2})/.match(value)
+              Date.parse(variable) <= Date.parse(value)
+            else
+              variable <= value
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,22 @@
+require 'smartdown/parser/base'
+
+module Smartdown
+  module Parser
+    module Element
+      class DateQuestion < Base
+        rule(:date_question) {
+          (
+          str("[date:") >>
+              optional_space >>
+              question_identifier.as(:identifier) >>
+              optional_space >>
+              str("]") >>
+              optional_space >>
+              line_ending
+          ).as(:date)
+        }
+        root(:date_question)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,22 @@
+require 'smartdown/parser/base'
+
+module Smartdown
+  module Parser
+    module Element
+      class SalaryQuestion < Base
+        rule(:salary_question) {
+          (
+          str("[salary:") >>
+              optional_space >>
+              question_identifier.as(:identifier) >>
+              optional_space >>
+              str("]") >>
+              optional_space >>
+              line_ending
+          ).as(:salary)
+        }
+        root(:salary_question)
+      end
+    end
+  end
+end

data/lib/smartdown/parser/node_parser.rb

@@ -3,6 +3,8 @@ require 'smartdown/parser/rules'
 require 'smartdown/parser/element/front_matter'
 require 'smartdown/parser/element/start_button'
 require 'smartdown/parser/element/multiple_choice_question'
+require 'smartdown/parser/element/date_question'
+require 'smartdown/parser/element/salary_question'
 require 'smartdown/parser/element/markdown_heading'
 require 'smartdown/parser/element/markdown_paragraph'
 require 'smartdown/parser/element/conditional'
@@ -15,6 +17,8 @@ module Smartdown
         Element::Conditional.new |
         Element::MarkdownHeading.new |
         Element::MultipleChoiceQuestion.new |
+        Element::DateQuestion.new |
+        Element::SalaryQuestion.new |
         Rules.new |
         Element::StartButton.new |
         Element::NextSteps.new |

data/lib/smartdown/parser/node_transform.rb

@@ -5,6 +5,8 @@ require 'smartdown/model/rule'
 require 'smartdown/model/nested_rule'
 require 'smartdown/model/next_node_rules'
 require 'smartdown/model/element/question/multiple_choice'
+require 'smartdown/model/element/question/date'
+require 'smartdown/model/element/question/salary'
 require 'smartdown/model/element/start_button'
 require 'smartdown/model/element/markdown_heading'
 require 'smartdown/model/element/markdown_paragraph'
@@ -13,6 +15,11 @@ require 'smartdown/model/element/next_steps'
 require 'smartdown/model/predicate/equality'
 require 'smartdown/model/predicate/set_membership'
 require 'smartdown/model/predicate/named'
+require 'smartdown/model/predicate/combined'
+require 'smartdown/model/predicate/comparison/greater_or_equal'
+require 'smartdown/model/predicate/comparison/greater'
+require 'smartdown/model/predicate/comparison/less_or_equal'
+require 'smartdown/model/predicate/comparison/less'
 
 module Smartdown
   module Parser
@@ -61,6 +68,18 @@ module Smartdown
         )
       }
 
+      rule(:date => {identifier: simple(:identifier)}) {
+        Smartdown::Model::Element::Question::Date.new(
+          identifier.to_s
+        )
+      }
+
+      rule(:salary => {identifier: simple(:identifier)}) {
+        Smartdown::Model::Element::Question::Salary.new(
+          identifier.to_s
+        )
+      }
+
       rule(:next_steps => { content: simple(:content) }) {
         Smartdown::Model::Element::NextSteps.new(content.to_s)
       }
@@ -92,6 +111,7 @@ module Smartdown
       }
 
       rule(:set_value => simple(:value)) { value }
+
       rule(:set_membership_predicate => { varname: simple(:varname), values: subtree(:values) }) {
         Smartdown::Model::Predicate::SetMembership.new(varname, values)
       }
@@ -100,6 +120,29 @@ module Smartdown
         Smartdown::Model::Predicate::Named.new(name)
       }
 
+
+      rule(:combined_predicate => {first_predicate: subtree(:first_predicate), and_predicates: subtree(:and_predicates) }) {
+        Smartdown::Model::Predicate::Combined.new([first_predicate]+and_predicates)
+      }
+
+      rule(:comparison_predicate => { varname: simple(:varname), 
+                                       value: simple(:value),
+                                       operator: simple(:operator)
+                                     }) { 
+        case operator
+        when "<="
+          Smartdown::Model::Predicate::Comparison::LessOrEqual.new(varname, value)
+        when "<"
+          Smartdown::Model::Predicate::Comparison::Less.new(varname, value)
+        when ">="
+          Smartdown::Model::Predicate::Comparison::GreaterOrEqual.new(varname, value)
+        when ">"
+          Smartdown::Model::Predicate::Comparison::Greater.new(varname, value)
+        else
+          raise "Comparison operator not recognised"
+        end
+      }
+
       rule(:rule => {predicate: subtree(:predicate), outcome: simple(:outcome_name) } ) {
         Smartdown::Model::Rule.new(predicate, outcome_name)
       }

data/lib/smartdown/parser/predicates.rb

@@ -9,6 +9,16 @@ module Smartdown
           str("'") >> match("[^']").repeat.as(:expected_value) >> str("'")
       }
 
+      rule(:comparison_operator) {
+        str('>=') | str('>') | str('<=') | str('<')
+      }
+
+      rule(:comparison_predicate) {
+        identifier.as(:varname) >> some_space >>
+        comparison_operator.as(:operator) >> some_space >>
+        str("'") >> match("[^']").repeat.as(:value) >> str("'")
+      }
+
       rule(:set_value) {
         match('[^\s}]').repeat(1).as(:set_value)
       }
@@ -26,8 +36,23 @@ module Smartdown
       rule(:named_predicate) {
         question_identifier.as(:named_predicate)
       }
-      rule(:predicates) {
-        equality_predicate.as(:equality_predicate) | set_membership_predicate.as(:set_membership_predicate) | named_predicate
+
+      rule(:predicate) {
+        equality_predicate.as(:equality_predicate) |
+        set_membership_predicate.as(:set_membership_predicate) |
+        comparison_predicate.as(:comparison_predicate) |
+        named_predicate
+      }
+
+      rule (:combined_predicate) {
+        predicate.as(:first_predicate) >>
+        (some_space >> str('AND') >> some_space >>
+        predicate).repeat(1).as(:and_predicates)
+      }
+
+      rule (:predicates) {
+        combined_predicate.as(:combined_predicate) |
+        predicate
       }
 
       root(:predicates)

data/lib/smartdown/version.rb

@@ -1,3 +1,3 @@
 module Smartdown
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/spec/engine/predicate_evaluator_spec.rb

@@ -2,10 +2,15 @@ require 'smartdown/engine/predicate_evaluator'
 require 'smartdown/model/predicate/equality'
 require 'smartdown/model/predicate/set_membership'
 require 'smartdown/model/predicate/named'
+require 'smartdown/model/predicate/combined'
+require 'smartdown/model/predicate/comparison/greater_or_equal'
+require 'smartdown/model/predicate/comparison/greater'
+require 'smartdown/model/predicate/comparison/less_or_equal'
+require 'smartdown/model/predicate/comparison/less'
 require 'smartdown/engine/state'
 
 describe Smartdown::Engine::PredicateEvaluator do
-  subject(:evalutator) { described_class.new }
+  subject(:evaluator) { described_class.new }
 
   context "equality predicate" do
     let(:predicate) { Smartdown::Model::Predicate::Equality.new("my_var", "some value") }
@@ -15,23 +20,23 @@ describe Smartdown::Engine::PredicateEvaluator do
         let(:state) { Smartdown::Engine::State.new(current_node: "n") }
 
         it "raises an UndefinedValue error" do
-          expect { evalutator.evaluate(predicate, state) }.to raise_error(Smartdown::Engine::UndefinedValue)
+          expect { evaluator.evaluate(predicate, state) }.to raise_error(Smartdown::Engine::UndefinedValue)
         end
       end
 
       context "state has expected variable with same value" do
         let(:state) { Smartdown::Engine::State.new(current_node: "n", my_var: "some value") }
 
-        it "evalutes to true" do
-          expect(evalutator.evaluate(predicate, state)).to eq(true)
+        it "evaluates to true" do
+          expect(evaluator.evaluate(predicate, state)).to eq(true)
         end
       end
 
       context "state has expected variable with a different value" do
         let(:state) { Smartdown::Engine::State.new(current_node: "n", my_var: "some other value") }
 
-        it "evalutes to false" do
-          expect(evalutator.evaluate(predicate, state)).to eq(false)
+        it "evaluates to false" do
+          expect(evaluator.evaluate(predicate, state)).to eq(false)
         end
       end
     end
@@ -47,15 +52,15 @@ describe Smartdown::Engine::PredicateEvaluator do
         let(:state) { Smartdown::Engine::State.new(current_node: "n") }
 
         it "raises an UndefinedValue error" do
-          expect { evalutator.evaluate(predicate, state) }.to raise_error(Smartdown::Engine::UndefinedValue)
+          expect { evaluator.evaluate(predicate, state) }.to raise_error(Smartdown::Engine::UndefinedValue)
         end
       end
 
       context "state has expected variable with one of the expected values" do
-        it "evalutes to true" do
+        it "evaluates to true" do
           expected_values.each do |value|
             state = Smartdown::Engine::State.new(current_node: "n", varname => value)
-            expect(evalutator.evaluate(predicate, state)).to eq(true)
+            expect(evaluator.evaluate(predicate, state)).to eq(true)
           end
         end
       end
@@ -63,8 +68,8 @@ describe Smartdown::Engine::PredicateEvaluator do
       context "state has expected variable with a value not in the list of expected values" do
         let(:state) { Smartdown::Engine::State.new(current_node: "n", varname => "some other value") }
 
-        it "evalutes to false" do
-          expect(evalutator.evaluate(predicate, state)).to eq(false)
+        it "evaluates to false" do
+          expect(evaluator.evaluate(predicate, state)).to eq(false)
         end
       end
     end
@@ -79,7 +84,7 @@ describe Smartdown::Engine::PredicateEvaluator do
         let(:state) { Smartdown::Engine::State.new(current_node: "n") }
 
         it "raises an UndefinedValue error" do
-          expect { evalutator.evaluate(predicate, state) }.to raise_error(Smartdown::Engine::UndefinedValue)
+          expect { evaluator.evaluate(predicate, state) }.to raise_error(Smartdown::Engine::UndefinedValue)
         end
       end
 
@@ -89,10 +94,191 @@ describe Smartdown::Engine::PredicateEvaluator do
         }
 
         it "fetches the predicate value from the state" do
-          expect(evalutator.evaluate(predicate, state)).to eq(true)
+          expect(evaluator.evaluate(predicate, state)).to eq(true)
         end
       end
     end
   end
 
+  context "combined predicate" do
+    let(:predicate_name) { "my_pred?" }
+    let(:predicate_name_2) { "my_other_pred?" }
+    let(:predicate) { Smartdown::Model::Predicate::Named.new(predicate_name) }
+    let(:predicate_2) { Smartdown::Model::Predicate::Named.new(predicate_name_2) }
+    let(:combined_predicate) { Smartdown::Model::Predicate::Combined.new([predicate, predicate_2])}
+
+    describe "#evaluate" do
+
+      context "both states are true" do
+        let(:state) {
+          Smartdown::Engine::State.new("current_node" => "n", "my_pred?" => true, "my_other_pred?" => true )
+        }
+
+        it "evaluates as true" do
+          expect(evaluator.evaluate(combined_predicate, state)).to eq(true)
+        end
+      end
+
+      context "both states are false" do
+        let(:state) {
+          Smartdown::Engine::State.new("current_node" => "n", "my_pred?" => false, "my_other_pred?" => false )
+        }
+
+        it "evaluates as false" do
+          expect(evaluator.evaluate(combined_predicate, state)).to eq(false)
+        end
+      end
+
+      context "one of the states is false" do
+        let(:state) {
+          Smartdown::Engine::State.new("current_node" => "n", "my_pred?" => true, "my_other_pred?" => false )
+        }
+
+        it "evaluates as false" do
+          expect(evaluator.evaluate(combined_predicate, state)).to eq(false)
+        end
+      end
+    end
+
+  end
+
+  context "comparison predicates with integers" do
+    let(:greater_predicate) { Smartdown::Model::Predicate::Comparison::Greater.new("my_var", "5") }
+    let(:greater_or_equal_predicate) { Smartdown::Model::Predicate::Comparison::GreaterOrEqual.new("my_var", "5") }
+    let(:less_predicate) { Smartdown::Model::Predicate::Comparison::Less.new("my_var", "5") }
+    let(:less_or_equal_predicate) { Smartdown::Model::Predicate::Comparison::LessOrEqual.new("my_var", "5") }
+    let(:predicates) { {
+      :greater => greater_predicate,
+      :greater_or_equal => greater_or_equal_predicate,
+      :less => less_predicate,
+      :less_or_equal => less_or_equal_predicate
+    } }
+
+    describe "#evaluate" do
+      context "state missing expected variable" do
+        let(:state) { Smartdown::Engine::State.new(current_node: "n") }
+
+        it "raises an UndefinedValue error" do
+          predicates.values.each do |predicate|
+            expect { evaluator.evaluate(predicate, state) }.to raise_error(Smartdown::Engine::UndefinedValue)
+          end
+        end
+      end
+
+      context "state has lower value" do
+        let(:state) { Smartdown::Engine::State.new(current_node: "n", my_var: "4") }
+        let(:results) { {
+          :greater => false,
+          :greater_or_equal => false,
+          :less => true,
+          :less_or_equal => true
+        } }
+        it "evaluates correctly" do
+          predicates.each do |predicate_key, predicate|
+            expect(evaluator.evaluate(predicate, state)).to eq(results[predicate_key])
+          end
+        end
+      end
+
+      context "state has identical value" do
+        let(:state) { Smartdown::Engine::State.new(current_node: "n", my_var: "5") }
+        let(:results) { {
+            :greater => false,
+            :greater_or_equal => true,
+            :less => false,
+            :less_or_equal => true
+        } }
+        it "evaluates correctly" do
+          predicates.each do |predicate_key, predicate|
+            expect(evaluator.evaluate(predicate, state)).to eq(results[predicate_key])
+          end
+        end
+      end
+
+      context "state has higher value" do
+        let(:state) { Smartdown::Engine::State.new(current_node: "n", my_var: "6") }
+        let(:results) { {
+            :greater => true,
+            :greater_or_equal => true,
+            :less => false,
+            :less_or_equal => false
+        } }
+        it "evaluates correctly" do
+          predicates.each do |predicate_key, predicate|
+            expect(evaluator.evaluate(predicate, state)).to eq(results[predicate_key])
+          end
+        end
+      end
+    end
+  end
+
+  context "comparison predicates with dates" do
+    let(:greater_predicate) { Smartdown::Model::Predicate::Comparison::Greater.new("my_var", "2014-1-31") }
+    let(:greater_or_equal_predicate) { Smartdown::Model::Predicate::Comparison::GreaterOrEqual.new("my_var", "2014-1-31") }
+    let(:less_predicate) { Smartdown::Model::Predicate::Comparison::Less.new("my_var", "2014-1-31") }
+    let(:less_or_equal_predicate) { Smartdown::Model::Predicate::Comparison::LessOrEqual.new("my_var", "2014-1-31") }
+    let(:predicates) { {
+        :greater => greater_predicate,
+        :greater_or_equal => greater_or_equal_predicate,
+        :less => less_predicate,
+        :less_or_equal => less_or_equal_predicate
+    } }
+
+    describe "#evaluate" do
+      context "state missing expected variable" do
+        let(:state) { Smartdown::Engine::State.new(current_node: "n") }
+
+        it "raises an UndefinedValue error" do
+          predicates.values.each do |predicate|
+            expect { evaluator.evaluate(predicate, state) }.to raise_error(Smartdown::Engine::UndefinedValue)
+          end
+        end
+      end
+
+      context "state has lower value" do
+        let(:state) { Smartdown::Engine::State.new(current_node: "n", my_var: "2014-1-30") }
+        let(:results) { {
+            :greater => false,
+            :greater_or_equal => false,
+            :less => true,
+            :less_or_equal => true
+        } }
+        it "evaluates correctly" do
+          predicates.each do |predicate_key, predicate|
+            expect(evaluator.evaluate(predicate, state)).to eq(results[predicate_key])
+          end
+        end
+      end
+
+      context "state has identical value" do
+        let(:state) { Smartdown::Engine::State.new(current_node: "n", my_var: "2014-1-31") }
+        let(:results) { {
+            :greater => false,
+            :greater_or_equal => true,
+            :less => false,
+            :less_or_equal => true
+        } }
+        it "evaluates correctly" do
+          predicates.each do |predicate_key, predicate|
+            expect(evaluator.evaluate(predicate, state)).to eq(results[predicate_key])
+          end
+        end
+      end
+
+      context "state has higher value" do
+        let(:state) { Smartdown::Engine::State.new(current_node: "n", my_var: "2014-2-1") }
+        let(:results) { {
+            :greater => true,
+            :greater_or_equal => true,
+            :less => false,
+            :less_or_equal => false
+        } }
+        it "evaluates correctly" do
+          predicates.each do |predicate_key, predicate|
+            expect(evaluator.evaluate(predicate, state)).to eq(results[predicate_key])
+          end
+        end
+      end
+    end
+  end
 end

data/spec/parser/element/date_question_spec.rb

@@ -0,0 +1,28 @@
+require 'smartdown/parser/node_parser'
+require 'smartdown/parser/node_interpreter'
+require 'smartdown/parser/element/date_question'
+
+describe Smartdown::Parser::Element::DateQuestion do
+  subject(:parser) { described_class.new }
+
+  context "with question tag" do
+    let(:source) { "[date: date_of_birth]" }
+
+    it "parses" do
+      should parse(source).as(
+        date: {
+          identifier: "date_of_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")) }
+    end
+  end
+end

data/spec/parser/element/salary_question_spec.rb

@@ -0,0 +1,28 @@
+require 'smartdown/parser/node_parser'
+require 'smartdown/parser/node_interpreter'
+require 'smartdown/parser/element/salary_question'
+
+describe Smartdown::Parser::Element::SalaryQuestion do
+  subject(:parser) { described_class.new }
+
+  context "with question tag" do
+    let(:source) { "[salary: mother_salary]" }
+
+    it "parses" do
+      should parse(source).as(
+                 salary: {
+                     identifier: "mother_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")) }
+    end
+  end
+end

data/spec/parser/predicates_spec.rb

@@ -61,5 +61,84 @@ describe Smartdown::Parser::Predicates do
       it { should eq(Smartdown::Model::Predicate::Named.new("my_pred")) }
     end
   end
+
+  describe "predicate AND predicate" do
+    subject(:parser) { described_class.new }
+
+    it { should parse("my_pred AND my_other_pred").as(
+      { combined_predicate: {
+        first_predicate: { named_predicate: "my_pred" },
+        and_predicates:
+          [
+            {named_predicate: "my_other_pred"},
+          ]
+      } }
+    ) }
+    it { should parse("my_pred AND my_other_pred AND varname in {a b c}").as(
+      { combined_predicate: {
+        first_predicate: { named_predicate: "my_pred" },
+        and_predicates:
+          [
+            {named_predicate: "my_other_pred"},
+            {set_membership_predicate:
+              {varname: "varname", values: [{set_value: "a"}, {set_value: "b"}, {set_value: "c"}]}
+            }
+          ]
+      } }
+    ) }
+    it { should_not parse("my_pred AND ") }
+
+    describe "transformed" do
+      let(:node_name) { "my_node" }
+      let(:source) { "my_pred AND my_other_pred" }
+      subject(:transformed) {
+        Smartdown::Parser::NodeInterpreter.new(node_name, source, parser: parser).interpret
+      }
+
+      it { should eq(Smartdown::Model::Predicate::Combined.new(
+        [
+          Smartdown::Model::Predicate::Named.new("my_pred"),
+          Smartdown::Model::Predicate::Named.new("my_other_pred")
+        ]
+      )) }
+    end
+  end
+
+  describe "comparison predicate" do
+    subject(:parser) { described_class.new }
+    let(:greater_equal_source) { "varname >= 'value'" }
+    let(:greater_source) { "varname > 'value'" }
+    let(:less_equal_source) { "varname <= 'value'" }
+    let(:less_source) { "varname < 'value'" }
+
+    it { should parse(greater_equal_source).as(comparison_predicate: {varname: "varname", value: "value", operator: ">="}) }
+    it { should_not parse("v >= value") }
+    it { should_not parse("v >= 'a thing's thing'") }
+    it { should_not parse("v >= 'a thing\\'s thing'") }
+    it { should_not parse(%q{v >= "a thing"}) }
+
+    describe "transformed" do
+      let(:node_name) { "my_node" }
+      subject(:transformed) {
+        Smartdown::Parser::NodeInterpreter.new(node_name, source, parser: parser).interpret
+      }
+      context "greater" do
+        let(:source) { greater_equal_source }
+        it { should eq(Smartdown::Model::Predicate::Comparison::GreaterOrEqual.new("varname", "value")) }
+      end
+      context "stricly greater" do
+        let(:source) { greater_source }
+        it { should eq(Smartdown::Model::Predicate::Comparison::Greater.new("varname", "value")) }
+      end
+      context "lower" do
+        let(:source) { less_equal_source }
+        it { should eq(Smartdown::Model::Predicate::Comparison::LessOrEqual.new("varname", "value")) }
+      end
+      context "strictly lower" do
+        let(:source) { less_source }
+        it { should eq(Smartdown::Model::Predicate::Comparison::Less.new("varname", "value")) }
+      end
+    end
+  end
 end
 

data/spec/support/model_builder.rb

@@ -4,12 +4,19 @@ require 'smartdown/model/element/markdown_heading'
 require 'smartdown/model/element/markdown_paragraph'
 require 'smartdown/model/element/start_button'
 require 'smartdown/model/element/question/multiple_choice'
+require 'smartdown/model/element/question/date'
+require 'smartdown/model/element/question/salary'
 require 'smartdown/model/element/conditional'
 require 'smartdown/model/next_node_rules'
 require 'smartdown/model/rule'
 require 'smartdown/model/predicate/named'
 require 'smartdown/model/predicate/equality'
 require 'smartdown/model/predicate/set_membership'
+require 'smartdown/model/predicate/combined'
+require 'smartdown/model/predicate/comparison/greater_or_equal'
+require 'smartdown/model/predicate/comparison/less_or_equal'
+require 'smartdown/model/predicate/comparison/greater'
+require 'smartdown/model/predicate/comparison/less'
 
 class ModelBuilder
   def flow(name, &block)
@@ -52,6 +59,12 @@ class ModelBuilder
     @elements.last
   end
 
+  def date(name)
+    @elements ||= []
+    @elements << Smartdown::Model::Element::Question::Date.new(name)
+    @elements.last
+  end
+
   def next_steps(urls)
     @elements ||= []
     urls_with_string_keys = ::Hash[urls.map {|k,v| [k.to_s, v]}]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smartdown
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   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: &18315460 !ruby/object:Gem::Requirement
+  requirement: &13419100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.6.1
   type: :runtime
   prerelease: false
-  version_requirements: *18315460
+  version_requirements: *13419100
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &18314660 !ruby/object:Gem::Requirement
+  requirement: &13417020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 3.0.0
   type: :development
   prerelease: false
-  version_requirements: *18314660
+  version_requirements: *13417020
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &18314100 !ruby/object:Gem::Requirement
+  requirement: &13819280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18314100
+  version_requirements: *13819280
 - !ruby/object:Gem::Dependency
   name: gem_publisher
-  requirement: &18313460 !ruby/object:Gem::Requirement
+  requirement: &13818580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18313460
+  version_requirements: *13818580
 description: 
 email: david.heath@digital.cabinet-office.gov.uk
 executables:
@@ -71,6 +71,8 @@ files:
 - lib/smartdown/parser/directory_input.rb
 - lib/smartdown/parser/rules.rb
 - lib/smartdown/parser/node_parser.rb
+- lib/smartdown/parser/element/date_question.rb
+- lib/smartdown/parser/element/salary_question.rb
 - lib/smartdown/parser/element/conditional.rb
 - lib/smartdown/parser/element/markdown_paragraph.rb
 - lib/smartdown/parser/element/start_button.rb
@@ -79,8 +81,10 @@ files:
 - lib/smartdown/parser/element/next_steps.rb
 - lib/smartdown/parser/element/markdown_heading.rb
 - lib/smartdown/parser/flow_interpreter.rb
+- lib/smartdown/api/date_question.rb
 - lib/smartdown/api/coversheet.rb
 - lib/smartdown/api/question.rb
+- lib/smartdown/api/salary_question.rb
 - lib/smartdown/api/flow.rb
 - lib/smartdown/api/question_page.rb
 - lib/smartdown/api/state.rb
@@ -102,6 +106,12 @@ files:
 - lib/smartdown/model/predicate/named.rb
 - lib/smartdown/model/predicate/set_membership.rb
 - lib/smartdown/model/predicate/equality.rb
+- lib/smartdown/model/predicate/comparison/less_or_equal.rb
+- lib/smartdown/model/predicate/comparison/greater_or_equal.rb
+- lib/smartdown/model/predicate/comparison/base.rb
+- lib/smartdown/model/predicate/comparison/greater.rb
+- lib/smartdown/model/predicate/comparison/less.rb
+- lib/smartdown/model/predicate/combined.rb
 - lib/smartdown/model/node.rb
 - lib/smartdown/model/front_matter.rb
 - lib/smartdown/model/element/conditional.rb
@@ -109,6 +119,8 @@ files:
 - lib/smartdown/model/element/start_button.rb
 - lib/smartdown/model/element/next_steps.rb
 - lib/smartdown/model/element/markdown_heading.rb
+- lib/smartdown/model/element/question/date.rb
+- lib/smartdown/model/element/question/salary.rb
 - lib/smartdown/model/element/question/multiple_choice.rb
 - lib/smartdown/model/next_node_rules.rb
 - lib/smartdown/model/nested_rule.rb
@@ -127,9 +139,11 @@ files:
 - 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/date_question_spec.rb
 - spec/parser/element/markdown_paragraph_spec.rb
 - spec/parser/element/markdown_heading_spec.rb
 - spec/parser/element/front_matter_spec.rb
+- spec/parser/element/salary_question_spec.rb
 - spec/parser/node_parser_spec.rb
 - spec/support/model_builder.rb
 - spec/spec_helper.rb
@@ -168,7 +182,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3191894024105276380
+      hash: -352555312520548432
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -177,7 +191,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3191894024105276380
+      hash: -352555312520548432
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.11
@@ -196,9 +210,11 @@ test_files:
 - 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/date_question_spec.rb
 - spec/parser/element/markdown_paragraph_spec.rb
 - spec/parser/element/markdown_heading_spec.rb
 - spec/parser/element/front_matter_spec.rb
+- spec/parser/element/salary_question_spec.rb
 - spec/parser/node_parser_spec.rb
 - spec/support/model_builder.rb
 - spec/spec_helper.rb