valise 0.7 → 0.8

data/lib/valise/item.rb

@@ -57,10 +57,18 @@ module Valise
       "#{@root.inspect}//#{@stack.inspect}"
     end
 
+    def depth
+      @stack.depth_of(self)
+    end
+
     def segments
       @stack.segments
     end
 
+    def rel_path
+      @stack.rel_path
+    end
+
     def full_path
       @root.full_path(segments)
     end

data/lib/valise/path-matcher.rb

@@ -4,6 +4,19 @@ module Valise
   class PathMatcher
     include Unpath
 
+    def self.build(path, value = true)
+      case path
+      when PathMatcher
+        return path
+      when String, Array
+        matcher = PathMatcher.new
+        matcher[path] = value
+        return matcher
+      else
+        raise ArgumentError, "Path matchers can only be built from arrays or strings"
+      end
+    end
+
     def initialize(segment = nil)
       @children = []
       @segment = segment
@@ -58,6 +71,10 @@ module Valise
       store(unpath(pattern), result)
     end
 
+    def ===(path)
+      return !!self[path]
+    end
+
     def store(segments, result)
       if segments.empty?
         @value = result
@@ -66,7 +83,7 @@ module Valise
         target = @children.find {|child| child.segment == index } ||
           case index
           when "**"; DirGlob.new.tap{|m| @children << m}
-          when /^[*].*/; FileGlob.new(index).tap{|m| @children << m}
+          when /.*[*].*/; FileGlob.new(index).tap{|m| @children << m}
           else; PathMatcher.new(index).tap{|m| @children << m}
           end
         target.store(segments, result)
@@ -95,7 +112,7 @@ module Valise
   class FileGlob < PathMatcher
     def initialize(segment)
       super
