message_bus 0.9.4 → 0.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd00357fe6b7e4663c46c3c34c74a5d8529433c5
-  data.tar.gz: df3641a9d63749c6035ecd0b45d656bd53361e4d
+  metadata.gz: f276c95da4b72d4c4ed5710fd1af3883116ee77a
+  data.tar.gz: ace4ed261e91e1efa464c4a30eec2ffed0a05291
 SHA512:
-  metadata.gz: c08c802702acc7c30db0c3ebfb1c0949644553b7fc6a63330a8f260d414a350e94c2fb40143bd3956a068eda1a8e764e3fc3f858568bedb5075d25d82392185d
-  data.tar.gz: 41c4d7584df49be995a21495841d63d65998aab5582c5ec6987fc620f86b995cc632e505fa641558c15568d8e6545075d075f4eec1c6501ad21fc4563220dc99
+  metadata.gz: fe593ca357284143f1ab125a4dea02eb8060414830f8b613e2cabca8bbbdfb4746c9a9df83529d318bf233b00bc84d297d191e0185dbd4782d1cf7388e40cf8b
+  data.tar.gz: 0af4fe02cd3479d72285b6e3b7d6f937279c6defc02a4bcf0603a2e832ee240da78e12c4d8ccf08fa5ff54a7e0799dda5d6a72ea9a18829e4ca82b8e6611016f

data/.travis.yml

@@ -2,6 +2,7 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
+  - 2.1.2
 gemfile:
   - Gemfile
 services:

data/CHANGELOG

@@ -1,3 +1,7 @@
+11-08-2014
+- Version 0.9.5
+- Fix: release db connection a lot earlier for long polling (rails defer closes)
+
 13-01-2014
 - Version 0.9.4
 - Added support for /global/ channel to publish messages across a multisite

data/README.md

