active_redis_orm 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 899ade6f6bc04ef66e156a453353590f4d66289b
-  data.tar.gz: e80082d10320bfdc323dda8673341ad443864e45
+  metadata.gz: 69575da090b72886a83b27078d14b461c6750d5a
+  data.tar.gz: fd66ae1837b07736e6e93d89877a28cfa7cabbab
 SHA512:
-  metadata.gz: 86ae6af995214ec4443333edc352e5ff8e4953ad8a03c0d9e7dd879947897d7f97f65c7f11915ac8e6f8c0df57a0557d0eb4756dbee7e859e18d50e193fc0f0a
-  data.tar.gz: 145d76d2954de1e367a315ece73bf18d36d6de24a0ba838962347aeafc10a3ddc05696f37a138c2b9e0ea9d99b24db82803cbd1d4c4c5ae24e59a441f519e080
+  metadata.gz: f675563efa18c94e2e3e698d08f102ca213c4dafd1f22bff7a95fbbcd433952e756583b85423c3048a54167a9105aedf6fb4206b7b36ad43e9b5057e4afa31be
+  data.tar.gz: b98a86c0b724064805350d80598aeb8af7c958598765e77308d8b816ea0df8a6f1baf1f9c8f94c029c2badfc28ef376d51b11846c720674b9e40230926d63117

data/lib/active_redis/all_list.rb

@@ -45,11 +45,11 @@ module ActiveRedis
       end
 
       def add
-        ActiveRedis.redis.zadd(key, Time.now.to_f, @object.id) if should_add?
+        @object.class.redis.zadd(key, Time.now.to_f, @object.id) if should_add?
       end
 
       def remove
-        ActiveRedis.redis.zrem(key, @object.id)
+        @object.class.redis.zrem(key, @object.id)
       end
 
       def key

data/lib/active_redis/attributes.rb

@@ -24,7 +24,7 @@ module ActiveRedis
     def expire_field(field_name)
       expires_in = self.class.attribute_options[field_name.to_sym][:expires_in]
       if expires_in.to_i > 0
-        ActiveRedis.redis.expire(send("#{field_name}_redis_key"), expires_in.to_i)
+        self.class.redis.expire(send("#{field_name}_redis_key"), expires_in.to_i)
       end
     end
   end
@@ -51,7 +51,7 @@ module ActiveRedis
         end
 
         def destroy_#{field_name}
