cpee-frames 1.0.1 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f185881405a4d448a676a5aefbb6a5edd722fd430075b42cb1439c929d511125
-  data.tar.gz: 93bf3f7767e6e5bd19f3a8d27bbf7769ab7954f512444ea726f00402db32b704
+  metadata.gz: f6e3e17dafdfc33eea6a1985ef1195ae366e481783eee9a0521f2e24b376ab89
+  data.tar.gz: b1027c8c1e6ddea9122c87ccef384c1e628f8db1fa6369f61e819d235446cb96
 SHA512:
-  metadata.gz: 9a863dcefcbb9d3090c7bee148d2c66d37323772c8ed40d7f0e269ab866c84f76b213c1cd7bdb6ec10f51a79b562cf9f60fca9e1c4d815b1cfbaa8b95b0ba04d
-  data.tar.gz: 03ab2e9889d33eed886334e378c526801925e0eb641baf2eb3b8200c1529b395a2af6451b127db69d487fedbebeceab89cd33391411b41f3743cb4d825919588
+  metadata.gz: 182e44f12d97f59918eaea3a2590614c7758f920f2a4ce06ed848623348941fd60bfc493add7228f4f228d32867fb42bf66984d0505a68f95d4c294b49e7c17b
+  data.tar.gz: 190580b76dfc5a2100ad0cd1fbee4056f7db53ce9fa9cc7845574b3d87c8ee7923470c8b7da53e0047590696bc563790c3c1f4caaa880227fb5d8d4ff9894d86

data/cpee-frames.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee-frames"
-  s.version          = "1.0.1"
+  s.version          = "1.0.3"
   s.platform         = Gem::Platform::RUBY
   s.license          = "GPL-3.0"
   s.summary          = "Dashboard management service with UI and backend for the cpee.org family of workflow management tools"

data/lib/cpee-frames/implementation.rb

@@ -29,6 +29,17 @@ module CPEE
 
     SERVER = File.expand_path(File.join(__dir__,'frames.xml'))
 
+    def self::overlap?(l1x, l1y, r1x, r1y, l2x, l2y, r2x, r2y)
+      if l1x > r2x || l2x > r1x
+          return false
+      end
+      if l1y > r2y || l2y > r1y
+          return false
+      end
+      return true
+    end
+
+
     # https://coderwall.com/p/atyfyq/ruby-string-to-boolean
     # showbutton
     refine String do #{{{
@@ -69,21 +80,22 @@ module CPEE
 
     class InitFrame < Riddl::Implementation #{{{
       def response
-        Dir.mkdir(File.join('data',@r.last)) rescue nil
+        data_dir = @a[1]
+        Dir.mkdir(File.join(data_dir,@r.last)) rescue nil
 
         if !@p[0].value.to_s.empty?
-          File.write(File.join('data',@r.last,'style.url'),@p[0].value)
+          File.write(File.join(data_dir,@r.last,'style.url'),@p[0].value)
         end
 
-        File.write(File.join('data',@r.last,'frames.json'),JSON.dump(JSON.parse('{"data":[]}')))
+        File.write(File.join(data_dir,@r.last,'frames.json'),JSON.dump(JSON.parse('{"data":[]}')))
 
         #for handler
-        File.write(File.join('data',@r.last,'dataelements.json'),JSON.dump(JSON.parse('{"data":[]}')))
+        File.write(File.join(data_dir,@r.last,'dataelements.json'),JSON.dump(JSON.parse('{"data":[]}')))
 
-        File.write(File.join('data',@r.last,'info.json'),JSON.dump(JSON.parse('{"x_amount":' + @p[2].value + ', "y_amount":' + @p[3].value + ', "lang":"' + @p[4].value  + '", "langs":["' + @p[4].value +  '"], "document_name": "' + @p[5].value + '"}')))
+        File.write(File.join(data_dir,@r.last,'info.json'),JSON.dump(JSON.parse('{"x_amount":' + @p[2].value + ', "y_amount":' + @p[3].value + ', "lang":"' + @p[4].value  + '", "langs":["' + @p[4].value +  '"], "document_name": "' + @p[5].value + '"}')))
 
-        File.write(File.join('data',@r.last,'callback'),@h['CPEE_CALLBACK'])
-        File.write(File.join('data',@r.last,'cpeeinstance.url'),@h['CPEE_INSTANCE_URL'])
+        File.write(File.join(data_dir,@r.last,'callback'),@h['CPEE_CALLBACK'])
+        File.write(File.join(data_dir,@r.last,'cpeeinstance.url'),@h['CPEE_INSTANCE_URL'])
 
         @a[0].send('new')
         nil
@@ -92,13 +104,14 @@ module CPEE
 
     class NewFrameSet < Riddl::Implementation
       def response
