construct 0.1.6 → 0.1.7

data/lib/construct.rb

@@ -1,28 +1,24 @@
 class Construct
   # Construct is extensible, persistent, structured configuration for
   # Ruby and humans with text editors.
- 
+
   APP_NAME = 'Construct'
-  APP_VERSION = '0.1.6'
+  APP_VERSION = '0.1.7'
   APP_AUTHOR = 'Kyle Kingsbury'
+  APP_CONTRIBUTORS = ['Kyle Kingsbury', 'Spencer Miles', 'John MacKenzie']
   APP_EMAIL = 'aphyr@aphyr.com'
-  APP_URL = 'http://aphyr.com'
-  APP_COPYRIGHT = 'Copyright (c) 2009 Kyle Kingsbury <aphyr@aphyr.com>. All rights reserved.'
+  APP_URL = 'http://github.com/aphyr/construct'
 
   require 'yaml'
 
   include Enumerable
 
-  class << self
-    attr_writer :schema
-  end
-
   # Define a schema for a key on the class. The class schema is used as the
   # defaults on initialization of a new instance.
   def self.define(key, schema)
     key = key.to_sym if String === key
-    @schema[key] = schema
-  end 
+    self.schema[key] = schema
+  end
 
   # Load a construct from a YAML string
   def self.load(yaml)
@@ -30,6 +26,11 @@ class Construct
     new(hash)
   end
 
+  def self.load_file(filename)
+    hash = YAML::load_file(filename)
+    new(hash)
+  end
+
   # Returns the class schema
   def self.schema
     @schema ||= {}
@@ -56,8 +57,8 @@ class Construct
     if @data.include? key
       @data[key]
     elsif @schema.include? key and @schema[key].include? :default
-      @schema[key][:default]
-    end 
+      @data[key] = Marshal.load(Marshal.dump(@schema[key][:default]))
+    end
   end
 
   # Assign a value to a key. Constructs accept only symbols as values,
@@ -73,7 +74,7 @@ class Construct
 
     # Convert suitable hashes into Constructs
     if value.is_a? Hash
-      if value.keys.all? { |k| 
+      if value.keys.all? { |k|
             k.is_a? String or k.is_a? Symbol
           }
         value = Construct.new(value)
@@ -112,7 +113,7 @@ class Construct
   def each
     keys.each do |key|
       yield key, self[key]
-    end      
+    end
   end
 
   # Returns true if the construct has a value set for, or the schema defines,
@@ -150,9 +151,25 @@ class Construct
     end
   end
 
+  # Flattens this construct (recursively) into a hash, merging schema with
+  # values. Useful for passing a Construct to a library that checks kind_of?
+  def to_hash
+    inject({}) do |hash, pair|
+      value = pair[1]
+      hash[pair[0]] = case value
+      when Construct
+        value.to_hash
+      else
+        value
+      end
+
+      hash
+    end
+  end
+  
   # Dumps the data (not the schema!) of this construct to YAML. Keys are
   # expressed as strings.
-  # 
+  #
   # This gets a little complicated.
   #
   # If you define a schema where the default is a Construct

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: construct
 version: !ruby/object:Gem::Version 
-  version: 0.1.6
+  prerelease: false
+  segments: 
+  - 0
+  - 1
+  - 7
+  version: 0.1.7
 platform: ruby
 authors: 
 - Kyle Kingsbury
@@ -9,10 +14,22 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-23 00:00:00 -08:00
+date: 2011-06-01 00:00:00 -07:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: bacon
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 1
+        version: "1.1"
+  type: :development
+  version_requirements: *id001
 description: 
 email: aphyr@aphyr.com
 executables: []
@@ -26,7 +43,7 @@ files:
 - LICENSE
 - README
 has_rdoc: true
-homepage: http://aphyr.com
+homepage: http://github.com/aphyr/construct
 licenses: []
 
 post_install_message: 
@@ -38,18 +55,22 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 1
+      - 8
+      - 5
       version: 1.8.5
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: construct
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Extensible, persistent, structured configuration for Ruby.