smartdown 0.12.1 → 0.13.0

data/lib/smartdown/api/country_question.rb

@@ -1,5 +1,5 @@
 require 'smartdown/api/question'
-require 'smartdown/model/element/question/country'
+require 'smartdown/model/element/question'
 
 module Smartdown
   module Api

data/lib/smartdown/api/money_question.rb

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

data/lib/smartdown/api/previous_question.rb

@@ -8,20 +8,8 @@ module Smartdown
       attr_reader :answer, :question
 
       def initialize(elements, response)
-        if element = elements.find{|element| element.is_a? Smartdown::Model::Element::Question::MultipleChoice}
-          @question = MultipleChoice.new(elements)
-        elsif element = elements.find{|element| element.is_a? Smartdown::Model::Element::Question::Country}
-          @question = CountryQuestion.new(elements)
-        elsif element = elements.find{|element| element.is_a? Smartdown::Model::Element::Question::Date}
-          @question = DateQuestion.new(elements)
-        elsif element = elements.find{|element| element.is_a? Smartdown::Model::Element::Question::Salary}
-          @question = SalaryQuestion.new(elements)
-        elsif element = elements.find{|element| element.is_a? Smartdown::Model::Element::Question::Text}
-          @question = TextQuestion.new(elements)
-        elsif element = elements.find{|element| element.is_a? Smartdown::Model::Element::Question::Postcode}
-          @question = PostcodeQuestion.new(elements)
-        end
-        @answer = element.answer_type.new(response, element) if element
+        @question, @answer = Smartdown::Model::Element::Question.
+            create_question_answer(elements, response)
       end
 
     end

data/lib/smartdown/api/question_page.rb

@@ -1,9 +1,4 @@
-require 'smartdown/api/multiple_choice'
-require 'smartdown/api/date_question'
-require 'smartdown/api/country_question'
-require 'smartdown/api/salary_question'
-require 'smartdown/api/text_question'
-require 'smartdown/api/postcode_question'
+require 'smartdown/model/element/question'
 
 module Smartdown
   module Api
@@ -12,19 +7,9 @@ module Smartdown
         elements.slice_before do |element|
           element.is_a? Smartdown::Model::Element::MarkdownHeading
         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::Country) }
-            Smartdown::Api::CountryQuestion.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)
-          elsif question_element_group.find{|element| element.is_a? Smartdown::Model::Element::Question::Text}
-            Smartdown::Api::TextQuestion.new(question_element_group)
-          elsif question_element_group.find{|element| element.is_a? Smartdown::Model::Element::Question::Postcode}
-            Smartdown::Api::PostcodeQuestion.new(question_element_group)
-          end
+          question, answer = Smartdown::Model::Element::Question.
+              create_question_answer(question_element_group)
+          question
         end.compact
       end
     end

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

@@ -1,3 +1,5 @@
+require 'forwardable'
+
 module Smartdown
   module Model
     module Answer

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

@@ -1,23 +1,54 @@
 # encoding: utf-8
-#TODO: this is no technically an answer (only used for plugin formatting for now)
-#since we will have money questions in the near future, this todo should be removed, and the
-#require in interpolator.rb removed
-
 require_relative "base"
 
 module Smartdown
   module Model
     module Answer
       class Money < Base
+
+        FORMAT_REGEX = /^£?\W*([\d|,|]+[\.]?[\d]*)$/
+
         def value_type
           ::Float
         end
 
+        def to_s
+          ('%.2f' % value).chomp('.00')
+        end
+
         def humanize
-          number_string = "£#{'%.2f' % value}".gsub(/(\d)(?=(\d\d\d)+(?!\d))/) do |digit_to_delimit|
+          whole, decimal = separate_by_comma(value)
+          if decimal == '00'
+            "£#{whole}"
+          else
+            "£#{whole}.#{decimal}"
+          end
+        end
+
+        private
+
+        def parse_value value
+          if value.is_a?(Float)
+            value
+          elsif value.is_a?(Fixnum)
+            Float value
+          else
+            matched_value = value.strip.match FORMAT_REGEX
+            if matched_value
+              Float matched_value[1].gsub(',','')
+            else
+              @error = 'Invalid format'
+              return
+            end
+          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
-          number_string.end_with?(".00") ? number_string[0..-4] : number_string
+          [left, right]
         end
       end
     end

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

@@ -7,23 +7,19 @@ module Smartdown
       class Salary < Base
         attr_reader :period, :amount_per_period
 
