smartdown 0.5.4 → 0.6.0

data/README.md

@@ -140,10 +140,10 @@ passport_country:
 [date: baby_due_date]
 ```
 
-### Value (tbd)
+### Text
 
 ```markdown
-[value]
+[text: text_value]
 ```
 
 Asks for an arbitrary text input.

data/lib/smartdown/api/previous_question.rb

@@ -15,6 +15,8 @@ module Smartdown
           @question = DateQuestion.new(elements)
         elsif 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}
+          @question = TextQuestion.new(elements)
         end
       end
 

data/lib/smartdown/api/question_page.rb

@@ -1,6 +1,7 @@
 require 'smartdown/api/multiple_choice'
 require 'smartdown/api/date_question'
 require 'smartdown/api/salary_question'
+require 'smartdown/api/text_question'
 
 module Smartdown
   module Api
@@ -15,6 +16,8 @@ module Smartdown
             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)
           end
         end
       end

data/lib/smartdown/api/text_question.rb

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

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

@@ -0,0 +1,13 @@
+require_relative "base"
+
+module Smartdown
+  module Model
+    module Answer
+      class Text < Base
+        def value_type
+          ::String
+        end
+      end
+    end
+  end
+end

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

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

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

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

data/lib/smartdown/parser/node_parser.rb

@@ -5,6 +5,7 @@ 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/text_question'
 require 'smartdown/parser/element/markdown_heading'
 require 'smartdown/parser/element/markdown_paragraph'
 require 'smartdown/parser/element/conditional'
@@ -19,6 +20,7 @@ module Smartdown
         Element::MultipleChoiceQuestion.new |
         Element::DateQuestion.new |
         Element::SalaryQuestion.new |
+        Element::TextQuestion.new |
         Rules.new |
         Element::StartButton.new |
         Element::NextSteps.new |

data/lib/smartdown/parser/node_transform.rb

@@ -7,6 +7,7 @@ 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/question/text'
 require 'smartdown/model/element/start_button'
 require 'smartdown/model/element/markdown_heading'
 require 'smartdown/model/element/markdown_paragraph'
@@ -81,6 +82,12 @@ module Smartdown
         )
       }
 
+      rule(:text => {identifier: simple(:identifier)}) {
+        Smartdown::Model::Element::Question::Text.new(
+          identifier.to_s
+        )
+      }
+
       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.5.4"
+  VERSION = "0.6.0"
 end

data/spec/model/answer/text_spec.rb

@@ -0,0 +1,6 @@
+describe Smartdown::Model::Answer::Text do
+  let(:text_string) { "London" }
+  subject(:instance) { described_class.new(text_string) }
+
+  specify { expect(instance.to_s).to eql("London") }
+end

data/spec/parser/element/text_question_spec.rb

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

data/spec/support/model_builder.rb

@@ -6,6 +6,7 @@ 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/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.5.4
+  version: 0.6.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: &10346540 !ruby/object:Gem::Requirement
+  requirement: &18240820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.6.1
   type: :runtime
   prerelease: false
-  version_requirements: *10346540
+  version_requirements: *18240820
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &10344500 !ruby/object:Gem::Requirement
+  requirement: &18238780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 3.0.0
   type: :development
   prerelease: false
-  version_requirements: *10344500
+  version_requirements: *18238780
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &10342380 !ruby/object:Gem::Requirement
+  requirement: &18237320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *10342380
+  version_requirements: *18237320
 - !ruby/object:Gem::Dependency
   name: gem_publisher
-  requirement: &10366360 !ruby/object:Gem::Requirement
+  requirement: &18235860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *10366360
+  version_requirements: *18235860
 description: 
 email: david.heath@digital.cabinet-office.gov.uk
 executables:
@@ -82,6 +82,7 @@ files:
 - lib/smartdown/parser/element/multiple_choice_question.rb
 - lib/smartdown/parser/element/next_steps.rb
 - lib/smartdown/parser/element/markdown_heading.rb
+- lib/smartdown/parser/element/text_question.rb
 - lib/smartdown/parser/flow_interpreter.rb
 - lib/smartdown/api/date_question.rb
 - lib/smartdown/api/coversheet.rb
@@ -95,6 +96,7 @@ files:
 - lib/smartdown/api/previous_question.rb
 - lib/smartdown/api/outcome.rb
 - lib/smartdown/api/multiple_choice.rb
+- lib/smartdown/api/text_question.rb
 - lib/smartdown/api/previous_question_page.rb
 - lib/smartdown/version.rb
 - lib/smartdown/engine/node_presenter.rb
@@ -122,6 +124,7 @@ files:
 - lib/smartdown/model/answer/salary.rb
 - lib/smartdown/model/answer/money.rb
 - lib/smartdown/model/answer/multiple_choice.rb
+- lib/smartdown/model/answer/text.rb
 - lib/smartdown/model/element/conditional.rb
 - lib/smartdown/model/element/markdown_paragraph.rb
 - lib/smartdown/model/element/start_button.rb
@@ -130,6 +133,7 @@ files:
 - 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/element/question/text.rb
 - lib/smartdown/model/next_node_rules.rb
 - lib/smartdown/model/nested_rule.rb
 - lib/smartdown/model/rule.rb
@@ -153,6 +157,7 @@ files:
 - spec/parser/element/markdown_heading_spec.rb
 - spec/parser/element/front_matter_spec.rb
 - spec/parser/element/salary_question_spec.rb
+- spec/parser/element/text_question_spec.rb
 - spec/parser/node_parser_spec.rb
 - spec/parser/snippet_pre_parser_spec.rb
 - spec/support/flow_input_interface.rb
@@ -188,6 +193,7 @@ files:
 - spec/model/node_spec.rb
 - spec/model/flow_spec.rb
 - spec/model/answer/money_spec.rb
+- spec/model/answer/text_spec.rb
 - spec/model/answer/base_spec.rb
 - spec/model/answer/salary_spec.rb
 - spec/model/answer/date_spec.rb
@@ -212,7 +218,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1694965112533004237
+      hash: -4119241983513724352
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -221,7 +227,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1694965112533004237
+      hash: -4119241983513724352
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.11
@@ -246,6 +252,7 @@ test_files:
 - spec/parser/element/markdown_heading_spec.rb
 - spec/parser/element/front_matter_spec.rb
 - spec/parser/element/salary_question_spec.rb
+- spec/parser/element/text_question_spec.rb
 - spec/parser/node_parser_spec.rb
 - spec/parser/snippet_pre_parser_spec.rb
 - spec/support/flow_input_interface.rb
@@ -281,6 +288,7 @@ test_files:
 - spec/model/node_spec.rb
 - spec/model/flow_spec.rb
 - spec/model/answer/money_spec.rb
+- spec/model/answer/text_spec.rb
 - spec/model/answer/base_spec.rb
 - spec/model/answer/salary_spec.rb
 - spec/model/answer/date_spec.rb