con_duxml 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb76f2afcac22ab8c56593829fc84ec21ff1ac6a
-  data.tar.gz: 5de14320187997e34c4aba43ee3183b9e25ddc45
+  metadata.gz: f310021527cf21283951d133438156181a2937b2
+  data.tar.gz: c7ac7d363ecd3451628a26b84cde8c139c9564fa
 SHA512:
-  metadata.gz: 209f32ee7f0108e8fd88340455eac5504b2fb11f7f1a10ca20016a391c89a35bcf52a24daa2d97d1875fdb5838d04b81a565b8c1f4280a2efe2143338cf36551
-  data.tar.gz: a1dfeabc917a8b7836b7e545b0082f9256f918725d76929845e99c8503af4c40783929f613bd11e45cab9c56299155be2d79456d2ee83a7be2c67fa062fe77ab
+  metadata.gz: 0f94edd9c559d4515270e928d5f9a4497be68710ae4cc9bdf2bef50f85932886029e2d6f4797fae261e85a905cc50075ab71aa106740c1f7542b1bdd9c921510
+  data.tar.gz: 0e351f296e4538c421342af885062f6e2040a2b90f0b7063457b7eae9f25659938f392adbdb17af76e41d8c8ba2c911e325b775382f7f2074a6169d9eb0823df

data/lib/con_duxml.rb

@@ -11,30 +11,35 @@ module ConDuxml
   attr_reader :src_ns
 
   # @param transforms [String, Doc] transforms file or path to one
-  # @param doc_or_path [String, Doc] XML document or path to one that will provide content to be transformed; source file can
-  #   also contain directives or links to them
-  # @return [Doc] result of transform; automatically hashed into @transforms
-  def transform(transforms, doc_or_path=nil)
-    @output = Doc.new
+  # @param doc_or_path [String, Doc] XML document or path to one that will provide content to be transformed
+  # @param opts [Hash] more to come TODO
+  #   :strict => [boolean] # true by default, throws errors when transform results violate given grammar; if false,
+  #                        # saves error to doc.history and resumes transform
+  # @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
-    @doc = case doc_or_path
+    @src_doc = case doc_or_path
              when Doc then doc_or_path
              when String then sax doc_or_path
-             else doc
+             else
            end
     @src_ns = transforms[:src_ns]
-    source = doc.locate(add_name_space_prefix(transforms[:source])).first
-    @output.grammar = transforms[:grammar] if transforms[:grammar]
-    add_observer @output.history
-    a = activate(transforms.first, source).first
-    @output << a
+    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
   end
 
+  attr_reader :src_doc
+
   # 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:
   #

data/lib/con_duxml/duxml_ext/transform_class.rb

@@ -1,23 +1,24 @@
 # Copyright (c) 2016 Freescale Semiconductor Inc.
 require 'duxml/meta/history/change'
 
-include Duxml
-class TransformClass < ChangeClass
-  def initialize(xform, src, output)
-    @instructions = xform
-    @input = src
-    @output = output
-  end
+module Duxml
+  class TransformClass < ChangeClass
+    def initialize(xform, src, output)
+      @instructions = xform
+      @input = src
+      @output = output
+    end
 
-  attr_reader :instructions, :input, :output
+    attr_reader :instructions, :input, :output
 
-  # @return [String] verbal description of transform event
-  def description
-    "#{output.description} created from #{input.description} by #{instructions.description}"
-  end
+    # @return [String] verbal description of transform event
+    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
+    # @return [false] required to prevent grammar from attempting to validate transform
+    def error?
+      false
+    end
   end
-end
+end

data/lib/con_duxml/transform/transform_private.rb

@@ -22,6 +22,10 @@ module Private
       changed
       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?
+        raise Exception, doc.history.latest.description unless doc.grammar.validate output
+      end
       output
     end
   end
@@ -64,7 +68,7 @@ module Private
           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
+          when /^'([\s\w]+)'$/    then $1
           else # arg is path to node
             target = src.locate(add_name_space_prefix arg_str).first
             target or ''

metadata

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