cpee 1.3.230 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a42c601b7e85d421eba4b6a6720f0d9ad685ad5e
-  data.tar.gz: 81cd4eb173c56c56424d766353200f0781b846e6
+  metadata.gz: fb1429c372aeadbd308ea2c3ee03f2d145fbaf0f
+  data.tar.gz: 78c26a41bd1c433956b407999fb274497870ec76
 SHA512:
-  metadata.gz: afd9b2950af36b839ecdc2bfd0ff858c07bf86fc5103ac9ede1f3a1f9f1e84f6b7783f7f29aa48507941462c31f31198f33dc5d960f6c5a4f5236b94ffa2c2c0
-  data.tar.gz: 54748f688eec3b116b3a6bde4c0d5c37fd330f1a39e6d19098f6f4d1391d44e220dd5613c5afcf0284fd79012c51f0a977ff545ae6713ff22c5ece911e8e1305
+  metadata.gz: ba3f71ee6ec2baf7525456d2358be59fa272e742936064606a736715063dde21180660ad0864eba16ab6015aa0a9ccc73fcd25ee54317267d45510185fc736dc
+  data.tar.gz: fa5629168bb3ad646c223fff779d52fc3f24d6967c5680caffe812067f3c808fa6d2999a63e1d443b5dacfd0ef833038b559e2a28cefd21063d7fc2cc46aa9a8

data/cockpit/js/wfadaptor.js

