hx 0.14.0 → 0.15.0

data/VERSION

@@ -1 +1 @@
-0.14.0
+0.15.0

data/lib/hx.rb

@@ -158,9 +158,7 @@ module CircumfixPath
     @input = input
     @prefix = options[:prefix]
     @suffix = options[:suffix]
-    prefix = Regexp.quote(@prefix.to_s)
-    suffix = Regexp.quote(@suffix.to_s)
-    @regexp = Regexp.new("^#{prefix}(.*)#{suffix}$")
+    @regexp = Path.make_circumfix_re(@prefix, @suffix)
   end
 
 private
@@ -184,9 +182,9 @@ class AddPath
   end
 
   def each_entry_path(selector)
-    @input.each_entry_path(Path::ALL) do |path|
-      path = add_circumfix(path)
-      yield path if selector.accept_path? path
+    selector = selector.assume_circumfix(@prefix, @suffix)
+    @input.each_entry_path(selector) do |path|
+      yield add_circumfix(path)
     end
     self
   end
@@ -208,9 +206,9 @@ class StripPath
   end
 
   def each_entry_path(selector)
-    @input.each_entry_path(Path::ALL) do |path|
-      path = strip_circumfix(path)
-      yield path if path and selector.accept_path? path
+    selector = selector.elide_circumfix(@prefix, @suffix)
+    @input.each_entry_path(selector) do |path|
+      yield strip_circumfix(path)
     end
     self
   end

data/lib/hx/backend/rawfiles.rb

@@ -32,8 +32,8 @@ class RawFiles
 
   def initialize(input, options)
     @entry_dir = Hx.get_pathname(options, :entry_dir)
-    @post_edit = options[:post_edit]
-    @post_edit = @post_edit.split(/\s+/) if @post_edit
+    @postedit_cmd = options[:postedit_cmd]
+    @postedit_cmd = @postedit_cmd.split(/\s+/) if @postedit_cmd
   end
 
   def path_to_pathname(path) ; @entry_dir + path ; end
@@ -54,7 +54,7 @@ class RawFiles
     end
     text = yield text
     Hx.write_file(pathname, text)
-    system *(@post_edit + [pathname]) if @post_edit
+    system *(@postedit_cmd + [pathname]) if @postedit_cmd
     self
   end
 

data/lib/hx/path.rb

@@ -38,7 +38,15 @@ module Selector
   end
 
   def ~()
-    Negation.new(self)
+    Negation.build(self)
+  end
+
+  def assume_circumfix(prefix, suffix)
+    AssumeCircumfix.build(self, prefix, suffix)
+  end
+
+  def elide_circumfix(prefix, suffix)
+    ElideCircumfix.build(self, prefix, suffix)
   end
 end
 
@@ -124,6 +132,10 @@ end
 class Negation
   include Selector
 
+  def self.build(selector)
+    new(selector)
+  end
+
   def initialize(selector)
     @selector = selector
   end
@@ -133,5 +145,49 @@ class Negation
   end
 end
 
+class AssumeCircumfix
+  include Selector
+
+  def self.build(selector, prefix, suffix)
+    case selector
+    when All; ALL
+    else; new(selector, prefix, suffix)
+    end
+  end
+
+  def initialize(selector, prefix, suffix)
+    @selector = selector
+    @prefix = prefix
+    @suffix = suffix
+  end
+
+  def accept_path?(path)
+    @selector.accept_path?("#{@prefix}#{path}#{@suffix}")
+  end
+end
+
+def self.make_circumfix_re(prefix, suffix)
+  quoted_prefix = Regexp.quote(prefix.to_s)
+  quoted_suffix = Regexp.quote(suffix.to_s)
+  @circumfix_re = /^#{quoted_prefix}(.*)#{quoted_suffix}$/
+end
+
+class ElideCircumfix
+  include Selector
+
+  def self.build(selector, prefix, suffix)
+    new(selector, prefix, suffix)
+  end
+
+  def initialize(selector, prefix, suffix)
+    @selector = selector
+    @circumfix_re = Path.make_circumfix_re(prefix, suffix)
+  end
+
+  def accept_path?(path)
+    !!(path =~ @circumfix_re and @selector.accept_path?($1))
+  end
+end
+
 end
 end

data/spec/selector_spec.rb

@@ -83,3 +83,21 @@ describe "Hx::Path::Selector conjunctions" do
     (Hx::Path::ALL & Hx::Path::ALL).should equal(Hx::Path::ALL)
   end
 end
+
+describe "Hx::Path::Selector" do
+  it "should be able to elide specific circumfixes" do
+    filter = Hx::Path.parse_pattern("foo").elide_circumfix("XXX", "YYY")
+    filter.should accept_path("XXXfooYYY")
+    filter.should_not accept_path("foo")
+    filter.should_not accept_path("XXXfoo")
+    filter.should_not accept_path("fooYYY")
+  end
+
+  it "should be able to assume specific circumfixes" do
+    filter = Hx::Path.parse_pattern("XXXfooYYY").assume_circumfix("XXX", "YYY")
+    filter.should accept_path("foo")
+    filter.should_not accept_path("XXXfoo")
+    filter.should_not accept_path("fooYYY")
+    filter.should_not accept_path("XXXfooYYY")
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: hx
 version: !ruby/object:Gem::Version 
-  hash: 39
+  hash: 35
   prerelease: false
   segments: 
   - 0
-  - 14
+  - 15
   - 0
-  version: 0.14.0
+  version: 0.15.0
 platform: ruby
 authors: 
 - MenTaLguY
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-04 00:00:00 -08:00
+date: 2011-03-06 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency