cpee 1.3.124 → 1.3.125

data/cpee.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "1.3.124"
+  s.version          = "1.3.125"
   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

@@ -116,6 +116,12 @@ module CPEE
     def xmpp 
       @opts[:xmpp]
     end
+    def base
+      @opts[:jid] ? base_url + "," + base_jid : base_url
+    end
+    def instance
+      @opts[:jid] ? instance_url + "," + instance_jid : instance_url
+    end
     
     def sim # {{{
       @thread.join if !@thread.nil? && @thread.alive?
@@ -377,7 +383,7 @@ module CPEE
             @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_url, :changed => JSON::generate(@instance.data)}]
+          nots << ["properties/dataelements/change", {:instance => instance, :changed => JSON::generate(@instance.data)}]
         end  
 
         ### enpoints extraction
@@ -402,7 +408,7 @@ module CPEE
             @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_url, :changed => JSON::generate(@instance.endpoints)}]
+          nots << ["properties/endpoints/change", {:instance => instance, :changed => JSON::generate(@instance.endpoints)}]
         end  
       end
       nots

data/lib/cpee/handler_notifications.rb

@@ -18,7 +18,7 @@ class NotificationsHandler < Riddl::Utils::Notifications::Producer::HandlerBase
   end
   def ws_close
     @data.unserialize_notifications!(:del,@key)
-    @data.notify('properties/handlers/change', :instance => @data.instance_url)
+    @data.notify('properties/handlers/change', :instance => @data.instance)
   end
   def ws_message(data)
     begin
@@ -34,14 +34,14 @@ class NotificationsHandler < Riddl::Utils::Notifications::Producer::HandlerBase
 
   def create
     @data.unserialize_notifications!(:cre,@key)
-    @data.notify('properties/handlers/change', :instance => @data.instance_url)
+    @data.notify('properties/handlers/change', :instance => @data.instance)
   end
   def delete
     @data.unserialize_notifications!(:del,@key)
-    @data.notify('properties/handlers/change', :instance => @data.instance_url)
+    @data.notify('properties/handlers/change', :instance => @data.instance)
   end
   def update
     @data.unserialize_notifications!(:upd,@key)
-    @data.notify('properties/handlers/change', :instance => @data.instance_url)
+    @data.notify('properties/handlers/change', :instance => @data.instance)
   end
 end

data/lib/cpee/handler_properties.rb

@@ -17,22 +17,22 @@ class PropertiesHandler < Riddl::Utils::Properties::HandlerBase
     case @property
       when 'handlerwrapper'
         @data.unserialize_handlerwrapper!
-        @data.notify('properties/handlerwrapper/change', :instance => @data.instance_url)
+        @data.notify('properties/handlerwrapper/change', :instance => @data.instance)
       when 'description'
         nots = @data.unserialize_description!
-        @data.notify('properties/description/change', :instance => @data.instance_url)
+        @data.notify('properties/description/change', :instance => @data.instance)
         nots.uniq.each do |noti|
           @data.notify(*noti)
         end
       when 'endpoints'
         @data.unserialize_endpoints!
-        @data.notify('properties/endpoints/change', :instance => @data.instance_url)
+        @data.notify('properties/endpoints/change', :instance => @data.instance)
       when 'dataelements'
         @data.unserialize_dataelements!
-        @data.notify('properties/dataelements/change', :instance => @data.instance_url)
+        @data.notify('properties/dataelements/change', :instance => @data.instance)
       when 'positions'  
         @data.unserialize_positions!
-        @data.notify('properties/position/change', :instance => @data.instance_url)
+        @data.notify('properties/position/change', :instance => @data.instance)
       when 'state'  
         @data.unserialize_state!
       else

data/server/handlerwrappers/default.rb

@@ -23,7 +23,7 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
   end # }}}
 
   def activity_handle(passthrough, parameters) # {{{
-    @controller.notify("running/activity_calling", :instance => @controller.instance_url, :activity => @handler_position, :passthrough => passthrough, :endpoint => @handler_endpoint, :parameters => parameters)
+    @controller.notify("running/activity_calling", :instance => @controller.instance, :activity => @handler_position, :passthrough => passthrough, :endpoint => @handler_endpoint, :parameters => parameters)
 
     if passthrough.nil?
       params = []
@@ -91,53 +91,53 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
   end # }}}
 
   def inform_activity_done # {{{
