restrict_cache 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c29fdf424ebafc1734aacbc3da69ca1a5ff9563
-  data.tar.gz: 48cc0cd115be5e997c74763b02569a7c8a978b17
+  metadata.gz: 628949fd15aa9d8f74fceddf1a3dd904c9b0fa7b
+  data.tar.gz: ee0d9321b713052ba936e1ad4e857749d820cac6
 SHA512:
-  metadata.gz: c29896eacf36a4e75f08752e1119ac5f65599894191ce44ee005790782d2164dd28a186df8fd37dc7e729ff4548c2350a1c208a2eca39642ce43ce8381bb9d93
-  data.tar.gz: 680747417162f543812e2ce6c34bca13b13d5847f6fe8e746cbd0b26c1329f3ba1cbba12e806c701964aa3f1796457e914e7685e99ff446ed27ea33d75781581
+  metadata.gz: c10186d4b8dc663a3d1faedcf393b4d211081cbc1e0f94a523fa95990ea1e6c61176d842cbceea7b1ccc3a2914476067e8d20a59dc0d2ba784cecf41a26fcf4a
+  data.tar.gz: 7d0b5ccce01c6c6429173b72d7c1a7de7d2d1e07b4326e82e2680da9001810d8f8de3354fc8843ab1945aa615c43b483335b5fc0f087e53319dc5a020f230ffd

data/lib/restrict_cache.rb

@@ -1,6 +1,7 @@
 require "restrict_cache/version"
+require "restrict_cache/base"
 require "restrict_cache/accessible"
-require "restrict_cache/cacheable"
+require "restrict_cache/cache_collection"
 require "restrict_cache/cache_sweeper"
 require "restrict_cache/railtie" if defined?(Rails)
 

data/lib/restrict_cache/accessible.rb

@@ -3,22 +3,27 @@ module RestrictCache
     THREAD_KEY = :restrict_cache
 
     def cache
-      Thread.current[THREAD_KEY] ||= Cacheable.new
+      Thread.current[THREAD_KEY] ||= CacheCollection.new
     end
 
     def clear
       Thread.current[THREAD_KEY] = nil
     end
 
-    def method_missing(name, *args, &block)
-      super unless cache.respond_to?(name)
+    private
+      def method_missing(name, *args, &block)
+        super unless cache.respond_to?(name)
 
-      define_singleton_method(name) do |*a, &b|
-        cache.public_send(name, *a, &b)
+        define_singleton_method(name) do |*a, &b|
+          cache.public_send(name, *a, &b)
+        end
+
+        send(name, *args, &block)
       end
 
-      send(name, *args, &block)
-    end
+      def respond_to_missing?(name, include_private = false)
+        cache.respond_to?(name)
+      end
   end
 
   extend Accessible

data/lib/restrict_cache/base.rb

@@ -0,0 +1,31 @@
+module RestrictCache
+  class Base
+    class << self
+      def instance
+        _cache = RestrictCache.custom_cache.contents(cache_key)
+        _cache = RestrictCache.custom_cache.add(self.new) unless _cache
+        _cache
+      end
+
+      def cache_key
+        self.name
+      end
+
+      private
+        def method_missing(name, *args, &block)
+          super unless instance.respond_to?(name)
+
+          define_singleton_method(name) do |*a, &b|
+            instance.public_send(name, *a, &b)
+          end
+
+          send(name, *args, &block)
+        end
+
+        def respond_to_missing?(name, include_private = false)
+          instance.respond_to?(name)
+        end
+    end
+  end
+end
+

data/lib/restrict_cache/{cacheable.rb → cache_collection.rb}

@@ -1,20 +1,25 @@
-require "restrict_cache/cacheable/base"
-require "restrict_cache/cacheable/active_record_cache"
-require "restrict_cache/cacheable/custom_cache"
+require "restrict_cache/cache_collection/inner_cache"
+require "restrict_cache/cache_collection/active_record_cache" if defined?(ActiveRecord)
+require "restrict_cache/cache_collection/custom_cache"
 
 module RestrictCache
-  class Cacheable
+  class CacheCollection
     module CacheKey
       ACTIVERECORD = :active_record_cache
       CUSTOM = :custom_cache
-      ALL = [ACTIVERECORD, CUSTOM]
+      ALL = [
+        defined?(ActiveRecord) ? ACTIVERECORD : nil,
+        CUSTOM,
+      ].compact.freeze
 
       def self.get(content)
         case
         when defined?(ActiveRecord) && content.class < ActiveRecord::Base
           ACTIVERECORD
-        else
+        when content.class < RestrictCache::Base
           CUSTOM
+        else
+          raise "unknown cache class"
         end
       end
     end

data/lib/restrict_cache/cache_collection/active_record_cache.rb

@@ -0,0 +1,25 @@
+module RestrictCache
+  class CacheCollection
+    class ActiveRecordCache < InnerCache
+      def add(content)
+        tbl_name, index = table_name_of(content), index_of(content)
+        @caches[tbl_name] ||= {}
+        @caches[tbl_name][index] = content
+      end
+
+      def contents(_table_name)
+        @caches[_table_name.to_sym]
+      end
+
+      private
+        def table_name_of(content)
+          content.class.table_name.to_sym
+        end
+
+        def index_of(content)
+          content.public_send content.class.primary_key
+        end
+    end
+  end
+end
+

data/lib/restrict_cache/cache_collection/custom_cache.rb

@@ -0,0 +1,14 @@
+module RestrictCache
+  class CacheCollection
+    class CustomCache < InnerCache
+      def add(content)
+        @caches[content.class.cache_key] = content
+      end
+
+      def contents(cache_key = nil)
+        cache_key ? @caches[cache_key] : nil
+      end
+    end
+  end
+end
+

data/lib/restrict_cache/{cacheable/base.rb → cache_collection/inner_cache.rb}

@@ -1,6 +1,6 @@
 module RestrictCache
-  class Cacheable
-    class Base
+  class CacheCollection
+    class InnerCache
       def initialize
         @caches = {}
       end

data/lib/restrict_cache/rails_ext/action_controller.rb

@@ -0,0 +1,23 @@
+module RestrictCache
+  module RailsExt
+    module ActionController
+      include ActiveSupport::Concern
+
+      module ClassMethods
+        def cache_sweep_action(*args)
+          options = args.extract_options!
+          actions = args.empty? ? {} : {only: args}
+          options.merge! actions unless actions.empty?
+          around_action :sweep_restrict_cache, options
+        end
+      end
+
+      def sweep_restrict_cache
+        yield
+      ensure
+        RestrictCache.clear
+      end
+    end
+  end
+end
+

data/lib/restrict_cache/rails_ext/active_record/base.rb

@@ -0,0 +1,20 @@
+module RestrictCache
+  module RailsExt
+    module ActiveRecord
+      module Base
+        extend ActiveSupport::Concern
+
+        module ClassMethods
+          %i(find_with_restrict_cache find_with_rc).each do |key|
+            delegate key, to: :all
+          end
+        end
+
+        def restrict_cache
+          RestrictCache.add(self)
+        end
+      end
+    end
+  end
+end
+

data/lib/restrict_cache/rails_ext/active_record/relation.rb

@@ -0,0 +1,54 @@
+module RestrictCache
+  module RailsExt
+    module ActiveRecord
+      module Relation
+        def find_and_restrict_cache(*args)
+          records = find(*args)
+          Array(records).each(&:restrict_cache)
+          records
+        end
+
+        def find_from_restrict_cache(*args)
+          return nil unless cached_contents
+
+          case args.first
+          when Integer
+            cached_contents[args.first]
+          when String
+            cached_contents[args.first.to_i]
+          when Array
+            args.first.map {|index| cached_contents[index.to_i] }
+          else
+            raise "unknown argument: #{args.inspect}"
+          end
+        end
+
+        def find_with_restrict_cache(*args, &block)
+          if restrict_cached?(*args)
+            records = find_from_restrict_cache(*args)
+          else
+            records = find_and_restrict_cache(*args)
+          end
+
+          block_given? ? records.each {|record| block.call(record) } : records
+        end
+        alias_method :find_with_rc, :find_with_restrict_cache
+
+        def with_restrict_cache
+          self.each(&:restrict_cache) && self
+        end
+
+        private
+          def cached_contents
+            RestrictCache.send(CacheCollection::CacheKey::ACTIVERECORD).contents(self.table_name)
+          end
+
+          def restrict_cached?(*args)
+            return false unless cached_contents
+            args.all? {|index| cached_contents.include?(index) }
+          end
+      end
+    end
+  end
+end
+

data/lib/restrict_cache/rails_ext/all.rb

@@ -0,0 +1,4 @@
+require "restrict_cache/rails_ext/action_controller"
+require "restrict_cache/rails_ext/active_record/base"
+require "restrict_cache/rails_ext/active_record/relation"
+

data/lib/restrict_cache/railtie.rb

@@ -1,16 +1,18 @@
 module RestrictCache
   class Railtie < ::Rails::Railtie
     initializer "restrict_cache" do
-      require "restrict_cache/action_controller_ext"
-      require "restrict_cache/active_record_ext"
+      require "restrict_cache/rails_ext/all"
 
       ActiveSupport.on_load(:action_controller) do
-        ::ActionController::Base.send(:include, RestrictCache::ActionControllerExt)
+        ::ActionController::Base.send(
+          :include, RestrictCache::RailsExt::ActionController)
       end
 
       ActiveSupport.on_load(:active_record) do
-         ::ActiveRecord::Base.send(:include, RestrictCache::ActiveRecordExt::Base)
-         ::ActiveRecord::Relation.send(:include, RestrictCache::ActiveRecordExt::Relation)
+         ::ActiveRecord::Base.send(
+           :include, RestrictCache::RailsExt::ActiveRecord::Base)
+         ::ActiveRecord::Relation.send(
+           :include, RestrictCache::RailsExt::ActiveRecord::Relation)
       end
     end
   end

