hx 0.8.4 → 0.9.0

data/VERSION

@@ -1 +1 @@
-0.8.4
+0.9.0

data/lib/hx.rb

@@ -98,7 +98,7 @@ class PathSubset
   end 
 
   def edit_entry(path, prototype=nil)
-    if @selector.accept? path
+    if @selector.accept_path? path
       @input.edit_entry(path, prototype) { |text| yield text }
     else
       raise EditingNotSupportedError, "Editing not supported for #{path}"
@@ -117,7 +117,7 @@ class PathSubset
   end
 
   def get_entry(path)
-    raise NoSuchEntryError, path unless @selector.accept? path
+    raise NoSuchEntryError, path unless @selector.accept_path? path
     @input.get_entry(path)
   end
 end
@@ -186,7 +186,7 @@ class AddPath
   def each_entry_path(selector)
     @input.each_entry_path(Path::ALL) do |path|
       path = add_circumfix(path)
-      yield path if selector.accept? path
+      yield path if selector.accept_path? path
     end
     self
   end
@@ -210,7 +210,7 @@ class StripPath
   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
+      yield path if path and selector.accept_path? path
     end
     self
   end
@@ -250,7 +250,7 @@ class Cache
       end
     end
     entries.each do |path, entry|
-      yield path, entry.dup if selector.accept? path
+      yield path, entry.dup if selector.accept_path? path
     end
     self
   end

data/lib/hx/backend/couchdb.rb

@@ -84,7 +84,7 @@ class CouchDB
     listing = JSON.parse(get_document('_all_docs'))
     listing['rows'].each do |row|
       path = row['id']
-      yield path if selector.accept? path
+      yield path if selector.accept_path? path
     end
     self
   end

data/lib/hx/backend/rawfiles.rb

@@ -59,7 +59,7 @@ class RawFiles
     Pathname.glob(@entry_dir + '**/*') do |pathname|
       next unless pathname.file?
       path = pathname_to_path(pathname)
-      yield path if selector.accept? path
+      yield path if selector.accept_path? path
     end
     self
   end

data/lib/hx/listing/paginate.rb

@@ -41,7 +41,7 @@ class Paginate
         index_entry = index_entry.dup
         index_entry['pages'] = [index_entry]
         index_entry['page_index'] = 0
-        yield index_path, index_entry if selector.accept? index_path
+        yield index_path, index_entry if selector.accept_path? index_path
       else
         pages = []
         n_pages = (items.size + @page_size - 1) / @page_size
@@ -65,7 +65,7 @@ class Paginate
         pages[-1]['entry'].delete('next_page')
         pages.each do |page|
           path = page['path']
-          yield path, page['entry'] if selector.accept? path
+          yield path, page['entry'] if selector.accept_path? path
         end
       end
     end

data/lib/hx/listing/recursiveindex.rb

@@ -70,7 +70,7 @@ class RecursiveIndex
       end
     end
     indexes.each do |path, entry|
-      yield path, entry if selector.accept? path
+      yield path, entry if selector.accept_path? path
     end
     self
   end

data/lib/hx/output/liquidtemplate.rb

@@ -82,7 +82,7 @@ class LiquidTemplate
   def each_entry_path(selector)
     @input.each_entry_path(Path::ALL) do |path|
       path = "#{path}.#{@extension}" unless @extension.nil?
-      yield path if selector.accept? path
+      yield path if selector.accept_path? path
     end
     self
   end

data/lib/hx/path.rb

@@ -25,8 +25,8 @@ module Hx
 module Path
 
 module Selector
-  def accept?(path)
-    raise NotImplementedError, "#{self.class}#accept? not implemented"
+  def accept_path?(path)
+    raise NotImplementedError, "#{self.class}#accept_path? not implemented"
   end
 
   def |(other)
@@ -44,7 +44,7 @@ end
 
 class All
   include Selector
-  def accept?(path) ; true ; end
+  def accept_path?(path) ; true ; end
 end
 
 ALL = All.new
@@ -62,7 +62,7 @@ class Pattern
     }}$")
   end
 
-  def accept?(path) ; !!(path =~ @regexp) ; end
+  def accept_path?(path) ; !!(path =~ @regexp) ; end
 end
 
 def self.parse_pattern(pattern_string)
@@ -103,16 +103,16 @@ class Conjunction
     super(*selectors)
   end
 
