smart_collection 0.0.1 → 0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 206884a5b82cfb9a32a8084b9e28602e0d06aef1
-  data.tar.gz: 4cfc1bd05e9b4e49d026e3388bb1409b9b92f1db
+  metadata.gz: 9f479b5262f4acf4557bce9c9afaefdd07c4c204
+  data.tar.gz: a1c9524cfad044566fae79aa21a6bb2286c581bf
 SHA512:
-  metadata.gz: e8f54ca5265ded99d18f0a41036fde1fb2052d6c1c26662482b409ecb7c9689bf14bd08f09fa9e10a7fa1cec331c979f88165e79d4fd1d7db0c52b7da5843599
-  data.tar.gz: de95c2aabb00d01f30fc5f60b826d2b8071d9ecd04e76a245466845a3d9f0a31a927bfc0db9d602ea12b100c8a81e916ad25044684e352c6423032c63ef461a7
+  metadata.gz: 21811df6d87e734e1565ea5f29c665e1057ca8f7206e1f53b71582d74c35ed821637eff906d5bb5d430d52c366024377c7829ecf48de3a86bf5f631a3e9a67d0
+  data.tar.gz: b92c5993149a07987a08bfa22826334611fd5cdc9fd7970daa5a3f321d340a6bbe9f62cd8a316a2eeafb3daad818cd99bc6a2fe00a7df9cd64ce6cd9bba8c1ff

data/lib/smart_collection/associations/preloader/smart_collection.rb

@@ -3,11 +3,11 @@ module SmartCollection
     module Preloader
       class SmartCollectionCachedByTable < ActiveRecord::Associations::Preloader::HasManyThrough
         def through_reflection
-          owners.first.class.reflect_on_association(:cached_items)
+          reflection.active_record.reflect_on_association(:cached_items)
         end
 
         def source_reflection
-          association_name = reflection.options[:smart_collection].items_name.to_s.singularize.to_sym
+          association_name = reflection.options[:smart_collection].item_name
           through_reflection.klass.reflect_on_association(association_name)
         end
 
@@ -15,43 +15,34 @@ module SmartCollection
           owners.reject(&:cache_exists?).each(&:update_cache)
           super
         end
-
-        private
-
       end
 
       class SmartCollectionCachedByCacheStore < ActiveRecord::Associations::Preloader::CollectionAssociation
         def associated_records_by_owner preloader
           owners.reject(&:cache_exists?).each(&:update_cache)
-          loaded = reflection.options[:smart_collection].cache_manager.read_multi(owners)
-          records = reflection.options[:smart_collection].item_class.where(id: loaded.values.flatten.uniq).map{|x| [x.id, x]}.to_h
+          config = reflection.options[:smart_collection]
+          loaded = config.cache_manager.read_multi(owners)
+          records = config.item_class.where(id: loaded.values.flatten.uniq).map{|x| [x.id, x]}.to_h
           loaded.map do |owner, ids|
             [owner, ids.map{|x| records[x]}]
           end
         end
-
-        def preload(preloader)
-          associated_records_by_owner(preloader).each do |owner, records|
-            association = owner.association(reflection.name)
-            association.loaded!
-            association.target.concat(records)
-          end
-        end
       end
+
     end
   end
 
   module ActiveRecordPreloaderPatch
     def preloader_for(reflection, owners, rhs_klass)
-      if reflection.options[:smart_collection]
-        unless reflection.options[:smart_collection].cache_manager
-          raise RuntimeError, "Turn on cache to enable preloading."
-        end
-        case reflection.options[:smart_collection].cache_manager
+      config = reflection.options[:smart_collection]
+      if config
+        case config.cache_manager
         when SmartCollection::CacheManager::CacheStore
           SmartCollection::Associations::Preloader::SmartCollectionCachedByCacheStore
         when SmartCollection::CacheManager::Table
           SmartCollection::Associations::Preloader::SmartCollectionCachedByTable