@@ -375,8 +375,16 @@ function WfDescription(wf_adaptor, wf_illustrator) { // Model {{{
   var context_eval = this.context_eval = function(what) { // {{{
     return eval(what);
   } // }}}
-  var get_free_id = this.get_free_id = function() { // {{{
+  var get_free_id = this.get_free_id = function(other) { // {{{
     var existing = new Array();
+    if (other) {
+      if ($(other).attr('id')) {
+        existing.push($(other).attr('id'));
+      }
+      $(other).find("[id]").each(function(k,v){
+        existing.push($(v).attr('id'));
+      });
+    }
     $('*[id]', description).each(function(){existing.push($(this).attr('id'))});
     var id = 1;
     while ($.inArray('a' + id,existing) != -1) {

data/cockpit/themes/default/theme.js

@@ -23,13 +23,13 @@ function WFAdaptorManifestation(adaptor) {
       return($X(ntxt));
     } else {
       if (opts && opts == 'clone') {
+        base = base.clone();
         if (base.attr('id')) {
-          base = base.clone();
-          // not very generic, because it is assumed that id is attribute of top level
-          // a better solution would be to parse rng for get_free_id()
-          // but: there is lots of lock-in to element-id, so fuck it
           base.attr('id',self.adaptor.description.get_free_id());
         }
+        base.find('*[id]').each(function(k,v){
+          $(v).attr('id',self.adaptor.description.get_free_id(base));
+        });
       }
       return base;
     }

data/cpee.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "1.3.230"
+  s.version          = "1.4.0"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0"
   s.summary          = "Preliminary release of cloud process execution engine (cpee). If you just need workflow execution, without a rest/xmpp service exposing it, then use WEEL"

data/lib/cpee/implementation.rb

@@ -17,7 +17,7 @@ require 'riddl/server'
 require 'riddl/client'
 require 'riddl/utils/notifications_producer'
 require 'riddl/utils/properties'
-require ::File.dirname(__FILE__) + '/controller'
+require_relative  'controller'
 
 require 'ostruct'
 class ParaStruct < OpenStruct
@@ -30,26 +30,26 @@ def ⭐(a); ParaStruct.new(a); end
 
 module CPEE
 
-  SERVER = File.expand_path(File.dirname(__FILE__) + '/../cpee.xml')
+  SERVER = File.expand_path(File.join(__dir__,'..','cpee.xml'))
 
   def self::implementation(opts)
-    opts[:instances]                  ||= File.expand_path(File.dirname(__FILE__) + '/../../server/instances')
-    opts[:global_handlerwrappers]     ||= File.expand_path(File.dirname(__FILE__) + '/../../server/handlerwrappers')
+    opts[:instances]                  ||= File.expand_path(File.join(__dir__,'..','..','server','instances'))
+    opts[:global_handlerwrappers]     ||= File.expand_path(File.join(__dir__,'..','..','server','handlerwrappers'))
     opts[:handlerwrappers]            ||= ''
-    opts[:topics]                     ||= File.expand_path(File.dirname(__FILE__) + '/../../server/resources/topics.xml')
-    opts[:properties_init]            ||= File.expand_path(File.dirname(__FILE__) + '/../../server/resources/properties.init')
-    opts[:properties_schema_active]   ||= File.expand_path(File.dirname(__FILE__) + '/../../server/resources/properties.schema.active')
-    opts[:properties_schema_finished] ||= File.expand_path(File.dirname(__FILE__) + '/../../server/resources/properties.schema.finished')
-    opts[:properties_schema_inactive] ||= File.expand_path(File.dirname(__FILE__) + '/../../server/resources/properties.schema.inactive')
-    opts[:transformation_dslx]        ||= File.expand_path(File.dirname(__FILE__) + '/../../server/resources/transformation_dslx.xsl')
-    opts[:transformation_service]     ||= File.expand_path(File.dirname(__FILE__) + '/../../server/resources/transformation.xml')
-    opts[:empty_dslx]                 ||= File.expand_path(File.dirname(__FILE__) + '/../../server/resources/empty_dslx.xml')
+    opts[:topics]                     ||= File.expand_path(File.join(__dir__,'..','..','server','resources','topics.xml'))
+    opts[:properties_init]            ||= File.expand_path(File.join(__dir__,'..','..','server','resources','properties.init'))
+    opts[:properties_schema_active]   ||= File.expand_path(File.join(__dir__,'..','..','server','resources','properties.schema.active'))
+    opts[:properties_schema_finished] ||= File.expand_path(File.join(__dir__,'..','..','server','resources','properties.schema.finished'))
+    opts[:properties_schema_inactive] ||= File.expand_path(File.join(__dir__,'..','..','server','resources','properties.schema.inactive'))
+    opts[:transformation_dslx]        ||= File.expand_path(File.join(__dir__,'..','..','server','resources','transformation_dslx.xsl'))
+    opts[:transformation_service]     ||= File.expand_path(File.join(__dir__,'..','..','server','resources','transformation.xml'))
+    opts[:empty_dslx]                 ||= File.expand_path(File.join(__dir__,'..','..','server','resources','empty_dslx.xml'))
     opts[:notifications_init]         ||= nil
     opts[:infinite_loop_stop]         ||= 10000
 
-    opts[:runtime_options]            << [
+    opts[:runtime_cmds]               << [
       "startclean", "Delete instances before starting.", Proc.new { |status|
-        Dir.glob(File.expand_path(File.dirname(__FILE__) + '/../../server/instances/*')).each do |d|
+        Dir.glob(File.expand_path(File.join(opts[:instances],'*'))).each do |d|
           FileUtils.rm_r(d) if File.basename(d) =~ /^\d+$/
         end
       }
@@ -64,7 +64,7 @@ module CPEE
       end unless opts[:handlerwrappers].strip == ''
 
       controller = {}
-      Dir[opts[:instances] + '/*/properties.xml'].each do |e|
+      Dir[File.join(opts[:instances],'*','properties.xml')].each do |e|
         id = ::File::basename(::File::dirname(e))
         (controller[id.to_i] = (Controller.new(id,opts)) rescue nil)
       end

data/log/xes_yaml.rb

@@ -12,7 +12,7 @@ class Logging < Riddl::Implementation #{{{
     uuid = notification['instance_uuid']
     return unless uuid
 
-    activity = notification["activity"]
+    activity = notification['activity']
     parameters = notification['parameters']
     receiving = notification['received']
 

data/server/handlerwrappers/default.rb

@@ -127,11 +127,11 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
     end
     unless changed_dataelements.nil?
       @controller.serialize_dataelements!
-      @controller.notify("dataelements/change", :endpoint => @handler_endpoint, :label => @label, :instance_name => @controller.info, :instance => @controller.instance, :instance_uuid => @controller.uuid, :activity => @handler_position, :changed => changed_dataelements, :values => dataelements)
+      @controller.notify("dataelements/change", :endpoint => @handler_endpoint, :label => @label, :instance_name => @controller.info, :instance => @controller.instance, :instance_uuid => @controller.uuid, :activity => @handler_position, :changed => changed_dataelements, :values => dataelements.select{|k,v| changed_dataelements.include?(k)})
     end
     unless changed_endpoints.nil?
       @controller.serialize_endpoints!
-      @controller.notify("endpoints/change", :endpoint => @handler_endpoint, :label => @label, :instance_name => @controller.info, :instance => @controller.instance, :instance_uuid => @controller.uuid, :activity => @handler_position, :changed => changed_endpoints, :values => endpoints)
+      @controller.notify("endpoints/change", :endpoint => @handler_endpoint, :label => @label, :instance_name => @controller.info, :instance => @controller.instance, :instance_uuid => @controller.uuid, :activity => @handler_position, :changed => changed_endpoints, :values => endpoints.select{|k,v| changed_endpoints.include?(k)})
     end
   end # }}}
 

data/server/resources/transformation_dslx.xsl

@@ -553,7 +553,16 @@
               </xsl:when>
               <xsl:otherwise>
                 <xsl:text>\"</xsl:text>
-                <xsl:value-of select="str:replace(str:replace(.,'\','\\'),'&quot;','\\\&quot;')"/>
+                <xsl:choose>
+                  <xsl:when test="substring(.,1,1) = '!'">
+                    <xsl:text>#{</xsl:text>
+                    <xsl:value-of select="str:replace(str:replace(substring(.,2),'\','\\'),'&quot;','\\\&quot;')"/>
+                    <xsl:text>}</xsl:text>
+                  </xsl:when>
+                  <xsl:otherwise>
+                    <xsl:value-of select="str:replace(str:replace(.,'\','\\'),'&quot;','\\\&quot;')"/>
+                  </xsl:otherwise>
+                </xsl:choose>
                 <xsl:text>\"</xsl:text>
               </xsl:otherwise>
             </xsl:choose>
@@ -568,7 +577,16 @@
               </xsl:when>
               <xsl:otherwise>
                 <xsl:text>\"</xsl:text>
-                <xsl:value-of select="str:replace(str:replace(.,'\','\\'),'&quot;','\\\&quot;')"/>
+                <xsl:choose>
+                  <xsl:when test="substring(.,1,1) = '!'">
+                    <xsl:text>#{</xsl:text>
+                    <xsl:value-of select="str:replace(str:replace(substring(.,2),'\','\\'),'&quot;','\\\&quot;')"/>
+                    <xsl:text>}</xsl:text>
+                  </xsl:when>
+                  <xsl:otherwise>
+                    <xsl:value-of select="str:replace(str:replace(.,'\','\\'),'&quot;','\\\&quot;')"/>
+                  </xsl:otherwise>
+                </xsl:choose>
                 <xsl:text>\"</xsl:text>
               </xsl:otherwise>
             </xsl:choose>
@@ -593,7 +611,16 @@
         <xsl:if test="text()[normalize-space(.)]">
           <xsl:text>, </xsl:text>
           <xsl:text>\"</xsl:text>
-          <xsl:value-of select="str:replace(str:replace(.,'\','\\'),'&quot;','\\\&quot;')"/>
+          <xsl:choose>
+            <xsl:when test="substring(.,1,1) = '!'">
+              <xsl:text>#{</xsl:text>
+              <xsl:value-of select="str:replace(str:replace(substring(.,2),'\','\\'),'&quot;','\\\&quot;')"/>
+              <xsl:text>}</xsl:text>
+            </xsl:when>
+            <xsl:otherwise>
+              <xsl:value-of select="str:replace(str:replace(.,'\','\\'),'&quot;','\\\&quot;')"/>
+            </xsl:otherwise>
+          </xsl:choose>
           <xsl:text>\"</xsl:text>
           <xsl:text>]</xsl:text>
         </xsl:if>
@@ -612,7 +639,16 @@
       </xsl:when>
       <xsl:otherwise>
         <xsl:text>\"</xsl:text>
-        <xsl:value-of select="str:replace(str:replace(.,'\','\\'),'&quot;','\\\&quot;')"/>
+        <xsl:choose>
+          <xsl:when test="substring(.,1,1) = '!'">
+            <xsl:text>#{</xsl:text>
+            <xsl:value-of select="str:replace(str:replace(substring(.,2),'\','\\'),'&quot;','\\\&quot;')"/>
+            <xsl:text>}</xsl:text>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:value-of select="str:replace(str:replace(.,'\','\\'),'&quot;','\\\&quot;')"/>
+          </xsl:otherwise>
+        </xsl:choose>
         <xsl:text>\"</xsl:text>
       </xsl:otherwise>
     </xsl:choose>

data/server/server.rb

@@ -15,12 +15,13 @@
 # <http://www.gnu.org/licenses/>.
 
 require 'rubygems'
+require 'memory_profiler'
 gem 'nokogiri'
 require File.expand_path(File.dirname(__FILE__) + '/../lib/cpee/implementation')
 
-Riddl::Server.new(CPEE::SERVER, :port => 8298) do
+Riddl::Server.new(CPEE::SERVER, :port => 8298) do |opts|
   accessible_description true
   cross_site_xhr true
 
-  use CPEE::implementation(@riddl_opts)
+  use CPEE::implementation(opts)
 end.loop!

data/tools/server/server.rb

@@ -2,13 +2,14 @@
 require 'rubygems'
 require 'cpee/implementation'
 
-Riddl::Server.new(CPEE::SERVER, :host => 'localhost', :port => 8298) do
-  @riddl_opts[:instances] = ::File.dirname(__FILE__) + '/instances'
-  @riddl_opts[:handlerwrappers] = ::File.dirname(__FILE__) + '/handlerwrappers'
-  @riddl_opts[:notifications_init] = ::File.dirname(__FILE__) + '/resources/notifications'
-  @riddl_opts[:properties_init] = ::File.dirname(__FILE__) + '/resources/properties.init'
+Riddl::Server.new(CPEE::SERVER, :host => 'localhost', :port => 8298) do |opts|
+  opts[:instances]          = File.join(__dir__,'instances')
+  opts[:handlerwrappers]    = File.join(__dir__,'handlerwrappers')
+  opts[:notifications_init] = File.join(__dir__,'resources','notifications')
+  opts[:properties_init]    = File.join(__dir__,'resources','properties.init')
+
   accessible_description true
   cross_site_xhr true
 
-  use CPEE::implementation(@riddl_opts)
+  use CPEE::implementation(opts)
 end.loop!

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee
 version: !ruby/object:Gem::Version
-  version: 1.3.230
+  version: 1.4.0
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: tools
 cert_chain: []
-date: 2018-03-29 00:00:00.000000000 Z
+date: 2018-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl