roundtrip_xml 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed71824b02e695d7398d8a74dd35186008b8b4e4
-  data.tar.gz: 0d8cfec6b03c3ab49be2ec57fb85adb65e6e7234
+  metadata.gz: 9f0012fb7fe73d2b380d6ccb789ce81e220a5cb5
+  data.tar.gz: b851118b3e91dd5644c77f95545621e65a98caf7
 SHA512:
-  metadata.gz: 1e4bfa899cbfa7f9aab2dd6356ebbad6704a58ce4abd3ad81f803ce3f8617c10f76dd575b8046767ddc88092f636f220ee7e43766367f7bc34321a08b05a8e4b
-  data.tar.gz: d529ce7d02687948829b7758ab3e82ef21dd61f61948926f6730d0d9e95622cffca4b67176475c83b9407601e7d41776c06123a27c9668d5e2217da9afa88a01
+  metadata.gz: d70527738c6a247d6769eca5e1b9135310b3eb1228dca18753a8d7cd9ffb51d2be3801a124431e4bd907699cd8532eb44997094d92f98c2209782fb73a211210
+  data.tar.gz: 77733f8c0ca731e0d1350f78fc12ca3244ae01910e63260a4a07b1fa546cc02ccbf3e72136023c6c6348f5fd4cc3cf513b5bd848151b92ad79229089ebf8e97e

data/lib/roundtrip_xml/base_cleanroom.rb

@@ -55,20 +55,37 @@ class BaseCleanroom
     @value_holder ||= {}
     hash = plain_accessors.inject({}) {|h, a| h[a] = @el.send(a); h}
     child = @runtime.create_cleanroom(clazz)
-    child.inherit_properties @value_holder.merge(hash)
+    child.inherit_properties hash.merge(@value_holder)
 
     child.evaluate &block
-    child.evaluate &child.get_el.process if child.get_el.respond_to? :process
+    new_values = child.value_holder
+    append_child_modifications new_values
+    child.get_el.process.each {|proc| child.evaluate &proc } if child.get_el.respond_to? :process
 
     child.get_el
   end
 
+  def append_child_modifications(hash)
+    hash.each do |k, v|
+      setter = "#{k}="
+      get_el.send(setter, v) if get_el.respond_to? setter
+    end
+
+    @value_holder.merge! hash
+  end
+
+  attr_reader :value_holder
   def inherit_properties(props)
     @value_holder = props
     props.each do |name, val|
 
-      self.class.send(:attr_reader, name)
-      self.instance_variable_set("@#{name}".to_sym, val)
+      self.instance_variable_set("@#{name}", val)
+      create_method name do |value = nil|
+        # self.instance_variable_set("@#{name}", value) if value
+        # instance_variable_get "@#{name}"
+        @value_holder[name] = value if value
+        @value_holder[name]
+      end
       self.class.send(:expose, name)
     end
   end

data/lib/roundtrip_xml/dsl_runtime.rb

@@ -59,9 +59,13 @@ class DslRuntime
 
   end
 
-  def evaluate_raw(dsl, root_class)
+  def evaluate_raw(dsl, root_class, &block)
     cleanroom = RootCleanroom.new(fetch(root_class).new, self)
-    cleanroom.evaluate dsl
+    if block_given?
+      cleanroom.evaluate &block
+    else
+      cleanroom.evaluate dsl
+    end
 
   end
 

data/lib/roundtrip_xml/root_cleanroom.rb

@@ -1,17 +1,40 @@
 require 'roundtrip_xml/base_cleanroom'
+require 'roundtrip_xml/utils'
 # addes the `define` and `use_file` method to a cleanroom. Only used when evaluating a root file
 class RootCleanroom < BaseCleanroom
-
+  include Utils
   def define(name, parent, *params, &block)
-    new_class = Class.new(@runtime.fetch parent) do
+    parent_class = @runtime.fetch parent
+    new_class = new_roxml_class(name, parent_class) do
+      self.instance_variable_set :@class_name, name
       # simply using @@params is referring to `AContainer`
-      self.class_variable_set(:@@block, block)
+      # hash = self.class_variable_defined?(:@@block) ? self.class_variable_get(:@@block) : {}
+      # hash[name] = block
+      self.instance_variable_set(:@block, block)
       params.each do |param|
         plain_accessor param
       end
 
+      parent_class.plain_accessors.each do |accessor|
+        plain_accessor accessor
+      end
+
       def process
-        self.class.class_variable_get(:@@block)
+        proc = self.class.instance_variable_get(:@block)#[self.class.instance_variable_get(:@class_name)]
+        if self.class.superclass.respond_to? :process
+          [proc].concat self.class.superclass.process
+        else
+          [proc]
+        end
+      end
+      def self.process
+        proc = self.instance_variable_get(:@block)
+        if self.superclass.respond_to? :process
+          [proc].concat self.superclass.process
+        else
+          [proc]
+        end
+
       end
     end
     @runtime.add_class name, new_class

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roundtrip_xml
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Chris Usick