-        path = File.join('data',@r.last,'frames.json')
+        data_dir = @a[1]
+        path = File.join(data_dir,@r.last,'frames.json')
         file = File.read(path)
         data_hash = JSON::parse(file)
 
         #check if new frame overlaps others if it does, delete overlapped frames
         data_hash["data"].each do | c |
-          if doOverlap(c['lx'], c['ly'], c['rx'], c['ry'], @p[1].value.to_i, @p[2].value.to_i, (@p[1].value.to_i + @p[3].value.to_i - 1), (@p[2].value.to_i + @p[4].value.to_i - 1))
+          if CPEE::Frames::overlap?(c['lx'], c['ly'], c['rx'], c['ry'], @p[1].value.to_i, @p[2].value.to_i, (@p[1].value.to_i + @p[3].value.to_i - 1), (@p[2].value.to_i + @p[4].value.to_i - 1))
             data_hash["data"].delete(c)
           end
         end
@@ -117,7 +130,7 @@ module CPEE
           File.write(path, JSON.dump(data_hash))
 
           #only send active url to client
-          infofile = File.join('data',@r.last,'info.json')
+          infofile = File.join(data_dir,@r.last,'info.json')
           infojson = JSON::parse(File.read(infofile))
           hash["url"] = urls.find{ |h| h['lang'] == infojson["lang"]}['url']
 
@@ -137,13 +150,14 @@ module CPEE
 
     class NewFrameWait < Riddl::Implementation
       def response
-        path = File.join('data',@r.last,'frames.json')
+        data_dir = @a[1]
+        path = File.join(data_dir,@r.last,'frames.json')
         file = File.read(path)
         data_hash = JSON::parse(file)
 
         #check if new frame overlaps others if it does, delete overlapped frames
         data_hash["data"].each do | c |
-          if doOverlap(c['lx'], c['ly'], c['rx'], c['ry'], @p[1].value.to_i, @p[2].value.to_i, (@p[1].value.to_i + @p[3].value.to_i - 1), (@p[2].value.to_i + @p[4].value.to_i - 1))
+          if CPEE::Frames::overlap?(c['lx'], c['ly'], c['rx'], c['ry'], @p[1].value.to_i, @p[2].value.to_i, (@p[1].value.to_i + @p[3].value.to_i - 1), (@p[2].value.to_i + @p[4].value.to_i - 1))
             data_hash["data"].delete(c)
           end
         end
@@ -161,11 +175,11 @@ module CPEE
           File.write(path, JSON.dump(data_hash))
 
           #only send active url to client
-          infofile = File.join('data',@r.last,'info.json')
+          infofile = File.join(data_dir,@r.last,'info.json')
           infojson = JSON::parse(File.read(infofile))
           hash["url"] = urls.find{ |h| h['lang'] == infojson["lang"]}['url']
 
-          File.write(File.join('data',@r.last,'callback'),@h['CPEE_CALLBACK'])
+          File.write(File.join(data_dir,@r.last,'callback'),@h['CPEE_CALLBACK'])
 
 
           @a[0].send(JSON.dump(hash))
@@ -173,7 +187,7 @@ module CPEE
           File.write(path, JSON.dump(data_hash))
           hash = {lx: @p[1].value.to_i, ly: @p[2].value.to_i, rx: (@p[1].value.to_i + @p[3].value.to_i - 1), ry: (@p[2].value.to_i + @p[4].value.to_i - 1), url: "empty", showbutton: @p[5].value, style: @p[6].value, default: "{}", callback: @h['CPEE_CALLBACK']};
 
-          File.write(File.join('data',@r.last,'callback'),@h['CPEE_CALLBACK'])
+          File.write(File.join(data_dir,@r.last,'callback'),@h['CPEE_CALLBACK'])
 
 
           @a[0].send(JSON.dump(hash))
@@ -190,12 +204,13 @@ module CPEE
 
     class DeleteFrame < Riddl::Implementation
       def response
-        path = File.join('data',@r.last,'frames.json')
+        data_dir = @a[1]
+        path = File.join(data_dir,@r.last,'frames.json')
         file = File.read(path)
         data_hash = JSON::parse(file)
 
         data_hash["data"].each do | c |
-          if doOverlap(c['lx'], c['ly'], c['rx'], c['ry'], @p[0].value.to_i, @p[1].value.to_i, (@p[0].value.to_i + 1), (@p[1].value.to_i + 1))
+          if CPEE::Frames::overlap?(c['lx'], c['ly'], c['rx'], c['ry'], @p[0].value.to_i, @p[1].value.to_i, (@p[0].value.to_i + 1), (@p[1].value.to_i + 1))
             data_hash["data"].delete(c)
           end
         end
@@ -204,20 +219,11 @@ module CPEE
       end
     end
 