-    @controller.notify("running/activity_done", :endpoint => @handler_endpoint, :instance => @controller.instance_url, :activity => @handler_position)
+    @controller.notify("running/activity_done", :endpoint => @handler_endpoint, :instance => @controller.instance, :activity => @handler_position)
   end # }}}
   def inform_activity_manipulate # {{{
-    @controller.notify("running/activity_manipulating", :endpoint => @handler_endpoint, :instance => @controller.instance_url, :activity => @handler_position)
+    @controller.notify("running/activity_manipulating", :endpoint => @handler_endpoint, :instance => @controller.instance, :activity => @handler_position)
   end # }}}
   def inform_activity_failed(err) # {{{
     puts err.message
     puts err.backtrace
-    @controller.notify("running/activity_failed", :endpoint => @handler_endpoint, :instance => @controller.instance_url, :activity => @handler_position, :message => err.message, :line => err.backtrace[0].match(/(.*?):(\d+):/)[2], :where => err.backtrace[0].match(/(.*?):(\d+):/)[1])
+    @controller.notify("running/activity_failed", :endpoint => @handler_endpoint, :instance => @controller.instance, :activity => @handler_position, :message => err.message, :line => err.backtrace[0].match(/(.*?):(\d+):/)[2], :where => err.backtrace[0].match(/(.*?):(\d+):/)[1])
   end # }}}
 
   def inform_syntax_error(err,code)# {{{
     puts err.message
     puts err.backtrace
-    @controller.notify("properties/description/error", :instance => @controller.instance_url, :message => err.message)
+    @controller.notify("properties/description/error", :instance => @controller.instance, :message => err.message)
   end# }}}
   def inform_manipulate_change(status,dataelements,endpoints) # {{{
     unless status.nil?
       @controller.serialize_status!
-      @controller.notify("properties/status/change", :endpoint => @handler_endpoint, :instance => @controller.instance_url, :activity => @handler_position, :id => status.id, :message => status.message)
+      @controller.notify("properties/status/change", :endpoint => @handler_endpoint, :instance => @controller.instance, :activity => @handler_position, :id => status.id, :message => status.message)
     end  
     unless dataelements.nil?
       @controller.serialize_dataelements!
-      @controller.notify("properties/dataelements/change", :endpoint => @handler_endpoint, :instance => @controller.instance_url, :activity => @handler_position, :changed => dataelements)
+      @controller.notify("properties/dataelements/change", :endpoint => @handler_endpoint, :instance => @controller.instance, :activity => @handler_position, :changed => dataelements)
     end
     unless endpoints.nil?
       @controller.serialize_endpoints!
-      @controller.notify("properties/endpoints/change", :endpoint => @handler_endpoint, :instance => @controller.instance_url, :activity => @handler_position, :changed => endpoints)
+      @controller.notify("properties/endpoints/change", :endpoint => @handler_endpoint, :instance => @controller.instance, :activity => @handler_position, :changed => endpoints)
     end  
   end # }}}
   def inform_position_change(ipc={}) # {{{
     @controller.serialize_positions!
-    ipc[:instance] = @controller.instance_url
+    ipc[:instance] = @controller.instance
     @controller.notify("properties/position/change", ipc)
   end # }}}
   def inform_state_change(newstate) # {{{
     if @controller
       @controller.serialize_state!
-      @controller.notify("properties/state/change", :instance => @controller.instance_url, :state => newstate)
+      @controller.notify("properties/state/change", :instance => @controller.instance, :state => newstate)
     end
   end # }}}
 
   def vote_sync_after # {{{
-    @controller.call_vote("running/syncing_after", :endpoint => @handler_endpoint, :instance => @controller.instance_url, :activity => @handler_position)
+    @controller.call_vote("running/syncing_after", :endpoint => @handler_endpoint, :instance => @controller.instance, :activity => @handler_position)
   end # }}}
   def vote_sync_before(parameters=nil) # {{{
-    @controller.call_vote("running/syncing_before", :endpoint => @handler_endpoint, :instance => @controller.instance_url, :activity => @handler_position)
+    @controller.call_vote("running/syncing_before", :endpoint => @handler_endpoint, :instance => @controller.instance, :activity => @handler_position)
   end # }}}
 
   def callback(result)
@@ -165,7 +165,7 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
 
     @controller.call_vote("simulating/step", 
       :endpoint => @handler_endpoint, 
-      :instance => @controller.instance_url, 
+      :instance => @controller.instance, 
       :activity => tid, 
       :type => type, 
       :nesting => nesting,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee
 version: !ruby/object:Gem::Version
-  version: 1.3.124
+  version: 1.3.125
   prerelease: 
 platform: ruby
 authors: