clay 1.2 → 1.3

data/src/clay.rb

@@ -6,19 +6,19 @@ require 'fileutils'
 require 'yaml'
 
 module Clay
-  VERSION = "1.2"
+  VERSION = "1.3"
   
   def self.init project_name
-    print "Creating the folder structure... "
+    puts "Creating the folder structure... "
     project.init project_name
-    puts "complete"
+    puts "OK."
   end
   
   def self.form
-    print "Forming... "
+    puts "Forming... "
     project.check_consistency
     project.build
-    puts "complete."
+    puts "OK."
   end
   
   def self.run
@@ -61,7 +61,8 @@ class Project
       create_directory path("build")
     end
     publish_public
-    publish_pages
+    texts = interpret_texts
+    publish_pages texts
   end
     
   def prepare_rack_config
@@ -102,16 +103,33 @@ class Project
     end
   end
 
-  def publish_pages
-    Dir.glob("pages/*.*").each { |page_path|
-      page = Page.new(page_path)
-      File.open(page.target, "w") {|f| f.write page.content }
-    }
-  end
-
   def publish_public
     FileUtils.cp_r(Dir.glob("public/*"), "build")
   end
+  
+  def interpret_texts
+    data = {}
+    texts = Dir.glob("texts/*")
+    texts.each do |filename| 
+      begin
+        data.merge! Text.new(filename).to_h 
+      rescue RuntimeError => e
+        puts "Warning: ", e.message
+      end
+    end
+    data
+  end
+
+  def publish_pages data=nil
+    Dir.glob("pages/*.*").each { |page_path|
+      begin
+        page = Page.new(page_path, data)
+        File.open(page.target, "w") {|f| f.write page.content }
+      rescue RuntimeError => e
+        puts "Warning: ", e.message
+      end
+    }
+  end
 
   def path filename
     File.expand_path(File.join("#{@project_root}/", filename))
@@ -121,15 +139,17 @@ end
 
 class Page
   attr_reader :content
-  def initialize filename
+  def initialize filename, data=nil
     case filename.split(".").last
     when "md", "markdown" then @page_type = "markdown"
     when "html" then @page_type = "html"
-    else raise "File type of #{filename} unknown.\nMaybe it belongs to the public directory?"
+    else raise "File type of #{filename} unknown. Shouldn\'t it be in the public directory?"
     end
     @filename = filename_within_pages filename
     file_content = File.read(filename)
-    layout, raw_content, data = interpret file_content
+    data ||= {}
+    layout, raw_content, new_data = interpret file_content
+    data.merge! new_data
     @content = render raw_content, layout, @page_type, data
   end
   
@@ -169,8 +189,6 @@ private
       layout_name = data.delete "layout" if data["layout"]
     end
     layout = "layouts/#{layout_name}.html"
-    texts = Dir.glob("texts/*")
-    texts.each{|filename| data.merge! Text.new(filename).to_h }
     return layout, content, data
   end
 end

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: clay
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: false
   segments: 
   - 1
-  - 2
-  version: "1.2"
+  - 3
+  version: "1.3"
 platform: ruby
 authors: 
 - Pavlo Kerestey
@@ -14,11 +14,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-27 00:00:00 +01:00
+date: 2011-01-02 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  name: mustache
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -28,12 +30,12 @@ dependencies:
         - 0
         - 11
         version: "0.11"
-  name: mustache
-  requirement: *id001
-  prerelease: false
   type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  name: rdiscount
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -42,12 +44,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: rdiscount
-  requirement: *id002
-  prerelease: false
   type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  name: rack
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -56,12 +58,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: rack
-  requirement: *id003
-  prerelease: false
   type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  name: bundler
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -71,12 +73,12 @@ dependencies:
         - 1
         - 0
         version: "1.0"
-  name: bundler
-  requirement: *id004
-  prerelease: false
   type: :development
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  name: rspec
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -85,12 +87,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: rspec
-  requirement: *id005
-  prerelease: false
   type: :development
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  name: rake
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -99,10 +101,8 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: rake
-  requirement: *id006
-  prerelease: false
   type: :development
+  version_requirements: *id006
 description: A sticky clay to automatically form a static website using Mustache templates and markdown files.
 email: 
 - pavlo@kerestey.net