-          Redis::Value.new(#{field_name}_redis_key).delete
+          Redis::Value.new(#{field_name}_redis_key, self.class.redis).delete
         end
       }
       if options[:finder_field]
@@ -90,7 +90,7 @@ module ActiveRedis
     def string_field(field_name, options)
       attributes_module.module_eval %Q{
         def #{field_name}_object
-          Redis::Value.new(#{field_name}_redis_key)
+          Redis::Value.new(#{field_name}_redis_key, self.class.redis)
         end
 
         def #{field_name}_val
@@ -121,7 +121,7 @@ module ActiveRedis
     def integer_field(field_name, options)
       attributes_module.module_eval %Q{
         def #{field_name}_object
-          Redis::Value.new(#{field_name}_redis_key)
+          Redis::Value.new(#{field_name}_redis_key, self.class.redis)
         end
 
         def #{field_name}_val
@@ -155,7 +155,7 @@ module ActiveRedis
     def float_field(field_name, options)
       attributes_module.module_eval %Q{
         def #{field_name}_object
-          Redis::Value.new(#{field_name}_redis_key)
+          Redis::Value.new(#{field_name}_redis_key, self.class.redis)
         end
 
         def #{field_name}_val
@@ -189,7 +189,7 @@ module ActiveRedis
     def boolean_field(field_name, options)
       attributes_module.module_eval %Q{
         def #{field_name}_object
-          Redis::Value.new(#{field_name}_redis_key)
+          Redis::Value.new(#{field_name}_redis_key, self.class.redis)
         end
 
         def #{field_name}_val
@@ -226,7 +226,7 @@ module ActiveRedis
     def counter_field(field_name, options)
       attributes_module.module_eval %Q{
         def #{field_name}_object
-          Redis::Counter.new(#{field_name}_redis_key)
+          Redis::Counter.new(#{field_name}_redis_key, self.class.redis)
         end
 
         def #{field_name}_val
@@ -256,7 +256,7 @@ module ActiveRedis
     def list_field(field_name, options)
       attributes_module.module_eval %Q{
         def #{field_name}_object
-          Redis::List.new(#{field_name}_redis_key)
+          Redis::List.new(#{field_name}_redis_key, self.class.redis)
         end
 
         def #{field_name}_val
@@ -298,7 +298,7 @@ module ActiveRedis
     def set_field(field_name, options)
       attributes_module.module_eval %Q{
         def #{field_name}_object
-          Redis::Set.new(#{field_name}_redis_key)
+          Redis::Set.new(#{field_name}_redis_key, self.class.redis)
         end
 
         def #{field_name}_val
@@ -331,7 +331,7 @@ module ActiveRedis
     def sorted_set_field(field_name, options)
       attributes_module.module_eval %Q{
         def #{field_name}_object
-          Redis::SortedSet.new(#{field_name}_redis_key)
+          Redis::SortedSet.new(#{field_name}_redis_key, self.class.redis)
         end
 
         def #{field_name}_val
@@ -360,7 +360,7 @@ module ActiveRedis
     def hash_field(field_name, options)
       attributes_module.module_eval %Q{
         def #{field_name}_hash_set
-          Redis::HashKey.new(#{field_name}_redis_key)
+          Redis::HashKey.new(#{field_name}_redis_key, self.class.redis)
         end
 
         def #{field_name}_val
@@ -438,14 +438,14 @@ module ActiveRedis
     def finder_field(field_name, options)
       before_save do
         if send("#{field_name}_changed?")
-          ActiveRedis.redis.del(self.class.finder_key(field_name, send("#{field_name}_was")))
-          ActiveRedis.redis.set(self.class.finder_key(field_name, send(field_name)), id)
+          self.class.redis.del(self.class.finder_key(field_name, send("#{field_name}_was")))
+          self.class.redis.set(self.class.finder_key(field_name, send(field_name)), id)
         end
       end
 
       class_eval %Q{
         def self.find_by_#{field_name}(value)
-          id = ActiveRedis.redis.get(finder_key(:#{field_name}, value))
+          id = redis.get(finder_key(:#{field_name}, value))
           if id.present?
             self.find(id)
           else

data/lib/active_redis/save.rb

@@ -27,7 +27,7 @@ module ActiveRedis
 
     def perform_save
       run_callbacks :save do
-        ActiveRedis.redis.pipelined do
+        self.class.redis.pipelined do
           self.changes.each do |key, value|
             if value.last.nil?
               send("#{key}_object").delete

data/lib/active_redis/version.rb

@@ -1,3 +1,3 @@
 module ActiveRedis
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/active_redis_orm.rb

@@ -73,7 +73,7 @@ module ActiveRedis
 
     class << self
       include ActiveRedis::Attributes
-      attr_accessor :attribute_definitions, :attributes_module
+      attr_accessor :attribute_definitions, :attributes_module, :redis
 
       def find(id)
         new(id)
@@ -112,6 +112,10 @@ module ActiveRedis
         attribute_definitions
       end
 
+      def redis
+        @redis ||= ::ActiveRedis.redis
+      end
+
       def inherited(klass)
         class << klass
           self.class_eval do

data/spec/lib/active_redis_spec.rb

@@ -357,4 +357,24 @@ describe ActiveRedis do
     end
   end
 
+  context "different redis connections" do
+    class DifferentConnection < ActiveRedis::Base
+      self.redis = Redis.new(db: 1)
+      field :foo
+    end
+
+    let(:con) {DifferentConnection.create(foo: "bar")}
+
+    it "writes to a different connection" do
+      con.reload!
+      con.foo.should == "bar"
+      ActiveRedis.redis.get(con.foo_object.key).should be_blank
+      DifferentConnection.redis.get(con.foo_object.key).should == "bar"
+    end
+
+    it "also sets the redis connection for the redis object" do
+      con.foo_object.value.should == "bar"
+    end
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_redis_orm
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Tom Caspy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-10 00:00:00.000000000 Z
+date: 2014-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler