cpee-frames 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d8d8cd4a48b7c860535716f62c9dbe7476a0f25a14ca317d5f6a41a634f75d9
-  data.tar.gz: 8a1ae031459158a8796ae00a2bcb188dd06de21199e02e05aa99c2d65becb8ef
+  metadata.gz: fbcc6ab7613127223f4cfd184b77101c3d7eb5dd98441616c92b37bcd732509d
+  data.tar.gz: 249be508581dda213ffe228cb1c70f7820f0470d2de4e0ad16817029b6a532ef
 SHA512:
-  metadata.gz: 89e1cfafe97abab3834f9417c826a580bb956853753509ce1f1d216e8d06552c4ba8338ac6e8458effd1445324db2f5c6f54fde053148e145f7dfcd6dccd0cfa
-  data.tar.gz: 37b7f23935452b346ff75aed9411c5393ef5e4d50bcc1bdb57243acc1d4b387e2f12e10242e3701c18e01eca3cdcf8214115613d81733d206c8b84c67ca7be1e
+  metadata.gz: dd79c5ddabc1d6820c217828055ce28c2b3fa0d15929de370efe85dab805e08dbb635ca582d849732473e29fe95eaef0ee34d9cfab6c9df470b04bdfd7efe0ba
+  data.tar.gz: 07a6bf8aa76babfe444b4ed6408b2cb2746af3320ffdae77073084b432d2a2c45ba9c88c3e36edf9361ebd5bd5c9c8a6a1762f4e6887ef84b64262cb95ae0025

data/cpee-frames.gemspec

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

data/lib/cpee-frames/implementation.rb

@@ -27,7 +27,7 @@ module CPEE
 
   module Frames
 
-    SERVER = File.expand_path(File.join(__dir__,'frames.xml'))
+    SERVER = File.expand_path(File.join(__dir__,'implementation.xml'))
 
     def self::overlap?(l1x, l1y, r1x, r1y, l2x, l2y, r2x, r2y)
       if l1x > r2x || l2x > r1x
@@ -39,6 +39,10 @@ module CPEE
       return true
     end
 
+    def self::target?(l1x, l1y, r1x, r1y, l2x, l2y, r2x, r2y)
+      return l1x == l2x && l1y == l2y && r1x == r2x && r1y == r2y
+    end
+
     # https://coderwall.com/p/atyfyq/ruby-string-to-boolean
     # showbutton
     refine String do #{{{
@@ -88,12 +92,12 @@ module CPEE
         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')
+        @a[0].send(JSON.dump({ message: 'new' }))
         nil
       end
     end #}}}
 
-    class NewFrameSet < Riddl::Implementation
+    class NewFrameSet < Riddl::Implementation #{{{
       def response
         data_dir = @a[1]
         path = File.join(data_dir,@r.last,'frames.json')
@@ -125,19 +129,19 @@ module CPEE
           infojson = JSON::parse(File.read(infofile))
           hash["url"] = urls.find{ |h| h['lang'] == infojson["lang"]}['url']
 
-          @a[0].send(JSON.dump(hash))
+          @a[0].send(JSON.dump({ message: 'display', content: hash }))
         else
           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", default: "{}", callback: @h['CPEE_CALLBACK']};
 
-          @a[0].send(JSON.dump(hash))
+          @a[0].send(JSON.dump({ message: 'display', content: hash }))
         end
 
         nil
       end
-    end
+    end #}}}
 
-    class NewFrameWait < Riddl::Implementation
+    class NewFrameWait < Riddl::Implementation #{{{NewFrameWait
       def response
         data_dir = @a[1]
         path = File.join(data_dir,@r.last,'frames.json')
@@ -169,7 +173,7 @@ module CPEE
 
           File.write(File.join(data_dir,@r.last,'callback'),@h['CPEE_CALLBACK'])
 
-          @a[0].send(JSON.dump(hash))
+          @a[0].send(JSON.dump({ message: 'display', content: hash }))
         else
           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", default: "{}", callback: @h['CPEE_CALLBACK']};
@@ -177,7 +181,7 @@ module CPEE
           File.write(File.join(data_dir,@r.last,'callback'),@h['CPEE_CALLBACK'])
 
 
-          @a[0].send(JSON.dump(hash))
+          @a[0].send(JSON.dump({ message: 'display', content: hash }))
 
           Typhoeus.put(@h['CPEE_CALLBACK'], body: "No Frame Set")
         end
@@ -187,9 +191,27 @@ module CPEE
       def headers
         Riddl::Header.new('CPEE-CALLBACK', 'true')
       end
-    end
+    end #}}}
 
-    class DeleteFrame < Riddl::Implementation
+    class SendDataToFrame < Riddl::Implementation #{{{NewFrameWait
+      def response
+        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 CPEE::Frames::target?(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))
+            @a[0].send(JSON.dump({ message: 'update', content: { 'callback' => c['callback'], 'data' => @p[5].value.strip == '' ? {} : JSON::parse(@p[5].value) }}))
+          end
+        end
+
+        nil
+      end
+    end #}}}
+
+    class DeleteFrame < Riddl::Implementation #{{{
       def response
         data_dir = @a[1]
         path = File.join(data_dir,@r.last,'frames.json')
@@ -204,9 +226,9 @@ module CPEE
 
         File.write(path, JSON.dump(data_hash))
       end
-    end
+    end #}}}
 
-    class Delete < Riddl::Implementation
+    class Delete < Riddl::Implementation #{{{
       def response
         data_dir = @a[1]
         pp "in delete"
@@ -227,10 +249,10 @@ module CPEE
         # 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')
