smartdown 0.2.1 → 0.3.0

data/lib/smartdown/api/flow.rb

@@ -8,15 +8,14 @@ require 'smartdown/api/outcome'
 module Smartdown
   module Api
     class Flow
-
-      def initialize(smartdown_input)
+      def initialize(smartdown_input, initial_state = {})
         @smartdown_flow = Smartdown::Parser::FlowInterpreter.new(smartdown_input).interpret
-        @engine = Smartdown::Engine.new(@smartdown_flow)
+        @engine = Smartdown::Engine.new(@smartdown_flow, initial_state)
       end
 
       def state(started, responses)
         state = smartdown_state(started, responses)
-        State.new(transform_node(node_by_name(state.get(:current_node))),
+        State.new(transform_node(evaluate_node(node_by_name(state.get(:current_node)), state)),
                   previous_question_nodes_for(state),
                   responses
         )
@@ -89,6 +88,10 @@ module Smartdown
         end
       end
 
+      def evaluate_node(node, state)
+        Smartdown::Engine::NodePresenter.new.present(node, state)
+      end
+
       def front_matter
         @front_matter ||= coversheet.front_matter
       end
@@ -110,7 +113,7 @@ module Smartdown
         return [] if node_path.empty?
 
         node_path[1..-1].map do |node_name|
-          node_by_name(node_name)
+          evaluate_node(node_by_name(node_name), state)
         end
       end
 

data/lib/smartdown/engine.rb

@@ -6,11 +6,12 @@ module Smartdown
   class Engine
     attr_reader :flow
 
-    def initialize(flow)
+    def initialize(flow, initial_state = {})
       @flow = flow
+      @initial_state = initial_state
     end
 
-    def default_start_state
+    def build_start_state
       Smartdown::Engine::State.new(
         default_predicates.merge(
           current_node: flow.name
@@ -21,11 +22,11 @@ module Smartdown
     def default_predicates
       {
         otherwise: ->(_) { true }
-      }
+      }.merge(@initial_state)
     end
 
-    def process(responses, start_state = nil)
-      state = start_state || default_start_state
+    def process(responses, test_start_state = nil)
+      state = test_start_state || build_start_state
       unprocessed_responses = responses
       while !unprocessed_responses.empty? do
         nb_questions = 0

data/lib/smartdown/version.rb

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

data/spec/engine_spec.rb

@@ -4,7 +4,7 @@ describe Smartdown::Engine do
 
   subject(:engine) { Smartdown::Engine.new(flow) }
   let(:start_state) {
-    engine.default_start_state
+    engine.build_start_state
       .put(:eea_passport?, ->(state) {
         %w{greek british}.include?(state.get(:what_passport_do_you_have?))
       })
@@ -117,6 +117,20 @@ describe Smartdown::Engine do
     end
   }
 
+  describe "initial_state" do
+    let(:initial_state) { {
+      key_1: 'a_state_object',
+      key_2: ->(state) { 'a_dynamic_state_object' }
+    } }
+    let(:engine) { Smartdown::Engine.new(flow, initial_state) }
+    subject(:state) { engine.process([]) }
+
+    it "should have added initial_state to state" do
+      expect(subject.get(:key_1)).to eql 'a_state_object'
+      expect(subject.get(:key_2)).to eql 'a_dynamic_state_object'
+    end
+  end
+
   describe "#process" do
     subject { engine.process(responses, start_state) }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smartdown
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.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: &13419100 !ruby/object:Gem::Requirement
+  requirement: &16437600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.6.1
   type: :runtime
   prerelease: false
-  version_requirements: *13419100
+  version_requirements: *16437600
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &13417020 !ruby/object:Gem::Requirement
+  requirement: &16435640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 3.0.0
   type: :development
   prerelease: false
-  version_requirements: *13417020
+  version_requirements: *16435640
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &13819280 !ruby/object:Gem::Requirement
+  requirement: &16837980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13819280
+  version_requirements: *16837980
 - !ruby/object:Gem::Dependency
   name: gem_publisher
-  requirement: &13818580 !ruby/object:Gem::Requirement
+  requirement: &16837320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13818580
+  version_requirements: *16837320
 description: 
 email: david.heath@digital.cabinet-office.gov.uk
 executables:
@@ -182,7 +182,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -352555312520548432
+      hash: 306060104431825323
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -191,7 +191,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -352555312520548432
+      hash: 306060104431825323
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.11