roundtrip_xml 0.2.2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e77511e2e2d2f257ab080cebb04b0f66ee25af7
-  data.tar.gz: 6a3ebee19eeffa57d16e80c18a87942d58edbfe4
+  metadata.gz: e2a828a5eed9aa3a533c7d19e959f9dd4ff3f1fd
+  data.tar.gz: 26585d066af79709c1f972fa82902af574a58881
 SHA512:
-  metadata.gz: cd50200ff25f0195d300e5c0d25ffff38dbb7ec84ce534ab0f7bf8e3a686e09eefd58f837012f8c31a695182535956753643d2c1f7fd69db46b318fc22a6dd28
-  data.tar.gz: 872b94b1378169aafd2efcdb979c8649dbbc1d9530cebbef70dc57143bc7de41fdfc94babbddeae3e5757eb1543ca67ca8c26dfef9ff9dd6dac6838d6ffa7fc3
+  metadata.gz: 9d875f5ee525541bafbe6068aa54cbb186fe5b9eddef5b726bc717ccbbcabdd00435d0cd11ee98d3a7bb4e872725f9d04b02a18283a07e39b03a652ca8792742
+  data.tar.gz: d1f17f80df1b8d92886c81a9cd9c1b19c9cf37482144eda6075c20bce5ea76ae085ff3ca4b0370f905976b5d12b7e053a571171bd6a4a352f1414dfd5d00bc61

data/lib/roundtrip_xml/base_cleanroom.rb

@@ -96,4 +96,9 @@ class BaseCleanroom
       self.class.send(:expose, name)
     end
   end
+
+  def _matcher(accessor, matcher)
+    @el.class.plain_accessor accessor, matcher
+  end
+  expose :_matcher
 end

data/lib/roundtrip_xml/dsl_runtime.rb

@@ -34,7 +34,7 @@ class DslRuntime
   end
 
   # @param block Proc This proc is passed each health rule and must return a string value which specifies the partition for it
-  def write_dsl(xml, root_class_name, root_method, helpers = '', &block)
+  def write_dsl(xml, root_class_name, root_method, helpers = nil, &block)
     roxml_root = fetch(root_class_name).from_xml xml
 
     extractor = Extractor.new roxml_root.send(root_method), self, root_class_name, helpers
@@ -83,10 +83,10 @@ class DslRuntime
 
   def evaluate_raw(dsl, root_class, templates = [], &block)
     cleanroom = RootCleanroom.new(fetch(root_class).new, self)
-    templates.each { |t| cleanroom.evaluate_file t }
-    if block_given?
-      cleanroom.evaluate &block
-    else
+      templates.each { |t| cleanroom.evaluate t }
+      if block_given?
+        cleanroom.evaluate &block
+      else
       cleanroom.evaluate dsl
     end
 

data/lib/roundtrip_xml/extractor.rb

@@ -6,6 +6,7 @@ require 'set'
 require 'roundtrip_xml/utils'
 require 'multiset'
 require 'roundtrip_xml/roxml_subclass_helpers.rb'
+require 'differ'
 
 class Extractor
 
@@ -13,10 +14,11 @@ class Extractor
     @roxml_objs = roxml_objs
     @runtime = runtime
     @root_class = root_class
+    @definitions = {}
     if block_given?
-      @definitions = eval_definitions root_class, &block
+      eval_definitions root_class, &block
     else
-      @definitions = eval_definitions root_class, definitions
+      definitions.each {|defin| eval_definitions root_class, defin } if definitions
     end
   end
 
@@ -29,7 +31,7 @@ class Extractor
     end
     new_names = @runtime.instance_variable_get(:@classes).keys
     def_names = new_names - old_names
-    def_names.inject({}) do |out, name|
+    @definitions = def_names.inject(@definitions) do |out, name|
       clazz = @runtime.fetch(name)
       parent = get_root_class clazz
       obj = clazz.new
