coral_core 0.2.15 → 0.2.16

data/VERSION

@@ -1 +1 @@
-0.2.15
+0.2.16

data/coral_core.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "coral_core"
-  s.version = "0.2.15"
+  s.version = "0.2.16"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Adrian Webb"]

data/lib/coral_core/template.rb

@@ -13,21 +13,31 @@ module Template
   
   def self.process(value)
     case value
-    when String
-      return ''         if Util::Data.undef?(value)
+    when String, Symbol
+      return nil        if Util::Data.undef?(value)
       return 'false'    if value == false
       return 'true'     if value == true      
       return value.to_s if value.is_a?(Symbol)
       
     when Hash
+      results = {}
       value.each do |key, item|
-        value[key] = process(item)
+        result = process(item)
+        unless result.nil?
+          results[key] = result  
+        end
+        value = results
       end
       
     when Array
+      results = []
       value.each_with_index do |item, index|
-        value[index] = process(item)
+        result = process(item)
+        unless result.nil?
+          results << result  
+        end        
       end
+      value = results
     end
     return value
   end

data/lib/coral_core/util/data.rb

@@ -104,14 +104,11 @@ class Data
     
     # Special case because this method is called from within Config.new so we 
     # can not use Config.ensure, as that would cause an infinite loop.
-    force = force.is_a?(Coral::Config) ? force.get(:force, force) : force
-    
-    #dbg(data, 'data')
+    force = force.is_a?(Coral::Config) ? force.get(:force, true) : force
     
     if data.is_a?(Array)
       value = data.shift
       data.each do |item|
-        #dbg(item, 'item')
         case value
         when Hash
           begin
@@ -120,7 +117,7 @@ class Data
             
           rescue LoadError
             if item.is_a?(Hash) # Non recursive top level by default.
-              value = value.merge(item)                
+              value = value.merge(item)              
             elsif force
               value = item
             end
@@ -131,11 +128,13 @@ class Data
           elsif force
             value = item
           end
+                
+        when String, Symbol
+          value = item if item.is_a?(String) || item.is_a?(Symbol) || force 
         end
       end  
     end
     
-    #dbg(value, 'value')            
     return value
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: coral_core
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 55
   prerelease: 
   segments: 
   - 0
   - 2
-  - 15
-  version: 0.2.15
+  - 16
+  version: 0.2.16
 platform: ruby
 authors: 
 - Adrian Webb