mixlib-config 2.0.0.rc.4 → 2.0.0.rc.5

data/lib/mixlib/config.rb

@@ -185,6 +185,7 @@ module Mixlib
     def configurable(symbol, &block)
       unless configurables[symbol]
         configurables[symbol] = Configurable.new(symbol)
+        define_attr_accessor_methods(symbol)
       end
       if block
         block.call(configurables[symbol])
@@ -287,48 +288,30 @@ module Mixlib
     # === Raises
     # <UnknownConfigOptionError>:: If the config option does not exist and strict mode is on.
     def method_missing(method_symbol, *args)
-      num_args = args.length
-      # Setting
-      if num_args > 0
-        method_symbol = $1.to_sym if method_symbol.to_s =~ /(.+)=$/
-        internal_set(method_symbol, num_args == 1 ? args[0] : args)
-      end
-
-      # Returning
-      internal_get(method_symbol)
+      method_symbol = $1.to_sym if method_symbol.to_s =~ /(.+)=$/
+      internal_get_or_set(method_symbol, *args)
     end
 
-    # Internal dispatch setter, calls the setter (def myvar=) if it is defined,
-    # otherwise calls configurable(method_symbol).set(value)
-    #
+    private
+
+    # Internal dispatch setter for config values.
     # === Parameters
-    # method_symbol<Symbol>:: Name of the method (variable setter)
+    # symbol<Symbol>:: Name of the method (variable setter)
     # value<Object>:: Value to be set in config hash
     #      
-    def internal_set(method_symbol,value)
-      # It would be nice not to have to 
-      method_name = method_symbol.id2name
-
-      if self.respond_to?("#{method_name}=".to_sym)
-        self.send("#{method_name}=", value)
+    def internal_set(symbol,value)
+      if configurables.has_key?(symbol)
+        configurables[symbol].set(self.configuration, value)
       else
-        if configurables.has_key?(method_symbol)
-          configurables[method_symbol].set(self.configuration, value)
-        else
-          if config_strict_mode == :warn
-            Chef::Log.warn("Setting unsupported config value #{method_name}..")
-          elsif config_strict_mode
-            raise UnknownConfigOptionError, "Cannot set unsupported config value #{method_name}."
-          end
-          configuration[method_symbol] = value
+        if config_strict_mode == :warn
+          Chef::Log.warn("Setting unsupported config value #{method_name}..")
+        elsif config_strict_mode
+          raise UnknownConfigOptionError, "Cannot set unsupported config value #{method_name}."
         end
+        configuration[symbol] = value
       end
     end
 
-    protected :internal_set
-
-    private
-
     def internal_get(symbol)
       if configurables.has_key?(symbol)
         configurables[symbol].get(self.configuration)
@@ -341,5 +324,29 @@ module Mixlib
         configuration[symbol]
       end
     end
+
+    def internal_get_or_set(symbol,*args)
+      num_args = args.length
+      # Setting
+      if num_args > 0
+        internal_set(symbol, num_args == 1 ? args[0] : args)
+      end
+
+      # Returning
+      internal_get(symbol)
+    end
+
+    def define_attr_accessor_methods(symbol)
+      # When Ruby 1.8.7 is no longer supported, this stuff can be done with define_singleton_method!
+      meta = class << self; self; end
+      # Setter
+      meta.send :define_method, "#{symbol.to_s}=".to_sym do |value|
+        internal_set(symbol, value)
+      end
+      # Getter
+      meta.send :define_method, symbol do |*args|
+        internal_get_or_set(symbol, *args)
+      end
+    end
   end
 end

data/lib/mixlib/config/version.rb

@@ -19,7 +19,7 @@
 module Mixlib
   module Config
 
-    VERSION = "2.0.0.rc.4"
+    VERSION = "2.0.0.rc.5"
 
   end
 end

data/spec/mixlib/config_spec.rb

@@ -151,11 +151,11 @@ describe Mixlib::Config do
     before do
       @klass = Class.new
       @klass.extend(::Mixlib::Config)
-      @klass.class_eval(<<-EVAL)
+      @klass.class_eval do
         config_attr_writer :test_method do |blah|
           blah.is_a?(Integer) ? blah * 1000 : blah
         end
-      EVAL
+      end
     end
 
     it "should multiply an integer by 1000" do
@@ -186,6 +186,64 @@ describe Mixlib::Config do
 
   end
 
+  describe "When a configurable exists" do
+    before :each do
+      @klass = Class.new
+      @klass.extend(::Mixlib::Config)
+      @klass.class_eval do
+        configurable :daemonizeme
+        default :a, 1
+        config_attr_writer(:b) { |v| v }
+        config_context(:c)
+      end
+    end
+
+    it "Getter methods are created for the configurable" do
+      @klass.respond_to?(:daemonizeme).should == true
+      @klass.respond_to?(:a).should == true
+      @klass.respond_to?(:b).should == true
+      @klass.respond_to?(:c).should == true
+      @klass.respond_to?(:z).should == false
+    end
+
+    it "Setter methods are created for the configurable" do
+      @klass.respond_to?("daemonizeme=".to_sym).should == true
+      @klass.respond_to?("a=".to_sym).should == true
+      @klass.respond_to?("b=".to_sym).should == true
+      @klass.respond_to?("c=".to_sym).should == true
+      @klass.respond_to?("z=".to_sym).should == false
+    end
+
+    describe "and extra methods have been dumped into Object" do
+      class NopeError < StandardError
+      end
+      before :each do
+        Object.send :define_method, :daemonizeme do
+          raise NopeError, "NOPE"
+        end
+        Object.send :define_method, "daemonizeme=".to_sym do
+          raise NopeError, "NOPE"
+        end
+      end
+      
+      it 'Normal classes call the extra method' do
+        normal_class = Class.new
+        normal_class.extend(::Mixlib::Config)
+        lambda { normal_class.daemonizeme }.should raise_error(NopeError)
+      end
+
+      it 'Configurables with the same name as the extra method can be set' do
+        @klass.daemonizeme = 10
+        @klass[:daemonizeme].should == 10
+      end
+
+      it 'Configurables with the same name as the extra method can be retrieved' do
+        @klass[:daemonizeme] = 10
+        @klass.daemonizeme.should == 10
+      end
+    end
+  end
+
   describe "When config has a default value" do
     before :each do
       @klass = Class.new
@@ -219,6 +277,48 @@ describe Mixlib::Config do
     end
   end
 
+  describe "When config has a default value block" do
+    before :each do
+      @klass = Class.new
+      @klass.extend(::Mixlib::Config)
+      @klass.class_eval do
+        default :x, 4
+        default(:attr) { x*2}
+      end
+    end
+
+    it "should default to that value" do
+      @klass.attr.should == 8
+    end
+
+    it "should be recalculated each time it is retrieved" do
+      @klass.attr.should == 8
+      @klass.x = 2
+      @klass.attr.should == 4
+    end
+
+    it "should default to that value when retrieved as a hash" do
+      @klass[:attr].should == 8
+    end
+
+    it "should be settable to another value" do
+      @klass.attr 5
+      @klass.attr.should == 5
+    end
+
+    it "should still default to that value after delete" do
+      @klass.attr 5
+      @klass.delete(:attr)
+      @klass.attr.should == 8
+    end
+
+    it "should still default to that value after reset" do
+      @klass.attr 5
+      @klass.reset
+      @klass.attr.should == 8
+    end
+  end
+
   describe "When config has an array default value" do
     before :each do
       @klass = Class.new

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mixlib-config
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc.4
+  version: 2.0.0.rc.5
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-16 00:00:00.000000000 Z
+date: 2013-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake