foreign_office 0.15.10 → 0.15.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 41ae26382de688baf1b41116375fbe87089f9c09
-  data.tar.gz: 3c4e36de4d98efcd857d43b8302f2c61138b89bd
+  metadata.gz: 7f8762a300288dfafad5cd1c5ce761d831f31e20
+  data.tar.gz: 0bf98d391c89d944c27e04c960114df8f10af5a2
 SHA512:
-  metadata.gz: cbbbd265379d9b2d179aa7489aeb971c5e4f7ecfe0eba8c7ea920a4729538405a157bde0677129bb245ba218b8b98e823baed24b2ac706aaedcfacdcfe05ae4a
-  data.tar.gz: cdce665b19bc083eff699169a1caddcfad53c01f33796851c17622c3ba3c8c6e5b359f8c8933ed0fef4b6219331fe2700edce829d8ee5b2c32f862a5813b1796
+  metadata.gz: 751dca65d0d5b78cd39efcdbb18617905e31d18be32e685b0b4d2bf8bd5669fc46068efbcff1cc34ff62cc3d291d32f689d68a90a536c6f5b854152268eb3527
+  data.tar.gz: 8f2f1dc2b2d5a871792ef6146c0764c004b81da88f1854388dbf0c3a38bd0dc9ef20adedfdef3ecd4a4e0c1c1db6277e279a9b259536bc7cb39c21ad184dc9ab

data/app/assets/javascripts/debug_logger.js