data/lib/restrict_cache/version.rb

@@ -1,4 +1,4 @@
 module RestrictCache
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: restrict_cache
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - i2bskn
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-03-19 00:00:00.000000000 Z
+date: 2015-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -71,13 +71,16 @@ files:
 - bin/setup
 - lib/restrict_cache.rb
 - lib/restrict_cache/accessible.rb
-- lib/restrict_cache/action_controller_ext.rb
-- lib/restrict_cache/active_record_ext.rb
+- lib/restrict_cache/base.rb
+- lib/restrict_cache/cache_collection.rb
+- lib/restrict_cache/cache_collection/active_record_cache.rb
+- lib/restrict_cache/cache_collection/custom_cache.rb
+- lib/restrict_cache/cache_collection/inner_cache.rb
 - lib/restrict_cache/cache_sweeper.rb
-- lib/restrict_cache/cacheable.rb
-- lib/restrict_cache/cacheable/active_record_cache.rb
-- lib/restrict_cache/cacheable/base.rb
-- lib/restrict_cache/cacheable/custom_cache.rb
+- lib/restrict_cache/rails_ext/action_controller.rb
+- lib/restrict_cache/rails_ext/active_record/base.rb
+- lib/restrict_cache/rails_ext/active_record/relation.rb
+- lib/restrict_cache/rails_ext/all.rb
 - lib/restrict_cache/railtie.rb
 - lib/restrict_cache/version.rb
 - restrict_cache.gemspec

data/lib/restrict_cache/action_controller_ext.rb

@@ -1,21 +0,0 @@
-module RestrictCache
-  module ActionControllerExt
-    include ActiveSupport::Concern
-
-    module ClassMethods
-      def cache_sweep_action(*args)
-        options = args.extract_options!
-        actions = args.empty? ? {} : {only: args}
-        options.merge! actions unless actions.empty?
-        around_action :sweep_restrict_cache, options
-      end
-    end
-
-    def sweep_restrict_cache
-      yield
-    ensure
-      RestrictCache.clear
-    end
-  end
-end
-

data/lib/restrict_cache/active_record_ext.rb

@@ -1,64 +0,0 @@
-module RestrictCache
-  module ActiveRecordExt
-    module Base
-      extend ActiveSupport::Concern
-
-      module ClassMethods
-        delegate :find_with_restrict_cache, to: :all
-      end
-
-      def restrict_cache
-        RestrictCache.add(self)
-      end
-    end
-
-    module Relation
-      AR_CACHE_KEY = Cacheable::CacheKey::ACTIVERECORD
-
-      def find_and_restrict_cache(arg)
-        records = find(arg)
-        Array(records).each(&:restrict_cache)
-        records
-      end
-
-      def find_from_restrict_cache(arg)
-        contents = RestrictCache.send(AR_CACHE_KEY).contents(self.table_name)
-        return nil unless contents
-
-        case arg
-        when Integer
-          contents[arg]
-        when String
-          contents[arg.to_i]
-        when Array
-          args.map {|index| contents[index.to_i] }
-        else
-          raise "unknown argument: #{arg.inspect}"
-        end
-      end
-
-      def find_with_restrict_cache(arg)
-        if restrict_cached?(Array(arg))
-          records = Array(arg).map {|index| find_from_restrict_cache(index) }
-          records.size > 1 ? records : records.first
-        else
-          find_and_restrict_cache(arg)
-        end
-      end
-
-      def with_restrict_cache
-        self.each(&:restrict_cache)
-        self
-      end
-
-      private
-        def restrict_cached?(args)
-          content = RestrictCache.send(AR_CACHE_KEY).contents(self.table_name)
-          return false unless content
-          ids = content.keys
-          args.all? {|index| ids.include?(index) }
-        end
-    end
-  end
-end
-

data/lib/restrict_cache/cacheable/active_record_cache.rb

@@ -1,20 +0,0 @@
-module RestrictCache
-  class Cacheable
-    class ActiveRecordCache < Base
-      def add(content)
-        @caches[table_name(content)] ||= {}
-        @caches[table_name(content)][content.id] = content
-      end
-
-      def contents(_table_name)
-        @caches[_table_name.to_sym]
-      end
-
-      private
-        def table_name(content)
-          content.class.table_name.to_sym
-        end
-    end
-  end
-end
-

data/lib/restrict_cache/cacheable/custom_cache.rb

@@ -1,13 +0,0 @@
-module RestrictCache
-  class Cacheable
-    class CustomCache < Base
-      def add(cache_key, content)
-        @caches[cache_key.to_sym] = content
-      end
-
-      def contents(cache_key = nil)
-        cache_key ? @caches[cache_key.to_sym] : nil
-      end
-    end
-  end
-end