redis-column 0.0.2 → 0.0.3

data/CHANGELOG.md

@@ -0,0 +1,11 @@
+## RedisColumn 0.0.3 (7th Dec, 2011) ##
+
+*   Adding the redis_columns in an after_initialize callback for better compatibility
+
+## RedisColumn 0.0.2 (5th Dec, 2011) ##
+
+*   Added deleting of values in Redis after_destroy
+
+## RedisColumn 0.0.1 (2nd Dec, 2011) ##
+
+*   Initial Release

data/lib/redis-column/version.rb

@@ -1,3 +1,3 @@
 module RedisColumn
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/redis-column.rb

@@ -30,12 +30,12 @@ module RedisColumn
       delegate :redis_columns, :to => "self.class"
       # Allow the instance access to RedisColumn.redis_instance
       delegate :redis_instance, :to => "RedisColumn"
+      # Assign redis_columns
+      after_initialize :assign_redis_columns
       # Save the columns after_save
       after_save :save_redis_columns!
       # Delete the columns after_destroy
       after_destroy :delete_redis_columns!
-      # Boosh!
-      alias_method_chain :attributes, :redis_columns
     end
 
     module ClassMethods
@@ -43,10 +43,8 @@ module RedisColumn
       # Setup a redis column
       def redis_column column_name
         self.redis_columns += [column_name]
-        attr_writer column_name
-        define_method column_name do # read the attribute or find from Redis and set to instance var
-          send(:instance_variable_get, "@#{column_name}") || send("#{column_name}=", read_redis_attribute(column_name))
-        end
+        define_method(column_name) { @attributes[column_name.to_s] }
+        define_method("#{column_name}=") {|val| @attributes[column_name.to_s] = val }
       end
       alias_method :redis_col, :redis_column
       
@@ -75,18 +73,17 @@ module RedisColumn
         redis_instance.del(redis_key(column_name))
       end
       
-      # Returns both the AR attributes and the Redis attributes in one hash
-      def attributes_with_redis_columns
-        _attributes = attributes_without_redis_columns.with_indifferent_access
-        redis_columns.inject(_attributes) do |res, column_name|
-          res.merge(column_name => send(column_name))
+      # Assigns the values from Redis unless already specified
+      def assign_redis_columns
+        redis_columns.each do |column_name|
+          write_attribute column_name, read_redis_attribute(column_name) unless read_attribute(column_name.to_s).present?
         end
       end
       
       # Save all values back to Redis
       def save_redis_columns!
         redis_columns.each do |column_name|
-          write_redis_attribute column_name, send(column_name)
+          write_redis_attribute column_name, read_attribute(column_name)
         end
       end
       

data/spec/redis_column_spec.rb

@@ -67,7 +67,19 @@ describe DescriptionInRedisModel do
       @instance.attributes.should have_key('description')
     end
     
-    context "And destroying" do
+    context "and finding" do
+      
+      before do
+        @instance = DescriptionInRedisModel.find(@instance.id)
+      end
+      
+      it "should set the redis_columns after find" do
+        @instance.attributes['description'].should == "A looong description"
+        @instance.description.should == "A looong description"
+      end
+    end
+
+    context "and destroying" do
       before do
         @instance.destroy
       end
@@ -77,6 +89,22 @@ describe DescriptionInRedisModel do
       end
       
     end
+    
+    context "and duping" do
+      
+      before do
+        @new_instance = @instance.dup
+        @new_instance.save!
+        @new_instance = DescriptionInRedisModel.find(@new_instance.id)
+      end
+      
+      it { @new_instance.should_not == @instance }
+      
+      it "should set the redis_columns after find" do
+        @new_instance.attributes['description'].should == "A looong description"
+        @new_instance.description.should == "A looong description"
+      end
+    end
   end
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis-column
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-05 00:00:00.000000000 Z
+date: 2011-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2152133180 !ruby/object:Gem::Requirement
+  requirement: &2152310300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152133180
+  version_requirements: *2152310300
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &2152132480 !ruby/object:Gem::Requirement
+  requirement: &2152309820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152132480
+  version_requirements: *2152309820
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2152131800 !ruby/object:Gem::Requirement
+  requirement: &2152309400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152131800
+  version_requirements: *2152309400
 - !ruby/object:Gem::Dependency
   name: autotest
-  requirement: &2152153200 !ruby/object:Gem::Requirement
+  requirement: &2152308960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152153200
+  version_requirements: *2152308960
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2152151300 !ruby/object:Gem::Requirement
+  requirement: &2152308540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152151300
+  version_requirements: *2152308540
 - !ruby/object:Gem::Dependency
   name: fakeredis
-  requirement: &2152150160 !ruby/object:Gem::Requirement
+  requirement: &2152308120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152150160
+  version_requirements: *2152308120
 description: The RedisColumn gem allows for the seamless integration of Redis within
   your ActiveRecord model in order to store heavy objects away from tables with a
   lot of rows.