.treasure_map.rb lib/configatron/blank_slate.rb spec/lib/blank_slate_spec.rb spec/lib/errors_spec.rb spec/lib/store_spec.rb @@ -1,6 +1,7 @@ base = File.join(File.dirname(__FILE__), 'configatron') require 'yaml' require 'erb' +require File.join(base, 'blank_slate') require File.join(base, 'configatron') require File.join(base, 'store') require File.join(base, 'errors') lib/configatron.rb @@ -12,7 +12,7 @@ class Configatron # Forwards the method call onto the 'namespaced' Configatron::Store def method_missing(sym, *args) - @_store[@_namespace.last].send(sym, *args) + @_store[@_namespace.last].__send__(sym, *args) end # Removes ALL configuration parameters lib/configatron/configatron.rb @@ -2,7 +2,7 @@ class Object # :nodoc: def send_with_chain(methods, *args) # :nodoc: obj = self - [methods].flatten.each {|m| obj = obj.send(m, *args)} + [methods].flatten.each {|m| obj = obj.__send__(m, *args)} obj end lib/configatron/core_ext/object.rb @@ -1,13 +1,13 @@ class Configatron - class ProtectedParameter < StandardError - def intialize(name) - super("Can not modify protected parameter: '#{name}'") + class ProtectedParameter < RuntimeError + def initialize(_name) + super("Can not modify protected parameter: '#{_name}'") end end - class LockedNamespace < StandardError - def initialize(name) - super("Cannot add new parameters to locked namespace: #{name.inspect}") + class LockedNamespace < RuntimeError + def initialize(_name) + super("Cannot add new parameters to locked namespace: #{_name.inspect}") end end end lib/configatron/errors.rb @@ -1,6 +1,6 @@ class Configatron - class Store - alias_method :send!, :send + class Store < BlankSlate + # alias_method :__send!, :__send__ # Takes an optional Hash of parameters def initialize(options = {}, name = nil, parent = nil) @@ -92,10 +92,14 @@ class Configatron end def method_missing(sym, *args) # :nodoc: + p "method_missing with #{sym} and #{args}" if sym.to_s.match(/(.+)=$/) name = sym.to_s.gsub("=", '').to_sym - raise Configatron::ProtectedParameter.new(name) if @_protected.include?(name) || methods_include?(name) - raise Configatron::LockedNamespace.new(@_name) if @_locked && !@_store.has_key?(name) + p 'in if block...' + p "protected: #{@_protected.inspect}" + p methods_include?(name) + raise Configatron::ProtectedParameter.new(name.to_s) if @_protected.include?(name) || methods_include?(name) + raise Configatron::LockedNamespace.new(@_name.to_s) if @_locked && !@_store.has_key?(name) @_store[name] = parse_options(*args) elsif @_store.has_key?(sym) return @_store[sym] @@ -120,7 +124,7 @@ class Configatron def protect_all! @_protected.clear @_store.keys.each do |k| - val = self.send(k) + val = self.__send__(k) val.protect_all! if val.class == Configatron::Store @_protected << k end @@ -134,7 +138,7 @@ class Configatron def unprotect_all! @_protected.clear @_store.keys.each do |k| - val = self.send(k) + val = self.__send__(k) val.unprotect_all! if val.class == Configatron::Store end end lib/configatron/store.rb @@ -3,15 +3,40 @@ require File.join(File.dirname(__FILE__), '..', 'spec_helper') describe "configatron" do before(:each) do + p 'in each!' configatron.reset! end + + describe 'store' do + it 'responds to methods_include' do + Configatron::Store.new.should respond_to(:methods_include) + Configatron::Store.new.should respond_to(:methods) + end + + it "responds to protect" do + Configatron::Store.new.should respond_to(:protect) + end + + end describe 'protect' do + fit "should shovel protected attribute onto @protected" do + begin + configatron.one = 1 + rescue Exception => e + p e.message + end + configatron.protect(:one) + configatron.instance_variable_get(:@_protected).should == [:one] + end + it 'should protect a parameter and prevent it from being set' do configatron.one = 1 configatron.protect(:one) - lambda{configatron.one = 'one'}.should raise_error(Configatron::ProtectedParameter) + lambda { + configatron.one = 'one' + }.should raise_error(Configatron::ProtectedParameter) configatron.one.should == 1 end @@ -51,7 +76,7 @@ describe "configatron" do configatron.protect_all! [:a,:b].each do |l| lambda{configatron.configure_from_hash(:letters => {l => l.to_s})}.should raise_error(Configatron::ProtectedParameter) - configatron.letters.send(l).should == l.to_s.upcase + configatron.letters.__send__(l).should == l.to_s.upcase end lambda{configatron.letters.configure_from_hash(:a => 'a')}.should raise_error(Configatron::ProtectedParameter) lambda{configatron.configure_from_hash(:letters => 'letters')}.should raise_error(Configatron::ProtectedParameter) spec/lib/configatron_spec.rb @@ -1,4 +1,15 @@ require 'rubygems' -require 'spec' +# require 'spec' +gem 'spicycode-micronaut' +gem 'relevance-log_buddy' +require 'micronaut' +require 'log_buddy' +LogBuddy.init + +Micronaut.configure do |c| + c.filter_run :focused => true + c.alias_example_to :fit, :focused => true +end + require File.join(File.dirname(__FILE__), '..', 'lib', 'configatron') \ No newline at end of file spec/spec_helper.rb 61b423e6d41fe9e13b3cab610c209e4a42b2cd13 Rob Sanheim rsanheim@gmail.com http://github.com/markbates/configatron/commit/27b060c6ed016971e3e4d0518ea6795a7f1a38a4 27b060c6ed016971e3e4d0518ea6795a7f1a38a4 2009-01-20T14:16:19-08:00 2009-01-20T14:16:08-08:00 first cut at adding in blank slate...work in progress! a0baad67f63ecfc935ef9256be2afc9868a0a10e Rob Sanheim rsanheim@gmail.com