nutella_framework 0.4.32 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be135400997f7f94dfce9f9d0184d2b25d02ae23
-  data.tar.gz: 0ba0e88dfe8106b071684562dfe4790d4955afd8
+  metadata.gz: 2ef5bfa3f250eb7387b0c0aa1b645a29e9269ec2
+  data.tar.gz: 8c5a6aac1655df59b14bfb8a8eb756c2811351b7
 SHA512:
-  metadata.gz: 70844abe9533e6549ab92b4f976b0d4b11bfc588863e1b40ac498f747881c98f9250722c3c8bc4989a5bb379b07967dd73d085310e84543192b88f6561647416
-  data.tar.gz: faea3dbf863456f1e38c11c19ccb7c8717506adc78ce1b46df7855f4c9992f8659c6fc0cd966674b5cd8a69df881c6f6621d74c719e4293419d9f055440c8b85
+  metadata.gz: 604a3233a279edc399a524fde062ed92159f21ee476a1537ec7b805788b1dde9aa99a857324aec8721b499bae811f3f2346dc76b32f4aef035eaeef75e6f1574
+  data.tar.gz: ab5eacb5ed237a5e52fd1b2ebfedb1397f6fc652f9a3417b92f76079239259c8c603eea3ff113b15bf8caee56b74fa155916c6b2b5a99564e0cbe0398733d5d0

data/VERSION

@@ -1 +1 @@
-0.4.32
+0.5.0

data/framework_components/room-debugger/main.js

@@ -64,7 +64,10 @@ $("#request_frm").submit(function(e) {
     e.preventDefault();
     var inputs = $('#request_frm :input');
     nutella.net.request(inputs[0].value, inputs[1].value, function(res){
-        $("#response").text(res);
+        if (typeof res === 'object')
+            $("#response").text(JSON.stringify(res));
+        else
+            $("#response").text(res);
     });
 });
 

data/framework_components/room-debugger/room_places_simulator.js

