plato 0.2.2 → 0.2.3

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

data/bin/plato

@@ -40,6 +40,6 @@ unless opts['base_url']
   exit 1
 end
 
-puts "Generating site..."
+puts "Compiling site..."
 Plato::Site.new(*opts.values_at('base_url', 'template', 'cache', 'root')).generate!
 puts "done!"

data/lib/plato/site.rb

@@ -12,7 +12,7 @@ module Plato
       @template_path  = detect_zip_path File.expand_path(template, @root)
 
       @config_path    = File.join(@template_path, 'config.rb')
-      @content_path   = File.join(@root, "content")
+      @content_path   = File.join(@root)
       @resources_path = File.join(@root, "resources")
     end
 
@@ -77,13 +77,17 @@ module Plato
 
       @content = config["content_categories"]
       categories = @content.values
-      manifest = Manifest.new(content_path, :hash)
+      content_manifests = @content.keys.map do |c|
+        Manifest.new(File.join(content_path, c), :hash)
+      end
 
-      manifest.each do |path, content_data|
-        if category = categories.find {|c| c.match path }
-          data = category.match(path).merge(content_data)
+      content_manifests.each do |manifest|
+        manifest.each do |path, content_data|
+          if category = categories.find {|c| c.match path }
+            data = category.match(path).merge(content_data)
 
-          category.documents << Document.new(category, data)
+            category.documents << Document.new(category, data)
+          end
         end
       end
 
@@ -114,9 +118,7 @@ module Plato
 
     def rendered_templates
       templates.map(:string) do |path, template|
-        if path =~ /\A_/
-          nil
-        else
+        if path !~ /\A_/
           { path => render(template, template.format, nil) }
         end
       end

data/plato.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{plato}
-  s.version = "0.2.2"
+  s.version = "0.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matt Freels"]
-  s.date = %q{2010-10-09}
+  s.date = %q{2010-10-10}
   s.description = %q{use templates and content to generate static sites.}
   s.email = %q{matt@freels.name}
   s.executables = ["plato", "plato-prepare-repo"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: plato
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - Matt Freels
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-09 00:00:00 -07:00
+date: 2010-10-10 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency