smart_collection 0.1.1 → 0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 187bb48a7b917cc0b0f8e068fb48f32a559d9ffb
-  data.tar.gz: fb246fd8dd0ca7c3cd1a8ed01d57a699dfa9433b
+  metadata.gz: e48926b0db15bfc7e6c786278522b7f07df46900
+  data.tar.gz: 6a1daefd7675a7bd97068d4e1298e5737f0273a0
 SHA512:
-  metadata.gz: de0fdf1c0a01d34314a4e6d6665ef945dbb195ef728519ef8a874f7b4961c9c4547679245ce7eae2b0ca999bccf939ee715404c9c05a8b385ec9b74944a4b3f7
-  data.tar.gz: 85aa4af37c448c96684b30a9764b677fd62f9de0de6d152cc81501ce40cf2aa7920695e7e29e5407236e2a5e87ad72ff5e02c88293c649b506293124433e07d1
+  metadata.gz: 6d9a7c2649df55b559a0f54517ffbca6a237cad2da28da6a254980fc41fd0eb6bb27db13b5eb7c59251fddfea404f9ad24e06595a364f962264fe147ec315528
+  data.tar.gz: 782412ba48ce5aa99508992857e94490a19602a8b28d546217725cb77b8232875e6b733b191ff09195f889d32919181f3ce3587c167f0b637eefcb770efdc752

data/lib/smart_collection/cache_manager/cache_store.rb

@@ -17,9 +17,7 @@ module SmartCollection
       end
 
       def update owner
-        association = owner.association(@config.items_name)
-
-        cache_store.write(cache_key(owner), Marshal.dump(association.uncached_scope.pluck(:id)))
+        cache_store.write(cache_key(owner), Marshal.dump(owner.smart_collection_mixin.uncached_scope(owner).pluck(:id)))
         owner.update(cache_expires_at: Time.now + expires_in)
       end
 

data/lib/smart_collection/cache_manager/table.rb

@@ -25,10 +25,8 @@ module SmartCollection
       end
 
       def update owner
-        association = owner.association(@config.items_name)
-
         @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}"
+        @cache_model.connection.execute "INSERT INTO #{@cache_model.table_name} (collection_id, item_id) #{owner.smart_collection_mixin.uncached_scope(owner).select(owner.id, :id).to_sql}"
         owner.update_column(:cache_expires_at, Time.now + expires_in)
       end
 

data/lib/smart_collection/mixin.rb

@@ -32,6 +32,14 @@ module SmartCollection
       @raw_config = raw_config
     end
 
+    def uncached_scope owner
+      SmartCollection::ScopeBuilder.new(owner.rule, @config.item_class).build
+    end
+
+    def cached_scope owner
+      @config.cache_manager.read_scope owner
+    end
+
     def included base
       @config = config = SmartCollection::Config.new(@raw_config)
 
@@ -40,9 +48,6 @@ module SmartCollection
         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)
 
@@ -50,6 +55,47 @@ module SmartCollection
         config.cache_manager = cache_class.new(model: base, config: config)
       end
 
+      mixin_options = {
+        name: config.items_name,
+        scope: -> owner {
+          if cache_manager = config.cache_manager
+            unless cache_manager.cache_exists? owner
+              owner.update_cache
+            end
+            cached_scope(owner)
+          else
+            uncached_scope(owner)
+          end
+        },
+        type: :collection
+      }
+
+      case
+      when cache_class == SmartCollection::CacheManager::CacheStore
+        mixin_options[:preloader] = -> owners {
+          owners.reject(&:cache_exists?).each(&:update_cache)
+          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.to_h
+        }
+      when cache_class == SmartCollection::CacheManager::Table
+        cached_name = "cached_#{config.items_name}".to_sym
+        mixin_options[:preloader] = -> owners {
+          owners.reject(&:cache_exists?).each(&:update_cache)
+          Associationist.preload(owners, cached_items: config.item_name)
+          owners.map do |owner|
+            [owner, owner.cached_items.map{|item| item.send(config.item_name)}]
+          end.to_h
+        }
+      else
+        mixin_options[:preloader] = -> _ {
+          raise RuntimeError, "Turn on cache to enable preloading."
+        }
+      end
+      base.include Associationist::Mixin.new(mixin_options)
+
       base.validates_with SmartCollection::Validator
 
     end

