cpee 2.1.135 → 2.1.136

data/lib/cpee/implementation_properties.rb

@@ -1,15 +1,15 @@
 # This file is part of CPEE.
 #
 # CPEE is free software: you can redistribute it and/or modify it under the terms
-# of the GNU General Public License as published by the Free Software Foundation,
+# of the GNU Lesser General Public License as published by the Free Software Foundation,
 # either version 3 of the License, or (at your option) any later version.
 #
 # CPEE is distributed in the hope that it will be useful, but WITHOUT ANY
 # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+# PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License along with
-# CPEE (file COPYING in the main directory).  If not, see
+# You should have received a copy of the GNU Lesser General Public License along with
+# CPEE (file LICENSE in the main directory).  If not, see
 # <http://www.gnu.org/licenses/>.
 
 require_relative 'fail'
@@ -139,6 +139,8 @@ module CPEE
         doc.find('/p:properties/p:transformation/p:description/@type').first.text = CPEE::Persistence::extract_item(id,opts,'transformation/description/@type')
         doc.find('/p:properties/p:transformation/p:dataelements/@type').first.text = CPEE::Persistence::extract_item(id,opts,'transformation/dataelements/@type')
         doc.find('/p:properties/p:transformation/p:endpoints/@type').first.text = CPEE::Persistence::extract_item(id,opts,'transformation/endpoints/@type')
+        doc.find('/p:properties/p:transformation/p:dslx').first.text = CPEE::Persistence::extract_item(id,opts,'transformation/dslx') || ''
+        doc.find('/p:properties/p:transformation/p:dslx/@type').first.text = CPEE::Persistence::extract_item(id,opts,'transformation/dslx/@type') || 'copy' # instances from before dslx backtransformation
         Riddl::Parameter::Complex.new('properties','application/xml',doc.to_s)
       end
     end #}}}
@@ -164,14 +166,14 @@ module CPEE
             end
           end
 
-          %w{dataelements documents endpoints documents}.each do |item|
+          %w{dataelements documents endpoints attributes}.each do |item|
             if (node = doc.find('/p:properties/p:' + item)).any?
               CPEE::Properties::PatchItems::set item, id, opts, node.first.dump
             end
           end
 
           if (node = doc.find('/p:properties/p:transformation')).any?
-            CPEE::Properties::PutTransformation::set id, opts, node.first.dump
+            CPEE::Properties::PutTransformation::set id, opts, node.first.dump, doc.find('/p:properties/p:description/*').empty?
           end
           if (node = doc.find('/p:properties/p:description/*')).any?
             CPEE::Properties::PutDescription::set id, opts, node.first.dump
@@ -206,7 +208,7 @@ module CPEE
         end
 
         if (node = doc.find('/*/p:transformation')).any?
-          CPEE::Properties::PutTransformation::set id, opts, node.first.dump
+          CPEE::Properties::PutTransformation::set id, opts, node.first.dump, doc.find('/*/p:description/*').empty?
         end
         if (node = doc.find('/*/p:description/*')).any?
           CPEE::Properties::PutDescription::set id, opts, node.first.dump
@@ -798,6 +800,32 @@ module CPEE
         [dslx, dsl, de, ep]
       end #}}}
 
+      def self::backtransform(xml,dslx,tdslx,tdslxtype) #{{{
+        # description from a directly set dslx, nil means keep the current description
+        case tdslxtype
+          when 'rest'
+            return nil if tdslx.nil? || tdslx.empty?
+            srv = Riddl::Client.new(tdslx)
+            status, res = srv.post [
+              Riddl::Parameter::Complex.new("description","text/xml",dslx), # the service distinguishes directions by path, e.g. /bpmn2/cpee/
+              Riddl::Parameter::Simple.new("type","description")
+            ]
+            if status >= 200 && status < 300
+              res[0].value.read
+            else
+              raise 'Could not backtransform dslx'
+            end
+          when 'xslt'
+            return nil if tdslx.nil? || tdslx.empty?
+            trans = XML::Smart::open_unprotected(tdslx)
+            XML::Smart::string(dslx).transform_with(trans).to_s
+          when 'none'
+            nil
+          else # copy, or instances from before dslx backtransformation
+            xml
+        end
+      end #}}}
+
       def self::set(id,opts,xml,exposition=[],copy=false)
         dslx, dsl, de, ep = if copy
           PutDescription::transform(
@@ -826,11 +854,28 @@ module CPEE
             opts
           )
         end
+        description = if copy
+          begin
+            PutDescription::backtransform(
+              xml,
+              dslx,
+              CPEE::Persistence::extract_item(id,opts,'transformation/dslx'),
+              CPEE::Persistence::extract_item(id,opts,'transformation/dslx/@type')
+            )
+          rescue => e # dslx is stored anyway, description stays as it is
+            puts e.message
+            puts e.backtrace
+            nil
+          end
+        else
+          xml
+        end
+        description ||= CPEE::Persistence::extract_item(id,opts,'description') || ''
         attrs = CPEE::Persistence::extract_list(id,opts,'attributes').to_h
         dos = CPEE::Persistence::extract_list(id,opts,'documents').to_h
         change_uuid = Digest::SHA1.hexdigest(dslx)
         CPEE::Persistence::set_item(id,opts,'description',
-          :description => xml,
+          :description => description,
           :dslx => dslx,
           :change_uuid => change_uuid,
           :dsl => dsl,
@@ -851,6 +896,16 @@ module CPEE
         end
       end
 
+      def self::validate(xml,opts) # dslx against t_dslx.rng, returns the errors
+        errors = []
+        begin
+          XML::Smart::string(xml).validate_against(XML::Smart::open_unprotected(opts[:dslx_rng])) { |e| errors << e.message.strip }
+        rescue => e # not even well-formed
+          errors << e.message.strip
+        end
+        errors
+      end
+
       def response
         id = @a[0]
         opts = @a[1]
@@ -860,9 +915,17 @@ module CPEE
         elsif opts[:statemachine].final? id
           @status = 410
         else
+          # force-encoding because johannes managed to sneak in ascii special characters. why the browser is not sanitizing it is beyond me.
+          xml = @p[0].value.read.force_encoding('UTF-8')
+          errors = copy ? PutDescription::validate(xml,opts) : [] # copy: dslx, a description can be any model type
+          if errors.any?
+            attrs = CPEE::Persistence::extract_list(id,opts,'attributes').to_h
+            CPEE::Message::send(:event,'description/error',File.join(opts[:url],'/'),id,attrs['uuid'],attrs['info'],{ :message => errors.join("\n"), :errors => errors, :attributes => attrs },opts[:redis])
+            @status = 422
+            return Riddl::Parameter::Complex.new('error','text/plain',errors.join("\n"))
+          end
           begin
-            # force-encoding because johannes managed to sneak in ascii special characters. why the browser is not sanitizing it is beyond me.
-            PutDescription::set(id,opts,@p[0].value.read.force_encoding('UTF-8'),@p[1..-1],copy)
+            PutDescription::set(id,opts,xml,@p[1..-1],copy)
           rescue => e
             puts e.message
             puts e.backtrace
@@ -886,20 +949,53 @@ module CPEE
         des.find('p:description/@type').first.text = CPEE::Persistence::extract_item(id,opts,'transformation/description/@type')
         des.find('p:dataelements/@type').first.text = CPEE::Persistence::extract_item(id,opts,'transformation/dataelements/@type')
         des.find('p:endpoints/@type').first.text = CPEE::Persistence::extract_item(id,opts,'transformation/endpoints/@type')
+        des.find('p:dslx').first.text = CPEE::Persistence::extract_item(id,opts,'transformation/dslx') || ''
+        des.find('p:dslx/@type').first.text = CPEE::Persistence::extract_item(id,opts,'transformation/dslx/@type') || 'copy' # instances from before dslx backtransformation
         Riddl::Parameter::Complex.new('status','text/xml',des.to_doc.to_s)
       end
     end #}}}
     class PutTransformation < Riddl::Implementation #{{{
-      def self::set(id,opts,xml)
+      def self::set(id,opts,xml,backtrans=true)
         doc = XML::Smart::string(xml)
         doc.register_namespace 'p', 'http://cpee.org/ns/properties/2.0'
+        tdslx = doc.find('string(/p:transformation/p:dslx)')
+        tdslxtype = (t = doc.find('string(/p:transformation/p:dslx/@type)')).empty? ? 'copy' : t # optional, missing means copy
+        changed = tdslx != (CPEE::Persistence::extract_item(id,opts,'transformation/dslx') || '') ||
+                  tdslxtype != (CPEE::Persistence::extract_item(id,opts,'transformation/dslx/@type') || 'copy')
         CPEE::Persistence::set_item(id,opts,'transformation',
           :description => doc.find('string(/p:transformation/p:description)'),
           :description_type => doc.find('string(/p:transformation/p:description/@type)'),
           :dataelements =>doc.find('string(/p:transformation/p:dataelements)'),
           :dataelements_type => doc.find('string(/p:transformation/p:dataelements/@type)'),
           :endpoints =>doc.find('string(/p:transformation/p:endpoints)'),
-          :endpoints_type => doc.find('string(/p:transformation/p:endpoints/@type)')
+          :endpoints_type => doc.find('string(/p:transformation/p:endpoints/@type)'),
+          :dslx => tdslx,
+          :dslx_type => tdslxtype
+        )
+        PutTransformation::backtransform(id,opts,tdslx,tdslxtype) if backtrans && changed
+      end
+      def self::backtransform(id,opts,tdslx,tdslxtype)
+        # the description has to follow the new transformation. the new values are passed
+        # directly, as redis is only updated asynchronously by persist.rb
+        dslx = CPEE::Persistence::extract_item(id,opts,'dslx')
+        return if dslx.nil? || dslx.empty?
+        description = begin
+          PutDescription::backtransform(dslx,dslx,tdslx,tdslxtype)
+        rescue => e # description stays as it is
+          puts e.message
+          puts e.backtrace
+          nil
+        end
+        return if description.nil?
+        CPEE::Persistence::set_item(id,opts,'description',
+          :description => description,
+          :dslx => dslx,
+          :change_uuid => Digest::SHA1.hexdigest(dslx),
+          :dsl => CPEE::Persistence::extract_item(id,opts,'dsl'),
+          :dataelements => CPEE::Persistence::extract_list(id,opts,'dataelements').to_h,
+          :documents => CPEE::Persistence::extract_list(id,opts,'documents').to_h,
+          :endpoints => CPEE::Persistence::extract_list(id,opts,'endpoints').to_h,
+          :attributes => CPEE::Persistence::extract_list(id,opts,'attributes').to_h
         )
       end
       def response

data/lib/cpee/message.rb

@@ -1,15 +1,15 @@
 # This file is part of CPEE.
 #
 # CPEE is free software: you can redistribute it and/or modify it under the terms
-# of the GNU General Public License as published by the Free Software Foundation,
+# of the GNU Lesser General Public License as published by the Free Software Foundation,
 # either version 3 of the License, or (at your option) any later version.
 #
 # CPEE is distributed in the hope that it will be useful, but WITHOUT ANY
 # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+# PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License along with
-# CPEE (file COPYING in the main directory).  If not, see
+# You should have received a copy of the GNU Lesser General Public License along with
+# CPEE (file LICENSE in the main directory).  If not, see
 # <http://www.gnu.org/licenses/>.
 
 module CPEE

data/lib/cpee/persistence.rb

@@ -1,15 +1,15 @@
 # This file is part of CPEE.
 #
 # CPEE is free software: you can redistribute it and/or modify it under the terms
-# of the GNU General Public License as published by the Free Software Foundation,
+# of the GNU Lesser General Public License as published by the Free Software Foundation,
 # either version 3 of the License, or (at your option) any later version.
 #
 # CPEE is distributed in the hope that it will be useful, but WITHOUT ANY
 # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+# PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License along with
-# CPEE (file COPYING in the main directory).  If not, see
+# You should have received a copy of the GNU Lesser General Public License along with
+# CPEE (file LICENSE in the main directory).  If not, see
 # <http://www.gnu.org/licenses/>.
 
 require 'msgpack'
@@ -209,6 +209,8 @@ module CPEE
       res += Persistence::keys_extract_name(opts,id,'transformation','description','@type')
       res += Persistence::keys_extract_name(opts,id,'transformation','dataelements')
       res += Persistence::keys_extract_name(opts,id,'transformation','dataelements','@type')
+      res += Persistence::keys_extract_name(opts,id,'transformation','dslx')
+      res += Persistence::keys_extract_name(opts,id,'transformation','dslx','@type')
       res
     end
 

data/lib/cpee/redis.rb

@@ -1,15 +1,15 @@
 # This file is part of CPEE.
 #
 # CPEE is free software: you can redistribute it and/or modify it under the terms
-# of the GNU General Public License as published by the Free Software Foundation,
+# of the GNU Lesser General Public License as published by the Free Software Foundation,
 # either version 3 of the License, or (at your option) any later version.
 #
 # CPEE is distributed in the hope that it will be useful, but WITHOUT ANY
 # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+# PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License along with
-# CPEE (file COPYING in the main directory).  If not, see
+# You should have received a copy of the GNU Lesser General Public License along with
+# CPEE (file LICENSE in the main directory).  If not, see
 # <http://www.gnu.org/licenses/>.
 
 require 'redis'

data/lib/cpee/statemachine.rb

@@ -1,15 +1,15 @@
 # This file is part of CPEE.
 #
 # CPEE is free software: you can redistribute it and/or modify it under the terms
-# of the GNU General Public License as published by the Free Software Foundation,
+# of the GNU Lesser General Public License as published by the Free Software Foundation,
 # either version 3 of the License, or (at your option) any later version.
 #
 # CPEE is distributed in the hope that it will be useful, but WITHOUT ANY
 # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+# PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License along with
-# CPEE (file COPYING in the main directory).  If not, see
+# You should have received a copy of the GNU Lesser General Public License along with
+# CPEE (file LICENSE in the main directory).  If not, see
 # <http://www.gnu.org/licenses/>.
 
 module CPEE

data/lib/cpee/value_helper.rb

@@ -1,15 +1,15 @@
 # This file is part of CPEE.
 #
 # CPEE is free software: you can redistribute it and/or modify it under the terms
-# of the GNU General Public License as published by the Free Software Foundation,
+# of the GNU Lesser General Public License as published by the Free Software Foundation,
 # either version 3 of the License, or (at your option) any later version.
 #
 # CPEE is distributed in the hope that it will be useful, but WITHOUT ANY
 # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+# PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License along with
-# CPEE (file COPYING in the main directory).  If not, see
+# You should have received a copy of the GNU Lesser General Public License along with
+# CPEE (file LICENSE in the main directory).  If not, see
 # <http://www.gnu.org/licenses/>.
 
 require 'json'

data/lib/cpee.xml

@@ -2,15 +2,15 @@
   This file is part of CPEE.
 
   CPEE is free software: you can redistribute it and/or modify it under the terms
-  of the GNU General Public License as published by the Free Software Foundation,
+  of the GNU Lesser General Public License as published by the Free Software Foundation,
   either version 3 of the License, or (at your option) any later version.
 
   CPEE is distributed in the hope that it will be useful, but WITHOUT ANY
   WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-  PARTICULAR PURPOSE. See the GNU General Public License for more details.
+  PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
 
-  You should have received a copy of the GNU General Public License along with
-  CPEE (file COPYING in the main directory).  If not, see
+  You should have received a copy of the GNU Lesser General Public License along with
+  CPEE (file LICENSE in the main directory).  If not, see
   <http://www.gnu.org/licenses/>.
 -->
 

data/lib/engine/executionhandler-list.rng

@@ -2,15 +2,15 @@
   This file is part of CPEE.
 
   CPEE is free software: you can redistribute it and/or modify it under the terms
-  of the GNU General Public License as published by the Free Software Foundation,
+  of the GNU Lesser General Public License as published by the Free Software Foundation,
   either version 3 of the License, or (at your option) any later version.
 
   CPEE is distributed in the hope that it will be useful, but WITHOUT ANY
   WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-  PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+  PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
 
-  You should have received a copy of the GNU General Public License along with
-  CPEE (file COPYING in the main directory).  If not, see
+  You should have received a copy of the GNU Lesser General Public License along with
+  CPEE (file LICENSE in the main directory).  If not, see
   <http://www.gnu.org/licenses/>.
 -->
 

data/lib/engine/instance-info.rng

@@ -2,15 +2,15 @@
   This file is part of CPEE.
 
   CPEE is free software: you can redistribute it and/or modify it under the terms
-  of the GNU General Public License as published by the Free Software Foundation,
+  of the GNU Lesser General Public License as published by the Free Software Foundation,
   either version 3 of the License, or (at your option) any later version.
 
   CPEE is distributed in the hope that it will be useful, but WITHOUT ANY
   WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-  PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+  PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
 
-  You should have received a copy of the GNU General Public License along with
-  CPEE (file COPYING in the main directory).  If not, see
+  You should have received a copy of the GNU Lesser General Public License along with
+  CPEE (file LICENSE in the main directory).  If not, see
   <http://www.gnu.org/licenses/>.
 -->
 

data/lib/engine/instances.rng

@@ -2,15 +2,15 @@
   This file is part of CPEE.
 
   CPEE is free software: you can redistribute it and/or modify it under the terms
-  of the GNU General Public License as published by the Free Software Foundation,
+  of the GNU Lesser General Public License as published by the Free Software Foundation,
   either version 3 of the License, or (at your option) any later version.
 
   CPEE is distributed in the hope that it will be useful, but WITHOUT ANY
   WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-  PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+  PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
 
-  You should have received a copy of the GNU General Public License along with
-  CPEE (file COPYING in the main directory).  If not, see
+  You should have received a copy of the GNU Lesser General Public License along with
+  CPEE (file LICENSE in the main directory).  If not, see
   <http://www.gnu.org/licenses/>.
 -->
 

data/lib/engine.xml

@@ -2,15 +2,15 @@
   This file is part of CPEE.
 
   CPEE is free software: you can redistribute it and/or modify it under the terms
-  of the GNU General Public License as published by the Free Software Foundation,
+  of the GNU Lesser General Public License as published by the Free Software Foundation,
   either version 3 of the License, or (at your option) any later version.
 
   CPEE is distributed in the hope that it will be useful, but WITHOUT ANY
   WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-  PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+  PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
 
-  You should have received a copy of the GNU General Public License along with
-  CPEE (file COPYING in the main directory).  If not, see
+  You should have received a copy of the GNU Lesser General Public License along with
+  CPEE (file LICENSE in the main directory).  If not, see
   <http://www.gnu.org/licenses/>.
 -->