@@ -91,7 +91,7 @@ MessageBus.start(); // call once at startup
 MessageBus.callbackInterval = 500;
 MessageBus.subscribe("/channel", function(data){
   // data shipped from server
-}
+});
 
 
 ```

data/assets/message-bus.js

@@ -60,8 +60,8 @@ window.MessageBus = (function() {
 
       var toElement = originalEvent.toElement;
 
-      // If it’s a `{focusin,focusout}` event (IE), `fromElement` and `toElement`
-      // should both be `null` or `undefined`; else, the page visibility hasn’t
+      // If it's a `{focusin,focusout}` event (IE), `fromElement` and `toElement`
+      // should both be `null` or `undefined`; else, the page visibility hasn't
       // changed, but the user just clicked somewhere in the doc. In IE9, we need
       // to check the `relatedTarget` property instead.
       if (
@@ -109,7 +109,7 @@ window.MessageBus = (function() {
     lastAjax = new Date();
     totalAjaxCalls += 1;
 
-    return $.ajax(baseUrl + "message-bus/" + clientId + "/poll?" + (!shouldLongPoll() || !me.enableLongPolling ? "dlp=t" : ""), {
+    return $.ajax(me.baseUrl + "message-bus/" + me.clientId + "/poll?" + (!shouldLongPoll() || !me.enableLongPolling ? "dlp=t" : ""), {
       data: data,
       cache: false,
       dataType: 'json',

data/lib/message_bus/rack/middleware.rb

@@ -73,6 +73,9 @@ class MessageBus::Rack::Middleware
     group_ids = @bus.group_ids_lookup.call(env) if @bus.group_ids_lookup
     site_id = @bus.site_id_lookup.call(env) if @bus.site_id_lookup
 
+    # close db connection as early as possible
+    close_db_connection!
+
     client = MessageBus::Client.new(message_bus: @bus, client_id: client_id, user_id: user_id, site_id: site_id, group_ids: group_ids)
 
     request = Rack::Request.new(env)
@@ -124,6 +127,16 @@ class MessageBus::Rack::Middleware
     end
   end
 
+  def close_db_connection!
+    # IMPORTANT
+    # ConnectionManagement in Rails puts a BodyProxy around stuff
+    #  this means connections are not returned until rack.async is
+    #  closed
+    if defined? ActiveRecord::Base.clear_active_connections!
+      ActiveRecord::Base.clear_active_connections!
+    end
+  end
+
   def ensure_reactor
     # ensure reactor is running
     if EM.reactor_pid != Process.pid

data/lib/message_bus/rails/railtie.rb

@@ -6,7 +6,14 @@ class MessageBus::Rails::Engine < ::Rails::Engine; end
 class MessageBus::Rails::Railtie < ::Rails::Railtie
   initializer "message_bus.configure_init" do |app|
     MessageBus::MessageHandler.load_handlers("#{Rails.root}/app/message_handlers")
-    app.middleware.insert_after(ActiveRecord::QueryCache, MessageBus::Rack::Middleware)
+
+    # We want MessageBus to show up after the session middleware, but depending on how
+    # the Rails app is configured that might be ActionDispatch::Session::CookieStore, or potentially
+    # ActionDispatch::Session::ActiveRecordStore.
+    #
+    # To handle either case, we insert it before ActionDispatch::Flash.
+    #
+    app.middleware.insert_before(ActionDispatch::Flash, MessageBus::Rack::Middleware)
     MessageBus.logger = Rails.logger
   end
 end

data/lib/message_bus/version.rb

@@ -1,3 +1,3 @@
 module MessageBus
-  VERSION = "0.9.4"
+  VERSION = "0.9.5"
 end

data/message_bus.gemspec

@@ -6,7 +6,8 @@ Gem::Specification.new do |gem|
   gem.email         = ["sam.saffron@gmail.com"]
   gem.description   = %q{A message bus for rack}
   gem.summary       = %q{}
-  gem.homepage      = ""
+  gem.homepage      = "https://github.com/SamSaffron/message_bus"
+  gem.license       = "MIT"
 
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

data/spec/lib/assets/asset_encoding_spec.rb

@@ -0,0 +1,19 @@
+asset_directory = File.expand_path('../../../../assets', __FILE__)
+asset_file_paths = Dir.glob(File.join(asset_directory, 'message-bus.js'))
+asset_file_names = asset_file_paths.map{|e| File.basename(e) }
+
+describe asset_file_names do
+  it 'should contain .js files' do
+    expect(asset_file_names).to include('message-bus.js')
+  end
+end
+
+asset_file_paths.each do | path |
+  describe "Asset file #{File.basename(path).inspect}" do
+    it 'should be encodable as UTF8' do
+      binary_data = File.open(path, 'rb'){|f| f.read }
+      encode_block = -> { binary_data.encode(Encoding::UTF_8) }
+      expect(encode_block).not_to raise_error
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,10 +1,6 @@
 require 'thin'
 require 'lib/fake_async_middleware'
 
-RSpec.configure do |config|
-  config.color_enabled = true
-end
-
 def wait_for(timeout_milliseconds)
   timeout = (timeout_milliseconds + 0.0) / 1000
   finish = Time.now + timeout

data/vendor/assets/javascripts/message-bus.js

@@ -60,8 +60,8 @@ window.MessageBus = (function() {
 
       var toElement = originalEvent.toElement;
 
-      // If it’s a `{focusin,focusout}` event (IE), `fromElement` and `toElement`
-      // should both be `null` or `undefined`; else, the page visibility hasn’t
+      // If it's a `{focusin,focusout}` event (IE), `fromElement` and `toElement`
+      // should both be `null` or `undefined`; else, the page visibility hasn't
       // changed, but the user just clicked somewhere in the doc. In IE9, we need
       // to check the `relatedTarget` property instead.
       if (
@@ -109,7 +109,7 @@ window.MessageBus = (function() {
     lastAjax = new Date();
     totalAjaxCalls += 1;
 
-    return $.ajax(baseUrl + "message-bus/" + clientId + "/poll?" + (!shouldLongPoll() || !me.enableLongPolling ? "dlp=t" : ""), {
+    return $.ajax(me.baseUrl + "message-bus/" + me.clientId + "/poll?" + (!shouldLongPoll() || !me.enableLongPolling ? "dlp=t" : ""), {
       data: data,
       cache: false,
       dataType: 'json',

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: message_bus
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.5
 platform: ruby
 authors:
 - Sam Saffron
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-14 00:00:00.000000000 Z
+date: 2014-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.3
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: A message bus for rack
@@ -59,8 +59,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CHANGELOG
 - Gemfile
 - Guardfile
@@ -96,6 +96,7 @@ files:
 - lib/message_bus/reliable_pub_sub.rb
 - lib/message_bus/version.rb
 - message_bus.gemspec
+- spec/lib/assets/asset_encoding_spec.rb
 - spec/lib/client_spec.rb
 - spec/lib/connection_manager_spec.rb
 - spec/lib/fake_async_middleware.rb
@@ -107,8 +108,9 @@ files:
 - spec/lib/reliable_pub_sub_spec.rb
 - spec/spec_helper.rb
 - vendor/assets/javascripts/message-bus.js
-homepage: ''
-licenses: []
+homepage: https://github.com/SamSaffron/message_bus
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -116,21 +118,22 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: ''
 test_files:
+- spec/lib/assets/asset_encoding_spec.rb
 - spec/lib/client_spec.rb
 - spec/lib/connection_manager_spec.rb
 - spec/lib/fake_async_middleware.rb