-    def doOverlap(l1x, l1y, r1x, r1y, l2x, l2y, r2x, r2y)
-      if l1x > r2x || l2x > r1x
-          return false;
-      end
-      if l1y > r2y || l2y > r1y
-          return false;
-      end
-      return true;
-    end
-
     class Delete < Riddl::Implementation
       def response
+        data_dir = @a[1]
         pp "in delete"
-        if cbu = File.read(File.join('data',@r.last,'callback'))
+        if cbu = File.read(File.join(data_dir,@r.last,'callback'))
           pp "XYZ"
           send = { 'operation' => @p[0].value }
           case send['operation']
@@ -229,11 +235,11 @@ module CPEE
           Typhoeus.put(cbu, body: JSON::generate(send), headers: { 'content-type' => 'application/json'})
         end
 
-        #File.unlink(File.join('data',@r.last,'callback')) rescue nil
-        #File.unlink(File.join('data',@r.last,'cpeeinstance.url')) rescue nil
-        #File.unlink(File.join('data',@r.last,'style.url')) rescue nil
-        #File.unlink(File.join('data',@r.last,'document.xml')) rescue nil
-        #File.unlink(File.join('data',@r.last,'info.json')) rescue nil
+        #File.unlink(File.join(data_dir,@r.last,'callback')) rescue nil
+        #File.unlink(File.join(data_dir,@r.last,'cpeeinstance.url')) rescue nil
+        #File.unlink(File.join(data_dir,@r.last,'style.url')) rescue nil
+        #File.unlink(File.join(data_dir,@r.last,'document.xml')) rescue nil
+        #File.unlink(File.join(data_dir,@r.last,'info.json')) rescue nil
 
         @a[0].send('reset')
         nil
@@ -242,10 +248,11 @@ module CPEE
 
     class GetFrames < Riddl::Implementation #{{{
       def response
-        fname = File.join('data',@r[-2],'frames.json')
+        data_dir = @a[0]
+        fname = File.join(data_dir,@r[-2],'frames.json')
         if File.exists? fname
 
-          infofile = File.join('data',@r[-2],'info.json')
+          infofile = File.join(data_dir,@r[-2],'info.json')
           infojson = JSON::parse(File.read(infofile))
 
           #remove not used languages
@@ -264,8 +271,9 @@ module CPEE
 
     class SetDataElements < Riddl::Implementation #{{{
       def response
+        data_dir = @a[0]
         savejson = @p.map { |o| Hash[o.name, o.value] }.to_json
-        path = File.join('data',@r[0],'dataelements.json')
+        path = File.join(data_dir,@r[0],'dataelements.json')
         File.write(path, savejson)
 
         #puts xyz
@@ -278,7 +286,7 @@ module CPEE
         #puts @p[0].name
         #puts @p[0].value
 
-        #fname = File.join('data',@r[-2],'dataelements.json')
+        #fname = File.join(data_dir,@r[-2],'dataelements.json')
         #if File.exists? fname
         #  Riddl::Parameter::Complex.new('value','application/json',File.read(fname))
         #else
@@ -289,7 +297,8 @@ module CPEE
 
     class GetDataElements < Riddl::Implementation #{{{
       def response
-        fname = File.join('data',@r[-2],'dataelements.json')
+        data_dir = @a[0]
+        fname = File.join(data_dir,@r[-2],'dataelements.json')
         if File.exists? fname
           Riddl::Parameter::Complex.new('value','application/json',File.read(fname))
         else
@@ -300,7 +309,8 @@ module CPEE
 
     class GetInfo < Riddl::Implementation #{{{
       def response
-        fname = File.join('data',@r[-2],'info.json')
+        data_dir = @a[0]
+        fname = File.join(data_dir,@r[-2],'info.json')
         if File.exists? fname
           Riddl::Parameter::Complex.new('value','application/json',File.read(fname))
         else
@@ -311,7 +321,8 @@ module CPEE
 
     class GetLangs < Riddl::Implementation #{{{
       def response
-        fname = File.join('data',@r[-2],'info.json')
+        data_dir = @a[0]
+        fname = File.join(data_dir,@r[-2],'info.json')
         if File.exists? fname
           infojson = JSON::parse(File.read(fname))
           Riddl::Parameter::Complex.new('value','application/json',infojson["langs"])
@@ -323,7 +334,8 @@ module CPEE
 
     class SetLang < Riddl::Implementation #{{{
       def response
-        fname = File.join('data',@r[-2],'info.json')
+        data_dir = @a[1]
+        fname = File.join(data_dir,@r[-2],'info.json')
         if File.exists? fname
           infojson = JSON::parse(File.read(fname))
           infojson["lang"] = @p[0].value
