configurate 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba2e5111a8d1a9882b5230e9ec15e673f2cb9e37
-  data.tar.gz: 28355f0874ff30a9607947a41da514fb1afdcb03
+  metadata.gz: 5c9982f04f1f636cbc5b6b9c5e45fdf1bdd94cdb
+  data.tar.gz: 62d95c25d55ab621123bb07d9a55fbac43c71e4e
 SHA512:
-  metadata.gz: 5a0bbf13823232c663225f52978c9a73d132d36e7ff16338b9d3181ec6d0c8faba3001839e0f50f7b1fb700c4516bc64606da7d4e209906524889fc0a672ab09
-  data.tar.gz: 25f1d06312902b428bf488894b76930df32b392b25964e10271e26bf09df2841a83471c6a9fde0cbb7aae99019195d6e4438c166c9a21356b97c459db4f474b3
+  metadata.gz: d697a43c3f69158c8d1fcfe0b232601830826d5a5c720e6628046dfbe21b110d9f42f04dbf1c1cd02ec3b59f7bf1f000c9241883e3393039e889e518bc5aaee1
+  data.tar.gz: d1ef8990fbb620024dca6093bb075211c8c7fe123e1105447f436eba924a8700aa3f006a7d81cfe4e2d654d976fccd5551f9f325d46b683fcb511772bdb9b21c

checksums.yaml.gz.asc

@@ -1,11 +1,11 @@
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAABAgAGBQJRa/mCAAoJEPNH4OtHrHDWMN4IAKejANfU2ta7YG9RixX5PHmu
-/AjTlpUCg/7InjX/xFmxUQo5MCuHxy9RImb12dA5k60MmLrIdNnFmUnBemyiwgo6
-9ArIc1qYX0C5GWFVOMWgRmfviPpW1cTGLSdd98sTlHMQcfT1IThS/ObXZZFZY1WS
-BVxXEOpGDUf251HzCOWcaLz8VFumzht+gdWg6A2RtAToQnrDRXLwm/aRTr4dFYYm
-sWi94JtRLOggNG8IqCkvv9AXn27ptkR+LOgnyXG9viUQx8XqPAdsssZ/Z3E5JGQN
-Kjj9PtQrL50mi4EotRXFjlQ5H/qwunI1yqtBLDDOMM+uWbfkoPvuLdHa+dv7lE0=
-=p6W9
+iQEcBAABAgAGBQJRcoukAAoJEPNH4OtHrHDWxfsH/RyFwwVlzI/nMKCgHReF4ljO
+MfIPgiyuDlOXAPCBpMNQy+Wi4cGepmiKogteDRG6iS62NJxVcdYC8mOAD7QTo8BF
+NsFaf8LjPGw4bGcOLsLSbK8bqBWQTIxbwqTWp0zEK0Hmh3QKs18xHsF4RhBauc9q
+FmT1SgjaVoYRM7kIKc1grGqR+ZG7hZKGab2gARyQnIN9TxIP0UbcENLdm3ZSFt89
+yDSmaf4ebc0oQvQbVJn/IiZWII8bubSkoZJO1ms/ARoUAOg+yL94FiRZpHn4wre/
+npbHnIC7bzMzHpcd9U6+STqMpEG8EAWtYaXY+pf3VE2PuA0Ieu+jtVpceTYTQgY=
+=dYJ4
 -----END PGP SIGNATURE-----

data.tar.gz.asc

