hx 0.24.0 → 0.25.0

data/VERSION

@@ -1 +1 @@
-0.24.0
+0.25.0

data/lib/hx.rb

@@ -39,12 +39,27 @@ end
 class EditingNotSupportedError < RuntimeError
 end
 
-# minimal complete definition: each_entry_path + get_entry, or each_entry
-module Filter
+module View
   def edit_entry(path, prototype=nil)
     raise EditingNotSupportedError, "Editing not supported for #{path}"
   end
 
+  def each_entry(selector)
+    raise NotImplementedError, "#{self.class}#each_entry not implemented"
+  end
+end
+
+def self.get_entry(view, path)
+  view.each_entry(Path.literal(path)) do |entry_path, entry|
+    return entry
+  end
+  raise NoSuchEntryError, path
+end
+
+# minimal complete definition: each_entry_path + get_entry, or each_entry
+module Filter
+  include View
+
   def each_entry_path(selector)
     each_entry(selector) { |path, entry| yield path }
   end
@@ -61,10 +76,7 @@ module Filter
   end
 
   def get_entry(path)
-    each_entry(Path.literal(path)) do |entry_path, entry|
-      return entry
-    end
-    raise NoSuchEntryError, path
+    Hx.get_entry(self, path)
   end
 end
 
@@ -332,42 +344,6 @@ class Sort
   end
 end
 
-class IncludeFragments
-  include Hx::Filter
-
-  def initialize(input, options)
-    @input = input
-    @fragments = options[:fragments] || {}
-    @fragment_paths = Set.new(@fragments.values)
-  end
-
-  def edit_entry(path, prototype)
-    raise EditingNotSupported, path if @fragment_paths.include? path
-    @input.edit_entry(path, prototype) { |text| yield text }
-    self
-  end
-
-  def each_entry_path(selector)
-    @input.each_entry_path(selector) do |path|
-      yield path unless @fragment_paths.include? path
-    end
-    self
-  end
-
-  def get_entry(path)
-    raise NoSuchEntryError, path if @fragment_paths.include? path
-    entry = @input.get_entry(path)
-    entry = entry.dup
-    for field, fragment_path in @fragments
-      begin
-        entry[field] = @input.get_entry(path)
-      rescue NoSuchEntryError
-      end
-    end
-    entry
-  end
-end
-
 Chain = Object.new
 def Chain.new(input, options)
   filters = options[:chain] || []
@@ -473,11 +449,6 @@ def self.build_source(options, default_input, sources, raw_source)
     source = Overlay.new(*input_sources)
   end
 
-  if raw_source.has_key? 'fragments'
-    source = IncludeFragments.new(source,
-                                  :fragments => raw_source['fragments'])
-  end
-
   if raw_source.has_key? 'filter'
     if raw_source.has_key? 'options'
       filter_options = options.dup

data/lib/hx/cli.rb

@@ -48,8 +48,8 @@ Usage: hx [--config CONFIG_FILE] [upgen]
        hx [--config CONFIG_FILE] regen
        hx [--config CONFIG_FILE] post[up] SOURCE:PATH
        hx [--config CONFIG_FILE] edit[up] SOURCE:PATH
-       hx [--config CONFIG_FILE] list SOURCE:PATTERN
-       hx [--config CONFIG_FILE] dump SOURCE:PATTERN
+       hx [--config CONFIG_FILE] list SOURCE[:PATTERN]
+       hx [--config CONFIG_FILE] dump SOURCE[:PATTERN]
        hx [--config CONFIG_FILE] serve [PORT]
 
 EOS
@@ -102,6 +102,7 @@ EOS
 end
 
 def self.cmd_serve(site, port=nil)
+  Socket.do_not_reverse_lookup = true
   server = WEBrick::HTTPServer.new({:Port => port || 0})
   real_port = server.config[:Port]
 

data/lib/hx/path.rb

@@ -29,6 +29,10 @@ module Selector
     raise NotImplementedError, "#{self.class}#accept_path? not implemented"
   end
 
+  def literal?
+    false
+  end
+
   def |(other)
     Disjunction.build(self, other)
   end
@@ -61,6 +65,7 @@ class Pattern
   include Selector
 
   def initialize(tokens)
+    @is_literal = tokens.size == 1 and String === tokens.first
     @regexp = Regexp.new("^#{tokens.map { |token|
       case token
       when :doublestar; '.*'
@@ -70,6 +75,10 @@ class Pattern
     }}$")
   end
 
+  def literal?
+    @is_literal
+  end
+
   def accept_path?(path) ; !!(path =~ @regexp) ; end
 end
 

data/spec/selector_spec.rb

@@ -7,6 +7,16 @@ describe Hx::Path::Pattern do
     Hx::Path::Pattern.should < Hx::Path::Selector
   end
 
+  it "should indicate literal paths as singletons" do
+    pattern = Hx::Path.literal("foo/bar")
+    pattern.literal?.should be_true
+  end
+
+  it "should not indicate patterns as singletons" do
+    pattern = Hx::Path.parse_pattern('foo/*')
+    pattern.literal?.should be_false
+  end
+
   it "should accept or reject literal paths" do
     pattern = Hx::Path.literal("foo/bar")
     pattern.should accept_path("foo/bar")
@@ -84,7 +94,13 @@ describe "Hx::Path::Selector conjunctions" do
   end
 end
 
-describe "Hx::Path::Selector" do
+describe Hx::Path::Selector do
+  it "should define a default literal? method which returns false" do
+    o = Object.new
+    o.extend Hx::Path::Selector
+    o.literal?.should be_false
+  end
+
   it "should be able to elide specific circumfixes" do
     filter = Hx::Path.parse_pattern("foo").elide_circumfix("XXX", "YYY")
     filter.should accept_path("XXXfooYYY")

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: hx
 version: !ruby/object:Gem::Version 
-  hash: 127
-  prerelease: false
+  hash: 123
+  prerelease: 
   segments: 
   - 0
-  - 24
+  - 25
   - 0
-  version: 0.24.0
+  version: 0.25.0
 platform: ruby
 authors: 
 - MenTaLguY
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-25 00:00:00 -07:00
+date: 2011-04-29 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -160,7 +160,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A miniature static site generator.