@@ -57,7 +59,14 @@ class Extractor
       h.delete '__class'
     end
     diffs = HashDiff.diff(obj_hash, def_hash).map do |diff|
-      ROXMLDiff.new diff[1], from_hash(diff[2]), diff[3]
+      accessor_name = if diff[3].is_a?(String) && match = diff[3].match(/#{Utils::UNDEFINED_PARAM}:(\w*)/)
+                        match[1].to_sym
+                      end
+      if accessor_name && defin.class.plain_accessors.include?(accessor_name)
+        matcher = defin.class.plain_accessors(true)[accessor_name]
+      end
+      template_val = diff[3].is_a?(String) && accessor_name ? Utils::UndefinedParam.new(accessor_name, diff[3]) : diff[3]
+      ROXMLDiff.new diff[0], diff[1], from_hash(diff[2]), template_val, matcher
     end
 
     diffs
@@ -82,11 +91,11 @@ class Extractor
 
     defs.each do |defin|
       diffs = diff_definition(defin, obj)
-      if diffs.all? {|diff| diff.template_val.is_a?(Utils::UndefinedParam) || diff.template_val == nil }
+      if diffs.all? {|diff| diff.operation == '~' && (diff.template_val.is_a?(Utils::UndefinedParam) || diff.template_val == nil || interpolated_diff(diff)) }
         new_obj = defin.class.new
         param_values = diffs.inject({}) do |values, diff|
           name = diff.template_val ? diff.template_val.name : diff.key
-          values[name] = diff.obj_val
+          values[name] = interpolated_diff(diff) ? extract_interpolated_diff(diff) : diff.obj_val
           values
         end
         set_attributes new_obj, param_values
@@ -97,7 +106,8 @@ class Extractor
 
     obj.class.roxml_attrs.each do |a|
       if a.array?
-        elements = obj.send(a.accessor).map {|el| convert_roxml_obj el}
+        elements = a.sought_type.class == Class ?
+          obj.send(a.accessor).map {|el| convert_roxml_obj el} : obj.send(a.accessor)
         obj.send a.setter.to_sym, elements
       elsif a.sought_type.class == Class
         current_value = obj.send(a.accessor)
@@ -107,22 +117,78 @@ class Extractor
     obj
   end
 
+  def interpolated_diff(diff)
+    diff.obj_val.is_a?(String) && diff.template_val.is_a?(Utils::UndefinedParam) && diff.template_val.original && diff.template_val.original.match(/#{Utils::UNDEFINED_PARAM}:/)
+  end
+
+  def extract_interpolated_diff(diff)
+    s_diff = Differ.diff_by_word(diff.obj_val, diff.template_val.original).to_s
+    value = s_diff.match(/(\{"\s*#{Utils::UNDEFINED_PARAM}:([\S]*)\s*" >> "(.*)"})/)[3]
+    value.strip.match(diff.matcher)[1]
+  end
+
   def set_attributes(obj, params)
     params.each do |param, val|
       methods = param.to_s.split '.'
-      # set_deep_attribute obj, methods, val
-      obj.send "#{param}=", val
+      methods << val
+      set_deep_attributes obj, methods
+      # obj.send "#{param}=", val
+    end
+
+  end
+
+  def set_deep_attributes(obj, methods)
+    index = methods[0].match(/\[(\d+)\]/)
+    child = index ? nil : obj.send(methods[0])
+    method = methods[0]
+    method.gsub!(/\[\d+\]/, '')
+    if child
+      set_deep_attributes child, methods[1..methods.size]
+    else
+      if index
+        arr = obj.send(method) || []
+        arr[Integer(index[1])] = methods[1..1][0] # hacky way to get second element
+        obj.send("#{method}=", arr)
+      else
+        obj.send(methods[0] + '=', set_deep_attributes_helper(obj, methods))
+      end
+    end
+  end
+
+  def set_deep_attributes_helper(obj, methods)
+    method = methods.shift
+    index = method.match(/\[(\d+)\]/)
+    return obj.send(method + '=', methods.first) if !index && methods.size == 1
+
+    method.gsub!(/\[\d+\]/, '')
+    child = obj.send(method)
+    unless child || methods.size == 1
+      clazz_name = method.dup
+      clazz_name[0] = clazz_name[0].upcase
+      child = @runtime.fetch(clazz_name.to_sym).new
+      obj.send("#{method}=", child)
+
+    end
+    if index
+      arr = obj.send(method) || []
+      arr[Integer(index[1])] = methods.first
+      obj.send("#{method}=", arr)
+    else
+      obj.send(method + '=', set_deep_attributes_helper(child, methods))
     end
 
+    child.is_a?(Array) ? obj : child || obj
   end
 
 end
 
 class ROXMLDiff
-  attr_reader :key, :obj_val, :template_val
-  def initialize(key, obj_val, template_val)
+  attr_reader :operation, :key, :obj_val, :template_val, :matcher
+  def initialize(operation, key, obj_val, template_val, matcher = nil)
+    @operation = operation
     @key = key.to_sym
     @obj_val = obj_val
     @template_val = template_val
+    @matcher = matcher
   end
 end

data/lib/roundtrip_xml/plain_accessors.rb

@@ -5,9 +5,9 @@ module PlainAccessors
   end
 
   module ClassMethods
-    def plain_accessor(name, default = nil)
+    def plain_accessor(name, matcher = /(\S*)/)
       @plain_accessors ||= {}
-      @plain_accessors[name] = default
+      @plain_accessors[name] = matcher
       attr_writer name
       define_method(name) do
         val = instance_variable_get "@#{name}"

data/lib/roundtrip_xml/sexp_dsl_builder.rb

@@ -43,11 +43,13 @@ EOF
     obj.attributes.each do |attr|
       val = obj.send attr.accessor
       next unless val
-      # if !val || (is_subclass && obj.class.defaults.keys.include?(attr.accessor))
-      #   next
-      # end
+
       if attr.sought_type.class == Symbol
-        accessors << [:call, nil, attr.accessor, [:str, val]]
+        if val.is_a? Array
+          val.each {|v| accessors << [:call, nil, attr.accessor, [:str, v]]}
+        else
+          accessors << [:call, nil, attr.accessor, [:str, val]]
+        end
       elsif val.class == Array
         val.each { |v| accessors << create_sexp_for_roxml_obj(v, attr.accessor) }
       else
@@ -79,7 +81,7 @@ EOF
     sexp = Sexp.from_array s
     processor = Ruby2Ruby.new
     str = processor.process(sexp)
-    str.gsub(/\((.*)\)/, ' \\1').gsub(/"([^'\n]+)"/, "'\\1'")
+    str.gsub(/([^"])\(([^\(\)]*|".*")\)([^"])([^{]|$)/, '\\1 \\2\\3\\4').gsub(/"([^'\n]+)"/, "'\\1'").gsub(/# do nothing/, '')
   end
 
   def write_full_dsl(root_method)

data/lib/roundtrip_xml/utils.rb

@@ -7,11 +7,16 @@ def name_to_sym_helper(name, lower_case = false)
     new_name.to_sym
 end
 module Utils
-  # UNDEFINED_PARAM = 'UNDEFINED_PARAM_VALUE'
+  UNDEFINED_PARAM = 'UNDEFINED_PARAM'.freeze
   class UndefinedParam
-    attr_reader :name
-    def initialize(name)
+    attr_reader :name, :original
+    def initialize(name, original = nil)
       @name = name
+      @original = original
+    end
+
+    def to_s
+      "#{Utils::UNDEFINED_PARAM}:#{@name}"
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roundtrip_xml
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 1.0.0
 platform: ruby
 authors:
 - Chris Usick
@@ -108,6 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.3'
+- !ruby/object:Gem::Dependency
+  name: differ
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: multiset
   requirement: !ruby/object:Gem::Requirement
@@ -175,7 +189,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: DSL which learns from XML