cpee-instantiation 1.0.7 → 1.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9efdce12606b0b4a2dcc8edb56a511a8b4392afa1de52d55df1d89f7037ad96d
-  data.tar.gz: b7ddc4881dadce16e7dfd2da9db9c0bd68c8b70dfe9dc8c8180a3cef75f1dcee
+  metadata.gz: fa7ec4be09e6574d2b06d3f63119403dd07d1bfd1f5c91b74e070a0168a73c92
+  data.tar.gz: 5557f2f30a55365b9ffe235cf025ed4c90bddfaa72d5a125da419b89eed83772
 SHA512:
-  metadata.gz: 4b65153017b9a2f2c7853e0d7ec658cba83b6e3eabe79425b3166ca818ae8a0f61ee36242c9b5cf080db41938b55c7652e6e37765c47b2fb282656fe25ad5ae6
-  data.tar.gz: 7b1a05794b4f6df41298f01ade332459806e613989f70f35c58b9786b86b7e38d9added2762b1bafe432de625910d25625d3bf1c27860180afec09730cdaeea9
+  metadata.gz: 934220dc9cd7953028f9ec8c32fc77046380eb54a8ca6d5566e40a0450c4045a3a101a8cf14f988ddeb5e1d068a0a6945333d63c02d053c02c3fcb7383267401
+  data.tar.gz: 55a39d02d5614c6a2cf1af1b59cc71b8e8544c002d28eb3de6da89bf3938d0f9c6a05e3db9b8f4c0b481067a0ca58e25929246674066cb2f4e084d8f254558dd

data/cpee-instantiation.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee-instantiation"
-  s.version          = "1.0.7"
+  s.version          = "1.0.11"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0"
   s.summary          = "Subprocess instantiation service for the cloud process execution engine (cpee.org)"
@@ -23,5 +23,5 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'riddl', '~> 0.99'
   s.add_runtime_dependency 'json', '~> 2.1'
   s.add_runtime_dependency 'redis', '~> 4.1'
-  s.add_runtime_dependency 'cpee', '~> 2.1'
+  s.add_runtime_dependency 'cpee', '~> 2.1', '>= 2.1.4'
 end

data/lib/cpee-instantiation/instantiation.rb

@@ -36,6 +36,7 @@ module CPEE
         XML::Smart.string(tdoc) do |doc|
           doc.register_namespace 'desc', 'http://cpee.org/ns/description/1.0'
           doc.register_namespace 'prop', 'http://cpee.org/ns/properties/2.0'
+          doc.register_namespace 'sub', 'http://riddl.org/ns/common-patterns/notifications-producer/2.0'
 
           srv = Riddl::Client.new(cpee, File.join(cpee,'?riddl-description'))
           res = srv.resource('/')
@@ -75,19 +76,26 @@ module CPEE
               inp.root.add(ele.first) if ele.any?
             end
             res = srv.resource("/#{ins}/properties").put Riddl::Parameter::Complex.new('properties','application/xml',inp.to_s)