data/lib/smart_collection/scope_builder.rb

@@ -0,0 +1,46 @@
+module SmartCollection
+  class ScopeBuilder
+    def initialize rule, klass
+      @rule = rule
+      @klass = klass
+      @klass_hash = {}
+    end
+
+    def build
+      rule_to_bulk_queries @rule
+      bulk_load
+      rule_to_scope @rule
+    end
+
+    def bulk_load
+      @klass_hash = @klass_hash.map do |klass_name, ids|
+        [klass_name, Object.const_get(klass_name).where(id: ids).map{|x| [x.id, x]}.to_h]
+      end.to_h
+    end
+
+    def rule_to_bulk_queries rule
+      case
+      when arr = (rule['or'] || rule['and'])
+        arr.each{|x| rule_to_bulk_queries x}
+      when assoc = rule['association']
+        ids = @klass_hash[assoc['class_name']] ||= []
+        ids << assoc['id']
+      end
+    end
+
+    def rule_to_scope rule
+      case
+      when ors = rule['or']
+        ors.map{|x| rule_to_scope x}.inject(:or)
+      when ands = rule['and']
+        ands.map{|x| rule_to_scope x}.inject(:merge)
+      when assoc = rule['association']
+        @klass_hash[assoc['class_name']][assoc['id']].association(assoc['source']).scope
+      when cond = rule['condition']
+        scope = @klass
+        scope = scope.joins(cond['joins'].to_sym) if cond['joins']
+        scope.where(cond['where'])
+      end
+    end
+  end
+end

data/lib/smart_collection/version.rb

@@ -1,3 +1,3 @@
 module SmartCollection
-  VERSION = '0.1.1'
+  VERSION = '0.2'
 end

data/lib/smart_collection.rb

@@ -1,4 +1,4 @@
-require 'active_record'
+require 'associationist'
 
 Dir.glob("#{File.dirname(__FILE__)}/**/*.rb").each do |file|
   require file

metadata

@@ -1,35 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: smart_collection
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: '0.2'
 platform: ruby
 authors:
 - CicholGricenchos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-23 00:00:00.000000000 Z
+date: 2019-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activerecord
+  name: associationist
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '5.0'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '5.0'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -94,15 +88,12 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/smart_collection.rb
-- lib/smart_collection/associations/preloader/smart_collection.rb
-- lib/smart_collection/associations/smart_collection_association.rb
-- lib/smart_collection/builder/smart_collection_association.rb
 - lib/smart_collection/cache_manager.rb
 - lib/smart_collection/cache_manager/cache_store.rb
 - lib/smart_collection/cache_manager/table.rb
 - lib/smart_collection/config.rb
 - lib/smart_collection/mixin.rb
-- lib/smart_collection/reflection/smart_collection_reflection.rb
+- lib/smart_collection/scope_builder.rb
 - lib/smart_collection/validator.rb
 - lib/smart_collection/version.rb
 homepage: https://github.com/CicholGricenchos/smart_collection

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

@@ -1,54 +0,0 @@
-module SmartCollection
-  module Associations
-    module Preloader
-      class SmartCollectionCachedByTable < ActiveRecord::Associations::Preloader::HasManyThrough
-        def through_reflection
-          reflection.active_record.reflect_on_association(:cached_items)
-        end
-
-        def source_reflection
-          association_name = reflection.options[:smart_collection].item_name
-          through_reflection.klass.reflect_on_association(association_name)
-        end
-
-        def associated_records_by_owner preloader
-          owners.reject(&:cache_exists?).each(&:update_cache)
-          super
-        end
-      end
-
-      class SmartCollectionCachedByCacheStore < ActiveRecord::Associations::Preloader::CollectionAssociation
-        def associated_records_by_owner preloader
-          owners.reject(&:cache_exists?).each(&:update_cache)
-          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
-      end
-
-    end
-  end
-
-  module ActiveRecordPreloaderPatch
-    def preloader_for(reflection, owners, rhs_klass)
-      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
-      end
-    end
-  end
-
-  ActiveRecord::Associations::Preloader.prepend ActiveRecordPreloaderPatch
-end

