second_level_cache 2.3.0 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4abc1a1470dbaddc2928a7b91c0c629eb0c92891
-  data.tar.gz: eb785ea9967fa623b5492ef1677388e53d693fe7
+  metadata.gz: 4ca8ef3f66bcc6dcc76e93958357d577a63a4769
+  data.tar.gz: f90a4c724367d36589712a31df03723c2f4b7248
 SHA512:
-  metadata.gz: e828132b84bec6a95eb5506b0d8ea55f2c713d1e6ef775d40780f8ab75ba490c2bab37c63c77a26a2ffd81669fc577f2de76e623e5dd9576cc890af3e504f3e7
-  data.tar.gz: a453166bc6e5216b5b4dd3b3abbea6a995b626916eff9346bbf5bfa1d7a53f2af93825cfb93077c6482c4cd0fc134fb97465a6c1452b58729c728b6d28c7b11d
+  metadata.gz: 2a544566618c8643153d1bbd7c764878323b67e731cded7b1a0419866f8be54564a4fc8bcfb4c6a6511aa6ee54ad3e7824fc0887206463aed2146d075bb18fd8
+  data.tar.gz: c94834042b2d630e6a3281af8cfedac728d9e4e7f76df5bd6230b577eb2669451391881bb732c42416c15ee1eeee8aff162abe4f9186d401bc28913fef98747d

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+2.3.1
+-----
+
+- Fix some cases will raise "uninitialized constant SecondLevelCache::Mixin" error. (#66)
+
+2.3.0
+-----
+
+* Use Model schema digest as cache_version, so you don't need set `:version` option now. (#60)
+* Fix `store` serialize option (#62)
+* Remove `acts_as_cached` method now! Please use `second_level_cache`. (#59)
+
 2.2.7
 -----
 

data/lib/second_level_cache.rb

@@ -12,92 +12,4 @@ module SecondLevelCache
   class << self
     delegate :logger, :cache_store, :cache_key_prefix, to: Config
   end
-
-  module Mixin
-    extend ActiveSupport::Concern
-
-    module ClassMethods
-      attr_reader :second_level_cache_options
-
-      delegate :logger, :cache_store, :cache_key_prefix, to: SecondLevelCache
-
-      def second_level_cache(options = {})
-        @second_level_cache_enabled = true
-        @second_level_cache_options = options
-        @second_level_cache_options[:version] ||= 0
-        @second_level_cache_options[:expires_in] ||= 1.week
-        relation.class.send :prepend, SecondLevelCache::ActiveRecord::FinderMethods
-        prepend SecondLevelCache::ActiveRecord::Core
-      end
-
-      def second_level_cache_enabled?
-        if defined? @second_level_cache_enabled
-          @second_level_cache_enabled == true
-        else
-          false
-        end
-      end
-
-      def without_second_level_cache
-        old = @second_level_cache_enabled
-        @second_level_cache_enabled = false
-
-        yield if block_given?
-      ensure
-        @second_level_cache_enabled = old
-      end
-
-      # Get MD5 digest of this Model schema
-      # http://api.rubyonrails.org/classes/ActiveRecord/Core/ClassMethods.html#method-i-inspect
-      def cache_version
-        return @cache_version if defined? @cache_version
-        # This line is copy from:
-        # https://github.com/rails/rails/blob/f9a5f48/activerecord/lib/active_record/core.rb#L236
-        attr_list = attribute_types.map { |name, type| "#{name}: #{type.type}" } * ', '
-        model_schema_digest = Digest::MD5.hexdigest(attr_list)
-        @cache_version = "#{second_level_cache_options[:version]}/#{model_schema_digest}"
-      end
-
-      def second_level_cache_key(id)
-        "#{cache_key_prefix}/#{table_name.downcase}/#{id}/#{cache_version}"
-      end
-
-      def read_second_level_cache(id)
-        return unless second_level_cache_enabled?
-        RecordMarshal.load(SecondLevelCache.cache_store.read(second_level_cache_key(id)))
-      end
-
-      def expire_second_level_cache(id)
-        return unless second_level_cache_enabled?
-        SecondLevelCache.cache_store.delete(second_level_cache_key(id))
-      end
-    end
-
-    def second_level_cache_key
-      self.class.second_level_cache_key(id)
-    end
-
-    def expire_second_level_cache
-      return unless self.class.second_level_cache_enabled?
-      SecondLevelCache.cache_store.delete(second_level_cache_key)
-    end
-
-    def write_second_level_cache
-      return unless self.class.second_level_cache_enabled?
-      marshal = RecordMarshal.dump(self)
-      expires_in = self.class.second_level_cache_options[:expires_in]
-      expire_changed_association_uniq_keys
-      SecondLevelCache.cache_store.write(second_level_cache_key, marshal, expires_in: expires_in)
-    end
-
-    alias update_second_level_cache write_second_level_cache
-
-    def expire_changed_association_uniq_keys
-      reflections = self.class.reflections.select { |_, reflection| reflection.belongs_to? }
-      changed_keys = reflections.map { |_, reflection| reflection.foreign_key } & previous_changes.keys
-      changed_keys.each do |key|
-        SecondLevelCache.cache_store.delete(self.class.send(:cache_uniq_key, key => previous_changes[key][0]))
-      end
-    end
-  end
 end

data/lib/second_level_cache/active_record.rb

@@ -1,3 +1,4 @@
+require 'second_level_cache/mixin'
 require 'second_level_cache/active_record/base'
 require 'second_level_cache/active_record/core'
 require 'second_level_cache/active_record/fetch_by_uniq_key'

data/lib/second_level_cache/mixin.rb

@@ -0,0 +1,89 @@
+module SecondLevelCache
+  module Mixin
+    extend ActiveSupport::Concern
+
+    module ClassMethods
+      attr_reader :second_level_cache_options
+
+      delegate :logger, :cache_store, :cache_key_prefix, to: SecondLevelCache
+
+      def second_level_cache(options = {})
+        @second_level_cache_enabled = true
+        @second_level_cache_options = options
+        @second_level_cache_options[:version] ||= 0
+        @second_level_cache_options[:expires_in] ||= 1.week
+        relation.class.send :prepend, SecondLevelCache::ActiveRecord::FinderMethods
+        prepend SecondLevelCache::ActiveRecord::Core
+      end
+
+      def second_level_cache_enabled?
+        if defined? @second_level_cache_enabled
+          @second_level_cache_enabled == true
+        else
+          false
+        end
+      end
+
+      def without_second_level_cache
+        old = @second_level_cache_enabled
+        @second_level_cache_enabled = false
+
+        yield if block_given?
+      ensure
+        @second_level_cache_enabled = old
+      end
+
+      # Get MD5 digest of this Model schema
+      # http://api.rubyonrails.org/classes/ActiveRecord/Core/ClassMethods.html#method-i-inspect
+      def cache_version
+        return @cache_version if defined? @cache_version
+        # This line is copy from:
+        # https://github.com/rails/rails/blob/f9a5f48/activerecord/lib/active_record/core.rb#L236
+        attr_list = attribute_types.map { |name, type| "#{name}: #{type.type}" } * ', '
+        model_schema_digest = Digest::MD5.hexdigest(attr_list)
+        @cache_version = "#{second_level_cache_options[:version]}/#{model_schema_digest}"
+      end
+
+      def second_level_cache_key(id)
+        "#{cache_key_prefix}/#{table_name.downcase}/#{id}/#{cache_version}"
+      end
+
+      def read_second_level_cache(id)
+        return unless second_level_cache_enabled?
+        RecordMarshal.load(SecondLevelCache.cache_store.read(second_level_cache_key(id)))
+      end
+
+      def expire_second_level_cache(id)
+        return unless second_level_cache_enabled?
+        SecondLevelCache.cache_store.delete(second_level_cache_key(id))
+      end
+    end
+
+    def second_level_cache_key
+      self.class.second_level_cache_key(id)
+    end
+
+    def expire_second_level_cache
+      return unless self.class.second_level_cache_enabled?
+      SecondLevelCache.cache_store.delete(second_level_cache_key)
+    end
+
+    def write_second_level_cache
+      return unless self.class.second_level_cache_enabled?
+      marshal = RecordMarshal.dump(self)
+      expires_in = self.class.second_level_cache_options[:expires_in]
+      expire_changed_association_uniq_keys
+      SecondLevelCache.cache_store.write(second_level_cache_key, marshal, expires_in: expires_in)
+    end
+
+    alias update_second_level_cache write_second_level_cache
+
+    def expire_changed_association_uniq_keys
+      reflections = self.class.reflections.select { |_, reflection| reflection.belongs_to? }
+      changed_keys = reflections.map { |_, reflection| reflection.foreign_key } & previous_changes.keys
+      changed_keys.each do |key|
+        SecondLevelCache.cache_store.delete(self.class.send(:cache_uniq_key, key => previous_changes[key][0]))
+      end
+    end
+  end
+end

data/lib/second_level_cache/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module SecondLevelCache
-  VERSION = '2.3.0'.freeze
+  VERSION = '2.3.1'.freeze
 end

data/test/test_helper.rb

@@ -6,6 +6,8 @@ require 'database_cleaner'
 require 'active_record'
 
 ActiveSupport.test_order = :sorted if ActiveSupport.respond_to?(:test_order=)
+# Force hook :active_record on_load event to make sure loader can work.
+ActiveSupport.run_load_hooks(:active_record, ActiveRecord::Base)
 
 require 'second_level_cache'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: second_level_cache
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.3.1
 platform: ruby
 authors:
 - Hooopo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-19 00:00:00.000000000 Z
+date: 2017-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -143,6 +143,7 @@ files:
 - lib/second_level_cache/active_record/persistence.rb
 - lib/second_level_cache/active_record/preloader.rb
 - lib/second_level_cache/config.rb
+- lib/second_level_cache/mixin.rb
 - lib/second_level_cache/record_marshal.rb
 - lib/second_level_cache/record_relation.rb
 - lib/second_level_cache/version.rb