valise 0.8.2 → 0.9.0

data/lib/valise/strategies/set.rb

@@ -0,0 +1,53 @@
+require 'valise/errors'
+
+module Valise
+  module Strategies
+    class Set
+      class << self
+        def root_class(&block)
+          if superclass == Valise::Strategies::Set
+            instance_eval(&block)
+          elsif self == Valise::Strategies::Set
+            raise "Complete class hierarchy fail"
+          else
+            superclass.root_class(&block)
+          end
+        end
+
+        def classes
+          root_class{@classes ||= {}}
+        end
+
+        def instances
+          root_class{@instances ||= {}}
+        end
+
+        def [](index)
+          classes[index]
+        end
+
+        def register(index)
+          classes[index] = self
+        end
+
+        def set_default(klass)
+          classes.default = klass
+        end
+
+        def default
+          set_default(self)
+        end
+
+        def check!(type)
+          classes.fetch(type)
+        rescue KeyError
+          raise Errors::UnregisteredStrategy.new(self.name, type)
+        end
+
+        def instance(type, options = nil)
+          instances[[type, options]] ||= classes[type].new(options)
+        end
+      end
+    end
+  end
+end

data/lib/valise/utils.rb

@@ -17,12 +17,40 @@ module Valise
     module_function :align
   end
 
+  #XXX This has been overtaken by std-lib Pathname and should be mostly
+  #refactored out
   module Unpath
     def string_to_segments(string)
       return string if string.empty?
       string.split(::File::Separator)
     end
 
+    def file_from_backtrace(line)
+      /(.*):\d+/.match(line)[1]
+    end
+
+    def from_here(rel_path, base_path = nil)
+      base_path ||= file_from_backtrace(caller[0])
+      collapse(unpath(base_path) + unpath(rel_path))
+    end
+
+    def up_to(up_to = nil, base_path = nil)
+      base_path ||= file_from_backtrace(caller[0])
+      up_to ||= "lib"
+
+      abs_path = File::expand_path(base_path)
+      base_path = unpath(base_path)
+      until base_path.empty? or base_path.last == up_to
+        base_path.pop
+      end
+
+      if base_path.empty?
+        raise "Relative root #{up_to.inspect} not found in #{abs_path.inspect}"
+      end
+
+      return base_path
+    end
+
     def unpath(parts)
       if Array === parts and parts.length == 1
         parts = parts[0]
@@ -58,8 +86,16 @@ module Valise
       segments.each do |segment|
         case segment
         when '.'
+        when ""
+          if collapsed.empty?
+            collapsed.push segment
+          end
         when '..'
-          collapsed.pop
+          if collapsed.empty?
+            collapsed.push segment
+          else
+            collapsed.pop
+          end
         else
           collapsed.push segment
         end
@@ -75,5 +111,8 @@ module Valise
         return segments
       end
     end
+
+    module_function :from_here, :up_to
+    public :from_here, :up_to
   end
 end

data/lib/valise.rb

@@ -1,8 +1,17 @@
 require 'valise/set'
 require 'valise/errors'
+require 'valise/adapters'
 
 module Valise
   def self.define(&block)
     Valise::Set.define(&block)
   end
+
+  def self.read_only(*dirs)
+    Valise::Set.define do
+      dirs.each do |dir|
+        ro dir
+      end
+    end
+  end
 end

data/spec/addable.rb

@@ -10,32 +10,38 @@ describe Valise do
     sandbox.new :directory => ".conductor"
     sandbox.new :directory => "spec"
     sandbox.new :file => "home/.conductor/existed", :with_contents => "TEST"
-    one = Valise::Set.define do
+  end
+
+  let :one do
+    Valise::Set.define do
       handle "test", :yaml
       rw ".conductor"
     end
+  end
 
-    two = Valise::Set.define do
+  let :two do
+    Valise::Set.define do
       handle "test", nil, :hash_merge
       defaults do
       end
     end
-
-    @sum = one + two
   end
 
+  let :sum do
+    one + two
+  end
 
   it "should be addable" do
-    @sum.should be_an_instance_of(Valise::Set)
+    sum.should be_an_instance_of(Valise::Set)
   end
 
   it "should add in order" do
-    @sum[0].should be_an_instance_of(Valise::SearchRoot)
-    @sum[1].should be_an_instance_of(Valise::DefinedDefaults)
+    sum[0].should be_an_instance_of(Valise::SearchRoot)
+    sum[1].should be_an_instance_of(Valise::DefinedDefaults)
   end
 
   it "should combine file handlers" do
-    @sum.merge_diff("test").should == Valise::MergeDiff::HashMerge
-    @sum.serialization("test").should == Valise::Serialization::YAML
+    sum.get("test").merge_diff.should be_a(Valise::Strategies::MergeDiff::HashMerge)
+    sum.get("test").dump_load.should be_a(Valise::Strategies::Serialization::YAML)
   end
 end

data/spec/fileset.rb

@@ -53,22 +53,6 @@ describe Valise do
       @valise.find(:text).contents.should == "Other text"
       @valise.find("text").contents.should == "Other text"
     end
-
-#    it "should get yaml files named with strings" do
-#      @valise.find(:yaml).contents.should == {:one => 1}
-#      @valise.find("yaml").contents.should == {:one => 1}
-#    end
-
-#    it "should get yaml files from the filesystem" do
-#      sandbox.new :file => "home/.conductor/yaml", :with_contents => "--- \n- Coo\n"
-#      @valise.find(:yaml).contents.should == ["Coo"]
-#      @valise.find("yaml").contents.should == ["Coo"]
-#    end
-
-#    it "should get yaml files named with symbols" do
-#      @valise.find(:other).contents.should == [3,4,5]
-#      @valise.find("other").contents.should == [3,4,5]
-#    end
   end
 
   share_examples_for "a populating Valise" do
@@ -150,31 +134,3 @@ describe Valise do
     end
   end
 end
-
-describe Valise, " - the unpath method: " do
-  before do
-    @search_root = Valise::SearchRoot.new("")
-  end
-
-  it 'state => ["state"]' 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 '/etc/configs => ["", "etc", "configs"]' do
-    @search_root.unpath("/etc/configs").should == [""] + %w{etc configs}
-  end
-
-  it '["", "etc", "configs"] => ["", "etc", "configs"]' do
-    @search_root.unpath(["", "etc", "configs"]).should == [""] + %w{etc configs}
-  end
-
-  it 'a File => #path' do
-    @file = File.new(__FILE__)
-    @path = __FILE__.split("/")
-    @search_root.unpath(@file)
-  end
-end

data/spec/glob-handling.rb

@@ -0,0 +1,44 @@
+require 'valise'
+require 'file-sandbox'
+
+describe Valise, "glob handling" do
+  include FileSandbox
+
+  let :valise do
+    sandbox.new :directory => "base/test"
+    Valise::Set.define do
+      handle "test/full", :yaml
+      handle "**/*.file", :yaml
+      handle "path/*.path", :yaml
+      rw "base"
+    end
+  end
+
+  it "should not recognize unmatched path" do
+    valise.get("not_matched/full").dump_load.should_not be_a(Valise::Strategies::Serialization::YAML)
+  end
+
+  it "should not recognize path like a path glob" do
+    valise.get("path/full.notpath").should_not be_a(Valise::Strategies::Serialization::YAML)
+  end
+
+  it "should recognize based on a full path" do
+    valise.get("test/full").dump_load.should be_a(Valise::Strategies::Serialization::YAML)
+  end
+
+  it "should recognize base on a file glob" do
+    valise.get("test/by.file").dump_load.should be_a(Valise::Strategies::Serialization::YAML)
+  end
+
+  it "should recognize simple files based on glob" do
+    valise.get("by.file").dump_load.should be_a(Valise::Strategies::Serialization::YAML)
+  end
+
+  it "should recognize deep files based on glob" do
+    valise.get("a/b/c/d/e/by.file").dump_load.should be_a(Valise::Strategies::Serialization::YAML)
+  end
+
+  it "should recognize based on a path glob" do
+    valise.get("path/by.path").dump_load.should be_a(Valise::Strategies::Serialization::YAML)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: valise
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.9.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-23 00:00:00.000000000 Z
+date: 2013-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: corundum
-  requirement: &82482560 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *82482560
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 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
@@ -31,6 +36,7 @@ email:
 executables: []
 extensions: []
 extra_rdoc_files:
+- doc/overview-diagram.svg
 - doc/README
 - doc/Specification
 - doc/Specifications
@@ -100,30 +106,39 @@ files:
 - doc/Specification
 - doc/Specifications
 - lib/valise.rb
+- lib/valise/item-enum.rb
 - lib/valise/debugging.rb
-- lib/valise/set/definer.rb
-- lib/valise/set.rb
+- lib/valise/utils.rb
 - lib/valise/errors.rb
-- lib/valise/item.rb
+- lib/valise/adapters.rb
+- lib/valise/strategies/set.rb
+- lib/valise/strategies/merge-diff.rb
+- lib/valise/strategies/serialization.rb
+- lib/valise/adapters/tilt.rb
 - lib/valise/path-matcher.rb
 - lib/valise/search-root.rb
+- lib/valise/set.rb
+- lib/valise/set/definer.rb
+- lib/valise/set/extensions-decorator.rb
 - lib/valise/stack.rb
+- lib/valise/stack/extensions-decorator.rb
 - lib/valise/stem-decorator.rb
-- lib/valise/utils.rb
+- lib/valise/item.rb
 - spec/addable.rb
-- spec/dump_load.rb
-- spec/error_handling.rb
+- spec/dump-load.rb
+- spec/error-handling.rb
 - spec/fileset.rb
-- spec/glob_handling.rb
+- spec/glob-handling.rb
 - spec/item.rb
-- spec/merge_diff.rb
+- spec/merge-diff.rb
 - spec/population.rb
-- spec/search_root.rb
+- spec/search-root.rb
 - spec/stemming.rb
 - spec_help/file-sandbox.rb
 - spec_help/gem_test_suite.rb
 - spec_help/spec_helper.rb
 - spec_help/ungemmer.rb
+- doc/overview-diagram.svg
 - doc/coverage/lib-fileset-utils_rb.html
 - doc/coverage/rcov.js
 - doc/coverage/jquery-1.3.2.min.js
@@ -188,13 +203,13 @@ files:
 homepage: http://valise.rubyforge.org/
 licenses:
 - MIT
-post_install_message: Another tidy package brought to you by Judson
+post_install_message: 
 rdoc_options:
 - --inline-source
 - --main
 - doc/README
 - --title
-- valise-0.8.2 RDoc
+- valise-0.9.0 RDoc
 require_paths:
 - lib/
 required_ruby_version: !ruby/object:Gem::Requirement
@@ -205,7 +220,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1028994253
+      hash: -29894543
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -214,7 +229,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: valise
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Manage configuration and data files simply

data/spec/glob_handling.rb

@@ -1,28 +0,0 @@
-require 'valise'
-require 'file-sandbox'
-
-describe Valise, "glob handling" do
-  include FileSandbox
-
-  let :valise do
-    sandbox.new :directory => "base/test"
-    Valise::Set.define do
-      handle "test/full", :yaml
-      handle "**/*.file", :yaml
-      handle "path/*.path", :yaml
-      rw "base"
-    end
-  end
-
-  it "should recognize based on a full path" do
-    valise.serialization("test/full").should == Valise::Serialization::YAML
-  end
-
-  it "should recognize base on a file glob" do
-    valise.serialization("test/by.file").should == Valise::Serialization::YAML
-  end
-
-  it "should recognize based on a path glob" do
-    valise.serialization("path/by.path").should == Valise::Serialization::YAML
-  end
-end