@@ -348,7 +360,8 @@ module CPEE
 
     class GetStyle < Riddl::Implementation #{{{
       def response
-        fname = File.join('data',@r[-2],'style.url')
+        data_dir = @a[0]
+        fname = File.join(data_dir,@r[-2],'style.url')
         if File.exists? fname
           Riddl::Parameter::Complex.new('url','text/plain',File.read(fname).strip)
         else
@@ -359,7 +372,8 @@ module CPEE
 
     class GetCpeeInstance < Riddl::Implementation #{{{
       def response
-        fname = File.join('data',@r[-2],'cpeeinstance.url')
+        data_dir = @a[0]
+        fname = File.join(data_dir,@r[-2],'cpeeinstance.url')
         if File.exists? fname
           Riddl::Parameter::Complex.new('url','text/plain',File.read(fname).strip)
         else
@@ -376,6 +390,7 @@ module CPEE
 
     class Handler < Riddl::Implementation
       def response
+        data_dir      = @a[1]
         topic         = @p[1].value
         event_name    = @p[2].value
         notification  = JSON.parse(@p[3].value.read)
@@ -394,7 +409,7 @@ module CPEE
         if content['values']&.any?
           #puts alldata['ausfuehrungen']
           puts "writing file"
-          path = File.join('data',@r[0],'dataelements.json')
+          path = File.join(data_dir,@r[0],'dataelements.json')
           File.write(path, JSON.dump(content['values']))
         end
 
@@ -486,49 +501,49 @@ module CPEE
             opts[:signals2]["handler"] ||= Signaling.new
 
             run Get, "test" if get
-            run InitFrame, opts[:signals][idx] if post 'input'
+            run InitFrame, opts[:signals][idx], opts[:data_dir] if post 'input'
 
-            run NewFrameSet, opts[:signals][idx] if put 'sframe'
-            run NewFrameWait, opts[:signals][idx] if put 'wframe'
+            run NewFrameSet, opts[:signals][idx], opts[:data_dir] if put 'sframe'
+            run NewFrameWait, opts[:signals][idx], opts[:data_dir] if put 'wframe'
 
-            run DeleteFrame, opts[:signals][idx] if post 'deleteframe'
+            run DeleteFrame, opts[:signals][idx], opts[:data_dir] if post 'deleteframe'
 
             on resource 'handler' do
-              run Handler, opts[:signals2]["handler"] if post
+              run Handler, opts[:signals2]["handler"], opts[:data_dir] if post
               on resource 'sse' do
                 run SSE2, opts[:signals2]["handler"] if sse
               end
             end
 
-            run Delete, opts[:signals][idx] if delete 'opa'
-            run Delete, opts[:signals][idx] if delete 'opb'
-            run Delete, opts[:signals][idx] if delete 'opc'
+            run Delete, opts[:signals][idx], opts[:data_dir] if delete 'opa'
+            run Delete, opts[:signals][idx], opts[:data_dir] if delete 'opb'
+            run Delete, opts[:signals][idx], opts[:data_dir] if delete 'opc'
             on resource 'sse' do
               run SSE, opts[:signals][idx] if sse
             end
             on resource 'languages' do
-              run GetLangs if get
-              run SetLang, opts[:signals][idx] if post 'lang'
+              run GetLangs, opts[:data_dir] if get
+              run SetLang, opts[:signals][idx], opts[:data_dir] if post 'lang'
             end
             on resource 'style.url' do
-              run GetStyle if get
+              run GetStyle, opts[:data_dir] if get
             end
             on resource 'cpeeinstance.url' do
-              run GetCpeeInstance if get
+              run GetCpeeInstance, opts[:data_dir] if get
             end
             on resource 'info.json' do
-              run GetInfo if get
+              run GetInfo, opts[:data_dir] if get
             end
             on resource 'frames.json' do
-              run GetFrames if get
+              run GetFrames, opts[:data_dir] if get
             end
             on resource 'test' do
               run OutputTest if put
             end
 
             on resource 'dataelements.json' do
-              run SetDataElements if post
-              run GetDataElements if get
+              run SetDataElements, opts[:data_dir] if post
+              run GetDataElements, opts[:data_dir] if get
             end
           end
         end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: cpee-frames
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.3
 platform: ruby
 authors:
 - Manuell Gall
 - Juergen 'eTM' Mangler
-autorequire: 
+autorequire:
 bindir: tools
 cert_chain: []
-date: 2023-02-21 00:00:00.000000000 Z
+date: 2023-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl
@@ -75,7 +75,7 @@ homepage: https://github.com/ManuelGall/cpee-frames
 licenses:
 - GPL-3.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -90,8 +90,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.3.26
+signing_key:
 specification_version: 4
 summary: Dashboard management service with UI and backend for the cpee.org family
   of workflow management tools