ace 0.3.1 → 0.3.2

data/README.textile

@@ -2,27 +2,6 @@ h1. About
 
 Ace is a static page generator like "Nanoc":http://nanoc.stoneship.org, "Jekyll":https://github.com/mojombo/jekyll or "Webby":http://webby.rubyforge.org/tutorial. How is it different? Well, it's better :) ! I really like Nanoc and I used it for quite a while, but it's not flexible enough. If you need to generate a lot of pages on the fly, it's a hassle. It provides helpers, but helpers are – let's face it – programming style we used to use years back when we yet believed that PHP is actually a really nice language.
 
-Ace chose an OOP approach
+Also, last but not least, Ace has a real template inheritance. Layouts are for kids, real men use template inheritance! What's the advantage? It's incredibly flexible.
 
-Another common proble of these generators is, that they are way too opinionated. Thanks Webby, but I don't give a damn about your Sitemap, thank you very much!
-
-Also, last but not least, Ace has a real template inheritance. Layouts are for kids, real men use template inheritance! What's the advantage? It's incredibly flexible. You can have
-
-h1. Why you should be interested in ace?
-
-In Ace, every page is an instance
-Typically I want to define methods, like @post.excerpt
-
-There are also *generators* available for easier generating items on the fly.
-
-Ace has *template inheritance*. I love template inheritance, it's more flexible pattern than layouts.
-
-Tasks for deployment are included.
-
-h1. The boot process
-
-# Load @boot.rb@ where the
-# load the rules (controllers / globs mapping)
-# load & instantiate the items: only the renderables (concrete post)
-# run the filters, layoutin' ... actually this can be defined in the controller
-# match the routes, write the files
+Check "Ace: Static Sites Generator":http://blog.101ideas.cz/posts/ace-static-site-generator.html for more information or you can take a look at "sources":https://github.com/botanicus/blog.101ideas.cz of "my blog":http://blog.101ideas.cz to have something to play with!

data/bin/ace

@@ -38,12 +38,15 @@ else
 end
 
 rules.rules.each do |klass, files|
-  puts "#{klass} #{files.inspect}"
+  # puts "#{klass} #{files.inspect}"
   files.each do |file|
     if File.binread(file).match(/^-{3,5}\s*$/) # TODO: this should be a filter or lazy-loaded
+      puts "~ Read #{file} with parse"
       raw_item = Ace::RawItem.new(file).tap(&:parse)
+      raw_item.check_metadata_created_at(file)
       item = klass.create(raw_item.metadata, raw_item.content)
     else
+      puts "~ Read #{file} without parse"
       item = klass.create(Hash.new, File.read(file))
     end
     item.original_path = file

data/example/app/posts.rb

@@ -8,7 +8,7 @@ require "ace/filters"
 #   - metadata
 #   - config
 class Post < Ace::Item
-  before Ace::LayoutFilter, layout: "post.html"
+  before Ace::TemplateFilter, layout: "post.html"
 
   def document
     Nokogiri::HTML(self.content)

data/example/app/tags.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 class Tag < Ace::Item
-  before Ace::LayoutFilter, layout: "tag.html"
+  before Ace::TemplateFilter, layout: "tag.html"
 end
 
 class TagPagesGenerator

data/lib/ace.rb

@@ -10,6 +10,8 @@
 require "yaml"
 require "fileutils"
 require "ace/filters/sass"
+require "digest/sha1"
+require "date"
 
 module Ace
   module Helpers
@@ -22,6 +24,13 @@ module Ace
       @data = File.read(path)
     end
 
+    def check_metadata_created_at(path)
+      if self.metadata[:title]
+        year, month, day = File.basename(path).slice(0,10).split('-')
+        self.metadata[:created_at] ||= Date.new(year.to_i, month.to_i, day.to_i)
+      end
+    end
+
     def parse
       pieces = @data.split(/^-{3,5}\s*$/)
       # if pieces.size < 3
@@ -32,6 +41,7 @@ module Ace
 
       # Parse
       self.metadata = YAML.load(pieces[1]).inject(Hash.new) { |metadata, pair| metadata.merge(pair[0].to_sym => pair[1]) } || Hash.new
+      # TODO: check metadata[:created_at] and supply it from filename
       self.content = pieces[2..-1].join.strip
     end
   end
@@ -135,6 +145,16 @@ module Ace
       "#{self.base_url}#{self.server_path}"
     end
 
+    def digest(data)
+      Digest::SHA1.hexdigest(data)
+    end
+
+    def feeds
+      @feeds ||= begin
+        RSSFeed.subclasses.map(&:new)
+      end
+    end
+
     attr_writer :output_path
     def output_path
       @output_path ||= begin
@@ -145,12 +165,24 @@ module Ace
     end
 
     def save!
-      content = self.render # so filters can influence output_path
       puts "~ [RENDER] #{self.output_path}"
+      content = self.render # so filters can influence output_path
 
-      FileUtils.mkdir_p File.dirname(self.output_path)
-      File.open(self.output_path, "w") do |file|
-        file.puts(content)
+      begin
+        old_content = File.open(self.output_path, "rb") { |f| f.read }
+      rescue
+        old_content = ''
+      end
+
+      if self.digest(content) != self.digest(old_content)
+        warn "~ CRC isn't same, save new content into #{self.output_path}"
+        # puts old_content.inspect
+        # puts content.inspect
+
+        FileUtils.mkdir_p File.dirname(self.output_path)
+        File.open(self.output_path, "w") do |file|
+          file.puts(content)
+        end
       end
     end
   end

data/lib/ace/filters/layout.rb

@@ -1,26 +1,10 @@
 # encoding: utf-8
 
-require "ace/filters"
-require "template-inheritance"
+require_relative "template"
 
-layouts = File.join(Dir.pwd, "layouts")
-unless TemplateInheritance::Template.paths.include?(layouts)
-  TemplateInheritance::Template.paths.unshift(layouts)
-end
+warn "~ TemplateFilter is deprecated, use TemplateFilter from now on."
 
 module Ace
-  class LayoutFilter < Filter
-    class Scope
-      include Ace::Helpers
-    end
-
-    def initialize(options)
-      @path = options[:layout]
-    end
-
-    def call(item, content)
-      template = TemplateInheritance::Template.new(@path, Scope.new)
-      return template.render(item: item)
-    end
+  class TemplateFilter < TemplateFilter
   end
 end

data/lib/ace/filters/template.rb

@@ -3,25 +3,41 @@
 require "ace/filters"
 require "template-inheritance"
 
-layouts = File.join(Dir.pwd, "layouts")
-unless TemplateInheritance::Template.paths.include?(layouts)
-  TemplateInheritance::Template.paths.unshift(layouts)
-end
-
-TemplateInheritance::Template.paths << File.join(Dir.pwd, "content")
-
 module Ace
   class TemplateFilter < Filter
-    TEMPLATE_EXTS_PATTERN = /\.(haml|erb|erubis)$/i
+    class Scope
+      include Ace::Helpers
+    end
+
+    def self.add_to_paths(directory)
+      unless TemplateInheritance::Template.paths.include?(directory)
+        TemplateInheritance::Template.paths.unshift(directory)
+      end
+    end
+
+    def initialize(options = Hash.new)
+      @path = options[:layout]
+    end
 
     def call(item, content)
-      if item.output_path.match(TEMPLATE_EXTS_PATTERN)
-        item.output_path = item.output_path.split(".")[0..-2].join(".")
+      if @path.nil?
+        @path = item.original_path.sub("content/", "")
       end
 
-      relative_path = item.original_path.sub("content/", "")
-      template = TemplateInheritance::Template.new(relative_path)
+      parts = item.output_path.split(".")
+      if parts.length == 2 # template.haml
+        item.output_path = "#{parts[0]}.html"
+      elsif parts.length == 3 # template.html.haml or template.xml.haml
+        item.output_path = "#{parts[0]}.#{parts[1]}"
+      else
+        raise "Template can be named either with one suffix as template.haml or with two of them as template.html.haml resp. template.xml.haml."
+      end
+
+      template = TemplateInheritance::Template.new(@path, Scope.new)
       return template.render(item: item)
     end
   end
 end
+
+Ace::TemplateFilter.add_to_paths(File.join(Dir.pwd, "layouts"))
+Ace::TemplateFilter.add_to_paths(File.join(Dir.pwd, "content"))

data/lib/ace/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Ace
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

metadata

@@ -2,14 +2,14 @@
 name: ace
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors: 
 - "Jakub \xC5\xA0\xC5\xA5astn\xC3\xBD aka Botanicus"
 autorequire: 
 bindir: bin
 cert_chain: 
-date: 2011-03-17 00:00:00 +00:00
+date: 2011-05-26 00:00:00 +02:00
 default_executable: ace
 dependencies: 
 - !ruby/object:Gem::Dependency