-        FORMAT_REGEX = /^£?\W*([\d|,|]+[\.]?[\d]*)[-|\W*per\W*](week|month|year)$/
+        FORMAT_REGEX = Regexp.new(Money::FORMAT_REGEX.source.chomp('$') +
+            /[-|\W*per\W*](week|month|year)$/.source)
 
         def value_type
           ::Float
         end
 
         def to_s
-          "#{'%.2f' % amount_per_period}-#{period}"
+          "#{@money_per_period}-#{period}"
         end
 
         def humanize
-          whole, decimal = separate_by_comma(amount_per_period)
-          if decimal == "00"
-            "£#{whole} per #{period}"
-          else
-            "£#{whole}.#{decimal} per #{period}"
-          end
+          "#{@money_per_period.humanize} per #{period}"
         end
 
       private
@@ -33,8 +29,10 @@ module Smartdown
             @error = "Invalid format"
             return
           end
-          @amount_per_period, @period = *matched_value[1..2]
-          @amount_per_period = @amount_per_period.gsub(",","").to_f
+          amount_per_period, @period = *matched_value[1..2]
+
+          @money_per_period = Money.new(amount_per_period)
+          @amount_per_period = @money_per_period.value
           yearly_total
         end
 
@@ -49,13 +47,6 @@ module Smartdown
           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
-          [left, right]
-        end
       end
     end
   end

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

@@ -0,0 +1,15 @@
+require 'smartdown/model/answer/money'
+
+module Smartdown
+  module Model
+    module Element
+      module Question
+        class Money < Struct.new(:name, :alias)
+          def answer_type
+            Smartdown::Model::Answer::Money
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,68 @@
+require 'forwardable'
+require 'smartdown/model/element/question/multiple_choice'
+require 'smartdown/model/element/question/country'
+require 'smartdown/model/element/question/date'
+require 'smartdown/model/element/question/money'
+require 'smartdown/model/element/question/salary'
+require 'smartdown/model/element/question/text'
+require 'smartdown/model/element/question/postcode'
+require 'smartdown/api/multiple_choice'
+require 'smartdown/api/date_question'
+require 'smartdown/api/country_question'
+require 'smartdown/api/money_question'
+require 'smartdown/api/salary_question'
+require 'smartdown/api/text_question'
+require 'smartdown/api/postcode_question'
+
+module Smartdown
+  module Model
+    module Element
+      module Question
+
+        class << self
+          def create_question_answer(elements, response=nil)
+            matching_question_element(elements) do |element|
+              question = create_question(elements, element)
+              answer   = create_answer(response, element)
+              return [question, answer]
+            end
+            return [nil, nil]
+          end
+
+          private
+
+          def matching_question_element(elements)
+            constants.find do |symbol|
+              question_type = const_get(symbol)
+
+              if element = elements.find {|e| e.is_a?(question_type) }
+                yield element
+              end
+            end
+          end
+
+          def create_question(elements, element)
+            question_model(element).new(elements)
+          end
+
+          def question_model(element)
+            Smartdown::Api.const_get question_model_name(element)
+          end
+
+          def question_model_name(element)
+            symbol = element.class.name.split(':').last.to_sym
+            name = (symbol.to_s + 'Question').to_sym
+            name = symbol unless Smartdown::Api.const_defined?(name)
+            name
+          end
+
+          def create_answer(response, element)
+            response ? element.answer_type.new(response, element) : nil
+          end
+
+        end
+      end
+    end
+  end
+end
+

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

@@ -0,0 +1,20 @@
+require 'smartdown/parser/base'
+require 'smartdown/parser/question'
+
+module Smartdown
+  module Parser
+    module Element
+      class MoneyQuestion < Question
+        rule(:question_type) {
+          str("money")
+        }
+
+        rule(:money_question) {
+          question_tag.as(:money)
+        }
+
+        root(:money_question)
+      end
+    end
+  end
+end

data/lib/smartdown/parser/node_parser.rb

@@ -4,6 +4,7 @@ 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/money_question'
 require 'smartdown/parser/element/salary_question'
 require 'smartdown/parser/element/text_question'
 require 'smartdown/parser/element/country_question'
@@ -26,6 +27,7 @@ module Smartdown
         Element::TextQuestion.new |
         Element::CountryQuestion.new |
         Element::PostcodeQuestion.new |
+        Element::MoneyQuestion.new |
         Rules.new |
         Element::StartButton.new |
         Element::NextSteps.new |
@@ -34,7 +36,7 @@ module Smartdown
       }
 
       rule(:markdown_elements) {
-        markdown_element.repeat(1, 1) >> 
+        markdown_element.repeat(1, 1) >>
         (newline.repeat(1).as(:blank_line) >> markdown_element.as(:element)).repeat
       }
 

data/lib/smartdown/parser/node_transform.rb

@@ -6,12 +6,7 @@ require 'smartdown/model/elements'
 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/country'
-require 'smartdown/model/element/question/date'
-require 'smartdown/model/element/question/salary'
-require 'smartdown/model/element/question/text'
-require 'smartdown/model/element/question/postcode'
+require 'smartdown/model/element/question'
 require 'smartdown/model/element/start_button'
 require 'smartdown/model/element/markdown_heading'
 require 'smartdown/model/element/markdown_line'
@@ -137,6 +132,13 @@ module Smartdown
         )
       }
 
+      rule money: { identifier: simple(:identifier), option_pairs: subtree(:option_pairs) } {
+        Smartdown::Model::Element::Question::Money.new(
+          identifier.to_s,
+          Smartdown::Parser::OptionPairs.transform(option_pairs).fetch('alias', nil)
+        )
+      }
+
       rule(:next_steps => { content: simple(:content) }) {
         Smartdown::Model::Element::NextSteps.new(content.to_s)
       }

data/lib/smartdown/version.rb

@@ -1,3 +1,3 @@
 module Smartdown
-  VERSION = "0.12.1"
+  VERSION = "0.13.0"
 end

data/spec/engine/interpolator_spec.rb

@@ -1,7 +1,5 @@
 # encoding: utf-8
-#TODO: this "require" for money is here for now since there is no associated question type for money yet
-require 'smartdown/model/answer/money'
-require 'smartdown/model/element/question/country'
+require 'smartdown/model/element/question'
 require 'smartdown/engine/interpolator'
 require 'smartdown/engine/state'
 require 'parslet'
@@ -120,7 +118,7 @@ describe Smartdown::Engine::Interpolator do
     let(:state) {
       Smartdown::Engine::State.new(
           current_node: node.name,
-          money_answer: Smartdown::Model::Answer::Money.new(12.32523)
+          money_answer: Smartdown::Model::Answer::Money.new('12.32523')
       )
     }
     it "interpolates the result of the function call" do

data/spec/model/answer/money_spec.rb

@@ -3,36 +3,147 @@ require 'smartdown/model/answer/money'
 
 describe Smartdown::Model::Answer::Money do
 
-  let(:money_float) { 523.42 }
-  subject(:instance) { described_class.new(money_float) }
+  let(:money_input) { '1523.42' }
+  subject(:instance) { described_class.new(money_input) }
+
+  specify { expect(instance.value).to eql(1523.42) }
+
+  describe 'instantiate with integer' do
+    let(:money_input) { 1523 }
+
+    specify { expect(instance.value).to eql(1523.0) }
+  end
+
+  describe 'instantiate with float' do
+    let(:money_input) { 1523.12 }
+
+    specify { expect(instance.value).to eql(1523.12) }
+  end
+
+  describe 'to_s' do
+    it "returns value without comma delimiter" do
+      expect(instance.to_s).to eql("1523.42")
+    end
+  end
 
   describe "#humanize" do
     it "specifies money in the correct format" do
-      expect(instance.humanize).to eql("£523.42")
+      expect(instance.humanize).to eql("£1,523.42")
     end
+
     context "rounding up" do
-      let(:money_float) { 523.427 }
+      let(:money_input) { '1523.427' }
       it "rounds up amounts of money correctly" do
-        expect(instance.humanize).to eql("£523.43")
+        expect(instance.humanize).to eql("£1,523.43")
       end
     end
     context "rounding down" do
-      let(:money_float) { 523.421 }
+      let(:money_input) { '1523.421' }
       it "rounds down amounts of money correctly" do
-        expect(instance.humanize).to eql("£523.42")
+        expect(instance.humanize).to eql("£1,523.42")
       end
     end
     context "rounds down in the .005 case" do
-      let(:money_float) { 523.425 }
+      let(:money_input) { '1523.425' }
       it "rounds down amounts of money correctly" do
-        expect(instance.humanize).to eql("£523.42")
+        expect(instance.humanize).to eql("£1,523.42")
       end
     end
     context "no pence" do
-      let(:money_float) { 523.00 }
+      let(:money_input) { '1523.00' }
       it "rounds down amounts of money correctly" do
