nutella_framework 0.6.7 → 0.6.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b009d2b3e95c7adc7eed7433044b9fb7760c4641
-  data.tar.gz: 1b19db1b0a5fad6f938c75022b5c341a1cb13e6e
+  metadata.gz: 5491cc28aa7ac6f8941e7e220ba9a727d426e39a
+  data.tar.gz: 43283252a40fd9b938c2e16d9e9f6f6211962eea
 SHA512:
-  metadata.gz: 457a4dea5e90ef12726ee65d82a66009b8d3636112233c8717a1ed615357220e98e399738ad9488a7fb6d9cf0326baa48d64dd035dab9326ff4d3f1d9506127d
-  data.tar.gz: 3bb8c59a350e51c406a21f19843a09d2dd8896e97ffc0671d5fe37daf0496c6746c935c1d7cc4809be2d1264860857d345739ad478f166cdfc735a49bbb50a20
+  metadata.gz: 4865474d1579f5fb6bb389f309b10c605d50cbc78098df3044d140f0a6d50d2ab59ce2ef66b5727ef75fdfdea8bed32f6e371334f57aee2281737168ca4e03b2
+  data.tar.gz: ff9d12b5d5e69736016cf79cc154013eb25afeb09da631798381883265cc760d7fdf7a4963c95be404ec9759e0404e8980365586b9489e957521805c828902f4

data/Gemfile

@@ -8,7 +8,7 @@ gem 'sinatra-cross_origin', '~> 0.3.2'
 gem 'thin', '~>1.6'
 gem 'nokogiri', '~>1.6'
 gem 'slop', '~>4.0'
-gem 'nutella_lib','~>0.4', '>=0.4.15'
+gem 'nutella_lib','~>0.4', '>=0.4.18'
 gem 'activesupport', '~>4.2'
 gem 'mandrill-api', '~>1.0', '>=1.0.53'
 gem 'bson', '~> 3.0'

data/VERSION

@@ -1 +1 @@
-0.6.7
+0.6.8

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

