cpee 1.5.16 → 1.5.17

data/server/handlerwrappers/default.rb

@@ -72,14 +72,14 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
       if s.respond_to?(:mimetype)
         params <<  Riddl::Parameter::Complex.new(s.name.to_s,v.mimetype,v.value)
       else
-        if s.name.to_s =~ /^__Q_/
-          params <<  Riddl::Parameter::Simple.new(s.name.to_s.sub(/^__Q_/,''),CPEE::ValueHelper::generate(s.value),:query)
-        elsif s.name.to_s =~ /^__B_/
-          params <<  Riddl::Parameter::Simple.new(s.name.to_s.sub(/^__B_/,''),CPEE::ValueHelper::generate(s.value),:body)
-        elsif s.name.to_s =~ /^__H_/
-          params <<  Riddl::Header.new(s.name.to_s.sub(/^__H_/,''),CPEE::ValueHelper::generate(s.value))
-        elsif s.name.to_s =~ /^__C_/
-          params <<  Riddl::Parameter::Complex.new(s.name.to_s.sub(/^__C_/,''),*CPEE::ValueHelper::generate(s.value).split(';',2))
+        if s.name.to_s =~ /^_Q_/
+          params <<  Riddl::Parameter::Simple.new(s.name.to_s.sub(/^_Q_/,''),CPEE::ValueHelper::generate(s.value),:query)
+        elsif s.name.to_s =~ /^_B_/
+          params <<  Riddl::Parameter::Simple.new(s.name.to_s.sub(/^_B_/,''),CPEE::ValueHelper::generate(s.value),:body)
+        elsif s.name.to_s =~ /^_H_/
+          params <<  Riddl::Header.new(s.name.to_s.sub(/^_H_/,''),CPEE::ValueHelper::generate(s.value))
+        elsif s.name.to_s =~ /^_C_/
+          params <<  Riddl::Parameter::Complex.new(s.name.to_s.sub(/^_C_/,''),*CPEE::ValueHelper::generate(s.value).split(';',2))
         else
           params <<  Riddl::Parameter::Simple.new(s.name.to_s,CPEE::ValueHelper::generate(s.value))
         end

data/server/resources/transformation_dslx.xsl

@@ -465,18 +465,37 @@
     </xsl:choose>
     <xsl:text> }</xsl:text>
   </xsl:template>
+  <xsl:template name="format-name">
+    <xsl:param name="tname"/>
+    <xsl:choose>
+      <xsl:when test="contains($tname,'-')">
+        <xsl:text>'</xsl:text>
+        <xsl:value-of select="$tname"/>
+        <xsl:text>'</xsl:text>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:value-of select="$tname"/>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
   <xsl:template match="d:*" mode="sub">
     <xsl:if test="count(preceding-sibling::*) &gt; 0">, </xsl:if>
     <xsl:text>⭐(</xsl:text>
     <xsl:text>:name =&gt; :</xsl:text>
     <xsl:choose>
-      <xsl:when test="contains(name(),'-')">
-        <xsl:text>'</xsl:text>
-        <xsl:value-of select="name()"/>
-        <xsl:text>'</xsl:text>
+      <xsl:when test="substring(name(),1,1) = '_'">
+        <xsl:call-template name="format-name">
+          <xsl:with-param name="tname">
+            <xsl:value-of select="substring(name(),2)"/>
+          </xsl:with-param>
+        </xsl:call-template>
       </xsl:when>
       <xsl:otherwise>
-        <xsl:value-of select="name()"/>
+        <xsl:call-template name="format-name">
+          <xsl:with-param name="tname">
+            <xsl:value-of select="name()"/>
+          </xsl:with-param>
+        </xsl:call-template>
       </xsl:otherwise>
     </xsl:choose>
     <xsl:text>, :value =&gt; -&gt;{ </xsl:text>

data/server/server.pid

@@ -0,0 +1 @@
+247566

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee
 version: !ruby/object:Gem::Version
-  version: 1.5.16
+  version: 1.5.17
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: tools
 cert_chain: []
-date: 2019-11-23 00:00:00.000000000 Z
+date: 2019-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl
@@ -152,8 +152,11 @@ files:
 - cockpit/testsets/Lego Conveyor.xml
 - cockpit/testsets/Lego Crane.xml
 - cockpit/testsets/Lego Ejector.xml
+- cockpit/testsets/Lego Full.xml
+- cockpit/testsets/Lego Liddy.xml
 - cockpit/testsets/Lego Plate.xml
 - cockpit/testsets/Lego Transporter.xml
+- cockpit/testsets/Lego_Part_1.xml
 - cockpit/testsets/LgLinear.xml
 - cockpit/testsets/Linear.xml
 - cockpit/testsets/Log.xml
@@ -273,6 +276,8 @@ files:
 - lib/engine/instance-info.rng
 - lib/engine/instances.rng
 - lib/instantiation.xml
+- log/azure.rb
+- log/azure_logger.rb
 - log/chain.xml
 - log/elasticsearch.rb
 - log/elasticsearch_logging.rb
@@ -305,6 +310,7 @@ files:
 - server/resources/topics.xml
 - server/resources/transformation.xml
 - server/resources/transformation_dslx.xsl
+- server/server.pid
 - server/server.rb
 - test/callback.rb
 - tools/cpee