hx 0.26.0 → 0.26.1

data/VERSION

@@ -1 +1 @@
-0.26.0
+0.26.1

data/lib/hx.rb

@@ -632,6 +632,10 @@ def self.write_file(pathname, content, executable=false)
   nil
 end
 
+def self.last_update_time(*entries)
+  entries.map { |e| e['updated'] || e['created'] }.compact.max
+end
+
 class LazyContent
   def initialize(&block)
     raise ArgumentError, "No block given" unless block

data/lib/hx/backend/rawfiles.rb

@@ -23,6 +23,7 @@
 
 require 'pathname'
 require 'hx'
+require 'find'
 
 module Hx
 module Backend
@@ -41,11 +42,6 @@ class RawFiles
   def path_to_pathname(path) ; @entry_dir + path ; end
   private :path_to_pathname
 
-  def pathname_to_path(pathname)
-    pathname.relative_path_from(@entry_dir).to_s
-  end
-  private :pathname_to_path
-
   def edit_entry(path, prototype=nil)
     pathname = path_to_pathname(path)
     begin
@@ -69,9 +65,9 @@ class RawFiles
   end
 
   def each_entry_path(selector)
-    Pathname.glob(@entry_dir + '**/*') do |pathname|
-      next unless pathname.file?
-      path = pathname_to_path(pathname)
+    Find.find @entry_dir.to_s do |fs_path|
+      next unless FileTest.file? fs_path
+      path = Pathname.new(fs_path).relative_path_from(@entry_dir).to_s
       yield path if selector.accept_path? path
     end
     self

data/lib/hx/listing/recursiveindex.rb

@@ -39,39 +39,33 @@ class RecursiveIndex
   def initialize(input, options)
     @input = input
     @index_name = options[:index_name] || "index"
-    @index_re = %r!^((?:.*/)?)#{Regexp.quote(@index_name)}$!
   end
 
-  def each_entry_path(selector)
-    emitted = Set.new
-    @input.each_entry_path(Path::ALL) do |path|
+  def each_entry(selector)
+    indices = {}
+    @input.each_entry(Path::ALL) do |path, entry|
       components = path.split("/")
       until components.empty?
         components.pop
         index_path = (components + [@index_name]).join("/")
-        break if emitted.include? index_path
-        yield index_path if selector.accept_path? index_path
-        emitted.add index_path
+        next unless selector.accept_path? index_path
+        index_entry = indices[index_path]
+        unless index_entry
+          index_entry = {'items' => []}
+          indices[index_path] = index_entry
+        end
+        if path == index_path
+          index_entry = entry.merge(index_entry)
+          indices[index_path] = index_entry
+        end
+        index_entry['items'] << {'path' => path, 'entry' => entry}
+        index_entry['updated'] = Hx.last_update_time(index_entry, entry)
       end
     end
-    self
-  end
-
-  def get_entry(path)
-    raise NoSuchEntryError, path unless path =~ @index_re
-    selector = Path.parse_pattern("#{$1}**")
-    index = {'items' => []}
-    @input.each_entry(selector) do |child_path, entry|
-      if child_path == path
-        index = entry.merge(index)
-      else
-        index['items'] << {'path' => child_path, 'entry' => entry}
-      end
-      updated = [entry['updated'], index['updated']].compact.max
-      index['updated'] = updated if updated
+    indices.each do |path, entry|
+      yield path, entry
     end
-    raise NoSuchEntryError, path if index['items'].empty?
-    index
+    self
   end
 end
 

data/spec/rawfiles_spec.rb

@@ -22,7 +22,7 @@ describe Hx::Backend::RawFiles do
   end
 
   it "should enumerate files" do
-    entry_names = Set.new %q(foo bar baz)
+    entry_names = Set.new %q(foo bar baz .dotfile)
     for name in entry_names
       File.open(File.join(@dir, name), 'w') {}
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: hx
 version: !ruby/object:Gem::Version 
-  hash: 119
+  hash: 117
   prerelease: 
   segments: 
   - 0
   - 26
-  - 0
-  version: 0.26.0
+  - 1
+  version: 0.26.1
 platform: ruby
 authors: 
 - MenTaLguY
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-30 00:00:00 -07:00
+date: 2011-08-22 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -164,15 +164,5 @@ rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A miniature static site generator.
-test_files: 
-- spec/cache_spec.rb
-- spec/hx_dummy.rb
-- spec/hx_dummy2.rb
-- spec/nullinput_spec.rb
-- spec/overlay_spec.rb
-- spec/pathops_spec.rb
-- spec/rack_spec.rb
-- spec/rawfiles_spec.rb
-- spec/selector_spec.rb
-- spec/site_spec.rb
-- spec/spec_helper.rb
+test_files: []
+