@@ -174,7 +174,6 @@ nutella.f.net.subscribe_to_all_runs('location/resource/add', lambda do |message,
       end
       publishResourceAdd(app_id, run_id, resources[rid])
       cache.publish_add
-      puts('Added resource')
     end
 
   end
@@ -195,7 +194,6 @@ nutella.f.net.subscribe_to_all_runs('location/resource/remove', lambda do |messa
     resources.delete(rid)
     publishResourceRemove(app_id, run_id, resourceCopy)
     cache.publish_remove
-    puts('Removed resource')
 
   end
 end)
@@ -270,7 +268,7 @@ def updateResource(app_id, run_id, updatedResource)
   if proximity != nil && proximity['rid'] != nil && proximity['distance'] != nil
     baseStation = resources[proximity['rid']]
 
-    if baseStation != nil
+    if baseStation != nil && baseStation['proximity_range'] != nil
 
       if baseStation['proximity_range'] >= proximity['distance']
         if resource['proximity'] != nil && resource['proximity']['rid'] && resource['proximity']['distance']
@@ -358,9 +356,6 @@ def updateResource(app_id, run_id, updatedResource)
       if parameter['delete'] != nil
         ps.delete(parameter['key'])
       else
-        puts "--------"
-        puts parameter['key']
-        puts parameter['value']
         ps[parameter['key']] = parameter['value']
       end
     end
@@ -368,8 +363,6 @@ def updateResource(app_id, run_id, updatedResource)
   end
 
   if type != nil
-    puts 'Update type'
-
     if type == 'STATIC'
       resource['type'] = type
       resource.delete('proximity')
@@ -382,29 +375,18 @@ def updateResource(app_id, run_id, updatedResource)
       resource['type'] = type
       resource.delete('proximity_range')
     end
-
-    puts 'Stored resource'
   end
 
   if proximity_range != nil
-    puts 'Update proximity range'
-
     if resource['type'] == 'STATIC'
       resource['proximity_range']	= proximity_range
     end
-
-    puts 'Stored resource'
-
   end
 
   if proximity == nil && discrete == nil && continuous == nil && parameters == nil
-
     resource.delete('proximity')
     resource.delete('continuous')
     resource.delete('discrete')
-
-    puts 'Stored resource'
-
   end
 
   resources[rid]=resource
@@ -418,8 +400,6 @@ nutella.f.net.handle_requests_on_all_runs('location/resources', lambda do |reque
   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')
 
-  puts 'Send list of resources'
-
 	rid = request['rid']
 	group = request['group']
 	reply = nil
@@ -476,7 +456,6 @@ nutella.f.net.subscribe_to_all_runs('location/room/update', lambda do |message,
     r['y'] = y
 
     publishRoomUpdate(app_id, run_id, r)
-    puts 'Room updated'
   end
 end)
 
@@ -488,27 +467,18 @@ def computeResourceUpdate(app_id, run_id, rid)
 
   if resource != nil
     if resource['proximity'] != nil
-      puts 'Proximity resource detected: take coordinates base station'
-
       if resource['proximity']['rid'] != nil
-        puts 'Search for base station ' + resource['proximity']['rid']
         baseStation = resources[resource['proximity']['rid']]
 
         if baseStation != nil && baseStation['continuous'] != nil
-          puts 'Copy continuous position base station'
           resource['proximity']['continuous'] = baseStation['continuous']
 
           # Update basic station
           computeResourceUpdate(app_id, run_id, resource['proximity']['rid'])
-        else
-          puts 'Continuous position not present'
         end
 
         if baseStation != nil && baseStation['discrete'] != nil
-          puts 'Copy discrete position base station'
           resource['proximity']['discrete'] = baseStation['discrete']
-        else
-          puts 'Discrete position not present'
         end
       end
     end
@@ -539,7 +509,6 @@ def computeResourceUpdate(app_id, run_id, rid)
 
     # Send update
     publishResourceUpdate(app_id, run_id, resource)
-    puts 'Sent update'
 
   end
 end
@@ -702,7 +671,6 @@ end
 # Request the size of the room
 nutella.f.net.handle_requests_on_all_runs('location/room', lambda do |request, app_id, run_id, from|
   room = nutella.f.persist.get_run_mongo_object_store(app_id, run_id, 'room')
-	puts 'Send the room dimension'
 
 	r = {}
 
@@ -726,8 +694,6 @@ nutella.f.net.handle_requests_on_all_runs('location/tracking/discrete', lambda d
 
   discrete_tracking = nutella.f.persist.get_run_mongo_object_store(app_id, run_id, 'discrete_tracking')
 
-  puts 'Send the discrete tracking system'
-
   x = discrete_tracking['x']
   y = discrete_tracking['y']
   width = discrete_tracking['width']
@@ -754,8 +720,6 @@ nutella.f.net.handle_requests_on_all_runs('location/tracking/discrete', lambda d
   end
 end)
 
-puts 'Initialization completed'
-
 # Routine that delete old proximity beacons
 
 while sleep 0.5
@@ -767,14 +731,13 @@ while sleep 0.5
 
       resources.to_h.each do |_, resource|
         if resource['proximity'] != nil && resource['proximity']['timestamp'] != nil
-          if Time.now.to_f - resource['proximity']['timestamp'] > 3.0
+          if Time.now.to_f - resource['proximity']['timestamp'] > 5.0
             if resource['proximity']['rid'] != nil
               baseStations.push(resource['proximity']['rid'])
               publishResourceExit(app_id, run_id, resource, resource['proximity']['rid'])
             end
             resource['proximity'] = {}
             resources[resource['rid']] = resource
-            puts 'Delete proximity resource'
             publishResourceUpdate(app_id, run_id, resource)
           end
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nutella_framework
 version: !ruby/object:Gem::Version
-  version: 0.6.7
+  version: 0.6.8
 platform: ruby
 authors:
 - Alessandro Gnoli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-29 00:00:00.000000000 Z
+date: 2015-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: semantic
@@ -128,7 +128,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.15
+        version: 0.4.18
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
@@ -138,7 +138,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.15
+        version: 0.4.18
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'