smartdown 0.5.2 → 0.5.3

data/lib/smartdown/engine/interpolator.rb

@@ -40,7 +40,8 @@ module Smartdown
       private
         def interpolate(text, state)
           text.to_s.gsub(/%{([^}]+)}/) do |_|
-            resolve_term($1, state)
+            term = resolve_term($1, state)
+            term.respond_to?(:humanize) ? term.humanize : term
           end
         end
 

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

@@ -12,6 +12,10 @@ module Smartdown
           value.strftime("%Y-%-m-%-d")
         end
 
+        def humanize
+          value.strftime("%-d %B %Y")
+        end
+
       private
         def parse_value(value)
           ::Date.parse(value)

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

@@ -0,0 +1,22 @@
+# 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
+        def value_type
+          ::Float
+        end
+
+        def humanize
+          "£#{'%.2f' % value}"
+        end
+      end
+    end
+  end
+end

data/lib/smartdown/parser/flow_interpreter.rb

@@ -44,7 +44,7 @@ module Smartdown
       def interpret_node(input_data)
         Smartdown::Parser::NodeInterpreter.new(input_data.name, input_data.read).interpret
       rescue Parslet::ParseFailed => error
-        raise ParseError.new(input_data.to_s, error)
+        raise ParseError.new(input_data.name, error)
       end
 
       def pre_parse(flow_input)

data/lib/smartdown/version.rb

@@ -1,3 +1,3 @@
 module Smartdown
-  VERSION = "0.5.2"
+  VERSION = "0.5.3"
 end

data/spec/engine/interpolator_spec.rb

@@ -1,3 +1,6 @@
+# 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/engine/interpolator'
 require 'smartdown/engine/state'
 require 'parslet'
@@ -92,4 +95,45 @@ describe Smartdown::Engine::Interpolator do
       expect(interpolated_node.elements.first.content).to eq("20")
     end
   end
+
+  context "a paragraph containing function call with two arguments" do
+    let(:elements) { [Smartdown::Model::Element::MarkdownParagraph.new('%{multiply(number other_number)}')] }
+    let(:state) {
+      Smartdown::Engine::State.new(
+          current_node: node.name,
+          number: 10,
+          other_number: 2,
+          multiply: ->(number, other_number) { number * other_number }
+      )
+    }
+    it "interpolates the result of the function call" do
+      expect(interpolated_node.elements.first.content).to eq("20")
+    end
+  end
+
+  context "a paragraph containing a date answer" do
+    let(:elements) { [Smartdown::Model::Element::MarkdownParagraph.new('%{date_answer}')] }
+    let(:state) {
+      Smartdown::Engine::State.new(
+          current_node: node.name,
+          date_answer: Smartdown::Model::Answer::Date.new("date_question", "2014-1-1")
+      )
+    }
+    it "interpolates the result of the function call" do
+      expect(interpolated_node.elements.first.content).to eq("1 January 2014")
+    end
+  end
+
+  context "a paragraph containing a money answer" do
+    let(:elements) { [Smartdown::Model::Element::MarkdownParagraph.new('%{money_answer}')] }
+    let(:state) {
+      Smartdown::Engine::State.new(
+          current_node: node.name,
+          money_answer: Smartdown::Model::Answer::Money.new("money_answer", 12.32523)
+      )
+    }
+    it "interpolates the result of the function call" do
+      expect(interpolated_node.elements.first.content).to eq("£12.33")
+    end
+  end
 end

data/spec/model/answer/date_spec.rb

@@ -9,6 +9,10 @@ describe Smartdown::Model::Answer::Date do
   specify { expect(instance.value).to eql Date.new(2014, 9, 4) }
   specify { expect(instance.to_s).to eql "2014-9-4" }
 
+  describe "humanize" do
+    let(:date_string) { "2000-1-10" }
+    specify { expect(instance.humanize).to eql "10 January 2000" }
+  end
 
   describe "comparisons" do
     let(:date_string) { "2000-1-10" }

data/spec/model/answer/money_spec.rb

@@ -0,0 +1,32 @@
+# encoding: utf-8
+require 'smartdown/model/answer/money'
+
+describe Smartdown::Model::Answer::Money do
+
+  let(:money_float) { 523.42 }
+  subject(:instance) { described_class.new(nil, money_float) }
+
+  describe "#humanize" do
+    it "specifies money in the correct format" do
+      expect(instance.humanize).to eql("£523.42")
+    end
+    context "rounding up" do
+      let(:money_float) { 523.427 }
+      it "rounds up amounts of money correctly" do
+        expect(instance.humanize).to eql("£523.43")
+      end
+    end
+    context "rounding down" do
+      let(:money_float) { 523.421 }
+      it "rounds down amounts of money correctly" do
+        expect(instance.humanize).to eql("£523.42")
+      end
+    end
+    context "rounds down in the .005 case" do
+      let(:money_float) { 523.425 }
+      it "rounds down amounts of money correctly" do
+        expect(instance.humanize).to eql("£523.42")
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smartdown
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
   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: &12608840 !ruby/object:Gem::Requirement
+  requirement: &18591420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.6.1
   type: :runtime
   prerelease: false
-  version_requirements: *12608840
+  version_requirements: *18591420
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &12606660 !ruby/object:Gem::Requirement
+  requirement: &18589340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 3.0.0
   type: :development
   prerelease: false
-  version_requirements: *12606660
+  version_requirements: *18589340
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &12629520 !ruby/object:Gem::Requirement
+  requirement: &18612100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12629520
+  version_requirements: *18612100
 - !ruby/object:Gem::Dependency
   name: gem_publisher
-  requirement: &12628900 !ruby/object:Gem::Requirement
+  requirement: &18611440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12628900
+  version_requirements: *18611440
 description: 
 email: david.heath@digital.cabinet-office.gov.uk
 executables:
@@ -120,6 +120,7 @@ files:
 - lib/smartdown/model/answer/date.rb
 - lib/smartdown/model/answer/base.rb
 - lib/smartdown/model/answer/salary.rb
+- lib/smartdown/model/answer/money.rb
 - lib/smartdown/model/answer/multiple_choice.rb
 - lib/smartdown/model/element/conditional.rb
 - lib/smartdown/model/element/markdown_paragraph.rb
@@ -186,6 +187,7 @@ files:
 - spec/engine_spec.rb
 - spec/model/node_spec.rb
 - spec/model/flow_spec.rb
+- spec/model/answer/money_spec.rb
 - spec/model/answer/base_spec.rb
 - spec/model/answer/salary_spec.rb
 - spec/model/answer/date_spec.rb
@@ -210,7 +212,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3468443137399922310
+      hash: -2081171920268489084
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -219,7 +221,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3468443137399922310
+      hash: -2081171920268489084
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.11
@@ -278,6 +280,7 @@ test_files:
 - spec/engine_spec.rb
 - spec/model/node_spec.rb
 - spec/model/flow_spec.rb
+- spec/model/answer/money_spec.rb
 - spec/model/answer/base_spec.rb
 - spec/model/answer/salary_spec.rb
 - spec/model/answer/date_spec.rb