-  def accept?(path)
-    @selectors.all? { |s| s.accept? path }
+  def accept_path?(path)
+    @selectors.all? { |s| s.accept_path? path }
   end
 end
 
 class Disjunction
   include Connective
 
-  def accept?(path)
-    @selectors.any? { |s| s.accept? path }
+  def accept_path?(path)
+    @selectors.any? { |s| s.accept_path? path }
   end
 end
 
@@ -123,8 +123,8 @@ class Negation
     @selector = selector
   end
 
-  def accept?(path)
-    not @selector.accept?(path)
+  def accept_path?(path)
+    not @selector.accept_path?(path)
   end
 end
 

data/spec/selector_spec.rb

@@ -9,22 +9,22 @@ describe Hx::Path::Pattern do
 
   it "should accept or reject literal paths" do
     pattern = Hx::Path.literal("foo/bar")
-    pattern.should accept("foo/bar")
-    pattern.should_not accept("foo/baz")
+    pattern.should accept_path("foo/bar")
+    pattern.should_not accept_path("foo/baz")
   end
 
   it "should match single path components with stars" do
     pattern = Hx::Path.parse_pattern("foo/*")
-    pattern.should_not accept("baz/eek")
-    pattern.should accept("foo/bar")
-    pattern.should_not accept("foo/bar/baz")
+    pattern.should_not accept_path("baz/eek")
+    pattern.should accept_path("foo/bar")
+    pattern.should_not accept_path("foo/bar/baz")
   end
 
   it "should match multiple path components with double stars" do
     pattern = Hx::Path.parse_pattern("foo/**")
-    pattern.should_not accept("baz/eek")
-    pattern.should accept("foo/bar")
-    pattern.should accept("foo/bar/baz")
+    pattern.should_not accept_path("baz/eek")
+    pattern.should accept_path("foo/bar")
+    pattern.should accept_path("foo/bar/baz")
   end
 end
 
@@ -38,9 +38,9 @@ describe "Hx::Path::Selector disjunctions" do
   it "should accept and reject the right paths" do
     filters = ["foo/bar", "abcdefg"].map { |p| Hx::Path.parse_pattern(p) }
     filter = filters.inject { |a, b| a | b }
-    filter.should accept("foo/bar")
-    filter.should accept("abcdefg")
-    filter.should_not accept("hoge")
+    filter.should accept_path("foo/bar")
+    filter.should accept_path("abcdefg")
+    filter.should_not accept_path("hoge")
   end
 end
 
@@ -54,8 +54,8 @@ describe "negated Hx::Path::Selectors" do
   end
 
   it "should reject what they match" do
-    @pattern.should_not accept("foobar")
-    @pattern.should accept("hoge")
+    @pattern.should_not accept_path("foobar")
+    @pattern.should accept_path("hoge")
   end
 end
 
@@ -69,11 +69,11 @@ describe "Hx::Path::Selector conjunctions" do
   it "should accept only paths matching both filters" do
     filters = ["foo*", "*bar"].map { |p| Hx::Path.parse_pattern(p) }
     filter = filters.inject { |a, b| a & b }
-    filter.should accept("foobar")
-    filter.should accept("fooxbar")
-    filter.should_not accept("lemur")
-    filter.should_not accept("foobear")
-    filter.should_not accept("rebar")
+    filter.should accept_path("foobar")
+    filter.should accept_path("fooxbar")
+    filter.should_not accept_path("lemur")
+    filter.should_not accept_path("foobear")
+    filter.should_not accept_path("rebar")
   end
 
   it "should optimize use of ALL" do

data/spec/spec_helper.rb

@@ -22,7 +22,7 @@ class FakeInput
   end
 
   def each_entry_path(selector)
-    @entries.each_key { |path| yield path if selector.accept? path }
+    @entries.each_key { |path| yield path if selector.accept_path? path }
     self
   end
 
@@ -35,8 +35,8 @@ class FakeInput
   end
 end
 
-RSpec::Matchers.define :accept do |value|
+RSpec::Matchers.define :accept_path do |value|
   match do |acceptor|
-    acceptor.accept?(value)
+    acceptor.accept_path?(value)
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: hx
 version: !ruby/object:Gem::Version 
-  hash: 55
+  hash: 59
   prerelease: false
   segments: 
   - 0
-  - 8
-  - 4
-  version: 0.8.4
+  - 9
+  - 0
+  version: 0.9.0
 platform: ruby
 authors: 
 - MenTaLguY
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-09 00:00:00 -08:00
+date: 2011-02-14 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency