saga 0.9.0 → 0.9.1

data/lib/saga/parser.rb

@@ -5,10 +5,15 @@ module Saga
     def initialize
       @tokenizer = ::Saga::Tokenizer.new(self)
       @document  = ::Saga::Document.new
-      @current_section = :title
+      self.current_section = :title
       @current_header = ''
     end
     
+    def current_section=(section)
+      @current_section = section
+      @tokenizer.current_section = section
+    end
+    
     def parse(input)
       @tokenizer.process(input)
       @document
@@ -19,13 +24,13 @@ module Saga
     end
     
     def handle_story(story)
-      @current_section = :stories
+      self.current_section = :stories
       @document.stories[@current_header] ||= []
       @document.stories[@current_header] << story
     end
     
     def handle_nested_story(story)
-      @current_section = :story
+      self.current_section = :story
       parent = @document.stories[@current_header][-1]
       parent[:stories] ||= []
       parent[:stories] << story
@@ -41,18 +46,21 @@ module Saga
     end
     
     def handle_definition(definition)
-      @current_section = :definitions
+      self.current_section = :definitions
       @document.definitions[@current_header] ||= []
       @document.definitions[@current_header] << definition
     end
     
     def handle_string(string)
       return if string.strip == ''
-      return(@current_section = :body) if string.strip == 'USER STORIES'
+      if string.strip == 'USER STORIES'
+        self.current_section = :stories
+        return @current_section
+      end
       
       if :title == @current_section
         @document.title = string.gsub(/^requirements/i, '').strip
-        @current_section = :introduction
+        self.current_section = :introduction
       elsif :introduction == @current_section
         @document.introduction << string
       else

data/lib/saga/tokenizer.rb

@@ -1,13 +1,21 @@
 module Saga
   class Tokenizer
+    attr_accessor :current_section
+    
+    RE_STORY = /\./
+    RE_DEFINITION = /\A\w(\w|[\s-])+:/
+    
     def initialize(parser)
       @parser = parser
+      @part = :current_section
+    end
+    
+    def expect_stories?
+      %w(story stories).include?(@current_section.to_s)
     end
     
     def process_line(input)
-      if input[0,2].downcase == 'as'
-        @parser.handle_story(self.class.tokenize_story(input))
-      elsif input[0,2] == '  '
+      if input[0,2] == '  '
         @parser.handle_notes(input.strip)
       elsif input[0,3] == '|  '
         @parser.handle_notes(input[1..-1].strip)
@@ -15,8 +23,10 @@ module Saga
         @parser.handle_nested_story(self.class.tokenize_story(input[1..-1]))
       elsif input[0,1] == '-'
         @parser.handle_author(self.class.tokenize_author(input))
-      elsif input =~ /^\w(\w|[\s-])+:/
+      elsif input =~ RE_DEFINITION
         @parser.handle_definition(self.class.tokenize_definition(input))
+      elsif expect_stories? && input =~ RE_STORY
+        @parser.handle_story(self.class.tokenize_story(input))
       else
         @parser.handle_string(input)
       end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: saga
 version: !ruby/object:Gem::Version 
-  hash: 59
+  hash: 57
   prerelease: 
   segments: 
   - 0
   - 9
-  - 0
-  version: 0.9.0
+  - 1
+  version: 0.9.1
 platform: ruby
 authors: 
 - Manfred Stienstra
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-10 00:00:00 Z
+date: 2012-07-19 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: erubis
@@ -76,7 +76,7 @@ dependencies:
   type: :development
   version_requirements: *id004
 description: Saga is a tool to convert stories syntax to a nicely formatted document.
-email: manfred@fngtpspec.com
+email: manfred@fngtps.com
 executables: 
 - saga
 extensions: []