pubsubstub 0.0.14 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e4106e5ee0478ce5a148b49fc03d444f77ccb539
-  data.tar.gz: 2683f674608bcf93cb6838afb8b877a811db663f
+  metadata.gz: e14d40f41e5f06347d7f552009f53d29bb3d4942
+  data.tar.gz: e1fca82791cb2f1769aa8bf3a6076736b70f8e4c
 SHA512:
-  metadata.gz: 30f6b41e4fb7d60ab31668ef88ff62d136d94d21a9c12be1d918b9bd8765153e2b51603c870764d3cbf030136c961772a643addc3ae0fadf60db927a837bfa89
-  data.tar.gz: ab0a8ced2ccb64356c70a56503c10d12b44a8a29d87db44429694432c5301a120d83b8eca8555b3604d8e6d2a2b9e0e8fad17c3edce70e1e33e9304aec81f175
+  metadata.gz: dad828aea534513d6acef76af10e057e8ad21f8804c1fccc9102ce1c1db8149dedd5e74f9730d4a4d64a67b1815fdc05b70149e2f9f561b90582cd9ac1c3fc7d
+  data.tar.gz: a9afa981566c4320fd578e99dbb843e537e2e1f10d668ab735929ec96dcc34a9a99eb0bad3c013594a378f544c130cb8ffbfce6700b42270005e5a03218d79e6

data/lib/pubsubstub/application.rb

@@ -1,11 +1,5 @@
 module Pubsubstub
-  class << self
-    attr_accessor :heartbeat_frequency
-  end
-  self.heartbeat_frequency = 15
-
   class Application < Sinatra::Base
-
     use PublishAction
     use StreamAction
   end

data/lib/pubsubstub/redis_pub_sub.rb

@@ -66,7 +66,7 @@ module Pubsubstub
       end
 
       def redis_url
-        ENV['REDIS_URL'] || "redis://localhost:6379"
+        Pubsubstub.redis_url || ENV['REDIS_URL'] || "redis://localhost:6379/0"
       end
     end
   end

data/lib/pubsubstub/version.rb

@@ -1,3 +1,3 @@
 module Pubsubstub
-  VERSION = "0.0.14"
+  VERSION = "0.0.15"
 end

data/lib/pubsubstub.rb

@@ -11,3 +11,10 @@ require "pubsubstub/stream_action"
 require "pubsubstub/publish_action"
 require "pubsubstub/application"
 
+module Pubsubstub
+  class << self
+    attr_accessor :heartbeat_frequency, :redis_url
+  end
+  self.heartbeat_frequency = 15
+end
+

data/spec/redis_pub_sub_spec.rb

@@ -34,6 +34,21 @@ describe Pubsubstub::RedisPubSub do
         expect(subject.blocking_redis.zcard("test.scrollback")).to eq(count - 1)
       end
     end
+
+    describe "#redis_url" do
+      it "uses the fallback url fallback chain" do
+        Pubsubstub.redis_url = "redis://localhost:6379/1"
+        expect(Pubsubstub::RedisPubSub.redis_url).to eq("redis://localhost:6379/1")
+
+        Pubsubstub.redis_url = nil
+        ENV['REDIS_URL'] = "redis://localhost:6379/2"
+        expect(Pubsubstub::RedisPubSub.redis_url).to eq("redis://localhost:6379/2")
+
+        Pubsubstub::RedisPubSub.instance_variable_set(:@blocking_redis, nil)
+        ENV['REDIS_URL'] = nil
+        expect(Pubsubstub::RedisPubSub.redis_url).to eq("redis://localhost:6379/0")
+      end
+    end
   end
 
   context "pubsub" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pubsubstub
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors:
 - Guillaume Malette
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-05 00:00:00.000000000 Z
+date: 2015-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -230,7 +230,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.3
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Pubsubstub is a rack middleware to add Pub/Sub