+        else
+          raise RuntimeError, "Turn on cache to enable preloading."
         end
       else
         super

data/lib/smart_collection/associations/smart_collection_association.rb

@@ -67,7 +67,7 @@ module SmartCollection
       end
 
       def cached_scope
-        reflection.options[:smart_collection].cache_manager.read owner
+        reflection.options[:smart_collection].cache_manager.read_scope owner
       end
 
     end

data/lib/smart_collection/cache_manager/cache_store.rb

@@ -2,12 +2,18 @@ module SmartCollection
   class CacheManager
     class CacheStore < CacheManager
 
+      def initialize model:, config:
+        super
+
+        @cache_key_proc = @config.cache_config[:cache_key_proc] || -> (owner) { "_smart_collection_#{owner.class.name}_#{owner.id}" }
+      end
+
       def cache_store
         @config.cache_config[:cache_store]
       end
 
       def cache_key owner
-        "_smart_collection_#{owner.class.name}_#{owner.id}"
+        @cache_key_proc.(owner)
       end
 
       def update owner
@@ -17,7 +23,7 @@ module SmartCollection
         owner.update(cache_expires_at: Time.now + expires_in)
       end
 
-      def read owner
+      def read_scope owner
         @config.item_class.where(id: Marshal.load(cache_store.read(cache_key owner)))
       end
 
@@ -30,7 +36,7 @@ module SmartCollection
       end
 
       def cache_exists? owner
-        !(owner.cache_expires_at.nil? || owner.cache_expires_at < Time.now) && cache_store.exist?(cache_key owner)
+        owner.cache_expires_at && owner.cache_expires_at > Time.now && cache_store.exist?(cache_key owner)
       end
 
     end

data/lib/smart_collection/cache_manager/table.rb

@@ -9,17 +9,17 @@ module SmartCollection
       end
 
       def define_cache_association_for model
-        options = @config.raw_config
+        config = @config
         cached_item_model = nil
         model.class_eval do
           cached_item_model = Class.new ActiveRecord::Base do
             self.table_name = 'smart_collection_cached_items'
-            belongs_to options[:items].to_s.singularize.to_sym, class_name: options[:class_name], foreign_key: :item_id
+            belongs_to config.item_name, class_name: config.item_class_name, foreign_key: :item_id
           end
           const_set("CachedItem", cached_item_model)
 
           has_many :cached_items, class_name: cached_item_model.name, foreign_key: :collection_id
-          has_many "cached_#{options[:items]}".to_sym, class_name: options[:class_name], through: :cached_items, source: options[:items].to_s.singularize.to_sym
+          has_many "cached_#{config.items_name}".to_sym, class_name: config.item_class_name, through: :cached_items, source: config.item_name
         end
         @cache_model = cached_item_model
       end
@@ -29,16 +29,16 @@ module SmartCollection
 
         @cache_model.where(collection_id: owner.id).delete_all
         @cache_model.connection.execute "INSERT INTO #{@cache_model.table_name} (collection_id, item_id) #{association.uncached_scope.select(owner.id, :id).to_sql}"
-        owner.update(cache_expires_at: Time.now + expires_in)
+        owner.update_column(:cache_expires_at, Time.now + expires_in)
       end
 
-      def read owner
+      def read_scope owner
         cache_association = owner.association("cached_#{@config.items_name}")
         cache_association.scope
       end
 
       def cache_exists? owner
-        !(owner.cache_expires_at.nil? || owner.cache_expires_at < Time.now)
+        owner.cache_expires_at && owner.cache_expires_at > Time.now
       end
 
     end

data/lib/smart_collection/cache_manager.rb

@@ -19,7 +19,11 @@ module SmartCollection
       raise NotImplementedError
     end
 
-    def read owner
+    def read_scope owner
+      raise NotImplementedError
+    end
+
+    def cache_exists? owner
       raise NotImplementedError
     end
 

data/lib/smart_collection/config.rb

@@ -11,12 +11,16 @@ module SmartCollection
       @raw_config[:items]
     end
 
+    def item_name
+      items_name.to_s.singularize.to_sym
+    end
+
     def item_class_name
-      @raw_config[:item_class]
+      @raw_config[:class_name]
     end
 
     def item_class
-      item_class_name.constantize
+      @item_class ||= item_class_name.constantize
     end
 
     def cache_config

data/lib/smart_collection/mixin.rb

@@ -14,7 +14,13 @@ module SmartCollection
       end
 
       def smart_collection_mixin
-        @__smart_collection_mixin ||= self.class.ancestors.find do |x|
+        self.class.smart_collection_mixin
+      end
+    end
+
+    module ClassMethods
+      def smart_collection_mixin
+        @__smart_collection_mixin ||= ancestors.find do |x|
           x.instance_of? Mixin
         end
       end
@@ -22,24 +28,23 @@ module SmartCollection
 
     attr_reader :config
 
-    def initialize items:, item_class: nil, cached_by: nil
-      @raw_config = {
-        items: items,
-        item_class: item_class,
-        cached_by: cached_by
-      }
+    def initialize raw_config
+      @raw_config = raw_config
     end
 
     def included base
-      COLLECTIONS[base] = true
       @config = config = SmartCollection::Config.new(@raw_config)
-      name = config.items_name
 
-      options = {smart_collection: config}
-      options[:class_name] = config.item_class_name if config.item_class_name
-      reflection = Builder::SmartCollectionAssociation.build(base, name, nil, options)
-      ::ActiveRecord::Reflection.add_reflection base, name, reflection
+      reflection_options = {smart_collection: config}
+      if config.item_class_name
+        reflection_options[:class_name] = config.item_class_name
+      end
+
+      reflection = Builder::SmartCollectionAssociation.build(base, config.items_name, nil, reflection_options)
+      ::ActiveRecord::Reflection.add_reflection base, config.items_name, reflection
+
       base.include(InstanceMethods)
+      base.extend(ClassMethods)
 
       if cache_class = CacheManager.determine_class(@raw_config)
         config.cache_manager = cache_class.new(model: base, config: config)

data/lib/smart_collection/reflection/smart_collection_reflection.rb

@@ -6,7 +6,14 @@ module SmartCollection
       end
 
       def check_eager_loadable!
-        raise RuntimeError, 'eager_load is not supported by now.'
+        unless options[:smart_collection].cache_manager.instance_of? SmartCollection::CacheManager::Table
+          raise RuntimeError, 'eager_load is only supported when using table for cache.'
+        end
+      end
+
+      def chain
+        items_name = options[:smart_collection].items_name
+        active_record.reflect_on_association("cached_#{items_name}".to_sym).chain
       end
     end
   end

data/lib/smart_collection/version.rb

@@ -0,0 +1,3 @@
+module SmartCollection
+  VERSION = '0.1'
+end

data/lib/smart_collection.rb

@@ -1,9 +1,5 @@
 require 'active_record'
 
-module SmartCollection
-  COLLECTIONS = {}
-end
-
 Dir.glob("#{File.dirname(__FILE__)}/**/*.rb").each do |file|
   require file
 end

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: smart_collection
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: '0.1'
 platform: ruby
 authors:
 - CicholGricenchos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-08 00:00:00.000000000 Z
+date: 2018-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.0'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '5.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +72,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ''
 email:
 - cichol@live.cn
@@ -83,6 +103,7 @@ files:
 - lib/smart_collection/config.rb
 - lib/smart_collection/mixin.rb
 - lib/smart_collection/reflection/smart_collection_reflection.rb
+- lib/smart_collection/version.rb
 homepage: https://github.com/CicholGricenchos/smart_collection
 licenses:
 - MIT
@@ -106,5 +127,5 @@ rubyforge_project:
 rubygems_version: 2.5.2.1
 signing_key: 
 specification_version: 4
-summary: ''
+summary: collections by rules
 test_files: []