-            doc.find('/*/prop:handlers/prop:handler').each do |han|
-              url =  han.attributes['url']
-              inp = 'url=' + URI.encode_www_form_component(url)
-              inp = inp + '&topic=' + han.children.first.attributes['topic']
-              inp = inp + '&' + han.children.first.qname.to_s + '=' + han.children.first.to_s
-              status,body = Riddl::Client::new(cpee+ins+'/notifications/subscriptions/').post(
-                [
-                  Riddl::Parameter::Simple.new('url',han.attributes['url']),
-                  Riddl::Parameter::Simple.new('topic',han.children.first.attributes['topic']),
-                  Riddl::Parameter::Simple.new(han.children.first.qname.to_s,han.children.first.to_s)
-                ]
-              )
-            end
+            # TODO new versions
+            doc.find('/*/sub:subscriptions/sub:subscription').each do |s|
+              parts = []
+              if id = s.attributes['id']
+                parts << Riddl::Parameter::Simple.new('id', id)
+              end
+              parts << Riddl::Parameter::Simple.new('url', s.attributes['url'])
+              s.find('sub:topic').each do |t|
+                p s.find('sub:event').map{ |e| e.text }
+                if (evs = t.find('sub:event').map{ |e| e.text }.join(',')).length > 0
+                  parts <<  Riddl::Parameter::Simple.new('topic', t.attributes['id'])
+                  parts <<  Riddl::Parameter::Simple.new('events', evs)
+                end
+                if (vos = t.find('sub:vote').map{ |e| e.text }.join(',')).length > 0
+                  parts <<  Riddl::Parameter::Simple.new('topic', t.attributes['id'])
+                  parts <<  Riddl::Parameter::Simple.new('votes', vos)
+                end
+              end
+              status,body = Riddl::Client::new(cpee+ins+'/notifications/subscriptions/').post parts
+            end rescue nil # in case just no subs are there
           end
         end
         [ins, uuid]
@@ -285,19 +293,29 @@ module CPEE
         cblist   = @a[2]
         instance = @p[1].value
 
-        srv = Riddl::Client.new(cpee, File.join(cpee,'?riddl-description'))
-        res = srv.resource("/#{instance}/properties/attributes/uuid")
+        srv = Riddl::Client.new(cpee)
+        res = srv.resource("/#{instance}/properties/attributes/uuid/")
         status, response = res.get
 
         if status >= 200 && status < 300
-          uuid = XML::Smart::string(response.first.value).root.text
+          uuid = response.first.value
           handle_data cpee, instance, @p[2]&.value
           handle_waiting cpee, instance, uuid, @p[0].value, selfurl, cblist
           handle_starting cpee, instance, @p[0].value
+
+          send = {
+            'CPEE-INSTANCE' => instance,
+            'CPEE-INSTANCE-URL' => File.join(cpee,instance),
+            'CPEE-INSTANCE-UUID' => uuid,
+            'CPEE-BEHAVIOR' => @p[0].value
+          }
+
           if @p[0].value =~ /^wait/
             @headers << Riddl::Header.new('CPEE-CALLBACK','true')
           end
-          return Riddl::Parameter::Simple.new("url",cpee + instance)
+          Riddl::Parameter::Complex.new('instance','application/json',JSON::generate(send))
+        else
+          @status = 500
         end
       end
     end #}}}

data/tools/cpee-instantiation

@@ -30,7 +30,7 @@ ARGV.options { |opt|
   opt.on("Options:")
   opt.on("--help", "-h", "This text") { puts opt; exit }
 	opt.on("")
-  opt.on(wrap("[DIR]        scaffolds a sample instantiation service. Post a testset to a model to keep going in one operation."))
+  opt.on(wrap("[DIR]             scaffolds a sample instantiation service. Post a testset to a model to keep going in one operation."))
   opt.parse!
 }
 if (ARGV.length != 1)
@@ -40,8 +40,10 @@ else
   p1 = ARGV[0]
 end
 
+insta = "#{curpath}/../server/"
 if !File.exists?(p1)
-  FileUtils.cp_r("#{curpath}/../server/",p1)
+  FileUtils.cp_r(insta,p1)
 else
-  puts 'Directory already exists.'
+  FileUtils.cp_r(Dir.glob(File.join(insta,'*')).delete_if{|e| e =~ /\.conf/ },p1,remove_destination: true)
+  puts 'Directory already exists, updating ...'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cpee-instantiation
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.11
 platform: ruby
 authors:
 - Juergen eTM Mangler
 autorequire:
 bindir: tools
 cert_chain: []
-date: 2021-05-19 00:00:00.000000000 Z
+date: 2021-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl
@@ -59,6 +59,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -66,6 +69,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.4
 description: see http://cpee.org
 email: juergen.mangler@gmail.com
 executables:
@@ -102,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: Subprocess instantiation service for the cloud process execution engine (cpee.org)