cpee-handlerwrapper-opcua 0.2 → 0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5097543e5a1b74cc025835261dc297194cb4ac7446187ca44a8d694ac86ce032
-  data.tar.gz: 5aefcf1dc9ffe6d088993a7b64d6ce4a976a552870faad76b0cf9e7a7d37ace6
+  metadata.gz: a5e99c034c7a91e6794c5c262c41cf7936f650181799dce95e20fcbc97fedf2e
+  data.tar.gz: b624904fa7d53581424512348891c558bb0c2bcd485497f99734c8ffcbeb90d5
 SHA512:
-  metadata.gz: 7932110d1fb1fde2e2f7fed5f5d958b7b6f9047942e3dd2ab6b01392b51fa292e1395e17ed73e444b32f18b90b280939943a94736781e241264f271e6d9cbc1a
-  data.tar.gz: 607f6b0b17991b6b0226c7b8b4ba1a188f0a95b458a64e2d8dbd271773fa9448ce6ae3030bf62c1e64a4e4d817d39ad510a06126c3e8d409638a9e9504727556
+  metadata.gz: 21bdb6a8e9919b110965160535e112e2f75b69d8476912037de9408c6d2134561e7c3da0248531738a20f69566c8ca5ab05a1f0a98439c3d79f80de3c41381f6
+  data.tar.gz: bc830bf16c10b98e94abad66c9737ff3b67dfb76b886ae84fd4f7bc3569f10b9887eca0af15ddb8acec40358af1b734d70d590ad1d78865ed97ea1f82f3ba34e

data/cpee-handlerwrapper-opcua.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee-handlerwrapper-opcua"
-  s.version          = "0.2"
+  s.version          = "0.3"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0"
   s.summary          = "OPCUA for CPEE HandlerWrapper. Use opc.tcp-read|write|exececute:// links."

data/lib/cpee-handlerwrapper-opcua.rb

@@ -47,7 +47,7 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
     @label = ''
   end # }}}
 
-  def prepare(readonly, endpoints, parameters)
+  def prepare(readonly, endpoints, parameters) #{{{
     @handler_endpoint = endpoints.is_a?(Array) ? endpoints.map{ |ep| readonly.endpoints[ep] }.compact : readonly.endpoints[endpoints]
     parameters[:arguments]&.each do |ele|
       if ele.value.is_a?(Proc)
@@ -55,7 +55,7 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
       end
     end
     parameters
-  end
+  end #}}}
 
   def activity_handle(passthrough, parameters) # {{{
     raise "Wrong endpoint" if @handler_endpoint.nil? || @handler_endpoint.empty?
@@ -121,8 +121,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 =~ /__$/
-              params <<  Riddl::Parameter::Simple.new(s.name.to_s.chop.chop,CPEE::ValueHelper::generate(s.value),:query)
+            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
@@ -151,7 +157,9 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
 
         status, result, headers = client.request type => params
         if status < 200 || status >= 300
-          callback([ Riddl::Parameter::Complex.new('error','application/json',StringIO.new(JSON::generate({ 'status' => status, 'error' => result[0].value.read }))) ], 'CPEE_SALVAGE' => true)
+          c = result[0]&.value
+          c = c.read if c.respond_to? :read
+          callback([ Riddl::Parameter::Complex.new('error','application/json',StringIO.new(JSON::generate({ 'status' => status, 'error' => c }))) ], 'CPEE_SALVAGE' => true)
         else
           if headers['CPEE_INSTANTIATION']
             @controller.notify("task/instantiation", :instance => @controller.instance, :label => @label, :instance_name => @controller.info, :instance_uuid => @controller.uuid, :activity => @handler_position, :endpoint => @handler_endpoint, :received => CPEE::ValueHelper.parse(headers['CPEE_INSTANTIATION']), :timestamp => Time.now.strftime("%Y-%m-%dT%H:%M:%S.%L%:z"), :attributes => @controller.attributes_translated)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cpee-handlerwrapper-opcua
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: '0.3'
 platform: ruby
 authors:
 - Juergen eTM Mangler
 autorequire: 
 bindir: tools
 cert_chain: []
-date: 2019-10-08 00:00:00.000000000 Z
+date: 2019-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cpee