shadow_model 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf08bdba63148d597aa5e6715f84f653e08fe9f5
-  data.tar.gz: 38f161d7f1a5b3aa48177c26eb449de3b7f752bd
+  metadata.gz: aa974f5c3893ad1f5dea40c681fce0a0a9c74106
+  data.tar.gz: e6ce3ed9689ee1d5111d992b16da1a47249d07ec
 SHA512:
-  metadata.gz: 58ad5075998f12a353e940eacfdd413b2e37645fa8a929803057bc2855eaa172179fa7a1771a27b150e60b203dea331ddcf229fb303bb8271231c08a13997614
-  data.tar.gz: b51695d413eeae6c9e723560b742801b9ccd7223366884970ad8344710c97e80393b9a49527d26e9b43b37cb5b24d881814293063d3a66a8ad03a0d90e847c4a
+  metadata.gz: 00a3a7a0ebce17e67cd58fca294399cbda1ff53b171fe14ca5b9751fba7f62a9d1d8d6290fd757a9b58915cf7143e881e2cd1d4cd39753b4bf3e2c11e98bee74
+  data.tar.gz: 8f338e84131c743f146728f17b034388094f711dc66adb18cf4b2323b0c9343295e8e8fda9d622ef5c205f09f219b74ff3f9e33be4b23148625fe6677cea316d

data/lib/shadow_model/associations/has_many.rb

@@ -12,43 +12,52 @@ class ::ActiveRecord::Associations::Builder::HasMany
     reflection = build_without_shadow_option
     if options[:shadow]
       model_name = model.name.tr('::', '').underscore
-      model.class_eval <<-RUBY
-        def #{name}_shadow_cache_key
-          "#{model_name}_\#{self[self.class.primary_key]}_#{name}_shadow_cache"
-        end
+      define_shadow_methods_of_model_class(reflection, model_name)
+      define_shadow_methods_of_reflection_class(reflection, model_name)
+    end
+    reflection
+  end
+  alias_method_chain :build, :shadow_option
 
-        def #{name}_by_shadow
-          Redis.current.hvals(#{name}_shadow_cache_key).map do |val|
-            shadow_data = Marshal.load(val)
-            #{reflection.klass.name}.instantiate_shadow_model(shadow_data)
-          end
-        end
+  private
 
-        def clear_#{name}_shadow_cache
-          Redis.current.del(#{name}_shadow_cache_key)
+  def define_shadow_methods_of_model_class(reflection, model_name)
+    model.class_eval <<-RUBY
+      def #{name}_shadow_cache_key
+        "#{model_name}_\#{self[self.class.primary_key]}_#{name}_shadow_cache"
+      end
+
+      def #{name}_by_shadow
+        Redis.current.hvals(#{name}_shadow_cache_key).map do |val|
+          shadow_data = Marshal.load(val)
+          #{reflection.klass.name}.instantiate_shadow_model(shadow_data)
         end
-      RUBY
+      end
 
-      reflection.klass.class_eval <<-RUBY
-        after_save :update_shadow_cache_of_#{model_name}
-        after_destroy :delete_shadow_cache_of_#{model_name}
+      def clear_#{name}_shadow_cache
+        Redis.current.del(#{name}_shadow_cache_key)
+      end
+    RUBY
+  end
 
-        def belongs_to_#{model_name}_shadow_cache_key
-          "#{model_name}_\#{self[:#{reflection.foreign_key}]}_#{name}_shadow_cache"
-        end
+  def define_shadow_methods_of_reflection_class(reflection, model_name)
+    reflection.klass.class_eval <<-RUBY
+      after_save :update_shadow_cache_of_#{model_name}
+      after_destroy :delete_shadow_cache_of_#{model_name}
 
-        def update_shadow_cache_of_#{model_name}
-          cache_key = belongs_to_#{model_name}_shadow_cache_key
-          Redis.current.hset(cache_key, self[self.class.primary_key], self.build_shadow_data)
-          update_expiration(cache_key)
-        end
+      def belongs_to_#{model_name}_shadow_cache_key
+        "#{model_name}_\#{self[:#{reflection.foreign_key}]}_#{name}_shadow_cache"
+      end
 
-        def delete_shadow_cache_of_#{model_name}
-          Redis.current.hdel(belongs_to_#{model_name}_shadow_cache_key, self[self.class.primary_key])
-        end
-      RUBY
-    end
-    reflection
+      def update_shadow_cache_of_#{model_name}
+        cache_key = belongs_to_#{model_name}_shadow_cache_key
+        Redis.current.hset(cache_key, self[self.class.primary_key], self.build_shadow_data)
+        update_expiration(cache_key)
+      end
+
+      def delete_shadow_cache_of_#{model_name}
+        Redis.current.hdel(belongs_to_#{model_name}_shadow_cache_key, self[self.class.primary_key])
+      end
+    RUBY
   end
-  alias_method_chain :build, :shadow_option
 end

data/lib/shadow_model/version.rb

@@ -1,3 +1,3 @@
 module ShadowModel
-  VERSION = "0.2.6"
+  VERSION = "0.2.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shadow_model
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - Weihu Chen