-        expect(instance.humanize).to eql("£523")
+        expect(instance.humanize).to eql("£1,523")
       end
     end
   end
+
+  describe "errors" do
+    context "invalid formatting" do
+      let(:money_input) {"Loads'a'money"}
+
+      it "Has errors" do
+        expect(instance.error).to eql("Invalid format")
+      end
+    end
+
+    context "no input" do
+      let(:money_input) { nil }
+
+      it "Has errors" do
+        expect(instance.error).to eql("Please answer this question")
+      end
+    end
+  end
+
+  describe "comparisons" do
+    let(:money_input) { '62,400' }
+
+    context "comparing against Float" do
+      specify { expect(instance == 62400.0).to eql true }
+
+      specify { expect(instance < 62400.1).to eql true }
+      specify { expect(instance < 62400.0).to eql false }
+      specify { expect(instance < 62399.9).to eql false }
+
+      specify { expect(instance > 62400.1).to eql false }
+      specify { expect(instance > 62400.0).to eql false }
+      specify { expect(instance > 62399.9).to eql true }
+
+      specify { expect(instance <= 62400.1).to eql true }
+      specify { expect(instance <= 62400.0).to eql true }
+      specify { expect(instance <= 62399.9).to eql false }
+
+      specify { expect(instance >= 62400.1).to eql false }
+      specify { expect(instance >= 62400.0).to eql true }
+      specify { expect(instance >= 62399.9).to eql true }
+    end
+
+    context "comparing against Integer" do
+      specify { expect(instance == 62400).to eql true }
+
+      specify { expect(instance < 62401).to eql true }
+      specify { expect(instance < 62400).to eql false }
+      specify { expect(instance < 62399).to eql false }
+
+      specify { expect(instance > 62401).to eql false }
+      specify { expect(instance > 62400).to eql false }
+      specify { expect(instance > 62399).to eql true }
+
+      specify { expect(instance <= 62401).to eql true }
+      specify { expect(instance <= 62400).to eql true }
+      specify { expect(instance <= 62399).to eql false }
+
+      specify { expect(instance >= 62401).to eql false }
+      specify { expect(instance >= 62400).to eql true }
+      specify { expect(instance >= 62399).to eql true }
+    end
+
+    context "comparing against strings" do
+      specify { expect(instance == '62400').to eql true }
+      specify { expect(instance < '62400.1').to eql true }
+      specify { expect(instance > '62400').to eql false }
+      specify { expect(instance <= '62400.1').to eql true }
+      specify { expect(instance >= '62400').to eql true }
+    end
+
+    context "comparing against Answer::Money" do
+      specify { expect(instance == described_class.new(money_input)).to eql true }
+
+      specify { expect(instance < described_class.new('62,400.1')).to eql true }
+      specify { expect(instance < described_class.new('62,400')).to eql false }
+      specify { expect(instance < described_class.new('62,399.99')).to eql false }
+
+      specify { expect(instance > described_class.new('62,400.1')).to eql false }
+      specify { expect(instance > described_class.new('62,400')).to eql false }
+      specify { expect(instance > described_class.new('62,399.99')).to eql true }
+
+      specify { expect(instance <= described_class.new('62,400.1')).to eql true }
+      specify { expect(instance <= described_class.new('62,400')).to eql true }
+      specify { expect(instance <= described_class.new('62,399.99')).to eql false }
+
+      specify { expect(instance >= described_class.new('62,400.1')).to eql false }
+      specify { expect(instance >= described_class.new('62,400')).to eql true }
+      specify { expect(instance >= described_class.new('62,399.99')).to eql true }
+    end
+  end
 end

data/spec/model/answer/salary_spec.rb

@@ -1,5 +1,6 @@
 # encoding: utf-8
 require 'smartdown/model/answer/date'
+require 'smartdown/model/answer/money'
 require 'smartdown/model/element/question/date'
 
 describe Smartdown::Model::Answer::Salary do
@@ -11,7 +12,7 @@ describe Smartdown::Model::Answer::Salary do
   specify { expect(instance.amount_per_period).to eql(500.00) }
 
   it "as a string, it should declare itself in the initial format provided" do
-    expect(instance.to_s).to eql("500.00-week")
+    expect(instance.to_s).to eql("500-week")
   end
 
   describe "#humanize" do
@@ -71,7 +72,6 @@ describe Smartdown::Model::Answer::Salary do
         expect(instance.error).to eql("Please answer this question")
       end
     end
-
   end
 
   context "declared by week" do
@@ -89,7 +89,6 @@ describe Smartdown::Model::Answer::Salary do
     specify { expect(instance.value).to eql 20000.0 }
   end
 
-
   describe "comparisons" do
     let(:salary_string) { "1200-week" } # equivalent to 62,400 yearly or 5200 monthly
 
@@ -136,7 +135,7 @@ describe Smartdown::Model::Answer::Salary do
       specify { expect(instance >= "5199.9-month").to eql true }
     end
 
-    context "comparing against Answer::Salaries" do
+    context "comparing against Answer::Salary" do
       specify { expect(instance == described_class.new("1200-week")).to eql true }
 
       specify { expect(instance < described_class.new("1200.1-week")).to eql true }

data/spec/model/element/question_spec.rb

@@ -0,0 +1,70 @@
+require 'smartdown/model/element/question'
+
+describe Smartdown::Model::Element::Question do
+
+  let(:elements) { [
+    Smartdown::Model::Element::Question::Money.new('10.30'),
+    Smartdown::Model::Element::Question::Date.new('2014-10-01')
+  ] }
+
+  describe 'constants()' do
+    it 'has expected order' do
+      expect(described_class.constants).to eq [
+        :MultipleChoice,
+        :Country,
+        :Date,
+        :Money,
+        :Salary,
+        :Text,
+        :Postcode
+      ]
+    end
+  end
+
+  describe 'create_question_answer()' do
+
+    context 'with no matching elements' do
+      before do
+        @question, @answer = described_class.create_question_answer([])
+      end
+
+      it 'does not create question or answer' do
+        expect(@question).to be_nil
+        expect(@answer).to be_nil
+      end
+    end
+
+    context 'with response value not given' do
+      before do
+        @question, @answer = described_class.create_question_answer(elements)
+      end
+
+      it 'should create question with correct class' do
+        expect(@question).to be_a Smartdown::Api::DateQuestion
+      end
+
+      it 'should not create answer' do
+        expect(@answer).to be_nil
+      end
+    end
+
+    context 'with response value given' do
+      before do
+        @question, @answer = described_class.create_question_answer(elements, '2014-10-01')
+      end
+
+      it 'should create question with correct class' do
+        expect(@question).to be_a Smartdown::Api::DateQuestion
+      end
+
+      it 'should create answer with correct class' do
+        expect(@answer).to be_a Smartdown::Model::Answer::Date
+      end
+
+      it 'should create answer with correct value' do
+        expect(@answer.value.to_s).to eq('2014-10-01')
+      end
+    end
+  end
+end
+

data/spec/parser/element/money_question_spec.rb

@@ -0,0 +1,57 @@
+require 'smartdown/parser/node_parser'
+require 'smartdown/parser/node_interpreter'
+require 'smartdown/parser/element/money_question'
+
+describe Smartdown::Parser::Element::MoneyQuestion do
+  subject(:parser) { described_class.new }
+
+  context 'with question tag' do
+    let(:source) { '[money: court_fee]' }
+
+    it 'parses' do
+      should parse(source).as(
+        money: {
+          identifier: 'court_fee',
+          option_pairs:[],
+        }
+      )
+    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::Money.new('court_fee')) }
+    end
+  end
+
+  context 'with question tag and alias' do
+    let(:source) { '[money: court_fee, alias: claim_fee]' }
+
+    it 'parses' do
+      should parse(source).as(
+        money: {
+          identifier: 'court_fee',
+          option_pairs: [
+            {
+              key: 'alias',
+              value: 'claim_fee',
+            }
+          ]
+        }
+      )
+    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::Money.new('court_fee', 'claim_fee')) }
+    end
+  end
+
+end

data/spec/support/model_builder.rb

@@ -3,10 +3,7 @@ require 'smartdown/model/node'
 require 'smartdown/model/element/markdown_heading'
 require 'smartdown/model/element/markdown_line'
 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/question/text'
+require 'smartdown/model/element/question'
 require 'smartdown/model/element/conditional'
 require 'smartdown/model/next_node_rules'
 require 'smartdown/model/rule'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smartdown
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 0.13.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-09 00:00:00.000000000 Z
+date: 2015-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet
-  requirement: &20811800 !ruby/object:Gem::Requirement
+  requirement: &16864100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.6.2
   type: :runtime
   prerelease: false
-  version_requirements: *20811800
+  version_requirements: *16864100
 - !ruby/object:Gem::Dependency
   name: uk_postcode
