RubyGems - cpee - Versions diffs - 1.3.206 → 1.3.207 - Mend

cpee 1.3.206 → 1.3.207

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (46) hide show

checksums.yaml +4 -4
data/cpee.gemspec +1 -1
data/lib/cpee/controller.rb +9 -1
data/log/yaml/log.xml +27 -0
data/log/yaml/logoverlay.xml +10 -0
data/log/yaml/server.rb +122 -0
data/log/yaml/topics.xml +22 -0
data/log/yaml/yaml.rb +19 -0
data/server/instances/1/properties.xml +1 -1
data/server/instances/2/properties.xml +1 -1
data/server/instances/3/properties.xml +93 -35
data/server/instances/4/properties.xml +87 -35
data/server/instances/5/properties.xml +87 -35
data/server/instances/6/notifications/0e9f3728f00c0562870110697bd8819c/consumer-secret +1 -0
data/server/instances/6/notifications/0e9f3728f00c0562870110697bd8819c/producer-secret +1 -0
data/server/instances/{30/notifications/f7afc30fd195bc06ac100a9b848c5da3 → 6/notifications/0e9f3728f00c0562870110697bd8819c}/subscription.xml +3 -7
data/server/instances/6/properties.xml +92 -9
data/server/server.rb +1 -1
metadata +10 -30
data/server/instances/10/properties.xml +0 -31
data/server/instances/11/properties.xml +0 -62
data/server/instances/12/properties.xml +0 -152
data/server/instances/13/properties.xml +0 -62
data/server/instances/14/properties.xml +0 -150
data/server/instances/15/properties.xml +0 -69
data/server/instances/16/properties.xml +0 -63
data/server/instances/17/properties.xml +0 -31
data/server/instances/18/properties.xml +0 -150
data/server/instances/19/properties.xml +0 -152
data/server/instances/20/properties.xml +0 -68
data/server/instances/21/properties.xml +0 -118
data/server/instances/22/properties.xml +0 -525
data/server/instances/23/properties.xml +0 -65
data/server/instances/24/properties.xml +0 -65
data/server/instances/25/properties.xml +0 -65
data/server/instances/26/properties.xml +0 -65
data/server/instances/27/properties.xml +0 -65
data/server/instances/28/properties.xml +0 -65
data/server/instances/29/properties.xml +0 -67
data/server/instances/30/notifications/f7afc30fd195bc06ac100a9b848c5da3/consumer-secret +0 -1
data/server/instances/30/notifications/f7afc30fd195bc06ac100a9b848c5da3/producer-secret +0 -1
data/server/instances/30/properties.xml +0 -65
data/server/instances/7/properties.xml +0 -62
data/server/instances/8/properties.xml +0 -31
data/server/instances/9/properties.xml +0 -62
data/server/resources/test.rb +0 -9

data/server/instances/5/properties.xml CHANGED

@@ -1,38 +1,67 @@
 <properties xmlns="http://riddl.org/ns/common-patterns/properties/1.0">
   <attributes>
-    <uuid>cd7e37f1-c963-4bf2-84d9-55365f62f341</uuid>
-    <info>Lego Plate</info>
+    <uuid>33bdd814-1a39-4fff-a9d6-934126dcb259</uuid>
+    <info>Linear</info>
     <modeltype>CPEE</modeltype>
+    <theme>default</theme>
   </attributes>
-  <state>finished</state>
+  <state>ready</state>
   <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
-  <positions/>
+  <positions>
+    <a1>after</a1>
+  </positions>
   <dataelements>
-    <i>0</i>
+    <x/>
   </dataelements>
   <endpoints>
     <timeout>http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
-    <move>http://plate.wst.univie.ac.at:9200/go-next</move>
   </endpoints>