+        @a[0].send(JSON.dump({ message: 'reset' }))
         nil
       end
-    end
+    end #}}}
 
     class GetFrames < Riddl::Implementation #{{{
       def response
@@ -336,7 +358,7 @@ module CPEE
 
 
 
-          @a[0].send('reset')
+          @a[0].send(JSON.dump({ message: 'reset' }))
           nil
         else
           @status = 404
@@ -388,7 +410,7 @@ module CPEE
           File.write(path, JSON.dump(content['values']))
         end
 
-        @a[0].send(@r[0])
+        @a[0].send(JSON.dump({ message: @r[0] }))
         nil
       end
     end #}}}
@@ -397,7 +419,7 @@ module CPEE
       def onopen
         signals = @a[0]
         signals.add self
-        send 'started'
+        send JSON.dump({ message: 'started' })
         true
       end
 
@@ -412,7 +434,7 @@ module CPEE
       def onopen
         signals = @a[0]
         signals.add self
-        send 'started'
+        send JSON.dump({ message: 'started' })
         true
       end
 
@@ -454,10 +476,10 @@ module CPEE
         parallel do
           loop do
             opts[:signals].each do |k,v|
-              v.send('keepalive')
+              v.send(JSON.dump({ message: 'keepalive' }))
             end
             opts[:signals2].each do |k,v|
-              v.send('keepalive')
+              v.send(JSON.dump({ message: 'keepalive' }))
             end
             sleep 5
           end
@@ -480,6 +502,7 @@ module CPEE
 
             run NewFrameSet, opts[:signals][idx], opts[:data_dir] if put 'sframe'
             run NewFrameWait, opts[:signals][idx], opts[:data_dir] if put 'wframe'
+            run SendDataToFrame, opts[:signals][idx], opts[:data_dir] if put 'uframe'
 
             run DeleteFrame, opts[:signals][idx], opts[:data_dir] if post 'deleteframe'
 

data/lib/cpee-frames/{frames.xml → implementation.xml}

@@ -43,6 +43,14 @@
     <parameter name="urls" type="string"/>
     <parameter name="default" type="string"/>
   </message>
+  <message name="uframe">
+    <parameter name="type" fixed="send"/>
+    <parameter name="lx" type="nonNegativeInteger"/>
+    <parameter name="ly" type="nonNegativeInteger"/>
+    <parameter name="x_amount" type="nonNegativeInteger"/>
+    <parameter name="y_amount" type="nonNegativeInteger"/>
+    <parameter name="default" type="string"/>
+  </message>
   <message name="deleteframe">
     <parameter name="lx" type="string"/>
     <parameter name="ly" type="string"/>
@@ -92,6 +100,8 @@
       <put in='wframe' out="callback"/>
       <!-- Set Frame Data without callback -->
       <put in='sframe'/>
+      <!-- Send Data to existing Frame -->
+      <put in='uframe'/>
 
       <post in='deleteframe'/>
 

data/ui/examples/button.html

@@ -37,6 +37,10 @@
     </style>
     <script>
       // you have access to cpee.data and cpee.callback, because frames.js (remote includable) fills it through postMessage
+
+      document.addEventListener('cpee:message', function (e) {
+        console.log(cpee.data);
+      }, false);
     </script>
 
   </head>

data/ui/js/frames.js

@@ -1,9 +1,10 @@
+var cpee_message = new Event("cpee:message", {"bubbles":true, "cancelable":false});
 var cpee = { data: null, callback: null};
 window.addEventListener("message", (event) => {
   if (/(tum\.de|cpee\.org)$/.test(event.origin)) {
     cpee.data = event.data.data;
     cpee.callback = event.data.callback;
-    $(document).trigger("cpee:message");
+    document.dispatchEvent(cpee_message);
   }
 });
 

data/ui/js/ui.js

@@ -110,27 +110,22 @@ function init() {
     // load
   };
   es.onmessage = function(e) {
-    if (e.data == 'new') {
-      reason = '';
-      showDocument();
+    var notification;
+    try {
+      notification = JSON.parse(e.data);
+    } catch (err) {
+      return;
     }
-    if (e.data == 'reset') {
+    if (notification.message == 'new' || notification.message == 'reset') {
       reason = '';
       showDocument();
-    }
-    else{
-      if(e.data == "update"){
-        alert("update")
-      }
-      if(e.data != "keepalive" && e.data != "started"){
-        try {
-          //alert(e.data)
-          var frd = JSON.parse(e.data)
-          makeFrame(frd.lx,frd.ly,frd.rx,frd.ry, frd.url, frd.callback, frd.default, frd.showbutton, frd.style);
-        }
-        catch (e) {
-        }
-      }
+    } else if (notification.message == 'display') {
+      var frd = notification.content;
+      makeFrame(frd.lx,frd.ly,frd.rx,frd.ry, frd.url, frd.callback, frd.default, frd.showbutton, frd.style);
+    } else if (notification.message == 'update') {
+      var frd = notification.content;
+      iframe = $('iframe[id="' + frd.callback + '"]').get(0);
+      iframe.contentWindow.postMessage({ data: frd.data });
     }
   };
   es.onerror = function() {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee-frames
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Manuell Gall
@@ -52,8 +52,8 @@ files:
 - README.md
 - Rakefile
 - cpee-frames.gemspec
-- lib/cpee-frames/frames.xml
 - lib/cpee-frames/implementation.rb
+- lib/cpee-frames/implementation.xml
 - lib/cpee-frames/ui/template.html
 - lib/cpee-frames/ui/tutorial.html
 - server/frames