cpee 1.3.152 → 1.3.153

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e899a082b8d6c5fbea2e1967c60aa4869ab51b40
-  data.tar.gz: da32f08d62191f645a60ec18fb870faed7c279fb
+  metadata.gz: 21ec5e5f7ac3fa863944fbc529d2ba6c76a607af
+  data.tar.gz: 62ece76319951cc933330e66790970c1459d9768
 SHA512:
-  metadata.gz: 167ac5e92dc07428f77d2402bb913ecaeeacf2e54177698eaad4adcef3db7d10ad75707ff4478475a1585320cfb572747d7be31110ffd0d0d853f6b4d2bb1dd2
-  data.tar.gz: bc78e736bf4c5695b47b717fd02a22764f346decca66d0facea78b702a8bc88b50c543afaf98e0b1b9a0700ebef27ce0b51c9280225a532fe89b1b4e735cfa7e
+  metadata.gz: e3864d4873c6828dd51521d1a43f627ebed013d8a98a3fbb36cfc27d4f3fdb938d1a025dda7ccd818f2f67c7f3acb8c54769402b4db32b1b1b4b9f88d6f11bdc
+  data.tar.gz: 2205fc313cf30d7b99a0e6541dd57d434b61d574c22a9b915ec8536cfe526adc0788f0c45cd647ea37b30da1c31d5ec690747afcd4528460efb0cf5185e2bb4f

data/cpee.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "1.3.152"
+  s.version          = "1.3.153"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3"
   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/controller.rb

@@ -333,100 +333,117 @@ module CPEE
       dsl = nil
       nots = []
       @properties.modify do |doc|
-        dsl   = doc.find("/p:properties/p:dsl").first
-        dslx  = doc.find("/p:properties/p:dslx").first
-        desc  = doc.find("/p:properties/p:description").first
-        tdesc = doc.find("/p:properties/p:transformation/p:description").first
-        tdata = doc.find("/p:properties/p:transformation/p:dataelements").first
-        tendp = doc.find("/p:properties/p:transformation/p:endpoints").first
-
-        tdesctype = tdesc.attributes['type']
-        tdatatype = tdata.attributes['type']
-        tendptype = tendp.attributes['type']
-
-        if desc.children.empty?
-          tdesctype = tdatatype = tendptype = 'clean'
-        end  
+        begin
+          dsl   = doc.find("/p:properties/p:dsl").first
+          dslx  = doc.find("/p:properties/p:dslx").first
+          desc  = doc.find("/p:properties/p:description").first
+          tdesc = doc.find("/p:properties/p:transformation/p:description").first
+          tdata = doc.find("/p:properties/p:transformation/p:dataelements").first
+          tendp = doc.find("/p:properties/p:transformation/p:endpoints").first
+
+          tdesctype = tdesc.attributes['type']
+          tdatatype = tdata.attributes['type']
+          tendptype = tendp.attributes['type']
+
+          if desc.children.empty?
+            tdesctype = tdatatype = tendptype = 'clean'
+          end  
 
-        ### description transformation, including dslx to dsl
-        addit = if tdesctype == 'copy' || tdesc.empty?
-          desc.children.first.to_doc.root
-        elsif tdesctype == 'rest' && !tdesc.empty?
-          srv = Riddl::Client.interface(tdesc.text,@opts[:transformation_service],:xmpp => @opts[:xmpp])
-          status, res = srv.post [
-            Riddl::Parameter::Complex.new("description","text/xml",desc.children.first.dump),
-            Riddl::Parameter::Simple.new("type","description")
-          ]
-          XML::Smart::string(res[0].value.read).root if status == 200
-        elsif tdesctype == 'xslt' && !tdesc.empty?
-          trans = XML::Smart::open_unprotected(tdesc.text)
-          desc.children.first.to_doc.transform_with(trans).root
-        elsif tdesctype == 'clean'
-          XML::Smart::open_unprotected(@opts[:empty_dslx]).root
-        else  
-          nil
-        end
-        unless addit.nil?
-          dslx.children.delete_all!
-          dslx.add addit
-          trans = XML::Smart::open_unprotected(@opts[:transformation_dslx])
-          dsl.text = dslx.to_doc.transform_with(trans)
-          @instance.description = dsl.text
-        end
+          ### description transformation, including dslx to dsl
+          addit = if tdesctype == 'copy' || tdesc.empty?
+            desc.children.first.to_doc.root
+          elsif tdesctype == 'rest' && !tdesc.empty?
+            srv = Riddl::Client.interface(tdesc.text,@opts[:transformation_service],:xmpp => @opts[:xmpp])
+            status, res = srv.post [
+              Riddl::Parameter::Complex.new("description","text/xml",desc.children.first.dump),
+              Riddl::Parameter::Simple.new("type","description")
+            ]
+            if status >= 200 && status < 300 
+              XML::Smart::string(res[0].value.read).root 
+            else  
+              raise 'Could not extract dslx' 
+            end  
+          elsif tdesctype == 'xslt' && !tdesc.empty?
+            trans = XML::Smart::open_unprotected(tdesc.text)
+            desc.children.first.to_doc.transform_with(trans).root
+          elsif tdesctype == 'clean'
+            XML::Smart::open_unprotected(@opts[:empty_dslx]).root
+          else  
+            nil
+          end
+          unless addit.nil?
+            dslx.children.delete_all!
+            dslx.add addit
+            trans = XML::Smart::open_unprotected(@opts[:transformation_dslx])
+            dsl.text = dslx.to_doc.transform_with(trans)
+            @instance.description = dsl.text
+          end
 
-        ### dataelements extraction
-        addit = if tdatatype == 'rest' && !tdata.empty?
-          srv = Riddl::Client.interface(tdata.text,@opts[:transformation_service],:xmpp => @opts[:xmpp])
-          status, res = srv.post [ 
-            Riddl::Parameter::Complex.new("description","text/xml",desc.children.first.dump),
-            Riddl::Parameter::Simple.new("type","dataelements")
-          ]
-          res
-        elsif tdatatype == 'xslt' && !tdata.empty?
-          trans = XML::Smart::open_unprotected(tdata.text)
-          desc.children.first.to_doc.transform_with(trans)
-        elsif tdatatype == 'clean'
-          []
-        else
-          nil
-        end  
-        unless addit.nil?
-          node = doc.find("/p:properties/p:dataelements").first
-          node.children.delete_all!
-          @instance.data.clear
-          addit.each_slice(2).each do |k,v|
-            @instance.data[k.value.to_sym] = ValueHelper::parse(v.value)
-            node.add(k.value,ValueHelper::generate(v.value))
+          ### dataelements extraction
+          addit = if tdatatype == 'rest' && !tdata.empty?
+            srv = Riddl::Client.interface(tdata.text,@opts[:transformation_service],:xmpp => @opts[:xmpp])
+            status, res = srv.post [ 
+              Riddl::Parameter::Complex.new("description","text/xml",desc.children.first.dump),
+              Riddl::Parameter::Simple.new("type","dataelements")
+            ]
+            if status >= 200 && status < 300 
+              res
+            else  
+              raise 'Could not extract dataelements' 
+            end  
+          elsif tdatatype == 'xslt' && !tdata.empty?
+            trans = XML::Smart::open_unprotected(tdata.text)
+            desc.children.first.to_doc.transform_with(trans)
+          elsif tdatatype == 'clean'
+            []
+          else
+            nil
+          end  
+          unless addit.nil?
+            node = doc.find("/p:properties/p:dataelements").first
+            node.children.delete_all!
+            @instance.data.clear
+            addit.each_slice(2).each do |k,v|
+              @instance.data[k.value.to_sym] = ValueHelper::parse(v.value)
+              node.add(k.value,ValueHelper::generate(v.value))
+            end  
+            nots << ["properties/dataelements/change", {:instance => instance, :changed => JSON::generate(@instance.data)}]
           end  
-          nots << ["properties/dataelements/change", {:instance => instance, :changed => JSON::generate(@instance.data)}]
-        end  
 
-        ### enpoints extraction
-        addit = if tendptype == 'rest' && !tdata.empty?
-          srv = Riddl::Client.interface(tendp.text,@opts[:transformation_service],:xmpp => @opts[:xmpp])
-          status, res = srv.post [ 
-            Riddl::Parameter::Complex.new("description","text/xml",desc.children.first.dump),
-            Riddl::Parameter::Simple.new("type","endpoints")
-          ]
-          res
-        elsif tendptype == 'xslt' && !tdata.empty?
-          trans = XML::Smart::open_unprotected(tendp.text)
-          desc.children.first.to_doc.transform_with(trans)
-        elsif tendptype == 'clean'
-          []
-        else
-          nil
-        end  
-        unless addit.nil?
-          node = doc.find("/p:properties/p:endpoints").first
-          node.children.delete_all!
-          @instance.endpoints.clear
-          addit.each_slice(2).each do |k,v|
-            @instance.endpoints[k.value.to_sym] = ValueHelper::parse(v.value)
-            node.add(k.value,ValueHelper::generate(v.value))
+          ### endpoints extraction
+          addit = if tendptype == 'rest' && !tdata.empty?
+            srv = Riddl::Client.interface(tendp.text,@opts[:transformation_service],:xmpp => @opts[:xmpp])
+            status, res = srv.post [ 
+              Riddl::Parameter::Complex.new("description","text/xml",desc.children.first.dump),
+              Riddl::Parameter::Simple.new("type","endpoints")
+            ]
+            if status >= 200 && status < 300 
+              res
+            else  
+              raise 'Could not extract endpoints' 
+            end  
+          elsif tendptype == 'xslt' && !tdata.empty?
+            trans = XML::Smart::open_unprotected(tendp.text)
+            desc.children.first.to_doc.transform_with(trans)
+          elsif tendptype == 'clean'
+            []
+          else
+            nil
           end  
-          nots << ["properties/endpoints/change", {:instance => instance, :changed => JSON::generate(@instance.endpoints)}]
-        end  
+          unless addit.nil?
+            node = doc.find("/p:properties/p:endpoints").first
+            node.children.delete_all!
+            @instance.endpoints.clear
+            addit.each_slice(2).each do |k,v|
+              @instance.endpoints[k.value.to_sym] = ValueHelper::parse(v.value)
+              node.add(k.value,ValueHelper::generate(v.value))
+            end  
+            nots << ["properties/endpoints/change", {:instance => instance, :changed => JSON::generate(@instance.endpoints)}]
+          end  
+          nots << ['properties/description/change', { :instance => instance }]
+        rescue => err
+          nots << ["properties/description/error", { :instance => instance, :message => err.message }]
+        end
       end
       nots
     end #}}}

data/lib/cpee/handler_properties.rb

@@ -20,7 +20,6 @@ class PropertiesHandler < Riddl::Utils::Properties::HandlerBase
         @data.notify('properties/handlerwrapper/change', :instance => @data.instance)
       when 'description'
         nots = @data.unserialize_description!
-        @data.notify('properties/description/change', :instance => @data.instance)
         nots.uniq.each do |noti|
           @data.notify(*noti)
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee
 version: !ruby/object:Gem::Version
-  version: 1.3.152
+  version: 1.3.153
 platform: ruby
 authors:
 - Juergen eTM Mangler