-  <dsl>loop pre_test{i&lt;2}  do
-  call :a1, :move, parameters: { :label =&gt; "Move to next station", :method =&gt; :post, :arguments =&gt; nil }, finalize: &lt;&lt;-END
-    data.i= data.i + 1
-  END
-end
+  <dsl>call :a1, :timeout, parameters: { :method =&gt; :post, :arguments =&gt; [⭐(:name =&gt; :timeout, :value =&gt; 2)] }, finalize: &lt;&lt;-END
+  data.x += "a1,"
+END
+call :a2, :timeout, parameters: { :method =&gt; :post, :arguments =&gt; [⭐(:name =&gt; :timeout, :value =&gt; 4)] }, finalize: &lt;&lt;-END
+  data.x += "a2,"
+END
+call :a3, :timeout, parameters: { :method =&gt; :post, :arguments =&gt; [⭐(:name =&gt; :timeout, :value =&gt; 4)] }, finalize: &lt;&lt;-END
+  data.x += "a3,"
+END
 </dsl>
   <dslx>
     <description xmlns="http://cpee.org/ns/description/1.0">
-      <loop mode="pre_test" condition="i&lt;2">
-        <call id="a1" endpoint="move">
-          <parameters>
-            <label>Move to next station</label>
-            <method>:post</method>
-            <arguments/>
-          </parameters>
-          <finalize output="result">data.i= data.i + 1</finalize>
-          <update output="result"/>
-        </call>
-      </loop>
+      <!--{{{-->
+      <call id="a1" endpoint="timeout">
+        <parameters>
+          <!--{{{-->
+          <method>:post</method>
+          <arguments>
+            <timeout>2</timeout>
+          </arguments>
+        </parameters>
+        <!--}}}-->
+        <finalize output="result">data.x += "a1,"</finalize>
+      </call>
+      <call id="a2" endpoint="timeout">
+        <parameters>
+          <!--{{{-->
+          <method>:post</method>
+          <arguments>
+            <timeout>4</timeout>
+          </arguments>
+        </parameters>
+        <!--}}}-->
+        <finalize output="result">data.x += "a2,"</finalize>
+      </call>
+      <call id="a3" endpoint="timeout">
+        <parameters>
+          <!--{{{-->
+          <method>:post</method>
+          <arguments>
+            <timeout>4</timeout>
+          </arguments>
+        </parameters>
+        <!--}}}-->
+        <finalize output="result">data.x += "a3,"</finalize>
+      </call>
     </description>
   </dslx>
   <status>
@@ -41,22 +70,45 @@ end
   </status>
   <description>
     <description xmlns="http://cpee.org/ns/description/1.0">
-      <loop mode="pre_test" condition="i&lt;2">
-        <call id="a1" endpoint="move">
-          <parameters>
-            <label>Move to next station</label>
-            <method>:post</method>
-            <arguments/>
-          </parameters>
-          <finalize output="result">data.i= data.i + 1</finalize>
-          <update output="result"/>
-        </call>
-      </loop>
+      <!--{{{-->
+      <call id="a1" endpoint="timeout">
+        <parameters>
+          <!--{{{-->
+          <method>:post</method>
+          <arguments>
+            <timeout>2</timeout>
+          </arguments>
+        </parameters>
+        <!--}}}-->
+        <finalize output="result">data.x += "a1,"</finalize>
+      </call>
+      <call id="a2" endpoint="timeout">
+        <parameters>
+          <!--{{{-->
+          <method>:post</method>
+          <arguments>
+            <timeout>4</timeout>
+          </arguments>
+        </parameters>
+        <!--}}}-->
+        <finalize output="result">data.x += "a2,"</finalize>
+      </call>
+      <call id="a3" endpoint="timeout">
+        <parameters>
+          <!--{{{-->
+          <method>:post</method>
+          <arguments>
+            <timeout>4</timeout>
+          </arguments>
+        </parameters>
+        <!--}}}-->
+        <finalize output="result">data.x += "a3,"</finalize>
+      </call>
     </description>
   </description>
   <transformation>
     <description type="copy"/>
-    <dataelements type="none"/>
-    <endpoints type="none"/>
+    <dataelements type="rest"/>
+    <endpoints type="rest"/>
   </transformation>
 </properties>

data/server/instances/6/notifications/0e9f3728f00c0562870110697bd8819c/consumer-secret ADDED

	@@ -0,0 +1 @@
1	+ 7c72df9d5d3ccd0fabf29690e101e041

data/server/instances/6/notifications/0e9f3728f00c0562870110697bd8819c/producer-secret ADDED

	@@ -0,0 +1 @@
1	+ 6371ff3583509c23cb3107698adc3f20

data/server/instances/{30/notifications/f7afc30fd195bc06ac100a9b848c5da3 → 6/notifications/0e9f3728f00c0562870110697bd8819c}/subscription.xml RENAMED

@@ -5,14 +5,13 @@
     <event>manipulating</event>
     <event>failed</event>
     <event>done</event>
-    <vote>syncing_after</vote>
   </topic>
-  <topic id="description">
+  <topic id="position">
     <event>change</event>
-    <event>error</event>
   </topic>
-  <topic id="position">
+  <topic id="description">
     <event>change</event>
+    <event>error</event>
   </topic>
   <topic id="state">
     <event>change</event>
@@ -36,7 +35,4 @@
   <topic id="handlers">
     <event>change</event>
   </topic>
-  <topic id="xxx">
-    <fingerprint-with-producer-secre>xxx</fingerprint-with-producer-secre>
-  </topic>
 </subscription>

data/server/instances/6/properties.xml CHANGED

@@ -1,31 +1,114 @@
 <properties xmlns="http://riddl.org/ns/common-patterns/properties/1.0">
   <attributes>
-    <uuid>506f28ad-708e-4530-9e58-0df2cefa9d61</uuid>
-    <info/>
+    <uuid>a5e56666-9168-4d33-b63e-81c9039c6700</uuid>
+    <info>Linear</info>
     <modeltype>CPEE</modeltype>
     <theme>default</theme>
   </attributes>
   <state>ready</state>
   <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
-  <positions/>
-  <dataelements/>
+  <positions>
+    <a1>after</a1>
+  </positions>
+  <dataelements>
+    <x/>
+  </dataelements>
   <endpoints>
     <timeout>http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
   </endpoints>
-  <dsl/>
+  <dsl>call :a1, :timeout, parameters: { :method =&gt; :post, :arguments =&gt; [⭐(:name =&gt; :timeout, :value =&gt; 2)] }, finalize: &lt;&lt;-END
+  data.x += "a1,"
+END
+call :a2, :timeout, parameters: { :method =&gt; :post, :arguments =&gt; [⭐(:name =&gt; :timeout, :value =&gt; 4)] }, finalize: &lt;&lt;-END
+  data.x += "a2,"
+END
+call :a3, :timeout, parameters: { :method =&gt; :post, :arguments =&gt; [⭐(:name =&gt; :timeout, :value =&gt; 4)] }, finalize: &lt;&lt;-END
+  data.x += "a3,"
+END
+</dsl>
   <dslx>
-    <description xmlns="http://cpee.org/ns/description/1.0"/>
+    <description xmlns="http://cpee.org/ns/description/1.0">
+      <!--{{{-->
+      <call id="a1" endpoint="timeout">
+        <parameters>
+          <!--{{{-->
+          <method>:post</method>
+          <arguments>
+            <timeout>2</timeout>
+          </arguments>
+        </parameters>
+        <!--}}}-->
+        <finalize output="result">data.x += "a1,"</finalize>
+      </call>
+      <call id="a2" endpoint="timeout">
+        <parameters>
+          <!--{{{-->
+          <method>:post</method>
+          <arguments>
+            <timeout>4</timeout>
+          </arguments>
+        </parameters>
+        <!--}}}-->
+        <finalize output="result">data.x += "a2,"</finalize>
+      </call>
+      <call id="a3" endpoint="timeout">
+        <parameters>
+          <!--{{{-->
+          <method>:post</method>
+          <arguments>
+            <timeout>4</timeout>
+          </arguments>
+        </parameters>
+        <!--}}}-->
+        <finalize output="result">data.x += "a3,"</finalize>
+      </call>
+    </description>
   </dslx>
   <status>
     <id>0</id>
     <message>undefined</message>
   </status>
   <description>
-    <description xmlns="http://cpee.org/ns/description/1.0"/>
+    <description xmlns="http://cpee.org/ns/description/1.0">
+      <!--{{{-->
+      <call id="a1" endpoint="timeout">
+        <parameters>
+          <!--{{{-->
+          <method>:post</method>
+          <arguments>
+            <timeout>2</timeout>
+          </arguments>
+        </parameters>
+        <!--}}}-->
+        <finalize output="result">data.x += "a1,"</finalize>
+      </call>
+      <call id="a2" endpoint="timeout">
+        <parameters>
+          <!--{{{-->
+          <method>:post</method>
+          <arguments>
+            <timeout>4</timeout>
+          </arguments>
+        </parameters>
+        <!--}}}-->
+        <finalize output="result">data.x += "a2,"</finalize>
+      </call>
+      <call id="a3" endpoint="timeout">
+        <parameters>
+          <!--{{{-->
+          <method>:post</method>
+          <arguments>
+            <timeout>4</timeout>
+          </arguments>
+        </parameters>
+        <!--}}}-->
+        <finalize output="result">data.x += "a3,"</finalize>
+      </call>
+    </description>
   </description>
   <transformation>
     <description type="copy"/>
-    <dataelements type="none"/>
-    <endpoints type="none"/>
+    <dataelements type="rest"/>
+    <endpoints type="rest"/>
   </transformation>
 </properties>

data/server/server.rb CHANGED

@@ -15,7 +15,7 @@
 # <http://www.gnu.org/licenses/>.
 require 'rubygems'
-gem 'nokogiri', '~> 1.6.6'
+gem 'nokogiri'#, '~> 1.6.6'
 require File.expand_path(File.dirname(__FILE__) + '/../lib/cpee/implementation')
 Riddl::Server.new(CPEE::SERVER, :port => 9298) do

metadata CHANGED

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee
 version: !ruby/object:Gem::Version
-  version: 1.3.206
+  version: 1.3.207
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-02-07 00:00:00.000000000 Z
+date: 2017-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl
@@ -285,47 +285,27 @@ files:
 - log/server.rb
 - log/template.xes
 - log/topics.xml
+- log/yaml/log.xml
+- log/yaml/logoverlay.xml
+- log/yaml/server.rb
+- log/yaml/topics.xml
+- log/yaml/yaml.rb
 - server/handlerwrappers/default.rb
 - server/handlerwrappers/soap.rb
 - server/instances/1/properties.xml
-- server/instances/10/properties.xml
-- server/instances/11/properties.xml
-- server/instances/12/properties.xml
-- server/instances/13/properties.xml
-- server/instances/14/properties.xml
-- server/instances/15/properties.xml
-- server/instances/16/properties.xml
-- server/instances/17/properties.xml
-- server/instances/18/properties.xml
-- server/instances/19/properties.xml
 - server/instances/2/properties.xml
-- server/instances/20/properties.xml
-- server/instances/21/properties.xml
-- server/instances/22/properties.xml
-- server/instances/23/properties.xml
-- server/instances/24/properties.xml
-- server/instances/25/properties.xml
-- server/instances/26/properties.xml
-- server/instances/27/properties.xml
-- server/instances/28/properties.xml
-- server/instances/29/properties.xml
 - server/instances/3/properties.xml
-- server/instances/30/notifications/f7afc30fd195bc06ac100a9b848c5da3/consumer-secret
-- server/instances/30/notifications/f7afc30fd195bc06ac100a9b848c5da3/producer-secret
-- server/instances/30/notifications/f7afc30fd195bc06ac100a9b848c5da3/subscription.xml
-- server/instances/30/properties.xml
 - server/instances/4/properties.xml
 - server/instances/5/properties.xml
+- server/instances/6/notifications/0e9f3728f00c0562870110697bd8819c/consumer-secret
+- server/instances/6/notifications/0e9f3728f00c0562870110697bd8819c/producer-secret
+- server/instances/6/notifications/0e9f3728f00c0562870110697bd8819c/subscription.xml
 - server/instances/6/properties.xml
-- server/instances/7/properties.xml
-- server/instances/8/properties.xml
-- server/instances/9/properties.xml
 - server/resources/empty_dslx.xml
 - server/resources/properties.init
 - server/resources/properties.schema.active
 - server/resources/properties.schema.finished
 - server/resources/properties.schema.inactive
-- server/resources/test.rb
 - server/resources/topics.xml
 - server/resources/transformation.xml
 - server/resources/transformation_dslx.xsl

data/server/instances/10/properties.xml DELETED

@@ -1,31 +0,0 @@
-<properties xmlns="http://riddl.org/ns/common-patterns/properties/1.0">
-  <attributes>
-    <uuid>8a7ed2d4-5a9a-4d0e-876e-bd924297d286</uuid>
-    <info/>
-    <modeltype>CPEE</modeltype>
-    <theme>default</theme>
-  </attributes>
-  <state>ready</state>
-  <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
-  <positions/>
-  <dataelements/>
-  <endpoints>
-    <timeout>http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
-  </endpoints>
-  <dsl/>
-  <dslx>
-    <description xmlns="http://cpee.org/ns/description/1.0"/>
-  </dslx>
-  <status>
-    <id>0</id>
-    <message>undefined</message>
-  </status>
-  <description>
-    <description xmlns="http://cpee.org/ns/description/1.0"/>
-  </description>
-  <transformation>
-    <description type="copy"/>
-    <dataelements type="none"/>
-    <endpoints type="none"/>
-  </transformation>
-</properties>

data/server/instances/11/properties.xml DELETED

@@ -1,62 +0,0 @@
-<properties xmlns="http://riddl.org/ns/common-patterns/properties/1.0">
-  <attributes>
-    <uuid>0a8bd5ab-9ceb-4e8c-aae1-02dcefc6a2c3</uuid>
-    <info>Lego Plate</info>
-    <modeltype>CPEE</modeltype>
-  </attributes>
-  <state>stopped</state>
-  <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
-  <positions/>
-  <dataelements>
-    <i>0</i>
-  </dataelements>
-  <endpoints>
-    <timeout>http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
-    <move>http://plate.wst.univie.ac.at:9200/go-next</move>
-  </endpoints>
-  <dsl>loop pre_test{i&lt;2}  do
-  call :a1, :move, parameters: { :label =&gt; "Move to next station", :method =&gt; :post, :arguments =&gt; nil }, finalize: &lt;&lt;-END
-    data.i= data.i + 1
-  END
-end
-</dsl>
-  <dslx>
-    <description xmlns="http://cpee.org/ns/description/1.0">
-      <loop mode="pre_test" condition="i&lt;2">
-        <call id="a1" endpoint="move">
-          <parameters>
-            <label>Move to next station</label>
-            <method>:post</method>
-            <arguments/>
-          </parameters>
-          <finalize output="result">data.i= data.i + 1</finalize>
-          <update output="result"/>
-        </call>
-      </loop>
-    </description>
-  </dslx>
-  <status>
-    <id>0</id>
-    <message>undefined</message>
-  </status>
-  <description>
-    <description xmlns="http://cpee.org/ns/description/1.0">
-      <loop mode="pre_test" condition="i&lt;2">
-        <call id="a1" endpoint="move">
-          <parameters>
-            <label>Move to next station</label>
-            <method>:post</method>
-            <arguments/>
-          </parameters>
-          <finalize output="result">data.i= data.i + 1</finalize>
-          <update output="result"/>
-        </call>
-      </loop>
-    </description>
-  </description>
-  <transformation>
-    <description type="copy"/>
-    <dataelements type="none"/>
-    <endpoints type="none"/>
-  </transformation>
-</properties>