data/lib/smart_collection/associations/smart_collection_association.rb

@@ -1,75 +0,0 @@
-module SmartCollection
-  module Associations
-    class SmartCollectionAssociation < ::ActiveRecord::Associations::HasManyAssociation
-
-      class ScopeBuilder
-        def initialize rule, klass
-          @rule = rule
-          @klass = klass
-          @klass_hash = {}
-        end
-
-        def build
-          rule_to_bulk_queries @rule
-          bulk_load
-          rule_to_scope @rule
-        end
-
-        def bulk_load
-          @klass_hash = @klass_hash.map do |klass_name, ids|
-            [klass_name, Object.const_get(klass_name).where(id: ids).map{|x| [x.id, x]}.to_h]
-          end.to_h
-        end
-
-        def rule_to_bulk_queries rule
-          case
-          when arr = (rule['or'] || rule['and'])
-            arr.each{|x| rule_to_bulk_queries x}
-          when assoc = rule['association']
-            ids = @klass_hash[assoc['class_name']] ||= []
-            ids << assoc['id']
-          end
-        end
-
-        def rule_to_scope rule
-          case
-          when ors = rule['or']
-            ors.map{|x| rule_to_scope x}.inject(:or)
-          when ands = rule['and']
-            ands.map{|x| rule_to_scope x}.inject(:merge)
-          when assoc = rule['association']
-            @klass_hash[assoc['class_name']][assoc['id']].association(assoc['source']).scope
-          when cond = rule['condition']
-            scope = @klass
-            scope = scope.joins(cond['joins'].to_sym) if cond['joins']
-            scope.where(cond['where'])
-          end
-        end
-      end
-
-      def association_scope
-        if cache_manager = reflection.options[:smart_collection].cache_manager
-          unless cache_manager.cache_exists? owner
-            owner.update_cache
-          end
-          cached_scope
-        else
-          uncached_scope
-        end
-      end
-
-      def skip_statement_cache?
-        true
-      end
-
-      def uncached_scope
-        ScopeBuilder.new(owner.rule, reflection.klass).build
-      end
-
-      def cached_scope
-        reflection.options[:smart_collection].cache_manager.read_scope owner
-      end
-
-    end
-  end
-end

data/lib/smart_collection/builder/smart_collection_association.rb

@@ -1,26 +0,0 @@
-module SmartCollection
-  module Builder
-    class SmartCollectionAssociation < ::ActiveRecord::Associations::Builder::CollectionAssociation
-      def self.macro
-        :has_many
-      end
-
-      def self.valid_options(options)
-        super + [:primary_key, :dependent, :as, :through, :source, :source_type, :inverse_of, :counter_cache, :join_table, :foreign_type, :index_errors, :smart_collection]
-      end
-
-      def self.valid_dependent_options
-        [:destroy, :delete_all, :nullify, :restrict_with_error, :restrict_with_exception]
-      end
-
-      def self.create_reflection(model, name, scope, options, extension = nil)
-        raise ArgumentError, "association names must be a Symbol" unless name.kind_of?(Symbol)
-
-        validate_options(options)
-
-        scope = build_scope(scope, extension)
-        Reflection::SmartCollectionReflection.new(name, scope, options, model)
-      end
-    end
-  end
-end

data/lib/smart_collection/reflection/smart_collection_reflection.rb

@@ -1,20 +0,0 @@
-module SmartCollection
-  module Reflection
-    class SmartCollectionReflection < ::ActiveRecord::Reflection::HasManyReflection
-      def association_class
-        Associations::SmartCollectionAssociation
-      end
-
-      def check_eager_loadable!
-        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
-end