smartdown 0.11.1 → 0.11.2

data/lib/smartdown/api/flow.rb

@@ -84,9 +84,9 @@ module Smartdown
     private
 
       def transform_node(node)
-        if node.elements.any?{|element| element.is_a? Smartdown::Model::Element::StartButton}
+        if node.is_start_page_node?
           Smartdown::Api::Coversheet.new(node)
-        elsif node.elements.any?{|element| element.is_a? Smartdown::Model::NextNodeRules}
+        elsif node.is_question_node?
           if node.elements.any?{|element| element.class.to_s.include?("Smartdown::Model::Element::Question")}
             Smartdown::Api::QuestionPage.new(node)
           else

data/lib/smartdown/api/node.rb

@@ -27,12 +27,15 @@ module Smartdown
       end
 
       def post_body
-        elements_after_smartdown = elements.drop_while{|element| !smartdown_element?(element)}
+        elements_after_smartdown = elements.select{ |element| !next_node_element?(element) }
+                                           .reverse
+                                           .take_while{|element| !smartdown_element?(element)}
+                                           .reverse
         build_govspeak(elements_after_smartdown)
       end
 
       def next_nodes
-        elements.select{ |element| element.is_a? Smartdown::Model::NextNodeRules }
+        elements.select{ |element| next_node_element? element }
       end
 
       def permitted_next_nodes
@@ -45,12 +48,18 @@ module Smartdown
         (element.is_a? Smartdown::Model::Element::MarkdownParagraph) || (element.is_a? Smartdown::Model::Element::MarkdownHeading)
       end
 
+      def next_node_element?(element)
+        (element.is_a? Smartdown::Model::NextNodeRules)
+      end
+
       def smartdown_element?(element)
         !markdown_element?(element)
       end
 
       def build_govspeak(elements)
-        elements.select { |element| markdown_element?(element) }.map(&:content).join("\n")
+        elements.select { |element| markdown_element?(element) }
+        return nil if elements.empty?
+        elements.map(&:content).join("\n")
       end
     end
   end

data/lib/smartdown/engine/interpolator.rb

@@ -1,3 +1,7 @@
+require 'parslet'
+require 'smartdown/parser/node_transform'
+require 'smartdown/parser/predicates'
+
 module Smartdown
   class Engine
     class Interpolator

data/lib/smartdown/engine.rb

@@ -24,28 +24,28 @@ module Smartdown
       {}.merge(@initial_state)
     end
 
-    def process(raw_responses, test_start_state = nil)
-      #TODO: change interface to match started, raw_responses like API state...no need for shifting etc...
-      state = test_start_state || build_start_state
-      unprocessed_responses = raw_responses
+    def process(unprocessed_responses, test_start_state = nil)
+      state = test_start_state || build_start_state   
+
       while !unprocessed_responses.empty? do
         current_node = flow.node(state.get(:current_node))
-
+        break if current_node.is_outcome_page_node?
+        
         if current_node.is_start_page_node?
           # If it's a start page node, we've got to do something different because of the preceeding 'y' answer
-          transition = Transition.new(state, current_node, unprocessed_responses.shift(1))
+          answers = unprocessed_responses.shift(1)
         else
           answers = current_node.questions.map do |question|
             question.answer_type.new(unprocessed_responses.shift, question)
           end
-
-          unless answers.all?(&:valid?)
+          if answers.any?(&:invalid?)
             state = state.put(:current_answers, answers)
             break
           end
-          transition = Transition.new(state, current_node, answers)
         end
-        state = transition.next_state
+        
+        transition = Transition.new(state, current_node, answers)
+        state = transition.next_state 
       end
       state
     end

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

@@ -43,6 +43,10 @@ module Smartdown
           @error.nil?
         end
 
+        def invalid?
+          !valid?
+        end
+
       private
         def parse_other_object(comparison_object)
           if comparison_object.is_a? Base

data/lib/smartdown/model/node.rb

@@ -37,6 +37,14 @@ module Smartdown
         @is_start_page_node ||= !!start_button
       end
 
+      def is_question_node?
+        @is_question_node ||= elements.any?{|element| element.is_a? Smartdown::Model::NextNodeRules}
+      end
+
+      def is_outcome_page_node?
+        @is_outcome_page_node ||= !is_start_page_node? && !is_question_node?
+      end
+
       private
 
       def markdown_blocks_before_question

data/lib/smartdown/version.rb

@@ -1,3 +1,3 @@
 module Smartdown
-  VERSION = "0.11.1"
+  VERSION = "0.11.2"
 end

data/spec/api/node_spec.rb

@@ -0,0 +1,148 @@
+require 'smartdown/api/node'
+require 'smartdown/api/question'
+require 'smartdown/api/date_question'
+require 'smartdown/model/node'
+require 'smartdown/model/front_matter'
+require 'smartdown/model/next_node_rules'
+require 'smartdown/model/element/question/date'
+require 'smartdown/model/element/markdown_heading'
+require 'smartdown/model/element/markdown_paragraph'
+
+describe Smartdown::Api::Node do
+
+  subject(:node) { Smartdown::Api::Node.new(node_model) }
+
+  let(:node_name) { "New Oxford Dictionary of English" }
+  let(:front_matter) { Smartdown::Model::FrontMatter.new({}) }
+  let(:node_model) { Smartdown::Model::Node.new(node_name, elements, front_matter) }
+
+  let(:next_node_rules_content) { 
+    %{ Rule 1: Do not talk about Fight Club.
+       Rule 2: Do not talk about Fight Club.
+       Rule 3: If someone says "stop" or goes limp, taps out the fight is over.
+       Rule 4: Only two guys to a fight.
+       Rule 5: One fight at a time.
+       Rule 6: No shirts, no shoes.
+       Rule 7: Fights will go on as long as they have to.
+       Rule 8: If this is your first night at Fight Club, you have to fight.} }
+  let(:next_node_rules) { Smartdown::Model::NextNodeRules.new(next_node_rules_content) }
+
+  let(:question_element) {
+    Smartdown::Model::Element::Question::Date.new(name, *args)
+  }
+  let(:aliaz) { nil }
+  let(:args) { [start_year, end_year, aliaz] }
+  let(:name)       { "a question" }
+  let(:start_year) { nil }
+  let(:end_year)   { nil }
+
+  let(:node_heading_content) { "hehehe" }
+  let(:node_heading) { Smartdown::Model::Element::MarkdownHeading.new(node_heading_content) }
+
+  let(:question_heading_content) { "Do you feel lucky?" }
+  let(:question_heading) { Smartdown::Model::Element::MarkdownHeading.new(question_heading_content) }
+
+  let(:body_content) { "I <3 bodyshopping" }
+  let(:body_element) {
+    Smartdown::Model::Element::MarkdownParagraph.new(body_content)
+  }
+
+  let(:post_body_content) { "hur hur such content" }
+  let(:post_body_element) {
+    Smartdown::Model::Element::MarkdownParagraph.new(post_body_content)
+  }
+
+  let(:other_post_body_content) { "Postman Pat and his black and white cat" }
+  let(:other_post_body_element) {
+    Smartdown::Model::Element::MarkdownParagraph.new(other_post_body_content)
+  }
+
+
+  context "with a body and post_body (and next node rules)" do
+    let(:elements) { [node_heading, body_element, question_heading, question_element, post_body_element, other_post_body_element, next_node_rules] }
+
+    describe "#body" do
+      it 'returns the content before the question element' do
+        body =  [body_content, question_heading_content].join("\n")
+        expect(node.body).to eq(body)
+      end
+    end
+
+    describe '#post_body' do
+      it 'returns the content after the question element' do
+        post_body =  [post_body_content, other_post_body_content].join("\n")
+        expect(node.post_body).to eq(post_body)
+      end
+    end
+  end
+
+  context "missing a body" do
+    let(:elements) { [question_element, post_body_element] }
+
+    describe "#body" do
+      it 'returns nil' do
+        expect(node.body).to eq(nil)
+      end
+    end
+
+    describe '#post_body' do
+      it 'returns the content after the question element' do
+        expect(node.post_body).to eq(post_body_content)
+      end
+    end
+  end
+
+  context "missing a post body" do
+    let(:elements) { [node_heading, body_element, question_heading, question_element] }
+
+    describe "#body" do
+      it 'returns the content before the question element' do
+        body =  [body_content, question_heading_content].join("\n")
+        expect(node.body).to eq(body)
+      end
+    end
+
+    describe '#post_body' do
+      it 'returns nil' do
+        expect(node.post_body).to eq(nil)
+      end
+    end
+  end
+
+  context "missing a body and post body" do
+    let(:elements) { [question_element] }
+
+    describe "#body" do
+      it 'returns nil' do
+        expect(node.body).to eq(nil)
+      end
+    end
+
+    describe '#post_body' do
+      it 'returns nil' do
+        expect(node.post_body).to eq(nil)
+      end
+    end
+  end
+
+  context "without next node rules" do
+    let(:elements) { [node_heading, question_heading, question_element] }
+
+    describe "#next_nodes" do
+      it 'returns an empty list' do
+        expect(node.next_nodes).to eq([])
+      end
+    end
+  end
+
+  context "with next node rules" do
+    let(:elements) { [node_heading, question_heading, question_element, next_node_rules] }
+
+    describe "#next_nodes" do
+      it 'returns the next node rules in a list' do
+        expect(node.next_nodes).to eq([next_node_rules])
+      end
+    end
+  end
+
+end

data/spec/api/outcome_spec.rb

@@ -0,0 +1,38 @@
+require 'smartdown/api/outcome'
+require 'smartdown/model/node'
+require 'smartdown/model/front_matter'
+require 'smartdown/model/element/next_steps'
+
+describe Smartdown::Api::Outcome do
+
+  subject(:outcome) { Smartdown::Api::Outcome.new(node) }
+
+  let(:node_name) { 'node.js' }
+  let(:front_matter) { Smartdown::Model::FrontMatter.new({}) }
+  let(:node) { Smartdown::Model::Node.new(node_name, elements, front_matter) }
+
+  let(:next_steps_content) { "discontentment" }
+  let(:next_steps) { Smartdown::Model::Element::NextSteps.new(next_steps_content) }
+
+
+  context "with next steps" do
+    let(:elements) { [next_steps] }
+
+    describe "#next_steps" do
+      it "returns the content for next steps" do
+        expect(outcome.next_steps).to eq(next_steps_content)
+      end
+    end
+  end
+
+  context "without next steps" do
+    let(:elements) { [] }
+
+    describe "#next_steps" do
+      it "returns nil" do
+        expect(outcome.next_steps).to eq(nil)
+      end
+    end
+  end
+
+end

data/spec/api/question_spec.rb

@@ -0,0 +1,99 @@
+require 'smartdown/api/question'
+require 'smartdown/api/date_question'
+require 'smartdown/model/element/question/date'
+require 'smartdown/model/element/markdown_heading'
+require 'smartdown/model/element/markdown_paragraph'
+
+describe Smartdown::Api::Question do
+
+  subject(:question) { Smartdown::Api::Question.new(elements) }
+
+  let(:question_element) {
+    Smartdown::Model::Element::Question::Date.new(name, *args)
+  }
+  let(:aliaz) { nil }
+  let(:args) { [start_year, end_year, aliaz] }
+  let(:name)       { "a question" }
+  let(:start_year) { nil }
+  let(:end_year)   { nil }
+
+  let(:heading_content) { "hehehe" }
+  let(:heading) { Smartdown::Model::Element::MarkdownHeading}
+
+  let(:body_content) { 'I <3 bodyshopping' }
+  let(:body_element) {
+    Smartdown::Model::Element::MarkdownParagraph.new(body_content)
+  }
+
+  let(:post_body_content) { 'hur hur such content' }
+  let(:post_body_element) {
+    Smartdown::Model::Element::MarkdownParagraph.new(post_body_content)
+  }
+
+
+
+  context "with a body and post_body" do
+    let(:elements) { [heading, body_element, question_element, post_body_element] }
+
+    describe "#body" do
+      it 'returns the content before the question element' do
+        expect(question.body).to eq(body_content)
+      end
+    end
+
+    describe '#post_body' do
+      it 'returns the content after the question element' do
+        expect(question.post_body).to eq(post_body_content)
+      end
+    end
+  end
+
+  context "missing a body" do
+    let(:elements) { [heading, question_element, post_body_element] }
+
+    describe "#body" do
+      it 'returns nil' do
+        expect(question.body).to eq(nil)
+      end
+    end
+
+    describe '#post_body' do
+      it 'returns the content after the question element' do
+        expect(question.post_body).to eq(post_body_content)
+      end
+    end
+  end
+
+  context "missing a post body" do
+    let(:elements) { [heading, body_element, question_element] }
+
+    describe "#body" do
+      it 'returns the content before the question element' do
+        expect(question.body).to eq(body_content)
+      end
+    end
+
+    describe '#post_body' do
+      it 'returns nil' do
+        expect(question.post_body).to eq(nil)
+      end
+    end
+  end
+
+  context "missing a body and post body" do
+    let(:elements) { [heading, question_element] }
+
+    describe "#body" do
+      it 'returns nil' do
+        expect(question.body).to eq(nil)
+      end
+    end
+
+    describe '#post_body' do
+      it 'returns nil' do
+        expect(question.post_body).to eq(nil)
+      end
+    end
+  end
+
+end

data/spec/engine_spec.rb

@@ -186,6 +186,13 @@ describe Smartdown::Engine do
         it "recorded input is accessiable via question alias" do
           expect(subject.get("passport_type?")).to eq("greek")
         end
+
+        context "extra answers passed" do
+          let(:responses) { %w{yes greek I wanna be the very best like no one ever was} }
+          it "return current_node as outcome and ignores extra responses" do
+            expect(subject.get(:current_node)).to eq("outcome_no_visa_needed")
+          end
+        end
       end
 
       context "USA passport" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smartdown
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.11.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-02 00:00:00.000000000 Z
+date: 2014-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet
-  requirement: &10521380 !ruby/object:Gem::Requirement
+  requirement: &22904640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.6.1
   type: :runtime
   prerelease: false
-  version_requirements: *10521380
+  version_requirements: *22904640
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &10520820 !ruby/object:Gem::Requirement
+  requirement: &22903900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 3.0.0
   type: :development
   prerelease: false
-  version_requirements: *10520820
+  version_requirements: *22903900
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &10520420 !ruby/object:Gem::Requirement
+  requirement: &22903440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *10520420
+  version_requirements: *22903440
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: &22902800 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *22902800
 - !ruby/object:Gem::Dependency
   name: gem_publisher
-  requirement: &10519900 !ruby/object:Gem::Requirement
+  requirement: &22902180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *10519900
+  version_requirements: *22902180
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &10519480 !ruby/object:Gem::Requirement
+  requirement: &22901520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *10519480
+  version_requirements: *22901520
 description: 
 email: david.heath@digital.cabinet-office.gov.uk
 executables:
@@ -188,7 +199,10 @@ files:
 - spec/parser/snippet_pre_parser_spec.rb
 - spec/support/flow_input_interface.rb
 - spec/support/model_builder.rb
+- spec/api/outcome_spec.rb
 - spec/api/state_spec.rb
+- spec/api/node_spec.rb
+- spec/api/question_spec.rb
 - spec/api/date_question_spec.rb
 - spec/api/previous_question_spec.rb
 - spec/spec_helper.rb
@@ -269,7 +283,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3693296040115547194
+      hash: 3333648473832850396
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -278,7 +292,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3693296040115547194
+      hash: 3333648473832850396
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.11
@@ -311,7 +325,10 @@ test_files:
 - spec/parser/snippet_pre_parser_spec.rb
 - spec/support/flow_input_interface.rb
 - spec/support/model_builder.rb
+- spec/api/outcome_spec.rb
 - spec/api/state_spec.rb
+- spec/api/node_spec.rb
+- spec/api/question_spec.rb
 - spec/api/date_question_spec.rb
 - spec/api/previous_question_spec.rb
 - spec/spec_helper.rb