neapolitan 0.4.0 → 0.4.1

data/.ruby

@@ -60,7 +60,7 @@ revision: 0
 created: '2009-08-25'
 summary: Kid in the Candy Store Templating
 title: Neapolitan
-version: 0.4.0
+version: 0.4.1
 name: neapolitan
 description: ! 'Neapolitan is a meta-templating engine. Like a candy store it allows
   you to pick
@@ -69,4 +69,4 @@ description: ! 'Neapolitan is a meta-templating engine. Like a candy store it al
 
   document. Selections include eruby, textile, markdown and many others.'
 organization: rubyworks
-date: '2011-11-30'
+date: '2011-12-15'

data/HISTORY.rdoc

@@ -1,5 +1,15 @@
 = RELEASE HISTORY
 
+== 0.4.1 / 2011-12-15
+
+This release simply improves the parsing of a templates YAML front
+matter, so the top bar (i.e. `---`) is completely optional.
+
+Changes:
+
+* Better parsing of YAML from matter.
+
+
 == 0.4.0 / 2011-11-30
 
 This release updates Neapolitan for use with the latest version

data/lib/neapolitan.yml

@@ -60,7 +60,7 @@ revision: 0
 created: '2009-08-25'
 summary: Kid in the Candy Store Templating
 title: Neapolitan
-version: 0.4.0
+version: 0.4.1
 name: neapolitan
 description: ! 'Neapolitan is a meta-templating engine. Like a candy store it allows
   you to pick
@@ -69,4 +69,4 @@ description: ! 'Neapolitan is a meta-templating engine. Like a candy store it al
 
   document. Selections include eruby, textile, markdown and many others.'
 organization: rubyworks
-date: '2011-11-30'
+date: '2011-12-15'

data/lib/neapolitan/part.rb

@@ -6,10 +6,14 @@ module Neapolitan
 
     # Parse text body and create new part.
     def self.parse(template, body)
-      index   = body.index("\n")
-      format  = body[0...index].strip
-      text    = body[index+1..-1].strip
-
+      if body.start_with?('---')
+        index   = body.index("\n")
+        format  = body[0...index].strip.sub(/^---/,'').strip
+        text    = body[index+1..-1].strip
+      else
+        text   = body
+        format = ''
+      end
       new(template, text, format)
     end
 

data/lib/neapolitan/template.rb

@@ -217,23 +217,36 @@ module Neapolitan
 
     # Parse template document into metadata and parts.
     def parse
-      parts = text.split(/^\-\-\-/)
-
-      if parts.size == 1
-        data = {}
-        #@parts << Part.new(sect[0]) #, *[@stencil, @default].compact.flatten)
-      else
-        parts.shift if parts.first.strip.empty?
-        data = YAML::load(parts.first)
-        if Hash === data
-          parts.shift
+      parts = []
+      part  = ''
+      text.each_line do |line|
+        if line.start_with?('---')
+          parts << part unless part == ''
+          part = line
         else
-          data = {}
+          part << line
+        end
+      end
+      parts << part unless part == ''
+
+      data = {}
+      if parts.size > 1
+        first = parts.first.lines.first.strip
+        case first
+        when '---', /[^-]/, /^---\s*settings/
+          data = YAML::load(parts.first)
+          if Hash === data
+            parts.shift
+          else
+            data = {}
+          end
         end
       end
-
       parse_metadata(data)
 
+      # remove empty sections
+      #parts = parts.reject{ |part| part.strip == '---' }
+
       @parts = parts.map{ |part| Part.parse(self, part) }
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: neapolitan
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-30 00:00:00.000000000 Z
+date: 2011-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: malt
-  requirement: &24921200 !ruby/object:Gem::Requirement
+  requirement: &24515340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *24921200
+  version_requirements: *24515340
 - !ruby/object:Gem::Dependency
   name: detroit
-  requirement: &24913780 !ruby/object:Gem::Requirement
+  requirement: &24514720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *24913780
+  version_requirements: *24514720
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &24913120 !ruby/object:Gem::Requirement
+  requirement: &24513740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *24913120
+  version_requirements: *24513740
 - !ruby/object:Gem::Dependency
   name: qed
-  requirement: &24912520 !ruby/object:Gem::Requirement
+  requirement: &24505480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *24912520
+  version_requirements: *24505480
 - !ruby/object:Gem::Dependency
   name: coderay
-  requirement: &24911920 !ruby/object:Gem::Requirement
+  requirement: &24504880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *24911920
+  version_requirements: *24504880
 - !ruby/object:Gem::Dependency
   name: RedCloth
-  requirement: &24911280 !ruby/object:Gem::Requirement
+  requirement: &24504160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *24911280
+  version_requirements: *24504160
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &24910640 !ruby/object:Gem::Requirement
+  requirement: &24503580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *24910640
+  version_requirements: *24503580
 - !ruby/object:Gem::Dependency
   name: liquid
-  requirement: &24910080 !ruby/object:Gem::Requirement
+  requirement: &24502860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *24910080
+  version_requirements: *24502860
 description: ! 'Neapolitan is a meta-templating engine. Like a candy store it allows
   you to pick