@@ -25,7 +25,7 @@ RoomPlacesSimulator.prototype.start = function() {
             if(Math.random()>0.93) {
                 e.l = hotspots[Math.floor(Math.random()*hotspots.length)];
                 e.d = this.distance -0.1 + Math.random()*0.2;
-                console.log(e.b + " moved to " + e.l);
+                //console.log(e.b + " moved to " + e.l);
             }
             if (e.l != 'none')
                 this.publishLocation(e);
@@ -46,6 +46,7 @@ RoomPlacesSimulator.prototype.setHotspots = function(hotspots) {
 };
 
 RoomPlacesSimulator.prototype.setBeacons = function(beacons) {
+    this.beacons = [];
     beacons.forEach((function(e){
         this.beacons.push({b: e, l: 'none'});
     }).bind(this));

data/framework_components/room-places-bot/room_places_bot.rb

@@ -14,7 +14,12 @@ nutella.f.init(Nutella.config['broker'], 'room_places_bot')
 # Buffer object that caches all the updates
 class RoomPlacesCachePublish
 
-  def initialize
+  @@cache_list = {}
+
+  def initialize(app_id, run_id)
+    @app_id = app_id
+    @run_id = run_id
+
     @resource_updated = {}
     @resource_added = []
     @resource_removed = []
@@ -72,54 +77,59 @@ class RoomPlacesCachePublish
     }
   end
 
-  def publish_update(app_id, run_id)
+  def publish_update()
     @s6.synchronize {
       if @resource_updated.length > 0
-        nutella.f.net.publish_to_run(app_id, run_id, 'location/resources/updated', {:resources => @resource_updated.values})
+        nutella.f.net.publish_to_run(@app_id, @run_id, 'location/resources/updated', {:resources => @resource_updated.values})
         @resource_updated = {}
       end
     }
   end
 
-  def publish_add(app_id, run_id)
+  def publish_add()
     @s7.synchronize {
       if @resource_added.length > 0
-        nutella.f.net.publish_to_run(app_id, run_id, 'location/resources/added', {:resources => @resource_added})
+        nutella.f.net.publish_to_run(@app_id, @run_id, 'location/resources/added', {:resources => @resource_added})
         @resource_added = []
       end
     }
   end
 
-  def publish_remove(app_id, run_id)
+  def publish_remove()
     @s8.synchronize {
       if @resource_removed.length > 0
-        nutella.f.net.publish_to_run(app_id, run_id, 'location/resources/removed', {:resources => @resource_removed})
+        nutella.f.net.publish_to_run(@app_id, @run_id, 'location/resources/removed', {:resources => @resource_removed})
         @resource_removed = []
       end
     }
   end
 
-  def publish_enter(app_id, run_id)
+  def publish_enter()
     @s9.synchronize {
       @resource_entered.each do |baseStationRid, resources|
-        nutella.f.net.publish_to_run(app_id, run_id, "location/resource/static/#{baseStationRid}/enter", {'resources' => resources})
+        nutella.f.net.publish_to_run(@app_id, @run_id, "location/resource/static/#{baseStationRid}/enter", {'resources' => resources})
       end
       @resource_entered = {}
     }
   end
 
-  def publish_exit(app_id, run_id)
+  def publish_exit()
     @s10.synchronize {
       @resource_exited.each do |baseStationRid, resources|
-        nutella.f.net.publish_to_run(app_id, run_id, "location/resource/static/#{baseStationRid}/exit", {'resources' => resources})
+        nutella.f.net.publish_to_run(@app_id, @run_id, "location/resource/static/#{baseStationRid}/exit", {'resources' => resources})
       end
       @resource_exited = {}
     }
   end
 
-end
+  def self.get_cache(app_id, run_id)
+    unless @@cache_list.has_key? [app_id, run_id]
+      @@cache_list[[app_id, run_id]] = RoomPlacesCachePublish.new(app_id, run_id)
+    end
+    @@cache_list[[app_id, run_id]]
+  end
 
-$cache = RoomPlacesCachePublish.new
+end
 
 puts 'Room places initialization'
 
@@ -134,6 +144,9 @@ nutella.f.net.subscribe_to_all_runs('location/resource/add', lambda do |message,
   # Persistent data
   resources = nutella.f.persist.get_run_mongo_object_store(app_id, run_id, 'resources')
 
+  # Cache
+  cache = RoomPlacesCachePublish.get_cache(app_id, run_id)
+
   rid = message['rid']
   type = message['type']
   model = message['model']
@@ -159,8 +172,8 @@ nutella.f.net.subscribe_to_all_runs('location/resource/add', lambda do |message,
             :parameters => {}
           }
       end
-      publishResourceAdd(resources[rid])
-      $cache.publish_add(app_id, run_id)
+      publishResourceAdd(app_id, run_id, resources[rid])
+      cache.publish_add
       puts('Added resource')
     end
 
@@ -169,15 +182,19 @@ end)
 
 # Remove resource
 nutella.f.net.subscribe_to_all_runs('location/resource/remove', lambda do |message, app_id, run_id, from|
+  # Persistent data
   resources = nutella.f.persist.get_run_mongo_object_store(app_id, run_id, 'resources')
 
+  # Cache
+  cache = RoomPlacesCachePublish.get_cache(app_id, run_id)
+
   rid = message['rid']
   if rid != nil
 
     resourceCopy = resources[rid]
     resources.delete(rid)
-    publishResourceRemove(resourceCopy)
-    $cache.publish_remove(app_id, run_id)
+    publishResourceRemove(app_id, run_id, resourceCopy)
+    cache.publish_remove
     puts('Removed resource')
 
   end
@@ -186,28 +203,35 @@ end)
 
 # Update the location of the resources
 nutella.f.net.subscribe_to_all_runs('location/resource/update', lambda do |message, app_id, run_id, from|
+  # Cache
+  cache = RoomPlacesCachePublish.get_cache(app_id, run_id)
+
   updateResource(app_id, run_id, message)
 
-  $cache.publish_update(app_id, run_id)
-  $cache.publish_exit(app_id, run_id)
-  $cache.publish_enter(app_id, run_id)
+  cache.publish_update(app_id, run_id)
+  cache.publish_exit(app_id, run_id)
+  cache.publish_enter(app_id, run_id)
 end)
 
 # Update the location of the resources
 nutella.f.net.subscribe_to_all_runs('location/resources/update', lambda do |message, app_id, run_id, from|
-    resources = message['resources']
-    if resources != nil
-      resources.each do |resource|
-        updateResource(app_id, run_id, resource)
-      end
+  # Cache
+  cache = RoomPlacesCachePublish.get_cache(app_id, run_id)
+
+  resources = message['resources']
+  if resources != nil
+    resources.each do |resource|
+      updateResource(app_id, run_id, resource)
     end
+  end
 
-    $cache.publish_update(app_id, run_id)
-    $cache.publish_exit(app_id, run_id)
-    $cache.publish_enter(app_id, run_id)
-  end)
+  cache.publish_update
+  cache.publish_exit
+  cache.publish_enter
+end)
 
 def updateResource(app_id, run_id, updatedResource)