@@ -1,11 +1,11 @@
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAABAgAGBQJRa/mCAAoJEPNH4OtHrHDWbEYH/jS9zjsEY7m3WWU9ip+udadO
-N2ct1TE64CI1FcnhcUMGPea29M97t0qaEJyCR5woGAmHXM7jMMIYByb6wTtzAr6x
-i5MRnckiiDO/XmcFEgoEeCBQ9tpNhXXvBKVbCBguDGyNitlYbp0t9k8/u+PTMaFq
-3g7PTAuZvX4Nv7B6rLucNG1B9wovy8rDpx1IRqaesVO02iKSG97pkuEfpcIIIPGG
-6neSFek+pOhu7RDs7n5PUJDjT1XJhg7e+u8a8mKkc55mt4qRrADiOw1tcEslBt7M
-6S8v5rXW0gH7KfsNhtucXvOVRVxkM9fBRiQeBLaW44QlBBkdrFT+4CeSLEKBEzk=
-=O1N3
+iQEcBAABAgAGBQJRcoukAAoJEPNH4OtHrHDWPUsH/ih9CZWu1ei8sAz8NqqrmwPU
+BpgECWYpzisCe0LBu5tgLJCRe4WLEg7V3LT/fAVFJoPB8m4vtnNAmtZWOAAkEyZk
+xgSeyF7Rjs9zKA29Ez1EDk9CBn5Iy+jDcKiBvKtsH4VWnPOiBgYTPM11/VQPES5J
+VWSjIBwrDrLgx2LAJjPhsO9pSnHdf36ZMF4X6sGPDr6bqmqU4HfbXOdtaOjqzlWK
+LCHJ2nZFlgDjmMgXVFvFMmVY4jHzcsjVmco1Zd1ziZTkigdZEkaBCB+zGXw2UMDl
+5a1ydYuzQAwvTD4SFh+6Gk048yyu+pFYKTfy2gawD1n8XQ3LBEJfhSoIOfD8f7s=
+=ISOk
 -----END PGP SIGNATURE-----

data/lib/configurate.rb

@@ -1,3 +1,4 @@
+require 'forwardable'
 
 require 'configurate/setting_path'
 require 'configurate/lookup_chain'
@@ -39,6 +40,13 @@ module Configurate
     attr_reader :lookup_chain
     
     undef_method :method # Remove possible conflicts with common setting names
+
+    extend Forwardable
+
+    def initialize
+      @lookup_chain = LookupChain.new
+      $stderr.puts "Warning you called Configurate::Settings.new with a block, you really meant to call #create" if block_given?
+    end
     
     # @!method lookup(setting)
     # (see {LookupChain#lookup})
@@ -49,18 +57,13 @@ module Configurate
     # @!method [](setting)
     # (see {LookupChain#[]})
 
+    def_delegators :@lookup_chain, :lookup, :add_provider, :[]
+
     # See description and {#lookup}, {#[]} and {#add_provider}
     def method_missing(method, *args, &block)
-      return @lookup_chain.public_send(method, *args, &block) if [:lookup, :add_provider, :[]].include?(method)
-      
       Proxy.new(@lookup_chain).public_send(method, *args, &block)
     end
     
-    def initialize
-      @lookup_chain = LookupChain.new
-      $stderr.puts "Warning you called Configurate::Settings.new with a block, you really meant to call #create" if block_given?
-    end
-    
     # Create a new configuration object
     # @yield the given block will be evaluated in the context of the new object
     def self.create(&block)

data/lib/configurate/lookup_chain.rb

@@ -31,7 +31,7 @@ module Configurate
     # @return [Array,Hash,String,Boolean,nil] whatever the responding
     #   provider provides is casted to a {String}, except for some special values
     def lookup(setting, *args)
-      setting = SettingPath.from_string(setting) if setting.is_a? String
+      setting = SettingPath.new setting if setting.is_a? String
       @provider.each do |provider|
         begin
           return special_value_or_string(provider.lookup(setting.dup, *args))

data/lib/configurate/provider/yaml.rb

@@ -19,8 +19,8 @@ module Configurate; module Provider
       
       namespace = opts.delete(:namespace)
       unless namespace.nil?
-        namespace = SettingPath.from_string(namespace)
-        actual_settings = lookup_in_hash(namespace, @settings)
+        namespace_path = SettingPath.new namespace
+        actual_settings = lookup_in_hash(namespace_path, @settings)
         if !actual_settings.nil?
           @settings = actual_settings
         elsif required

