smartdown 0.14.0 → 0.15.0

data/lib/smartdown/model/scenarios/scenario.rb

@@ -1,7 +1,7 @@
 module Smartdown
   module Model
     module Scenarios
-      Scenario = Struct.new(:description, :question_groups, :outcome, :markers)
+      Scenario = Struct.new(:description, :question_groups, :outcome, :markers, :exact_markers)
     end
   end
 end

data/lib/smartdown/parser/scenario_set_interpreter.rb

@@ -15,7 +15,8 @@ module Smartdown
           description,
           question_groups,
           outcome,
-          markers
+          markers,
+          exact_markers
         )
       end
 
@@ -30,31 +31,44 @@ module Smartdown
       end
 
       def question_groups
-        lines = @scenario_lines - description_lines
-        if has_markers?
-          question_pages = group_questions_by_page(lines[0..-3])
-        else
-          question_pages = group_questions_by_page(lines[0..-2])
-        end
+        question_pages = group_questions_by_page(@scenario_lines[first_question..last_question])
         question_groups = question_pages.map { |question_page| interpret_question_page(question_page) }
       end
 
+      def last_question
+        @scenario_lines.rindex { |line| line.match(/(\s\s\S*:)|(- \S*:)/) }
+      end
+
+      def first_question
+        @scenario_lines.index { |line| line.match(/(\s\s\S*:)|(- \S*:)/) }
+      end
+
       def outcome
-        if has_markers?
-          @scenario_lines[@scenario_lines.size - 2]
-        else
-          @scenario_lines.last
-        end
+        @scenario_lines[last_question + 1]
       end
 
       def has_markers?
-        @scenario_lines.last.match(/(has markers:|has marker:)/)
+        @scenario_lines.any? { |line| line.match(/(has markers:|has marker:)/) }
+      end
+
+      def has_exact_markers?
+        @scenario_lines.any? { |line| line.match(/(exact markers:|exact marker:)/) }
       end
 
       def markers
         if has_markers?
-          last_line = @scenario_lines.last
-          comma_sperated_markers = last_line.slice(last_line.index(":") + 1, last_line.size)
+          marker_line = @scenario_lines.find { |line| line.match(/(has markers:|has marker:)/) }
+          comma_sperated_markers = marker_line.slice(marker_line.index(":") + 1, marker_line.size)
+          comma_sperated_markers.split(',').map(&:strip)
+        else
+          []
+        end
+      end
+
+      def exact_markers
+        if has_exact_markers?
+          marker_line = @scenario_lines.find { |line| line.match(/(exact markers:|exact marker:)/) }
+          comma_sperated_markers = marker_line.slice(marker_line.index(":") + 1, marker_line.size)
           comma_sperated_markers.split(',').map(&:strip)
         else
           []

data/lib/smartdown/version.rb

@@ -1,3 +1,3 @@
 module Smartdown
-  VERSION = "0.14.0"
+  VERSION = "0.15.0"
 end

data/spec/fixtures/acceptance/animal-example-simple/scenarios/tigers_and_cats.txt

@@ -2,4 +2,5 @@
 # And cats are amazing
 - question_1: cat
 outcome_safe_pet
-has markers: is_a_safe_pet, safe_pets_are_cool
+has marker: is_a_safe_pet
+exact markers: is_a_safe_pet, safe_pets_are_cool

data/spec/parser/scenario_set_interpreter_spec.rb

@@ -1,8 +1,8 @@
 require 'smartdown/parser/scenario_set_interpreter'
 
 describe Smartdown::Parser::ScenarioSetInterpreter do
-  let(:outcome) { File.open(File.dirname(__FILE__) + "/../fixtures/acceptance/animal-example-simple/scenarios/tigers_and_cats.txt", "rb").read }
-  subject { described_class.new(outcome) }
+  let(:scenario) { File.open(File.dirname(__FILE__) + "/../fixtures/acceptance/animal-example-simple/scenarios/tigers_and_cats.txt", "rb").read }
+  subject { described_class.new(scenario) }
 
   describe "#description" do
     it { expect(subject.description).to eq("User has a cat;And cats are amazing") }
@@ -17,8 +17,10 @@ describe Smartdown::Parser::ScenarioSetInterpreter do
   end
 
   describe "#markers" do
-    it { expect(subject.markers).to eq(["is_a_safe_pet", "safe_pets_are_cool"]) }
+    it { expect(subject.markers).to eq(["is_a_safe_pet"]) }
   end
 
-
+  describe "#exact_markers" do
+    it { expect(subject.exact_markers).to eq(["is_a_safe_pet", "safe_pets_are_cool"]) }
+  end
 end

data/spec/parser/scenario_sets_interpreter_spec.rb

@@ -25,7 +25,8 @@ describe Smartdown::Parser::ScenarioSetsInterpreter do
       expect(tigers_and_cats_scenario_set.scenarios.first.description).to eq("User has a cat;And cats are amazing")
       expect(tigers_and_cats_scenario_set.scenarios.first.question_groups.size).to eq(1)
       expect(tigers_and_cats_scenario_set.scenarios.first.outcome).to eq("outcome_safe_pet")
-      expect(tigers_and_cats_scenario_set.scenarios.first.markers).to eq(['is_a_safe_pet', 'safe_pets_are_cool'])
+      expect(tigers_and_cats_scenario_set.scenarios.first.markers).to eq(['is_a_safe_pet'])
+      expect(tigers_and_cats_scenario_set.scenarios.first.exact_markers).to eq(['is_a_safe_pet', 'safe_pets_are_cool'])
     end
 
     it "has scenario questions with name and answer" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smartdown
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.15.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-24 00:00:00.000000000 Z
+date: 2015-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet
-  requirement: &23997380 !ruby/object:Gem::Requirement
+  requirement: &9427800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.6.2
   type: :runtime
   prerelease: false
-  version_requirements: *23997380
+  version_requirements: *9427800
 - !ruby/object:Gem::Dependency
   name: uk_postcode
-  requirement: &23996560 !ruby/object:Gem::Requirement
+  requirement: &9427020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *23996560
+  version_requirements: *9427020
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &24022840 !ruby/object:Gem::Requirement
+  requirement: &9453240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 3.0.0
   type: :development
   prerelease: false
-  version_requirements: *24022840
+  version_requirements: *9453240
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &24022300 !ruby/object:Gem::Requirement
+  requirement: &9452780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *24022300
+  version_requirements: *9452780
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &24021740 !ruby/object:Gem::Requirement
+  requirement: &9452180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *24021740
+  version_requirements: *9452180
 - !ruby/object:Gem::Dependency
   name: gem_publisher
-  requirement: &24021220 !ruby/object:Gem::Requirement
+  requirement: &9451440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *24021220
+  version_requirements: *9451440
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &24020020 !ruby/object:Gem::Requirement
+  requirement: &9450080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *24020020
+  version_requirements: *9450080
 description: 
 email: david.heath@digital.cabinet-office.gov.uk
 executables:
@@ -315,7 +315,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4151966028766809979
+      hash: 4167639428547367493
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -324,7 +324,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4151966028766809979
+      hash: 4167639428547367493
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.11