-  requirement: &20810920 !ruby/object:Gem::Requirement
+  requirement: &16863580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *20810920
+  version_requirements: *16863580
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &20810340 !ruby/object:Gem::Requirement
+  requirement: &16863120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 3.0.0
   type: :development
   prerelease: false
-  version_requirements: *20810340
+  version_requirements: *16863120
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &20809660 !ruby/object:Gem::Requirement
+  requirement: &16862640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20809660
+  version_requirements: *16862640
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &20808900 !ruby/object:Gem::Requirement
+  requirement: &16862140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20808900
+  version_requirements: *16862140
 - !ruby/object:Gem::Dependency
   name: gem_publisher
-  requirement: &20808260 !ruby/object:Gem::Requirement
+  requirement: &16861580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20808260
+  version_requirements: *16861580
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &20937900 !ruby/object:Gem::Requirement
+  requirement: &16861040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20937900
+  version_requirements: *16861040
 description: 
 email: david.heath@digital.cabinet-office.gov.uk
 executables:
@@ -112,6 +112,7 @@ files:
 - lib/smartdown/parser/element/markdown_blank_line.rb
 - lib/smartdown/parser/element/salary_question.rb
 - lib/smartdown/parser/element/postcode_question.rb
+- lib/smartdown/parser/element/money_question.rb
 - lib/smartdown/parser/element/conditional.rb
 - lib/smartdown/parser/element/start_button.rb
 - lib/smartdown/parser/element/front_matter.rb
@@ -130,6 +131,7 @@ files:
 - lib/smartdown/api/postcode_question.rb
 - lib/smartdown/api/flow.rb
 - lib/smartdown/api/question_page.rb
+- lib/smartdown/api/money_question.rb
 - lib/smartdown/api/state.rb
 - lib/smartdown/api/node.rb
 - lib/smartdown/api/directory_input.rb
@@ -174,6 +176,7 @@ files:
 - lib/smartdown/model/answer/money.rb
 - lib/smartdown/model/answer/multiple_choice.rb
 - lib/smartdown/model/answer/text.rb
+- lib/smartdown/model/element/question.rb
 - lib/smartdown/model/element/conditional.rb
 - lib/smartdown/model/element/start_button.rb
 - lib/smartdown/model/element/markdown_line.rb
@@ -183,6 +186,7 @@ files:
 - lib/smartdown/model/element/question/salary.rb
 - lib/smartdown/model/element/question/postcode.rb
 - lib/smartdown/model/element/question/country.rb
+- lib/smartdown/model/element/question/money.rb
 - lib/smartdown/model/element/question/multiple_choice.rb
 - lib/smartdown/model/element/question/text.rb
 - lib/smartdown/model/next_node_rules.rb
@@ -212,6 +216,7 @@ files:
 - spec/parser/element/salary_question_spec.rb
 - spec/parser/element/markdown_line_spec.rb
 - spec/parser/element/text_question_spec.rb
+- spec/parser/element/money_question_spec.rb
 - spec/parser/option_pairs_transform_spec.rb
 - spec/parser/node_parser_spec.rb
 - spec/parser/snippet_pre_parser_spec.rb
@@ -280,6 +285,7 @@ files:
 - spec/model/answer/date_spec.rb
 - spec/model/answer/postcode_spec.rb
 - spec/model/answer/country_spec.rb
+- spec/model/element/question_spec.rb
 - spec/model/predicates/not_operation_spec.rb
 - spec/model/predicates/set_membership_spec.rb
 - spec/model/predicates/or_operation_spec.rb
@@ -303,7 +309,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3149710437722645719
+      hash: 2163453024912914140
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -312,7 +318,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3149710437722645719
+      hash: 2163453024912914140
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.11
@@ -341,6 +347,7 @@ test_files:
 - spec/parser/element/salary_question_spec.rb
 - spec/parser/element/markdown_line_spec.rb
 - spec/parser/element/text_question_spec.rb
+- spec/parser/element/money_question_spec.rb
 - spec/parser/option_pairs_transform_spec.rb
 - spec/parser/node_parser_spec.rb
 - spec/parser/snippet_pre_parser_spec.rb
@@ -409,6 +416,7 @@ test_files:
 - spec/model/answer/date_spec.rb
 - spec/model/answer/postcode_spec.rb
 - spec/model/answer/country_spec.rb
+- spec/model/element/question_spec.rb
 - spec/model/predicates/not_operation_spec.rb
 - spec/model/predicates/set_membership_spec.rb
 - spec/model/predicates/or_operation_spec.rb