data/lib/configurate/setting_path.rb

@@ -1,17 +1,26 @@
+require 'forwardable'
+
 module Configurate
   # Class encapsulating the concept of a path to a setting
-  class SettingPath < Array
+  class SettingPath
+    include Enumerable
+    extend Forwardable
 
-    # Create a path from the string format (+foo.bar+).
-    # @param path [String]
-    # @return [SettingPath]
-    def self.from_string(path)
-      SettingPath.new(path.split("."))
+    def initialize path=[]
+      path = path.split(".") if path.is_a? String
+      @path = path
     end
 
+    def_delegators :@path, :empty?, :last, :join, :length, :size, :hsh
+
     # Whether the current path looks like a question or setter method
     def is_question_or_setter?
-      last.to_s.end_with?("?") || is_setter?
+      is_question? || is_setter?
+    end
+
+    # Whether the current path looks like a question method
+    def is_question?
+      last.to_s.end_with?("?")
     end
 
     # Whether the current path looks like a setter method
@@ -19,16 +28,45 @@ module Configurate
       last.to_s.end_with?("=")
     end
 
+    def each
+      return to_enum(:each) unless block_given?
+      @path.each do |component|
+        yield clean_special_characters(component)
+      end
+    end
+
     def <<(component)
-      super component.to_s
+      @path << component.to_s
     end
 
     def to_s
-      join(".").chomp("?").chomp("=")
+      clean_special_characters join(".")
+    end
+
+    def shift
+      clean_special_characters @path.shift
+    end
+
+    def pop
+      clean_special_characters @path.pop
+    end
+
+    def dup
+      SettingPath.new(@path.dup)
+    end
+
+    def ==(other)
+      to_s == other.to_s
     end
 
     def inspect
-      "<SettingPath path=#{to_s}>"
+      "<SettingPath:#{object_id.to_s(16)} path=#{to_s}:#{@path.object_id.to_s(16)} setter=#{is_setter?} question=#{is_question?}>"
+    end
+
+    private
+
+    def clean_special_characters(value)
+      value.to_s.chomp("?").chomp("=")
     end
   end
 end

data/spec/configurate/lookup_chain_spec.rb

@@ -35,7 +35,8 @@ describe Configurate::LookupChain do
     end
     
     it "it tries all providers" do
-      setting = Configurate::SettingPath.from_string "some.setting"
+      setting = Configurate::SettingPath.new "some.setting"
+      setting.stub(:dup).and_return(setting)
       @provider.each do |provider|
         provider.should_receive(:lookup).with(setting).and_raise(Configurate::SettingNotFoundError)
       end
@@ -49,7 +50,7 @@ describe Configurate::LookupChain do
       path.stub(:stub).and_return(path)
       provider.should_receive(:lookup).with(path).and_raise(Configurate::SettingNotFoundError)
       setting = "bar"
-      Configurate::SettingPath.should_receive(:from_string).with(setting).and_return(path)
+      Configurate::SettingPath.should_receive(:new).with(setting).and_return(path)
       subject.lookup(setting)
     end
 

data/spec/configurate/setting_path_spec.rb

@@ -1,20 +1,39 @@
 require 'spec_helper'
 
 describe Configurate::SettingPath do
-  describe "::from_string" do
-    it "creates a path" do
-      described_class.from_string("foo.bar").should == described_class.new(["foo", "bar"])
+  let(:normal_path) { described_class.new([:foo]) }
+  let(:question_path) { described_class.new([:foo?]) }
+  let(:setter_path) { described_class.new([:foo=]) }
+  let(:long_path) { described_class.new(["foo", "bar?"]) }
+
+  describe "#initialize" do
+    context "with a string" do
+      it "creates a path" do
+        described_class.new(long_path.to_s).should == long_path
+      end
+    end
+  end
+
+  describe "#is_question?" do
+    context "with a question signature as setting" do
+      subject { question_path.is_question? }
+      it { should be_true }
+    end
+
+    context "with a normal path as setting" do
+      subject { normal_path.is_question? }
+      it { should be_false }
     end
   end
 
   describe "#is_setter?" do
     context "with a setter signature as setting" do