+  # Persistent data
   resources = nutella.f.persist.get_run_mongo_object_store(app_id, run_id, 'resources')
   room = nutella.f.persist.get_run_mongo_object_store(app_id, run_id, 'room')
   discrete_tracking = nutella.f.persist.get_run_mongo_object_store(app_id, run_id, 'discrete_tracking')
@@ -254,8 +278,8 @@ def updateResource(app_id, run_id, updatedResource)
           if resource['proximity']['rid'] != proximity['rid']
             resource['proximity'] = proximity
             resource['proximity']['timestamp'] = Time.now.to_f
-            publishResourceExit(resource, oldBaseStationRid)
-            publishResourceEnter(resource, resource['proximity']['rid'])
+            publishResourceExit(app_id, run_id, resource, oldBaseStationRid)
+            publishResourceEnter(app_id, run_id, resource, resource['proximity']['rid'])
           else
             resource['proximity'] = proximity
             resource['proximity']['timestamp'] = Time.now.to_f
@@ -264,7 +288,7 @@ def updateResource(app_id, run_id, updatedResource)
         else
           resource['proximity'] = proximity
           resource['proximity']['timestamp'] = Time.now.to_f
-          publishResourceEnter(resource, resource['proximity']['rid'])
+          publishResourceEnter(app_id, run_id, resource, resource['proximity']['rid'])
         end
       end
     end
@@ -390,6 +414,7 @@ end
 
 # Request the position of a single resource
 nutella.f.net.handle_requests_on_all_runs('location/resources', lambda do |request, app_id, run_id, from|
+  # Persistent data
   resources = nutella.f.persist.get_run_mongo_object_store(app_id, run_id, 'resources')
   groups = nutella.f.persist.get_run_mongo_object_store(app_id, run_id, 'groups')
 
@@ -436,11 +461,11 @@ end)
 
 # Update the room size
 nutella.f.net.subscribe_to_all_runs('location/room/update', lambda do |message, app_id, run_id, from|
+  # Persistent data
   room = nutella.f.persist.get_run_mongo_object_store(app_id, run_id, 'room')
 
   x = message['x']
   y = message['y']
-  z = message['z']
 
   if x != nil && y != nil
     r = {}
@@ -450,11 +475,6 @@ nutella.f.net.subscribe_to_all_runs('location/room/update', lambda do |message,
     room['y'] = y
     r['y'] = y
 
-    if z != nil
-      room['z'] = z
-      r['z'] = z
-    end
-
     publishRoomUpdate(app_id, run_id, r)
     puts 'Room updated'
   end
@@ -464,8 +484,6 @@ end)
 def computeResourceUpdate(app_id, run_id, rid)
   resources = nutella.f.persist.get_run_mongo_object_store(app_id, run_id, 'resources')
 
-  resource = nil
-
   resource = resources[rid]
 
   if resource != nil
@@ -474,7 +492,6 @@ def computeResourceUpdate(app_id, run_id, rid)
 
       if resource['proximity']['rid'] != nil
         puts 'Search for base station ' + resource['proximity']['rid']
-        baseStation = nil
         baseStation = resources[resource['proximity']['rid']]
 
         if baseStation != nil && baseStation['continuous'] != nil
@@ -521,7 +538,7 @@ def computeResourceUpdate(app_id, run_id, rid)
     end
 
     # Send update
-    publishResourceUpdate(resource)
+    publishResourceUpdate(app_id, run_id, resource)
     puts 'Sent update'
 
   end
@@ -584,20 +601,29 @@ end)
 
 
 # Publish an added resource
-def publishResourceAdd(resource)
-  $cache.resources_add([resource])
+def publishResourceAdd(app_id, run_id, resource)
+  # Cache
+  cache = RoomPlacesCachePublish.get_cache(app_id, run_id)
+
+  cache.resources_add([resource])
 	#nutella.net.publish('location/resources/added', {:resources => [resource]})
 end
 
 # Publish a removed resource
