figgy 0.9.0 → 0.9.1

data/.rvmrc

@@ -1 +1 @@
-rvm use ruby-1.9.3-rc1@figgy --create
+rvm use ruby-1.9.3-p0@figgy --create

data/README.md

@@ -41,6 +41,19 @@ Access it as a dottable, indifferent-access hash:
     AppConfig["foo"]["some_key"]
     AppConfig[:foo].some_key
 
+Multiple root directories may be specified, so that configuration files live in
+more than one place (say, in gems):
+
+    AppConfig = Figgy.build do |config|
+      config.root = Rails.root.join('etc')
+      config.add_root Rails.root.join('vendor/etc')
+    end
+
+Precedence of root directories is in reverse order of definition, such that the
+root directory added first (typically the one immediately within the application)
+has highest precedence. In this way, defaults can be inherited from libraries,
+but then overridden when necessary within the application.
+
 ## Thanks
 
 This was written on [Enova Financial's](http://www.enovafinancial.com) dime/time.

data/lib/figgy/configuration.rb

@@ -1,7 +1,7 @@
 class Figgy
   class Configuration
-    # The directory in which to search for configuration files
-    attr_reader :root
+    # The directories in which to search for configuration files
+    attr_reader :roots
 
     # The list of defined overlays
     attr_reader :overlays
@@ -21,7 +21,7 @@ class Figgy
     # By default, uses a +root+ of the current directory, and defines handlers
     # for +.yml+, +.yaml+, +.yml.erb+, +.yaml.erb+, and +.json+.
     def initialize
-      self.root = Dir.pwd
+      @roots    = [Dir.pwd]
       @handlers = []
       @overlays = []
       @always_reload = false
@@ -43,7 +43,11 @@ class Figgy
     end
 
     def root=(path)
-      @root = File.expand_path(path)
+      @roots = [File.expand_path(path)]
+    end
+
+    def add_root(path)
+      @roots.unshift File.expand_path(path)
     end
 
     # @see #always_reload=
@@ -88,8 +92,10 @@ class Figgy
 
     # @return [Array<String>] the list of directories to search for config files
     def overlay_dirs
-      return [@root] if @overlays.empty?
-      overlay_values.map { |v| v ? File.join(@root, v) : @root }.uniq
+      return @roots if @overlays.empty?
+      overlay_values.map { |overlay|
+        @roots.map { |root| overlay ? File.join(root, overlay) : root }
+      }.flatten.uniq
     end
 
     # Adds a new handler for files with any extension in +extensions+.

data/lib/figgy/hash.rb

@@ -43,7 +43,11 @@ class Figgy
     end
 
     def method_missing(m, *args, &block)
-      self[m]
+      if m.to_s.end_with? "="
+        self[m.to_s.chop] = args.shift
+      else
+        self[m]
+      end
     end
   end
 end

data/lib/figgy/version.rb

@@ -1,3 +1,3 @@
 class Figgy
-  VERSION = "0.9.0"
+  VERSION = "0.9.1"
 end

data/spec/figgy_spec.rb

@@ -101,6 +101,62 @@ describe Figgy do
       second[:still].should == "a dottable hash"
       second["still"].should == "a dottable hash"
     end
+
+    it "supports dottable and indifferent setting" do
+      write_config 'values', "number: 1"
+      config = test_config
+      config.values["number"] = 2
+      config.values.number.should == 2
+      config.values[:number] = 3
+      config.values.number.should == 3
+      config.values.number = 4
+      config.values.number.should == 4
+    end
+  end
+
+  context "multiple roots" do
+    it "can be told to read from multiple directories" do
+      write_config 'root1/values', 'foo: 1'
+      write_config 'root2/values', 'bar: 2'
+
+      config = test_config do |config|
+        config.root = File.join(current_dir, 'root1')
+        config.add_root File.join(current_dir, 'root2')
+      end
+
+      config.values.foo.should == 1
+      config.values.bar.should == 2
+    end
+
+    it "supports overlays in each root" do
+      write_config 'root1/values',      'foo: 1'
+      write_config 'root1/prod/values', 'foo: 2'
+      write_config 'root2/values',      'bar: 1'
+      write_config 'root2/prod/values', 'bar: 2'
+
+      config = test_config do |config|
+        config.root = File.join(current_dir, 'root1')
+        config.add_root File.join(current_dir, 'root2')
+        config.define_overlay :environment, 'prod'
+      end
+
+      config.values.foo.should == 2
+      config.values.bar.should == 2
+    end
+
+    it "reads from roots in *reverse* order of definition" do
+      write_config 'root1/values', 'foo: 1'
+      write_config 'root1/prod/values', 'foo: 2'
+      write_config 'root2/prod/values', 'foo: 3'
+
+      config = test_config do |config|
+        config.root = File.join(current_dir, 'root1')
+        config.add_root File.join(current_dir, 'root2')
+        config.define_overlay :environment, 'prod'
+      end
+
+      config.values.foo.should == 2
+    end
   end
 
   context "overlays" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: figgy
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-22 00:00:00.000000000 Z
+date: 2012-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70227241849560 !ruby/object:Gem::Requirement
+  requirement: &70290730298440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70227241849560
+  version_requirements: *70290730298440
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70227241848860 !ruby/object:Gem::Requirement
+  requirement: &70290730294020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70227241848860
+  version_requirements: *70290730294020
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70227241847880 !ruby/object:Gem::Requirement
+  requirement: &70290726201420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70227241847880
+  version_requirements: *70290726201420
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70227241845880 !ruby/object:Gem::Requirement
+  requirement: &70290726201000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70227241845880
+  version_requirements: *70290726201000
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &70227241842760 !ruby/object:Gem::Requirement
+  requirement: &70290726200580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70227241842760
+  version_requirements: *70290726200580
 - !ruby/object:Gem::Dependency
   name: heredoc_unindent
-  requirement: &70227241840320 !ruby/object:Gem::Requirement
+  requirement: &70290726200160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70227241840320
+  version_requirements: *70290726200160
 description: Access YAML, JSON (and ...) configuration files with ease
 email:
 - pd@krh.me
@@ -126,4 +126,3 @@ summary: Configuration file reading
 test_files:
 - spec/figgy_spec.rb
 - spec/spec_helper.rb
-has_rdoc: