Sutto-perennial 0.2.4.0 → 0.2.4.1

data/lib/perennial/nash.rb

@@ -1,7 +1,20 @@
+require 'yaml'
 module Perennial
   # A ninja hash. Like OpenStruct, but better
   class Nash
     
+    def self.load_file(path)
+      n = self.new
+      if File.file?(path) && File.readable?(path)
+        contents = YAML.load_file(path)
+      end
+      if contents.is_a?(Hash)
+        contents.to_hash
+      else
+        new(:data => contents).normalized
+      end
+    end
+    
     attr_reader :table
     
     def initialize(initial = {})
@@ -104,7 +117,7 @@ module Perennial
      
     def inspect
       str = ""
-      if first = Thread.current[:inspect_stack].nil?
+      if Thread.current[:inspect_stack].nil?
         Thread.current[:inspect_stack] = [self]
         str = _inspect
         Thread.current[:inspect_stack] = nil
@@ -129,9 +142,52 @@ module Perennial
       str << ">"
       return str
     end
+    
+    def hash
+      @table.hash
+    end
+    
+    def normalized(n = nil)
+      item = nil
+      if Thread.current[:normalized].nil?
+        n = self.class.new
+        Thread.current[:normalized] = {self => n}
+        item = normalize_nash(n)
+        Thread.current[:normalized] = nil
+      else
+        if Thread.current[:normalized].has_key?(self)
+          return Thread.current[:normalized][self]
+        else
+          n = self.class.new
+          Thread.current[:normalized][self] = n
+          item = normalize_nash(n)
+        end
+      end
+      item
+    end
      
     protected
     
+    def normalize_nash(n = self.class.new)
+      each_pair do |k, v|
+        n[k] = normalize_item(v)
+      end
+      return n
+    end
+    
+    def normalize_item(i)
+      case i
+      when Hash
+        self.class.new(i).normalized
+      when Array
+        i.map { |v| normalize_item(v) }
+      when self.class
+        i.normalized
+      else
+        i
+      end
+    end
+    
     def method_missing(name, *args, &blk)
       name = name.to_s
       case name.to_s[-1]

data/lib/perennial/settings.rb

@@ -71,6 +71,8 @@ module Perennial
           @@configuration.merge!(lookup_settings_from(loaded_yaml))
         end
         @@configuration.merge! options
+        # Finally, normalize settings
+        @@configuration = @@configuration.normalized
         @@setup = true
       end
       

data/lib/perennial.rb

@@ -9,7 +9,7 @@ require 'perennial/exceptions'
 
 module Perennial
   
-  VERSION = "0.2.4.0"
+  VERSION = "0.2.4.1"
   
   has_library :dispatchable, :hookable, :loader, :logger, :nash,
               :loggable, :manifest, :settings, :argument_parser,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: Sutto-perennial
 version: !ruby/object:Gem::Version 
-  version: 0.2.4.0
+  version: 0.2.4.1
 platform: ruby
 authors: 
 - Darcy Laycock