-      subject { described_class.new([:foo=]).is_setter? } 
+      subject { setter_path.is_setter? } 
       it { should be_true }
     end
 
     context "with a normal path as setting" do
-      subject { described_class.new([:foo]).is_setter? }
+      subject { normal_path.is_setter? }
       it { should be_false }
     end
   end
@@ -22,21 +41,37 @@ describe Configurate::SettingPath do
 
   describe "#is_question_or_setter?" do
     context "with a question signature as setting" do
-      subject { described_class.new([:foo?]).is_question_or_setter? }
+      subject { question_path.is_question_or_setter? }
       it { should be_true }
     end
 
     context "with a setter signature as setting" do
-      subject { described_class.new([:foo=]).is_question_or_setter? } 
+      subject { setter_path.is_question_or_setter? } 
       it { should be_true }
     end
 
     context "with a normal path as setting" do
-      subject { described_class.new([:foo]).is_question_or_setter? }
+      subject { normal_path.is_question_or_setter? }
       it { should be_false }
     end
   end
 
+  describe "#shift" do
+    subject { question_path.shift }
+    it { should_not include "?" }
+  end
+
+  describe "#pop" do
+    subject { question_path.pop }
+    it { should_not include "?" }
+  end
+
+  describe "#each" do
+    it "should strip special characters" do
+      long_path.all? { |c| c.include? "?" }.should be_false
+    end
+  end
+
   describe "#<<" do
     it 'converts the argument to a string' do
       arg = mock

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: configurate
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Jonne Haß
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-15 00:00:00.000000000 Z
+date: 2013-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake

metadata.gz.asc

@@ -1,11 +1,11 @@
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAABAgAGBQJRa/mCAAoJEPNH4OtHrHDWko0H/3ehr8t5DF3gsssk+8hd4p2T
-wVPdWmzDovXT2zqM56MTCPtpKPQsG7/DaRvhxWIu/XfAmGpGuUTuNjLOURvslNun
-aii2q7ZIJPiRkQPh38DQ+56k1xU3b8jtkgumHqQBFCnJr9wmXAF6XXM9NebeAktc
-mfYNsJPye8oVUe8XsmVaDVNgVAY95FvG82E85ATIhL0muWTMLKhEzzuCVq59ZNVO
-LOq7Ryh9Zb/xKo+ybb1vQujxQ4Db+offzKrpMmcQguVW9XKfitV8xd6wwaw6d/dr
-jahH4UjIrsImu2eootgTT89gxjCkD1tXyH+UIm7PgoW551VsPk6N5YWhTXpg4s8=
-=Tp+n
+iQEcBAABAgAGBQJRcoujAAoJEPNH4OtHrHDWkxQIAK7oOLtLgFhGjS5pOq7KoEw7
+Z8CRfyb73ivBALGQHxjFPWo1Ez4+ha2hqwQSGhzJ8y8bedqhQRgD7BM8kLJUVvTM
+6MTDOv6oKlcP/4O4uQlf+Brzst4hptoVqTCI5k4wIFOyzu5nBUFe55ScbSzbmRqp
+eREGatvSqNH3KK8BEexCQxYlzLXuW3XV2WIHGW94i3RntKuB8n9NP7z+KPc/n6T2
+F+r9wO9raAtvFzc5/ycMQS3X6GN867YU+lh7yweldY/mWDjGlduw6agiCWDyap8o
+4XVA3iqx2j630bVn4RBF/u/WyHDrs/vxnWcM9pSitRY71NxXhasoEUSm0mK1jCc=
+=kuZ/
 -----END PGP SIGNATURE-----