con_duxml 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f310021527cf21283951d133438156181a2937b2
-  data.tar.gz: c7ac7d363ecd3451628a26b84cde8c139c9564fa
+  metadata.gz: 2f839d248fdc3df14fc70cce1075fb7b36c218ad
+  data.tar.gz: 3f6e928bfb479b302ea96f6acb6dd47e7460fee7
 SHA512:
-  metadata.gz: 0f94edd9c559d4515270e928d5f9a4497be68710ae4cc9bdf2bef50f85932886029e2d6f4797fae261e85a905cc50075ab71aa106740c1f7542b1bdd9c921510
-  data.tar.gz: 0e351f296e4538c421342af885062f6e2040a2b90f0b7063457b7eae9f25659938f392adbdb17af76e41d8c8ba2c911e325b775382f7f2074a6169d9eb0823df
+  metadata.gz: eea5385f086c3d75a5dd6afc6d9a34d3045e9e1adb50b66101a1b273c42bf42762ced1d3d908721246afcdb7e34b739adcd26a187b9d5a3ad1d3adccc0c621cb
+  data.tar.gz: 143de5258f6a664d9773f64398e48810e21ab988d5d988df632893ec36aa382d37e752e13901fd2473f166a08acea7696fd9197232666a8c99bb3a0b29427f4d

data/lib/con_duxml.rb

@@ -1,5 +1,5 @@
 # Copyright (c) 2016 Freescale Semiconductor Inc.
-%w(transform array instance link).each do |f| require_relative "con_duxml/#{f}" end
+%w(transform instance link).each do |f| require_relative "con_duxml/#{f}" end
 
 module ConDuxml
   include Duxml
@@ -18,24 +18,14 @@ module ConDuxml
   # @return [Doc] result of transform; automatically saved to @doc
   def transform(transforms, doc_or_path, opts={})
     @doc = Doc.new
-    transforms = case transforms
-                   when Doc then transforms.root
-                   when Element then transforms
-                   when String then sax(transforms).root
-                   else
-                 end
-    @src_doc = case doc_or_path
-             when Doc then doc_or_path
-             when String then sax doc_or_path
-             else
-           end
+    transforms = get_doc(transforms).root
+    @src_doc = get_doc doc_or_path
     @src_ns = transforms[:src_ns]
     src_node = src_doc.locate(add_name_space_prefix(transforms[:source])).first
     doc.grammar = transforms[:grammar] if transforms[:grammar]
     doc.history.strict?(false) if opts[:strict].is_a?(FalseClass)
     add_observer doc.history
-    a = activate(transforms.first, src_node).first
-    @doc << a
+    @doc << activate(transforms.first, src_node).first
   end
 
   attr_reader :src_doc
@@ -43,15 +33,42 @@ module ConDuxml
   # instantiation takes a static design file and constructs a dynamic model by identifying certain keyword elements,
   # executing their method on child nodes, then removing the interpolating keyword element. these are:
   #
-  # <array> - is replaced by multiple copies of its direct child or referenced XML nodes, allowing for user-defined variations between each copy
   # <instance> - when it contains design elements, it is removed but its reference ID is given to all children creating an XML-invisible arbitrary grouping
   #   when it references an XML file, ID or path to an XML element, the target is copied and inserted in place of this element
   # <link> - referenced XML file or nodes provides namespace, contents, and notification of changes to any direct children of this node @see ConDuxml::Link
   #
-  # @param source [String, Doc] XML document or path to one that will provide design content
+  # @param doc_or_node [String, Doc, Element] XML document or path to one or XMl Element
   # @return [Doc] resulting XML document
-  def instantiate(source)
-
+  def instantiate(doc_or_node, opts={})
+    if doc_or_node.is_a?(Element)
+      new_node = doc_or_node.stub
+      new_children = doc_or_node.nodes.collect do |src_node|
+        if src_node.respond_to?(:nodes)
+          src_node.activate.collect do |inst|
+            inst.name.match(/con_duxml:/) ? instantiate(src_node) : instantiate(inst)
+          end
+        else
+          src_node.clone
+        end
+      end.flatten
+      if new_children.any?
+        new_node << new_children
+      end
+      new_node
+    else
+      @src_doc = get_doc doc_or_node
+      instance = instantiate(src_doc.root)
+      @doc = Doc.new << instance
+    end
   end
 
+private
+  def get_doc(doc_or_path)
+    case doc_or_path
+      when Doc then doc_or_path
+      when String then sax doc_or_path
+      when Element then doc_or_path
+      else
+    end
+  end
 end

data/lib/con_duxml/duxml_ext/element.rb

@@ -18,6 +18,21 @@ module Duxml
       new_nodes
     end
 
+    # @return [Array[Element]] instantiated copy of this Element
+    def activate
+      if name_space == 'duxml'
+        maudule = ConDuxml.const_get(simple_name.constantize)
+        extend maudule
+        activate
+      else
+        [clone]
+      end
+    end
+
+    def simple_name
+      name.split(':').last
+    end
+
     # @param pattern [several_variants] if String/Symbol or array of such, differences between merged entities' instance vars matching pattern are masked; if pattern is a hash, the key is the instance var, and the value becomes the new value for the merged entity
     # @param &block [block] groups nodes by &block then merges each group into a single row @see #chunk
     def merge(pattern=nil, &block)

data/lib/con_duxml/instance.rb

@@ -5,29 +5,28 @@ module ConDuxml
   # Instances are copies of another XML element with a distinct set of parameter values
   # like Objects in relation to a Class
   module Instance
+    # @param target [String] path to target node or file
+    # @return [Element] self
     def ref=(target)
-      raise Exception unless target.respond_to?(:nodes) or File.exists?(target)
-      @ref = target
+      raise Exception unless doc.locate(target) or File.exists?(target)
+      self[:ref] = target
     end
 
-    def resolve_ref(attr=nil)
-      @ref ||= self[attr || :ref]
+    # @return [Element] either root node of referenced Doc or referenced node
+    def resolve_ref(attr='ref')
+      source = if self[:file]
+                 path = File.expand_path(File.dirname(doc.path) + '/' + self[:file])
+                 sax path
+               else
+                 doc
+               end
+      return source.locate(self[attr]).first if self[attr]
+      source.root if self[:file]
     end
 
-    # creates copy of referent (found from context given by 'meta') at this element's location
-    def instantiate
-      new_kids = []
-      target = resolve_ref
-      if target.nil?
-        new_kids = nodes
-      else
-        new_kids << target.dclone
-      end
-      new_kids
+    # @return [Array[Element, String]] array (or NodeSet) of either shallow clone of child nodes or referenced nodes @see #ref=
+    def activate
+      [resolve_ref || nodes].flatten.clone
     end # def instantiate
   end # module Instance
-
-  class InstanceClass
-    include Instance
-  end
 end # module Dux

data/lib/con_duxml/transform/transform_private.rb

@@ -23,7 +23,7 @@ module Private
       notify_observers(:Transform, xform, src, output)
       changed false
       output.add_observer doc.history if output.respond_to?(:add_observer)
-      if output.is_a?(Element) and doc.history.strict?
+      if output.respond_to?(:nodes) and doc.history.strict?
         raise Exception, doc.history.latest.description unless doc.grammar.validate output
       end
       output

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: con_duxml
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Peter Kong
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-23 00:00:00.000000000 Z
+date: 2016-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: duxml
@@ -45,7 +45,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/con_duxml/array.rb
 - lib/con_duxml/duxml_ext/element.rb
 - lib/con_duxml/duxml_ext/linkable.rb
 - lib/con_duxml/duxml_ext/transform_class.rb

data/lib/con_duxml/array.rb

@@ -1,42 +0,0 @@
-# Copyright (c) 2016 Freescale Semiconductor Inc.
-
-require File.expand_path(File.dirname(__FILE__) + '/instance')
-
-module ConDuxml
-  # XML object array
-  # represents a pattern of copies of a this object's children or referents
-  # differentiates between copies using iterator Parameter
-  module Array
-    include Instance
-    include Enumerable
-
-    # @param block [block] each duplicated node is yielded to block if given
-    # @return [Array[Element]] flattened array of all duplicated Elements
-    def instantiate(&block)
-      size_expr = size.respond_to?(:to_i) ? size.to_i : size.to_s
-      if size_expr.is_a? Fixnum
-        new_children = []
-        size_expr.times do |index|
-          nodes.each do |node|
-            new_child = block_given? ? yield(node.dclone, index) : node.dclone
-            new_children << new_child
-          end
-        end
-        new_children
-      else
-        [self]
-      end
-    end # def instantiate
-
-    # size can be Fixnum or a Parameter expression
-    def size
-      self[:size]
-    end
-
-    # overriding #each to only traverse children and return self on completion, not Enumerator
-    def each &block
-      @children.each &block
-      self
-    end
-  end # class Array
-end # module Dux