nucleon 0.1.13 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f70ed4e699ce46380540f987964c6dc765f542a0
-  data.tar.gz: 291ade54e0558e342f349adc551b0ebd7d0bf492
+  metadata.gz: 48e62bf112b4bd13ecd4f96651ce25a420c1bcbd
+  data.tar.gz: 5d0ea41b9a3e78b341f948fad1f457bd006336df
 SHA512:
-  metadata.gz: 19ba8e9c5ccfb4bbbcc44115ceda60d0af1f11879e65e10d81b4ce4b5ff11e69da0d03648a899c236197a7fb1e8e1944145965e8228213c8f9623956ebf8cdd4
-  data.tar.gz: 970bef07364f59149c7c87cd20b598b1cb9372709e04a10aad3d3a7187818d7fb85423be7d0fb86cc4602bc1398d1ced493815f62ab3b5a6c4381fde730f9c80
+  metadata.gz: 6aacc8129db572a34d23ed12c7ec265c34319de350aed2b1e9a86a9e385ed0a41a299b196952beaf5ab79fcd28668243980086b941c672e116fc9b18fbfbfb99
+  data.tar.gz: 3e030e1bddd136de67db37f7d8838f13f866511f2910500655b58a6965e7ca0aa5624fa9fe8180d137bd66b46dadee3e6a8e5a3348a9d7e29494b1481faa48e5

data/VERSION

@@ -1 +1 @@
-0.1.13
+0.1.14

data/lib/core/mixin/macro/object_interface.rb

@@ -282,6 +282,27 @@ module ObjectInterface
         
         # TODO: Figure out a way to effectively cache this search operation
         #------------------------------------------------------------------
+        
+        add_settings = lambda do |final_options, obj_settings|
+          if obj_settings
+            local_options = {}
+            array(obj_settings).each do |group_name|
+              if group_options = Marshal.load(Marshal.dump(settings(group_name)))
+                if group_options.has_key?(:settings)
+                  group_options = add_settings.call(group_options, group_options[:settings])
+                end
+                local_options = Util::Data.merge([ local_options, group_options ], true)  
+              end
+            end
+            unless local_options.empty?
+              final_options = Util::Data.merge([ local_options, final_options ], true)   
+            end
+          end
+          final_options
+        end
+        
+        #---
+        
         settings = {}
     
         keys = [ keys ] unless keys.is_a?(Array)
@@ -291,26 +312,15 @@ module ObjectInterface
           
         logger.debug("Searching specialized settings")      
         until temp.empty? do
-          if obj_settings = obj_config.get([ temp, :settings ])
-            array(obj_settings).each do |group_name|
-              if group_settings = Marshal.load(Marshal.dump(settings(group_name)))
-                settings = Util::Data.merge([ group_settings.dup, settings ], true)  
-              end
-            end            
-          end
+          settings = add_settings.call(settings, obj_config.get([ temp, :settings ]))
           temp.pop
         end
           
         logger.debug("Specialized settings found: #{settings.inspect}") 
         logger.debug("Searching general settings") 
-      
-        if obj_settings = obj_config.get(:settings)
-          array(obj_settings).each do |group_name|
-            if group_settings = Marshal.load(Marshal.dump(settings(group_name)))
-              settings = Util::Data.merge([ group_settings, settings ], true)  
-            end
-          end            
-        end
+        
+        settings = add_settings.call(settings, obj_config.get(:settings))
+        
         #------------------------------------------------------------------
         # TODO: Cache the above!!! 
           

data/nucleon.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: nucleon 0.1.13 ruby lib
+# stub: nucleon 0.1.14 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "nucleon"
-  s.version = "0.1.13"
+  s.version = "0.1.14"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Adrian Webb"]
-  s.date = "2014-04-14"
+  s.date = "2014-04-15"
   s.description = "\nA framework that provides a simple foundation for building Ruby applications that are:\n\n* Highly configurable (with both distributed and persistent configurations)\n* Extremely pluggable and extendable\n* Easily parallel\n\nNote: This framework is still very early in development!\n"
   s.email = "adrian.webb@coralnexus.com"
   s.executables = ["nucleon"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nucleon
 version: !ruby/object:Gem::Version
-  version: 0.1.13
+  version: 0.1.14
 platform: ruby
 authors:
 - Adrian Webb
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-14 00:00:00.000000000 Z
+date: 2014-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: log4r