shadow_model 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a440b755047339d9c19cb083d67e6a850c1daf1b
-  data.tar.gz: 6f089365819678b32129e3e28a8b87cc5b13c6c7
+  metadata.gz: e255572a7b0b5d218d46279a38b089b0b5f6558b
+  data.tar.gz: 6d1886e2e310991e52706e123f84efd87efb61c7
 SHA512:
-  metadata.gz: 37f50a5bae551d95d019f739abadddd804bc6ffe61dac2c62a16cf632c046d3ecddbf53e9b7c6ce85db8fc39035fa72bb5de39bfa451a3966b736932e212a86c
-  data.tar.gz: 7322e40d43c14aee65124ad30dd454a5bb6769dc2024f9ee3df7891e657e565ccedb7196b27d32642bfb760a201818fc490ff68b56811f1a7e9e21bd720b35bc
+  metadata.gz: 9849e048bd70790ec511a96b3bc4a90f0e7241bffc11464832fd4eb56886e79b156398ea6af164ecc2fa38d57533970b6faba7a0f8e298d6a07c27fecb83a911
+  data.tar.gz: 32b0e4c220f0554258aa7739db64c6e92d38b9ae429f87e5b59ac1ef66584c207ef37be4e7e0f1ab3a022ad16b74298fa3adf81e619a2129ebb94a79ebe09dd1

data/README.md

@@ -24,9 +24,6 @@ And use this to retrieve the model from redis.
 
     model = YourModelClass.find_by_shadow(primary_key)
 
-    model.is_a?(YourModelClass) # true
-    model.readonly?             # true
-
 ### options
 
 <table>
@@ -61,6 +58,15 @@ And use this to retrieve the model from redis.
       end
     end
 
+    player = Player.create(name: "player one")
+    shadow = Player.find_by_shadow(player.id)
+    shadow.is_a?(Player)     # true
+    shadow.shadow_model?     # true
+    shadow.readonly?         # true
+    shadow.reload            # reload from database
+    shadow.shadow_model?     # false
+    shadow.readonly?         # false
+
 ## Associations
 
 ### has_many

data/lib/shadow_model/model_extension.rb

@@ -9,60 +9,6 @@ module ShadowModel
       RUBY
     end
 
-    def shadow_model?
-      @shadow_model
-    end
-
-    def shadow_model=(value)
-      @shadow_model = value
-    end
-
-    def shadow_cache_key
-      @shadow_cache_key ||= self.class.build_shadow_cache_key(self[self.class.primary_key])
-    end
-
-    def shadow_data
-      @shadow_data ||= self.class.find_shadow_data(self[self.class.primary_key])
-    end
-
-    def shadow_data=(data)
-      @shadow_data = data
-      self.class.attribute_names.each do |attribute_name|
-        attribute_name = attribute_name.to_sym
-        if value = data[attribute_name]
-          self[attribute_name] = value
-        end
-      end
-    end
-
-    def clear_shadow_data
-      Redis.current.del(shadow_cache_key)
-    end
-
-    def build_shadow_data
-      Marshal.dump(self.class.shadow_keys.inject({}) { |data, attr| data[attr] = send(attr); data })
-    end
-
-    def update_shadow_cache
-      return if shadow_options[:association_only]
-      Redis.current.set(shadow_cache_key, build_shadow_data)
-      update_expiration(shadow_cache_key)
-    end
-
-    def update_expiration(cache_key)
-      if expiration = self.class.shadow_options[:expiration]
-        if self.class.shadow_options[:update_expiration] || shadow_ttl < 0
-          Redis.current.expire(cache_key, expiration)
-        end
-      elsif expireat = self.class.shadow_options[:expireat]
-        Redis.current.expireat(cache_key, expireat.to_i) if shadow_ttl < 0
-      end
-    end
-
-    def shadow_ttl
-      Redis.current.ttl(shadow_cache_key)
-    end
-
     module ClassMethods
       def set_shadow_keys(args, options = {})
         @shadow_attributes ||= []
@@ -111,6 +57,7 @@ module ShadowModel
       end
 
       def find_by_shadow(id)
+        raise "Cannot find seperate shadow cache with association_only option set" if shadow_options[:association_only]
         if shadow_data = find_shadow_data(id)
           instantiate_shadow_model(shadow_data)
         else
@@ -127,8 +74,8 @@ module ShadowModel
 
       def instantiate_shadow_model(shadow_data)
         instance = self.new
-        instance.shadow_model = true
-        instance.shadow_data = shadow_data
+        instance.instance_variable_set(:@shadow_model, true)
+        instance.send(:shadow_data=, shadow_data)
         instance.readonly!
         instance
       end
@@ -137,5 +84,63 @@ module ShadowModel
         "#{self.name.tableize}:Shadow:#{id}"
       end
     end
+
+    def shadow_model?
+      @shadow_model
+    end
+
+    def reload
+      self.instance_variable_set(:@readonly, false)
+      @shadow_model = false
+      super
+    end
+
+    def shadow_cache_key
+      @shadow_cache_key ||= self.class.build_shadow_cache_key(self[self.class.primary_key])
+    end
+
+    def shadow_data
+      @shadow_data ||= self.class.find_shadow_data(self[self.class.primary_key])
+    end
+
+    def clear_shadow_data
+      Redis.current.del(shadow_cache_key)
+    end
+
+    def build_shadow_data
+      Marshal.dump(self.class.shadow_keys.inject({}) { |data, attr| data[attr] = send(attr); data })
+    end
+
+    def update_shadow_cache
+      return if shadow_options[:association_only]
+      Redis.current.set(shadow_cache_key, build_shadow_data)
+      update_expiration(shadow_cache_key)
+    end
+
+    def update_expiration(cache_key)
+      if expiration = shadow_options[:expiration]
+        if shadow_options[:update_expiration] || shadow_ttl < 0
+          Redis.current.expire(cache_key, expiration)
+        end
+      elsif expireat = shadow_options[:expireat]
+        Redis.current.expireat(cache_key, expireat.to_i) if shadow_ttl < 0
+      end
+    end
+
+    def shadow_ttl
+      Redis.current.ttl(shadow_cache_key)
+    end
+
+    private
+
+    def shadow_data=(data)
+      @shadow_data = data
+      self.class.attribute_names.each do |attribute_name|
+        attribute_name = attribute_name.to_sym
+        if value = data[attribute_name]
+          self[attribute_name] = value
+        end
+      end
+    end
   end
 end

data/lib/shadow_model/version.rb

@@ -1,3 +1,3 @@
 module ShadowModel
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shadow_model
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Weihu Chen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-24 00:00:00.000000000 Z
+date: 2013-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails