con_duxml 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be72385bfaedf3c2c5d3420bf97e9477b9ffc143
-  data.tar.gz: 87c695867176251b5e9cbbe57345cffaa6d6ec01
+  metadata.gz: cb76f2afcac22ab8c56593829fc84ec21ff1ac6a
+  data.tar.gz: 5de14320187997e34c4aba43ee3183b9e25ddc45
 SHA512:
-  metadata.gz: 5a91a034b74e087b809b5db6daede88759c97b6366516aaa911095bee2ced263c9d17f14fab33ef8a850cf01ac4dc7b9c558bd46ba9a987eca5d9c382526c7ce
-  data.tar.gz: 6cf35d65bdbb92876f1bf7ffd1ff0bd5a30ee542903e463b8c9f342b594c21cef0bf79ff859ca4d1f607080ce28e0ffca05a8dee6d5906f627869794bc7b65ce
+  metadata.gz: 209f32ee7f0108e8fd88340455eac5504b2fb11f7f1a10ca20016a391c89a35bcf52a24daa2d97d1875fdb5838d04b81a565b8c1f4280a2efe2143338cf36551
+  data.tar.gz: a1dfeabc917a8b7836b7e545b0082f9256f918725d76929845e99c8503af4c40783929f613bd11e45cab9c56299155be2d79456d2ee83a7be2c67fa062fe77ab

data/lib/con_duxml.rb

@@ -30,8 +30,8 @@ module ConDuxml
     @src_ns = transforms[:src_ns]
     source = doc.locate(add_name_space_prefix(transforms[:source])).first
     @output.grammar = transforms[:grammar] if transforms[:grammar]
-    a = activate(transforms.first, source).first
     add_observer @output.history
+    a = activate(transforms.first, source).first
     @output << a
   end
 

data/lib/con_duxml/duxml_ext/element.rb

@@ -1,3 +1,4 @@
+# Copyright (c) 2016 Freescale Semiconductor Inc.
 require 'duxml'
 require_relative 'linkable'
 

data/lib/con_duxml/duxml_ext/linkable.rb

@@ -1,3 +1,4 @@
+# Copyright (c) 2016 Freescale Semiconductor Inc.
 module Linkable
   def linked_by
     @observer_peers.select do |obs|

data/lib/con_duxml/duxml_ext/transform_class.rb

@@ -1,3 +1,4 @@
+# Copyright (c) 2016 Freescale Semiconductor Inc.
 require 'duxml/meta/history/change'
 
 include Duxml
@@ -14,4 +15,9 @@ class TransformClass < ChangeClass
   def description
     "#{output.description} created from #{input.description} by #{instructions.description}"
   end
+
+  # @return [false] required to prevent grammar from attempting to validate transform
+  def error?
+    false
+  end
 end

data/lib/con_duxml/transform.rb

@@ -6,8 +6,9 @@ include Duxml
 
 # All public methods can be invoked by a transform element; please hide methods you don't want users to invoke in Private
 module Transform
-  include Observable
+  private
   include Private
+  public
 
   # most recent XML node from which content has been taken; for constructing relative paths
   @source
@@ -32,11 +33,10 @@ module Transform
     find_xform_event(node).input
   end
 
-  # @param path [String] path to node from @source e.g. 'child/grandchild'; target is expected to return ONE child
-  #   containing TEXT only
-  # @return [String] content of target node
-  def content(path)
-    @source.locate(add_name_space_prefix path).first.text
+  # @param node [Element, String] XML node including Strings
+  # @return [Array[String, Element]] array of child nodes of target
+  def content(node)
+    node.respond_to?(:nodes) ? node.nodes : node
   end
 
   # @param *args [*several_variants] see Duxml::Element#new; the only difference here is that this method has access to the content source

data/lib/con_duxml/transform/transform_private.rb

@@ -1,19 +1,25 @@
 # Copyright (c) 2016 Freescale Semiconductor Inc.