-      @regex = %r{.*#{segment.sub(/^[*]/,"")}$}
+      @regex = %r{^#{segment.gsub(/[*]/,".*")}$}
     end
 
     def match?(segment)

data/lib/valise/search-root.rb

@@ -37,6 +37,10 @@ module Valise
       "#{self.class.name.split(":").last}:#{[*@segments].join("/")}"
     end
 
+    def to_s
+      "#{[*@segments].join("/")}"
+    end
+
     def full_path(segments)
       repath(@segments + segments)
     end

data/lib/valise/set/definer.rb

@@ -46,7 +46,7 @@ module Valise
         m = /(.*):\d+/.match(caller[0])
         dir = ::File::dirname(::File::expand_path(m[1]))
 
-        unpath(dir) + unpath(rel_path)
+        collapse(unpath(dir) + unpath(rel_path))
       end
 
       def handle(path, serialization, merge_diff = nil)

data/lib/valise/set.rb

@@ -22,9 +22,25 @@ module Valise
       @search_roots.inspect
     end
 
+    def to_s
+      @search_roots.map(&:to_s).join(":")
+    end
+
     def reverse
       set = Set.new
       set.search_roots = @search_roots.reverse
+      set.merge_diff = @merge_diff.dup
+      set.serialization = @serialization.dup
+      set
+    end
+
+    def sub_set(path)
+      set = Set.new
+      set.search_roots = @search_roots.map do |root|
+        SearchRoot.new(root.segments + unpath(path))
+      end
+      set.merge_diff = @merge_diff.dup
+      set.serialization = @serialization.dup
       set
     end
 
@@ -59,10 +75,12 @@ module Valise
       return result
     end
 
-    attr_accessor :search_roots
-    protected :search_roots, :search_roots=
+    attr_accessor :search_roots, :merge_diff, :serialization
+    protected :search_roots=, :search_roots,
+      :merge_diff=, :merge_diff,
+      :serialization=, :serialization
 
-      include Unpath
+    include Unpath
     def get(path)
       return Stack.new(path, self,
                        merge_diff(path),
@@ -96,16 +114,19 @@ module Valise
       @search_roots.each(&block)
     end
 
-    def files
+    def glob(path_matcher)
       unless block_given?
-        return self.enum_for(:files)
+        return self.enum_for(:glob, path_matcher)
       end
 
       visited = {}
+      path_matcher = PathMatcher.build(path_matcher)
+
       @search_roots.each do |root|
         root.each do |segments|
+          next unless path_matcher === segments
           unless visited.has_key?(segments)
-            item = find(segments)
+            item = get(segments).present.first
             visited[segments] = item
             yield(item)
           end
@@ -114,6 +135,11 @@ module Valise
       return visited
     end
 
+    ALL_FILES = PathMatcher.build("**")
+    def files(&block)
+      glob(ALL_FILES, &block)
+    end
+
     def not_above(root)
       index = @search_roots.index(root)
       raise Errors::RootNotInSet if index.nil?
@@ -130,6 +156,10 @@ module Valise
       set
     end
 
+    def depth_of(root)
+      return @search_roots.index(root)
+    end
+
     def [](index)
       return @search_roots[index]
     end

data/lib/valise/stack.rb

@@ -132,7 +132,7 @@ module Valise
     end
 
     def initialize(path, set, merge_class, dump_load)
-      @segments = unpath(path)
+      @segments = collapse(unpath(path))
       @valise = set
       @merge_diff = (merge_class || MergeDiff::TopMost).new(self)
       @dump_load = dump_load
@@ -144,6 +144,10 @@ module Valise
       @merge_diff.merge(item)
     end
 
+    def rel_path
+      repath(@segments)
+    end
+
     def diffed(item, value)
       @merge_diff.diff(item, value)
     end
@@ -156,6 +160,10 @@ module Valise
       Stack.new(@segments, @valise.below(item.root), @merge_diff.class, @dump_load)
     end
 
+    def depth_of(item)
+      @valise.depth_of(item.root)
+    end
+
     def each
       @valise.each do |root|
         yield(Item.new(self, root, @dump_load))

data/lib/valise/utils.rb

@@ -18,6 +18,10 @@ module Valise
   end
 
   module Unpath
+    def string_to_segments(string)
+      string.split(::File::Separator)
+    end
+
     def unpath(parts)
       if Array === parts and parts.length == 1
         parts = parts[0]
@@ -26,14 +30,14 @@ module Valise
       case parts
       when Array
         if (parts.find{|part| not (String === part or Symbol === part)}.nil?)
-          parts = parts.map{|part| part.to_s}
+          parts = parts.map{|part| string_to_segments(part.to_s)}.flatten
         else
           raise ArgumentError, "path must be composed of strings or symbols"
         end
       when String
-        parts = parts.split(::File::Separator)
+        parts = string_to_segments(parts)
       when Symbol
-        parts = [parts.to_s]
+        parts = string_to_segments(parts.to_s)
       when ::File
         parts = parts.path
         parts = parts.split(::File::Separator)
@@ -41,17 +45,27 @@ module Valise
         raise ArgumentError, "path must be String, Array of Strings or File"
       end
 
-      parts = parts.map do |part|
-        if /^~/ =~ part
-          ::File::expand_path(part).split(::File::Separator)
-        else
-          part
-        end
-      end.flatten
+      if /^~/ =~ parts[0]
+        parts = ::File::expand_path(parts[0]).split(::File::Separator) + parts[1..-1]
+      end
 
       return parts
     end
 
+    def collapse(segments)
+      collapsed = []
+      segments.each do |segment|
+        case segment
+        when '.'
+        when '..'
+          collapsed.pop
+        else
+          collapsed.push segment
+        end
+      end
+      collapsed
+    end
+
     def repath(segments)
       case segments
       when Array

data/spec/fileset.rb

@@ -160,6 +160,10 @@ describe Valise, " - the unpath method: " do
     @search_root.unpath("state").should == %w{state}
   end
 
+  it '["step", "step/step"] => ["step", "step", "step"]' do
+    @search_root.unpath(["step", "step/step"]).should == %w{step step step}
+  end
+
   it 'a File => #path' do
     @file = File.new(__FILE__)
     @path = __FILE__.split("/")

data/spec_help/spec_helper.rb

@@ -1,3 +1,5 @@
 require 'rspec'
 
-#Ungemmer::ungem_gemspec
+RSpec.configure do |config|
+  config.backtrace_clean_patterns.delete(/gems/)
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: valise
 version: !ruby/object:Gem::Version
-  version: '0.7'
+  version: '0.8'
   prerelease: 
 platform: ruby
 authors:
@@ -9,19 +9,19 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-15 00:00:00.000000000 Z
+date: 2012-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: corundum
-  requirement: &88576980 !ruby/object:Gem::Requirement
+  requirement: &73826910 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *88576980
+  version_requirements: *73826910
 description: ! "  Valise provides an API for accessing configuration and data files
   for your\n  application, including the population of default values, and managing
   search\n  paths.  Written to encourage a cross-platform approach to maintaining
@@ -194,7 +194,7 @@ rdoc_options:
 - --main
 - doc/README
 - --title
-- valise-0.7 RDoc
+- valise-0.8 RDoc
 require_paths:
 - lib/
 required_ruby_version: !ruby/object:Gem::Requirement
@@ -205,7 +205,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -446270865
+      hash: 796712559
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: