hx 0.4.1 → 0.5.0

data/Rakefile

@@ -6,8 +6,12 @@ begin
   Jeweler::Tasks.new do |gem|
     gem.name = "hx"
     gem.executables << 'hx'
-    gem.summary = %Q{A miniature site generator.}
-    gem.description = %Q{A miniature site generator.}
+    gem.summary = %Q{A miniature static site generator.}
+    gem.description = <<EOS
+Hx is a simple static site generator in the spirit of Hobix which reads a
+YAML configuration file, constructs a filter graph, and generates output
+files.
+EOS
     gem.email = "mental@rydia.net"
     gem.homepage = "http://github.com/mental/hx"
     gem.authors = ["MenTaLguY"]

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.5.0

data/lib/hx.rb

@@ -478,7 +478,17 @@ class FileBuilder
   end
 
   def build_file(path, entry)
+    build_file_helper(path, entry, false)
+  end
+
+  def build_file_if_updated(path, entry)
+    build_file_helper(path, entry, true)
+  end
+
+  def build_file_helper(path, entry, update_only)
     filename = @output_dir + path
+    return self if update_only and filename.exist? and \
+                   entry['updated'] and filename.mtime >= entry['updated']
     dirname = filename.parent
     dirname.mkpath()
     filename.open("wb") do |stream|
@@ -486,6 +496,35 @@ class FileBuilder
     end
     self
   end
+  private :build_file_helper
+end
+
+class LazyContent
+  def initialize(&block)
+    raise ArgumentError, "No block given" unless block
+    @content = nil
+    @block = block
+  end
+
+  def to_s
+    if @block
+      @content = @block.call
+      @block = nil
+    end
+    @content
+  end
+
+  def to_yaml(*args)
+    to_s.to_yaml(*args)
+  end
+
+  def to_json(*args)
+    to_s.to_json(*args)
+  end
+
+  def to_liquid(*args)
+    to_s.to_liquid(*args)
+  end
 end
 
 end

data/lib/hx/commandline.rb

@@ -79,7 +79,7 @@ def self.main(*args)
     site = Hx::Site.load(stream, options.config_file)
   end
 
-  subcommand = args.shift || "regen"
+  subcommand = args.shift || "upgen"
   method_name = "cmd_#{subcommand}".intern
   begin
     m = method(method_name)
@@ -90,11 +90,23 @@ def self.main(*args)
 end
 
 def self.cmd_regen(site)
+  do_gen(site, false)
+end
+
+def self.cmd_upgen(site)
+  do_gen(site, true)
+end
+
+def self.do_gen(site, update_only)
   output_dir = Hx.get_pathname(site.options, :output_dir)
   builder = Hx::FileBuilder.new(output_dir.to_s)
   site.each_entry do |path, entry|
     puts "===> #{path}"
-    builder.build_file(path, entry)
+    if update_only
+      builder.build_file_if_updated(path, entry)
+    else
+      builder.build_file(path, entry)
+    end
   end
 end
 

data/lib/hx/listing/recursiveindex.rb

@@ -56,9 +56,9 @@ class RecursiveIndex
         index_path = (components + ["index"]).join("/")
         index = indexes[index_path]
         index['items'] << {'path' => path, 'entry' => entry}
-        if entry['modified'] and
-           (not index['modified'] or entry['modified'] > index['modified'])
-          index['modified'] = entry['modified']
+        if entry['updated'] and
+           (not index['updated'] or entry['updated'] > index['updated'])
+          index['updated'] = entry['updated']
         end
       end
     end

data/lib/hx/output/liquidtemplate.rb

@@ -85,12 +85,14 @@ class LiquidTemplate
         output_path = path
       end
       output_entry = entry.dup
-      output_entry['content'] = @template.render(
-        'now' => Time.now,
-        'options' => @options,
-        'path' => path,
-        'entry' => entry
-      )
+      output_entry['content'] = Hx::LazyContent.new do
+        @template.render(
+          'now' => Time.now,
+          'options' => @options,
+          'path' => path,
+          'entry' => entry
+        )
+      end
       yield output_path, output_entry
     end
     self

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: hx
 version: !ruby/object:Gem::Version 
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors: 
 - MenTaLguY
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-06 00:00:00 -05:00
+date: 2010-02-07 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,7 +22,11 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.2.9
     version: 
-description: A miniature site generator.
+description: |
+  Hx is a simple static site generator in the spirit of Hobix which reads a
+  YAML configuration file, constructs a filter graph, and generates output
+  files.
+
 email: mental@rydia.net
 executables: 
 - hx
@@ -85,7 +89,7 @@ rubyforge_project:
 rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
-summary: A miniature site generator.
+summary: A miniature static site generator.
 test_files: 
 - spec/spec_helper.rb
 - spec/cache_spec.rb