+require 'observer'
 
 # Private is where methods should go that you DO NOT want invoked by a transform file!
 module Private
-  private
+  include Observable
 
   # @param xform [Element] transform element
-  # @param _source [Element] XML xform containing content to be transformed
+  # @param src [Element] XML xform containing content to be transformed
   # @return [Array[Element]] transformed content; always an array of nodes, even if just one
-  def activate(xform, _source)
-    @source = _source
+  def activate(xform, src)
+    @source = src
     get_sources(xform).collect do |src|
       args = get_args(xform, src)
-      output = get_method(xform).call(*args)
+      meth = get_method(xform)
+      a = meth.arity
+      if a == -1 or args.size == a or args.size.between?(-1 - a, 0 - a)
+        output = meth.call(*args)
+      else
+        output = ''
+      end
       changed
-      m = methods
       notify_observers(:Transform, xform, src, output)
       changed false
       output
@@ -47,33 +53,61 @@ module Private
   end
 
   # @param xform [Element] transform element
-  # @param subj [Element] source XML Element
+  # @param src [Element] source XML Element
   # @return [Array[String, Element]] string returned by self[:args] is separated by ';' into correctly formatted argument values for transform method
-  def get_args(xform, subj)
+  def get_args(xform, src)
     args = xform.attributes.keys.sort.collect do |attr|
       if attr.to_s.match(/arg[0-9]*/)
-        if xform[attr].include?(',')
-          xform[attr].split(',').collect do |s|
-            s.match(/'[\s\w]+'/) ? $MATCH.strip[1..-2] : subj.locate(add_name_space_prefix s.strip).first
-          end
-        elsif xform[attr].include?('/')
-          subj.locate(add_name_space_prefix xform[attr]).first
-        elsif xform[attr].match(/'[\s\w]+'/)
-          $MATCH.strip[1..-2]
-        else
-          targets = subj.locate(xform[attr])
-          targets.empty? ? xform[attr] : targets
+        arg_str = xform[attr].strip
+        case arg_str
+          when /,/              then separate_enumerables(arg_str, src)
+          when /^([\w]+): (\S.*)$/, /^([\S]+) => (\S.*)$/ then {$1.to_sym => normalize_arg($2, src)}
+            when /^'(.+)' => (.+)$/ then {$1 => normalize_arg($2, src)}
+          when /\//             then src.locate(add_name_space_prefix arg_str).first
+          when /^'([\s\w]+)'$/    then $MATCH
+          else # arg is path to node
+            target = src.locate(add_name_space_prefix arg_str).first
+            target or ''
         end
       end
     end.compact
     children = xform.nodes.collect do |child|
-      activate(child, subj)
+      activate(child, src)
     end
     args << children.flatten if children.any?
     args
   end
 
+  def normalize_arg(str, src)
+    case str
+      when /'.+'/ then str[1..-2]
+      when /^[0-9]$/  then str.to_i
+      when 'true' then true
+      when 'false' then false
+      else src.locate(add_name_space_prefix str).first
+    end
+  end
+
+  # @param str [String] comma separated values that can be either an array or a Hash
+  # @return [Array[String]] returns separated values as array of strings
+  def separate_enumerables(str, src)
+    words = str.split(',').collect do |w| w.strip end
+    h = {}
+    a = []
+    words.each do |s|
+      case s
+        when /^'([\s\w]+)'$/ then a << $1
+        when /^(\w+): (\S.*)$/, /^(\w+) => (\S.*)$/ then h[$1.to_sym] = normalize_arg($2, src)
+        when /^'(.+)' => (\S.*)$/ then h[$1] = normalize_arg($2, src)
+        else a << normalize_arg(s, src)
+      end
+    end
+    a.empty? ? h : a
+  end
+
+
   def add_name_space_prefix(str)
+    str
     str.split('/').collect do |w|
       w.match(/\w+/) ? "#{src_ns ? src_ns+':' : ''}#{w}" : w
     end.join('/')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: con_duxml
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Peter Kong