cpee 1.4.30 → 1.4.31

data/cockpit/themes/lego/theme.js

@@ -17,10 +17,10 @@ function WFAdaptorManifestation(adaptor) {
 
     return($X(ntxt));
   };
-  this.clicked = function(){
+  this.selected = function(){
     var svgid = 'unknown';
     _.each(self.adaptor.illustrator.get_elements(),function(value,key) {
-      if ($(value).hasClass('clicked')) {
+      if ($(value).hasClass('selected')) {
         svgid = $(value).attr('element-id');
       }
     });
@@ -78,7 +78,7 @@ function WFAdaptorManifestation(adaptor) {
     var tab   = $('#dat_' + visid);
         tab.empty();
 
-    self.adaptor.illustrator.get_elements().removeClass('clicked');
+    self.adaptor.illustrator.get_elements().removeClass('selected');
 
     if (e && e.ctrlKey) {
       var vtarget = self.adaptor.illustrator.get_node_by_svg_id(svgid);
@@ -90,7 +90,7 @@ function WFAdaptorManifestation(adaptor) {
 
       var vtarget = self.adaptor.illustrator.get_node_by_svg_id(svgid);
       if (vtarget.length > 0) {
-        vtarget.parents('g.element[element-id]').addClass('clicked');
+        vtarget.parents('g.element[element-id]').addClass('selected');
       }
 
       var node  = self.adaptor.description.get_node_by_svg_id(svgid).get(0);

data/cpee.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "1.4.30"
+  s.version          = "1.4.31"
   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"
@@ -26,6 +26,6 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'savon', '~> 2'
   s.add_runtime_dependency 'highline', '~> 1.6'
   s.add_runtime_dependency 'json', '~>2.1'
-  s.add_runtime_dependency 'opca', '~>0', '>= 0.13'
+  s.add_runtime_dependency 'opcua', '~>0', '>= 0.13'
   s.add_runtime_dependency 'rubyzip', '~>1.2'
 end

data/lib/cpee/value_helper.rb

@@ -1,3 +1,6 @@
+require 'json'
+require 'time'
+
 module CPEE
 
   class ValueHelper
@@ -27,6 +30,19 @@ module CPEE
           end
       end
     end
+
+    def self::parse_extended(value)
+      if [String].include? value.class
+        self::parse(value)
+      elsif [Array, NilClass, Integer, Float, TrueClass, FalseClass, Date].inclu
+        value
+      elsif value.respond_to?(:to_s)
+        value.to_s
+      else
+        ''
+      end
+    end
+
   end
 
 end

data/log/elasticsearch_logging.rb

@@ -164,6 +164,7 @@ class Logging < Riddl::Implementation
       end
     end #}}}
 
+    pp notification
     case "#{topic}/#{event_name}"
       when "dataelements/change", "endpoints/change"
         sensors = JSON.parse(notification.dig('attributes','sensors') || '[]')

data/server/handlerwrappers/default.rb

@@ -74,7 +74,7 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
           client = OPCUA::Client.new(url)
           if (node = client.get ns.to_i, nid)
             (parameters[:arguments] || [→(:name => 'value', :value => par)] || []).each do |ele|
-              what = CPEE::ValueHelper::parse(ele.value)
+              what = CPEE::ValueHelper::parse_extended(ele.value)
               node.value = what
               result = what
             end
@@ -92,7 +92,7 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
           if (node = client.get ns.to_i, nid)
             params = []
             (parameters[:arguments] || []).each do |ele|
-              what = CPEE::ValueHelper::parse(ele.value)
+              what = CPEE::ValueHelper::parse_extended(ele.value)
               params << what
             end
             result = node.call *params

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee
 version: !ruby/object:Gem::Version
-  version: 1.4.30
+  version: 1.4.31
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: tools
 cert_chain: []
-date: 2019-07-12 00:00:00.000000000 Z
+date: 2019-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl
@@ -84,7 +84,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.1'
 - !ruby/object:Gem::Dependency
-  name: opca
+  name: opcua
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -149,10 +149,10 @@ files:
 - cockpit/js/track.js
 - cockpit/js/ui.js
 - cockpit/js/wfadaptor.js
-- cockpit/js_libs.zip
 - cockpit/rngs/attributes.rng
 - cockpit/rngs/dataelements.rng
 - cockpit/rngs/endpoints.rng
+- cockpit/test.html
 - cockpit/testsets/Async.xml
 - cockpit/testsets/BCO.xml
 - cockpit/testsets/BCS.xml
@@ -215,13 +215,18 @@ files:
 - cockpit/themes/default/symbols/choose.svg
 - cockpit/themes/default/symbols/choose_exclusive.svg
 - cockpit/themes/default/symbols/choose_inclusive.svg
+- cockpit/themes/default/symbols/complex.svg
 - cockpit/themes/default/symbols/critical.svg
+- cockpit/themes/default/symbols/end.svg
 - cockpit/themes/default/symbols/escape.svg
+- cockpit/themes/default/symbols/event_end.svg
 - cockpit/themes/default/symbols/loop.svg
 - cockpit/themes/default/symbols/manipulate.svg
 - cockpit/themes/default/symbols/otherwise.svg
 - cockpit/themes/default/symbols/parallel.svg
 - cockpit/themes/default/symbols/parallel_branch.svg
+- cockpit/themes/default/symbols/parallel_branch_event.svg
+- cockpit/themes/default/symbols/parallel_branch_normal.svg
 - cockpit/themes/default/symbols/scripts.svg
 - cockpit/themes/default/symbols/start.svg
 - cockpit/themes/default/symbols/stop.svg