redis-classy 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 43bc9e17910f065ef35c2be995966f0714ce4ea1
-  data.tar.gz: b7499771aa9b2354c43ea346d8f3878297d66ab6
+  metadata.gz: 7d643329ea57aefcf21b2d5f82e10dc2ceb06153
+  data.tar.gz: 0ee4d20cad2936c1dfb51af9916e2bc7a100cc4a
 SHA512:
-  metadata.gz: 4b7491c74284bdddc17a8f47641813d608beb0dfdd4f02890e7cd79dcb04f51ba8a207cff3784ce09d4dfc3230039db945bf95b849e4b8e605051f503395e9de
-  data.tar.gz: 1614dd0aaee898bb35b74b2ccfc13d6ff866d01e8479edcdbe7c583ea68b955a2ffadbef83f3f2a953b9fbd75712a3c857f1bb4c47923d790aec3674cf1d5cc8
+  metadata.gz: b1f69e41172233934e798c9207bbd3e44b6e6f8d7d5e9767747507b2b8ab900a52274b1ca3c991584ba26a52fd202c68c3a762064ed23d9b3f481d4a391f1363
+  data.tar.gz: 4b31213c6d961b7520faa62bf38fc1fb0aa69e98ea645536c70834d9bb46dbdaf1f7644be742f1e6b5a6f178c2ac35b2089da30695661683c1dbdb24309ab8f0

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.1.0 2014-11-23
+
+  * Lazy connection loading
+
 ## 2.0.0 2014-11-23
 
   * New feature: `singletons` to support predefined keys

data/lib/redis_classy.rb

@@ -1,10 +1,16 @@
 class RedisClassy
   class << self
-    attr_accessor :redis
+    attr_writer :redis
 
-    def inherited(subclass)
-      raise Error.new('RedisClassy.redis is not assigned') unless RedisClassy.redis
-      subclass.redis = Redis::Namespace.new(subclass.name, redis: RedisClassy.redis)
+    def redis
+      @redis ||= begin
+        if self == RedisClassy
+          nil
+        else
+          raise Error.new('RedisClassy.redis is not assigned') if RedisClassy.redis.nil?
+          Redis::Namespace.new(self.name, redis: RedisClassy.redis)
+        end
+      end
     end
 
     def singletons(*args)
@@ -20,7 +26,7 @@ class RedisClassy
     end
 
     def keys(pattern = nil)
-      @redis.keys(pattern || '*')
+      redis.keys(pattern || '*')
     end
 
     def on(key)

data/lib/redis_classy/version.rb

@@ -1,3 +1,3 @@
 class RedisClassy
-  VERSION = '2.0.0'
+  VERSION = '2.1.0'
 end

data/spec/redis_classy_spec.rb

@@ -13,6 +13,20 @@ describe RedisClassy do
     RedisClassy.redis.quit
   end
 
+  it 'raises RedisClassy::Error when connection is missing' do
+    begin
+      backup = RedisClassy.redis
+      RedisClassy.redis = nil
+
+      class NoConnection < RedisClassy
+      end
+
+      expect{ NoConnection.keys }.to raise_error(RedisClassy::Error)
+    ensure
+      RedisClassy.redis = backup
+    end
+  end
+
   it 'stores redis or redis-namespace' do
     expect(RedisClassy.redis.is_a?(Redis)).to be_truthy
     expect(RedisClassy.redis.is_a?(Redis::Namespace)).to be_falsy

data/spec/spec_helper.rb

@@ -8,7 +8,6 @@ RSpec.configure do |config|
   # Use database 15 for testing so we don't accidentally step on you real data.
   RedisClassy.redis = Redis.new(db: 15)
   unless RedisClassy.keys.empty?
-    puts '[ERROR]: Redis database 15 not empty! If you are sure, run "rake flushdb" beforehand.'
-    exit!
+    abort '[ERROR]: Redis database 15 not empty! If you are sure, run "rake flushdb" beforehand.'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis-classy
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Kenn Ejima