-def publishResourceRemove(resource)
-  $cache.resources_remove([resource])
+def publishResourceRemove(app_id, run_id, resource)
+  # Cache
+  cache = RoomPlacesCachePublish.get_cache(app_id, run_id)
+
+  cache.resources_remove([resource])
 	#nutella.net.publish('location/resources/removed', {:resources => [resource]})
 end
 
 # Publish an updated resource
-def publishResourceUpdate(resource)
-  $cache.resources_update([resource])
+def publishResourceUpdate(app_id, run_id, resource)
+  # Cache
+  cache = RoomPlacesCachePublish.get_cache(app_id, run_id)
+
+  cache.resources_update([resource])
 	#nutella.net.publish('location/resources/updated', {:resources => [resource]})
 end
 
@@ -607,27 +633,29 @@ def publishRoomUpdate(app_id, run_id, room)
 end
 
 # Publish resources enter base station proximity area
-def publishResourcesEnter(resources, baseStationRid)
-  #message = {:resources => resources}
-  #nutella.net.publish("location/resource/static/#{baseStationRid}/enter", message)
-  $cache.resources_enter(resources, baseStationRid)
+def publishResourcesEnter(app_id, run_id, resources, baseStationRid)
+  # Cache
+  cache = RoomPlacesCachePublish.get_cache(app_id, run_id)
+
+  cache.resources_enter(resources, baseStationRid)
 end
 
 # Publish resources exit base station proximity area
-def publishResourcesExit(resources, baseStationRid)
-  #message = {:resources => resources}
-  #nutella.net.publish("location/resource/static/#{baseStationRid}/exit", message)
-  $cache.resources_exit(resources, baseStationRid)
+def publishResourcesExit(app_id, run_id, resources, baseStationRid)
+  # Cache
+  cache = RoomPlacesCachePublish.get_cache(app_id, run_id)
+
+  cache.resources_exit(resources, baseStationRid)
 end
 
 # Publish resource enter base station proximity area
-def publishResourceEnter(resource, baseStationRid)
-  publishResourcesEnter([resource], baseStationRid)
+def publishResourceEnter(app_id, run_id, resource, baseStationRid)
+  publishResourcesEnter(app_id, run_id, [resource], baseStationRid)
 end
 
 # Publish resource enter base station proximity area
-def publishResourceExit(resource, baseStationRid)
-  publishResourcesExit([resource], baseStationRid)
+def publishResourceExit(app_id, run_id, resource, baseStationRid)
+  publishResourcesExit(app_id, run_id, [resource], baseStationRid)
 end
 
 # Publish tracking system update
@@ -743,12 +771,12 @@ while sleep 0.5
           if Time.now.to_f - resource['proximity']['timestamp'] > 3.0
             if resource['proximity']['rid'] != nil
               baseStations.push(resource['proximity']['rid'])
-              publishResourceExit(resource, resource['proximity']['rid'])
+              publishResourceExit(app_id, run_id, resource, resource['proximity']['rid'])
             end
             resource['proximity'] = {}
             resources[resource['rid']] = resource
             puts 'Delete proximity resource'
-            publishResourceUpdate(resource)
+            publishResourceUpdate(app_id, run_id, resource)
           end
         end
       end
@@ -758,9 +786,12 @@ while sleep 0.5
         computeResourceUpdate(app_id, run_id, baseStation)
       end
 
-      $cache.publish_update(app_id, run_id)
-      $cache.publish_exit(app_id, run_id)
-      $cache.publish_enter(app_id, run_id)
+      # Cache
+      cache = RoomPlacesCachePublish.get_cache(app_id, run_id)
+
+      cache.publish_update
+      cache.publish_exit
+      cache.publish_enter
     end
   end
 

data/nutella_framework.gemspec

@@ -2,11 +2,11 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: nutella_framework 0.4.31 ruby lib
+# stub: nutella_framework 0.5.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "nutella_framework"
-  s.version = "0.4.31"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
@@ -27,7 +27,6 @@ Gem::Specification.new do |s|
     "README.md",
     "Rakefile",
     "VERSION",
-    "VERSION.orig",
     "bin/nutella",
     "data/index.html",
     "data/startup",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nutella_framework
 version: !ruby/object:Gem::Version
-  version: 0.4.32
+  version: 0.5.0
 platform: ruby
 authors:
 - Alessandro Gnoli