dotconfig 0.0.4 → 0.0.5

data/CHANGELOG.md

@@ -14,3 +14,8 @@
 ## Version 0.0.4
 
 * Adding The RubyDoc link
+
+## Version 0.0.5
+
+* Simplification of the DotConfig::Configuration#config= in using the Hash#reduce method
+* Adding a private method to detect the collision name

data/lib/dot_config/configuration.rb

@@ -40,21 +40,15 @@ module DotConfig
     # @return [Hash] The +Hash+ configuration.
     def config=(hash)
       raise ArgumentError, 'Invalid argument' if !hash.is_a?(Hash) || hash.empty?
+      raise "Some keys are already used by Ruby" if collision_name?(hash.keys)
 
-      keys   = (hash.keys + hash.keys.map { |key| "#{key}=" }).map(&:to_sym)
-      system = self.instance_variables + self.class.instance_methods(true)
-
-      if (conflict = keys & system).empty?
-        @config = Hash.new
-        hash.each do |key, value|
-          if value.is_a?(Hash)
-            @config[key.to_sym] = self.class.new(config: value, writing: @writing)
-          else
-            @config[key.to_sym] = value
-          end
+      @config = hash.reduce(Hash.new) do |config, (key, value)|
+        config[key.to_sym] = if value.is_a?(Hash)
+          self.class.new(config: value, writing: @writing)
+        else
+          value
         end
-      else
-        raise "The key(s) (#{conflict.join(', ')}) is already used by Ruby"
+        config
       end
     end
 
@@ -85,5 +79,20 @@ module DotConfig
       @config.each { |k, v| hash[k] = v.is_a?(self.class) ? v.to_hash : v }
       hash
     end
+
+    private
+
+    # Checks if the keys duplicate the name of the instance methods.
+    #
+    # @param [Array] keys The keys of the configuration.
+    # @return [Boolean] +true+ if some keys match with the instance methods
+    #  name, otherwise +false+.
+    def collision_name?(keys)
+      # Retrieves all names of the instance methods.
+      methods = self.class.instance_methods(true)
+      keys.reduce(false) do |value, key|
+        value || methods.include?(key.to_sym) || methods.include?(:"#{key}=")
+      end
+    end
   end
 end

data/lib/dot_config/version.rb

@@ -12,7 +12,7 @@ module DotConfig
     # The minor number version.
     MINOR  = 0
     # The tiny number version.
-    TINY   = 4
+    TINY   = 5
     # The pre realese number version.
     PRE    = nil
     # The complete number version.

data/test/dot_config/configuration_test.rb

@@ -82,4 +82,10 @@ class DotConfig::ConfigurationTest < ActiveSupport::TestCase
     config = Configuration.new(config: nested_hash)
     assert_equal config.to_hash, nested_hash
   end
+
+  test 'private collision_name? method' do
+    config = Configuration.new
+    assert config.send(:collision_name?, %w{config})
+    assert !config.send(:collision_name?, %w{world})
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dotconfig
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-26 00:00:00.000000000 Z
+date: 2012-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport