configurations 1.3.0 → 1.3.1

data/lib/configurations.rb

@@ -12,5 +12,5 @@ module Configurations
 
   # Version number of Configurations
   #
-  VERSION = '1.3.0'
+  VERSION = '1.3.1'
 end

data/lib/configurations/configurable.rb

@@ -54,7 +54,7 @@ module Configurations
       def configurable(*properties, &block)
         type = properties.shift if properties.first.is_a?(Class)
         @configurable ||= {}
-        @configurable.merge!(to_configurable_hash(properties, type, &block))
+        @configurable.merge! to_configurable_hash(properties, type, &block)
       end
 
       # returns whether a property is set to be configurable

data/lib/configurations/configuration.rb

@@ -65,8 +65,10 @@ module Configurations
         _assign!(property, value)
       elsif !_is_writer?(method) && @_writeable || _configured?(method)
         @configuration[method]
-      else
+      elsif ::Kernel.respond_to?(method, true)
         ::Kernel.send(method, *args, &block)
+      else
+        super
       end
     end
 
@@ -112,6 +114,11 @@ module Configurations
       @configurable.nil? or @configurable.empty?
     end
 
+    # @return [Hash] the configurations configurable hash
+    def _configurable
+      @configurable
+    end
+
     private
 
     # @param [Symbol] property The property to test for
@@ -137,19 +144,23 @@ module Configurations
       @configurable.each do |k, assertion|
         if k.is_a?(::Hash)
           k.each do |property, nested|
-            @configuration[property] = Configuration.new(nil, _to_configurable_hash(nested, assertion))
+            @configuration[property] = Configuration.new(nil, _configurable_hash(property, nested, assertion))
           end
         end
       end
     end
 
+    # @param [Symbol, Hash, Array] property configurable properties, either single or nested
     # @param [Symbol, Hash, Array] value configurable properties, either single or nested
-    # @param [Class] type the type to assert, if any
+    # @param [Hash] assertions if any
     # @return a hash with configurable values pointing to their types
     #
-    def _to_configurable_hash(value, assertion)
+    def _configurable_hash(property, value, assertion)
       value = [value] unless value.is_a?(::Array)
-      ::Hash[value.zip([assertion].flatten*value.size)]
+      hash  = ::Hash[value.zip([assertion].flatten*value.size)]
+      hash  = @configuration[property]._configurable.merge(hash) if @configuration.has_key?(property)
+
+      hash
     end
 
     # Assigns a value after running the assertions
@@ -172,7 +183,7 @@ module Configurations
       return unless _evaluable?(property, :type)
 
       assertion = @configurable[property][:type]
-      ::Kernel.raise ConfigurationError, "Expected #{property} to be configured with #{expected_type}, but got #{value.class.inspect}", caller unless value.is_a?(assertion)
+      ::Kernel.raise ConfigurationError, "Expected #{property} to be configured with #{assertion}, but got #{value.class.inspect}", caller unless value.is_a?(assertion)
     end
 
     # Block assertion for configurable properties

data/test/configurations/test_stricter_configuration.rb

@@ -7,7 +7,10 @@ class TestStricterConfiguration < Minitest::Test
     configurable :property1, :property2
     configurable String, :property3
     configurable Symbol, property4: :property5, property6: [:property7, :property8]
-    configurable Array, property9: { property10: :property11 }
+    configurable Fixnum, property6: :property14
+    configurable Fixnum, property4: :property12
+    configurable Array, property9: { property10: { property11: :property12 } }
+    configurable Hash, property9: { property10: { property11: :property13 } }
   end
 
   def setup
@@ -16,9 +19,12 @@ class TestStricterConfiguration < Minitest::Test
       c.property2 = 'BASIC2'
       c.property3 = 'STRING'
       c.property4.property5 = :something
+      c.property4.property12 = 12
       c.property6.property7 = :anything
       c.property6.property8 = :everything
-      c.property9.property10.property11 = %w(here I am)
+      c.property6.property14 = 555
+      c.property9.property10.property11.property12 = %w(here I am)
+      c.property9.property10.property11.property13 = { hi: :bye }
     end
 
     @configuration = StrictConfigurationTestModule.configuration
@@ -33,13 +39,41 @@ class TestStricterConfiguration < Minitest::Test
     assert_equal :something, @configuration.property4.property5
   end
 
+  def test_configurable_with_nested_calls_and_deeply_nested_property
+    assert_equal 12, @configuration.property4.property12
+  end
+
+  def test_configurable_with_nested_calls_and_added_property
+    assert_equal 555, @configuration.property6.property14
+  end
+
+  def test_configurable_type_assertion_with_nested_calls_and_added_property
+    assert_raises Configurations::ConfigurationError do
+      StrictConfigurationTestModule.configure do |c|
+        c.property6.property14 = ''
+      end
+    end
+  end
+
   def test_configurable_with_same_key_when_set_nested_configurable
     assert_equal :anything, @configuration.property6.property7
     assert_equal :everything, @configuration.property6.property8
   end
 
   def test_configurable_with_deeply_nested_property
-    assert_equal %w(here I am), @configuration.property9.property10.property11
+    assert_equal %w(here I am), @configuration.property9.property10.property11.property12
+  end
+
+  def test_configurable_with_nested_calls_and_deeply_nested_property
+    assert_equal({ hi: :bye }, @configuration.property9.property10.property11.property13)
+  end
+
+  def test_configurable_type_restricted_with_nested_calls_and_deeply_nested_property
+    assert_raises Configurations::ConfigurationError do
+      StrictConfigurationTestModule.configure do |c|
+        c.property9.property10.property11.property13 = ''
+      end
+    end
   end
 
   def test_not_configurable_with_wrong_type

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: configurations
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-17 00:00:00.000000000 Z
+date: 2014-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest