dashing-rails 2.6.1 → 2.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8dfddde01d385b4094caeb1dfa91d57eb3661695
-  data.tar.gz: f7afc786e36b73efdd1cd121818fe3dc3fb3f7dc
+  metadata.gz: 06cc63083d02f095ae16feb5e29521f4b448cc97
+  data.tar.gz: bef8bbb5ca30a5ebe0449c3544ace81d8457017a
 SHA512:
-  metadata.gz: ec6a9a63a1191a23eea315b6e22b6eb4b58045c9f5d6d8f2de73340f0c49deb1eefcdc53b6e0f3fa2351c04f61c020b556d8f85e608f43cfcdf0577c2742450b
-  data.tar.gz: e4146726fc36bc5e96d4cf2251d9d811387ea41e1ddffed1d9932375ca2d8be24c706618492b863ad9433fe07581fb38dd9430102119ccad6ff8ffa5fc659123
+  metadata.gz: 9f940073cb5fe34b9a6b9664f893b57824309fb1a83c88a247d6e2bcb60d10f6a0e2a5f06fb1f5e06c12d809cf2346780321aeb1b20033514e52eadbd516d395
+  data.tar.gz: 49874d2f0102b44446b38beb7af8fa0fa3340067424838012fe8c8409bc4a6a55f3c0a09366e0693bf2c084fab753ac37be9fb22b9313615005bd99bbe7026ef

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 2.6.2
+
+* Stop using connection pool wrapper as per the documentation [https://github.com/gottfrois/dashing-rails/pull/103](https://github.com/gottfrois/dashing-rails/pull/103)
+
+
 ## 2.6.1
 
 * Revert gridster dashing to a newer version

data/README.md

@@ -30,8 +30,8 @@ Key features:
 
 ## Requirements
 
-* Ruby >=1.9.3
-* Rails 4
+* Ruby >= 1.9.3
+* Rails >= 4
 * Redis
 * Multi Threaded server ([puma](https://github.com/puma/puma), [rainbows](http://rainbows.rubyforge.org/))
 
@@ -148,8 +148,11 @@ dashing_events.*
 where `*` can be anything. This give you all the flexibility you need to push to redis. For example the `send_event` method provided by Dashing uses the following namespace:
 
 ```ruby
-redis.publish("dashing_events.create", {})
+redis.with do |redis_connection|
+  redis_connection.publish("dashing_events.create", {})
+end
 ```
+(where `redis_connection` is a redis connection from a connection pooler.)
 
 You can configure the redis namespace in `config/initializers/dashing.rb`:
 

data/app/controllers/dashing/events_controller.rb

@@ -3,26 +3,31 @@ module Dashing
     include ActionController::Live
 
     def index
+      @redis = Dashing.redis
+
       response.headers['Content-Type']      = 'text/event-stream'
       response.headers['X-Accel-Buffering'] = 'no'
       response.stream.write latest_events
 
-      @redis = Dashing.redis
-      @redis.psubscribe("#{Dashing.config.redis_namespace}.*") do |on|
-        on.pmessage do |pattern, event, data|
-          response.stream.write("data: #{data}\n\n")
+      @redis.with do |redis_connection|
+        redis_connection.psubscribe("#{Dashing.config.redis_namespace}.*") do |on|
+          on.pmessage do |pattern, event, data|
+            response.stream.write("data: #{data}\n\n")
+          end
         end
       end
     rescue IOError
       logger.info "[Dashing][#{Time.now.utc.to_s}] Stream closed"
     ensure
-      @redis.quit
+      @redis.shutdown { |redis_connection| redis_connection.quit }
       response.stream.close
     end
 
     def latest_events
-      events = Dashing.redis.hvals("#{Dashing.config.redis_namespace}.latest")
-      events.map { |v| "data: #{v}\n\n" }.join
+      @redis.with do |redis_connection|
+        events = redis_connection.hvals("#{Dashing.config.redis_namespace}.latest")
+        events.map { |v| "data: #{v}\n\n" }.join
+      end
     end
   end
 end

data/app/controllers/dashing/widgets_controller.rb

@@ -14,7 +14,9 @@ module Dashing
     def update
       data = params[:widget] || {}
       hash = data.merge(id: params[:name], updatedAt: Time.now.utc.to_i)
-      Dashing.redis.publish("#{Dashing.config.redis_namespace}.create", hash.to_json)
+      Dashing.redis.with do |redis_connection|
+        redis_connection.publish("#{Dashing.config.redis_namespace}.create", hash.to_json)
+      end
 
       render nothing: true
     end

data/lib/dashing.rb

@@ -20,8 +20,10 @@ module Dashing
 
     def send_event(id, data)
       event = data.merge(id: id, updatedAt: Time.now.utc.to_i).to_json
-      redis.hset("#{Dashing.config.redis_namespace}.latest", id, event)
-      redis.publish("#{Dashing.config.redis_namespace}.create", event)
+      redis.with do |redis_connection|
+        redis_connection.hset("#{Dashing.config.redis_namespace}.latest", id, event)
+        redis_connection.publish("#{Dashing.config.redis_namespace}.create", event)
+      end
     end
 
   end

data/lib/dashing/configuration.rb

@@ -43,7 +43,7 @@ module Dashing
     end
 
     def redis
-      @redis ||= ::ConnectionPool::Wrapper.new(size: request_thread_count, timeout: redis_timeout) { new_redis_connection }
+      @redis ||= ::ConnectionPool.new(size: request_thread_count, timeout: redis_timeout) { new_redis_connection }
     end
 
     def new_redis_connection

data/lib/dashing/railtie.rb

@@ -21,8 +21,10 @@ module Dashing
       if defined?(::PhusionPassenger)
         ::PhusionPassenger.on_event(:starting_worker_process) do |forked|
           if forked
-            ::Dashing.redis.client.disconnect
-            ::Dashing.redis.client.connect
+            ::Dashing.redis.with do |redis_connection|
+              redis_connection.client.disconnect
+              redis_connection.client.connect
+            end
           end
         end
       end

data/lib/dashing/version.rb

@@ -1,3 +1,3 @@
 module Dashing
-  VERSION = '2.6.1'
+  VERSION = '2.6.2'
 end

data/spec/controllers/dashing/widgets_controller_spec.rb

@@ -1,9 +1,10 @@
 RSpec.describe Dashing::WidgetsController do
 
   let(:redis) { double }
+  let(:redis_connection) { double }
 
   before do
-    stub_redis(redis)
+    stub_redis_with_connection(redis, redis_connection)
     @routes = Dashing::Engine.routes
   end
 
@@ -49,7 +50,7 @@ RSpec.describe Dashing::WidgetsController do
     context 'when valid' do
 
       before do
-        expect(redis).to receive(:publish)
+        expect(redis_connection).to receive(:publish)
       end
 
       it 'responds success' do

data/spec/lib/dashing/configuration_spec.rb

@@ -4,7 +4,8 @@ RSpec.describe Dashing::Configuration do
 
   it { expect(instance.engine_path).to            eq('/dashing') }
   # it { expect(instance.scheduler).to              be_a(::Rufus::Scheduler.new) }
-  it { expect(instance.redis).to                  be_a(::Redis) }
+  it { expect(instance.redis).to                  be_a(::ConnectionPool) }
+  it { instance.redis.with { |r| expect(r).to     be_a(::Redis) } }
 
   # Redis
   it { expect(instance.redis_host).to             eq('127.0.0.1') }

data/spec/support/controller_spec_helpers.rb

@@ -6,4 +6,9 @@ module ControllerSpecHelpers
   def stub_redis(stubbed_redis)
     allow(Dashing.config).to receive(:redis).and_return(stubbed_redis)
   end
+
+  def stub_redis_with_connection(stubbed_redis, stubbed_redis_connection)
+    stub_redis(stubbed_redis)
+    allow(stubbed_redis).to receive(:with).and_yield(stubbed_redis_connection)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dashing-rails
 version: !ruby/object:Gem::Version
-  version: 2.6.1
+  version: 2.6.2
 platform: ruby
 authors:
 - Pierre-Louis Gottfrois
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-17 00:00:00.000000000 Z
+date: 2017-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -316,7 +316,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: The exceptionally handsome dashboard framework for Rails.