@@ -7,12 +7,22 @@ var DebugLogger = Class.extend({
     if($debug_settings.data('logging_on')){
       console.log('Debug logging turned on.')
       this.logging_on = true;
+      this.logger_level = $debug_settings.data('logger_level') || 1;
+      this.allows = $debug_settings.data('logger_include');
     } else {
       this.logging_on = false;
     }
   },
-  log: function(msg){
-    if(this.logging_on){
+  log: function(msg, level, source){
+    if(level === undefined){
+      level = 0;
+    }
+    if(source === undefined || this.allows === undefined){
+      source_allowed = true;
+    }else{
+      source_allowed = this.allows[source];
+    }
+    if(this.logging_on && this.logger_level >= level && source_allowed){
       console.log(msg)
     }
   }

data/app/assets/javascripts/foreign_office.js

@@ -10,9 +10,9 @@ var ForeignOffice = Class.extend({
     this.session_id = $('meta[name="client_id"]').attr('content')
   },
   config: function(config){
-    debug_logger.log("Using Foreign Office js config:")
-    debug_logger.log(config);
-    bus_class = eval(config.bus_name);
+    debug_logger.log("Using Foreign Office js config:", 1, 'foreign-office')
+    debug_logger.log(config, 1, 'foreign-office');
+    bus_class = eval(config.bus_name, 1);
 
     try {
       bus_class_name = bus_class.third_party_library
@@ -23,7 +23,7 @@ var ForeignOffice = Class.extend({
       bus_class_name = 'TestBus'
       bus_class = TestBus
     }
-    debug_logger.log("Connecting to message bus using " + bus_class_name)
+    debug_logger.log("Connecting to message bus using " + bus_class_name, 1, 'foreign-office')
     this.bus = new bus_class(config);
     if(typeof config.disconnect_alert != 'undefined'){
       this.disconnect_alert = config.disconnect_alert
@@ -87,8 +87,8 @@ foreign_office = new ForeignOffice();
 var ForeignOfficeChannel = Class.extend({
   init: function(channel_name){
     var foreign_office_channel = this;
-    debug_logger.log("Subscribing to: ");
-    debug_logger.log(channel_name);
+    debug_logger.log("Subscribing to: ", 1, 'foreign-office');
+    debug_logger.log(channel_name, 1, 'foreign-office');
     foreign_office.bus.subscribe({
       channel : channel_name,
       //If the bus binds the callback to the channel object...
@@ -100,11 +100,11 @@ var ForeignOfficeChannel = Class.extend({
     this.listeners = [];
   },
   handleMessage: function(m){
-    debug_logger.log("Got a message: ");
-    debug_logger.log(m);
+    debug_logger.log("Got a message: ", 1, 'foreign-office');
+    debug_logger.log(m, 1, 'foreign-office');
     $.each(this.listeners,function(i,listener){
-      debug_logger.log("sending message to listener: ");
-      debug_logger.log(listener);
+      debug_logger.log("sending message to listener: ", 1, 'foreign-office');
+      debug_logger.log(listener, 1, 'foreign-office');
       listener.handleMessage(m);
     })
   },

data/app/assets/javascripts/pubnub_bus.js

@@ -1,7 +1,7 @@
 var PubnubBus = Class.extend({
   init: function(config){
     var pubnubbus = this
-    debug_logger.log("initializing pubnub js with client id: " + foreign_office.session_id)
+    debug_logger.log("initializing pubnub js with client id: " + foreign_office.session_id, 1, 'foreign-office')
     this.pubnub = new PubNub({
       publish_key   : config.publish_key,
       subscribe_key : config.subscribe_key,
@@ -9,7 +9,7 @@ var PubnubBus = Class.extend({
       uuid          : foreign_office.session_id
     });
     window.onbeforeunload = function (e) {
-      debug_logger.log("about to unload page")
+      debug_logger.log("about to unload page", 1, 'foreign-office')
       pubnubbus.unsubscribe()
     };
     this.pubnub.addListener({
@@ -17,8 +17,8 @@ var PubnubBus = Class.extend({
         foreign_office.handleMessage(m)
       },
       status: function(s){
-        debug_logger.log("Foreign Office PubnubBus:")
-        debug_logger.log(s)
+        debug_logger.log("Foreign Office PubnubBus:", 1, 'foreign-office')
+        debug_logger.log(s, 1, 'foreign-office')
         if( s.operation === 'PNUnsubscribeOperation' ||
             s.operation === 'PNSubscribeOperation'){return}
 
@@ -26,28 +26,28 @@ var PubnubBus = Class.extend({
             s.category === 'PNUnexpectedDisconnectCategory' ||
             s.category === 'PNNetworkIssuesCategory' ||
             s.category === 'PNNetworkDownCategory'){
-          debug_logger.log("Network disconnected.")
-          foreign_office.disconnection(); debug_logger.log('Lost connection to: '); debug_logger.log(subscription.channel)
+          debug_logger.log("Network disconnected.", 1, 'foreign-office')
+          foreign_office.disconnection(); debug_logger.log('Lost connection to: ', 1, 'foreign-office'); debug_logger.log(subscription.channel, 1, 'foreign-office')
         }
         if( s.category === 'PNReconnectedCategory' ||
             s.category === 'PNNetworkUpCategory'){
-          foreign_office.reconnection(); debug_logger.log('Reestablished connection to: '); debug_logger.log(subscription.channel)
+          foreign_office.reconnection(); debug_logger.log('Reestablished connection to: ', 1, 'foreign-office'); debug_logger.log(subscription.channel, 1, 'foreign-office')
         }
         if(s.category === 'PNConnectedCategory'){
-          foreign_office.connect(); debug_logger.log("Connected to: "); debug_logger.log(subscription.channel)
+          foreign_office.connect(); debug_logger.log("Connected to: ", 1, 'foreign-office'); debug_logger.log(subscription.channel, 1, 'foreign-office')
         }
       }
     });
   },
   subscribe: function(subscription){
-    debug_logger.log("subscribing with PubnubBus")
-    debug_logger.log(subscription)
+    debug_logger.log("subscribing with PubnubBus", 1, 'foreign-office')
+    debug_logger.log(subscription, 1, 'foreign-office')
     this.pubnub.subscribe({
       channels : [subscription.channel]
     });
   },
   unsubscribe: function(){
-    debug_logger.log("unsubscribing all pubnub channels")
+    debug_logger.log("unsubscribing all pubnub channels", 1, 'foreign-office')
     this.pubnub.unsubscribeAll();
   }
 })

data/lib/foreign_office/version.rb

@@ -1,3 +1,3 @@
 module ForeignOffice
-  VERSION = "0.15.10"
+  VERSION = "0.15.11"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreign_office
 version: !ruby/object:Gem::Version
-  version: 0.15.10
+  version: 0.15.11
 platform: ruby
 authors:
 - Eric Draut
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-07 00:00:00.000000000 Z
+date: 2018-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -129,8 +129,6 @@ files:
 - test/dummy/config/locales/en.yml
 - test/dummy/config/routes.rb
 - test/dummy/config/secrets.yml
-- test/dummy/db/test.sqlite3
-- test/dummy/log/test.log
 - test/dummy/public/404.html
 - test/dummy/public/422.html
 - test/dummy/public/500.html
@@ -157,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: A light framework that provides functionality for listeners on web clients
@@ -191,8 +189,6 @@ test_files:
 - test/dummy/config/routes.rb
 - test/dummy/config/secrets.yml
 - test/dummy/config.ru
-- test/dummy/db/test.sqlite3
-- test/dummy/log/test.log
 - test/dummy/public/404.html
 - test/dummy/public/422.html
 - test/dummy/public/500.html

data/test/dummy/log/test.log

@@ -1,33 +0,0 @@
-ForeignOffice.publish: {:channel=>"TestMe", :object=>{:this=>"is a test"}}
-ForeignOffice.publish: {:channel=>"TestMe", :object=>{:this=>"is another test"}}
-ForeignOffice.publish: {:channel=>"TestMe", :object=>{:this=>"is a test"}}
-ForeignOffice.publish: {:channel=>"TestMeAgain", :object=>{:this=>"is another test"}}
-ForeignOffice.publish: {:channel=>"TestMe", :object=>{:this=>"is a test"}}
-ForeignOffice.publish: {:channel=>"TestMeAgain", :object=>{:this=>"is another test"}}
-ForeignOffice#publish! attempt: 1 message: {:channel=>"TestMe", :object=>{:this=>"is a test"}}
-ForeignOffice#publish! attempt: 1 message: {:channel=>"TestMeAgain", :object=>{:this=>"is another test"}}
-ForeignOffice.publish: {:channel=>"TestMe", :object=>{:this=>"is a test"}}
-ForeignOffice#publish! attempt: 1 message: {:channel=>"TestMe", :object=>{:this=>"is a test"}}
-ForeignOffice.publish: {:channel=>"TestMe", :object=>{:this=>"is a test"}}
-ForeignOffice.publish: {:channel=>"TestMe", :object=>{:this=>"is a test"}}
-ForeignOffice.publish: {:channel=>"TestMe", :object=>{:this=>"is a test"}}
-ForeignOffice.publish: {:channel=>"TestMeAgain", :object=>{:this=>"is another test"}}
-ForeignOffice.publish: {:channel=>"TestMe", :object=>{:this=>"is a test"}}
-ForeignOffice.publish: {:channel=>"TestMe", :object=>{:this=>"is another test"}}
-ForeignOffice.publish: {:channel=>"TestMe", :object=>{:this=>"is a test"}}
-ForeignOffice.publish: {:channel=>"TestMeAgain", :object=>{:this=>"is another test"}}
-ForeignOffice#publish! attempt: 1 message: {:channel=>"TestMe", :object=>{:this=>"is a test"}}
-ForeignOffice#publish! attempt: 1 message: {:channel=>"TestMeAgain", :object=>{:this=>"is another test"}}
-ForeignOffice.publish: {:channel=>"TestMe", :object=>{:this=>"is a test"}}
-ForeignOffice#publish! attempt: 1 message: {:channel=>"TestMe", :object=>{:this=>"is a test"}}
-ForeignOffice.publish: {:channel=>"TestMe", :object=>{:this=>"is a test"}}
-ForeignOffice#publish! attempt: 1 message: {:channel=>"TestMe", :object=>{:this=>"is a test"}}
-ForeignOffice.publish: {:channel=>"TestMe", :object=>{:this=>"is a test"}}
-ForeignOffice.publish: {:channel=>"TestMe", :object=>{:this=>"is a test"}}
-ForeignOffice.publish: {:channel=>"TestMeAgain", :object=>{:this=>"is another test"}}
-ForeignOffice.publish: {:channel=>"TestMe", :object=>{:this=>"is a test"}}
-ForeignOffice.publish: {:channel=>"TestMe", :object=>{:this=>"is another test"}}
-ForeignOffice.publish: {:channel=>"TestMe", :object=>{:this=>"is a test"}}
-ForeignOffice.publish: {:channel=>"TestMeAgain", :object=>{:this=>"is another test"}}
-ForeignOffice#publish! attempt: 1 message: {:channel=>"TestMe", :object=>{:this=>"is a test"}}
-ForeignOffice#publish! attempt: 1 message: {:channel=>"TestMeAgain", :object=>{:this=>"is another test"}}