construct 0.1.2 → 0.1.3

data/lib/construct.rb

@@ -3,7 +3,7 @@ class Construct
   # Ruby and humans with text editors.
  
   APP_NAME = 'Construct'
-  APP_VERSION = '0.1.2'
+  APP_VERSION = '0.1.3'
   APP_AUTHOR = 'Kyle Kingsbury'
   APP_EMAIL = 'aphyr@aphyr.com'
   APP_URL = 'http://aphyr.com'
@@ -11,13 +11,6 @@ class Construct
 
   require 'yaml'
 
-  YAML::add_domain_type("aphyr.com,2009", "construct") do |type, val|
-    # Not implemented ;)
-    Construct.load(val)
-  end
-  yaml_as "tag:aphyr.com,2009:construct"
-  yaml_as "tag:yaml.org,2002:map"
-
   class << self
     attr_writer :schema
   end
@@ -51,7 +44,8 @@ class Construct
   end
 
   def ==(other)
-    @schema == other.schema and @data == other.data
+    other.respond_to? :schema and other.respond_to? :data and
+      @schema == other.schema and @data == other.data
   end
 
   def [](key)
@@ -139,13 +133,34 @@ class Construct
 
   # 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
+  #
+  #   conf.define :sub, :default => Construct
+  #
+  # and then try to write to it:
+  #
+  #   conf.sub.opt = 2
+  #
+  # That opt gets stored on the *schema* sub. Everything works fine... except
+  # that when it comes time to serialize there's now *data* buried in the
+  # schema tree. Therefore, we write out schema objects as well when they are
+  # non-empty.
   def to_yaml(opts = {})
-    YAML::quick_emit(self, opts) do |out|
-      out.map(taguri, to_yaml_style) do |map|
-        @data.each do |key, value|
-          map.add(key.to_s, value)
-        end
+    hash = {}
+    @schema.each do |key, value|
+      if value[:default].kind_of? Construct
+        hashed = YAML::load(value[:default].to_yaml)
+        next if hashed.empty?
+        hash[key.to_s] = hashed
       end
     end
+
+    @data.each do |key, value|
+      hash[key.to_s] = value
+    end
+    hash.to_yaml(opts)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: construct
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - Kyle Kingsbury
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-15 00:00:00 -05:00
+date: 2009-07-23 00:00:00 -05:00
 default_executable: 
 dependencies: []