active_model_cachers 2.1.3 → 2.1.8

data/Rakefile

@@ -1,10 +1,10 @@
-require "bundler/gem_tasks"
-require "rake/testtask"
-
-Rake::TestTask.new(:test) do |t|
-  t.libs << "test"
-  t.libs << "lib"
-  t.test_files = FileList['test/**/*_test.rb']
-end
-
-task :default => :test
+require "bundler/gem_tasks"
+require "rake/testtask"
+
+Rake::TestTask.new(:test) do |t|
+  t.libs << "test"
+  t.libs << "lib"
+  t.test_files = FileList['test/**/*_test.rb']
+end
+
+task :default => :test

data/active_model_cachers.gemspec

@@ -1,38 +1,45 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'active_model_cachers/version'
-
-Gem::Specification.new do |spec|
-  spec.name          = "active_model_cachers"
-  spec.version       = ActiveModelCachers::VERSION
-  spec.authors       = ["khiav reoy"]
-  spec.email         = ["mrtmrt15xn@yahoo.com.tw"]
-
-  spec.summary       = %q{Simply cache whatever you want by using cachers. Support Rails 3, 4, 5.}
-  spec.description   = %q{Simply cache whatever you want by using cachers which will help you maintain cached objects and expire them when they are changed. Support Rails 3, 4, 5.}
-  spec.homepage      = "https://github.com/khiav223577/active_model_cachers"
-  spec.license       = "MIT"
-
-  # Prevent pushing this gem to RubyGems.org by setting 'allowed_push_host', or
-  # delete this section to allow pushing this gem to any host.
-  #if spec.respond_to?(:metadata)
-  #  spec.metadata['allowed_push_host'] = "TODO: Set to 'http://mygemserver.com'"
-  #else
-  #  raise "RubyGems 2.0 or newer is required to protect against public gem pushes."
-  #end
-
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
-
-  spec.add_development_dependency "bundler", "~> 1.11"
-  spec.add_development_dependency "rake", "~> 12.0"
-  spec.add_development_dependency "sqlite3", "~> 1.3"
-  spec.add_development_dependency "minitest", "~> 5.0"
-
-  spec.add_dependency "request_store", "~> 1.4.0"
-  spec.add_dependency "activerecord", ">= 3"
-
-end
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'active_model_cachers/version'
+
+Gem::Specification.new do |spec|
+  spec.name          = "active_model_cachers"
+  spec.version       = ActiveModelCachers::VERSION
+  spec.authors       = ["khiav reoy"]
+  spec.email         = ["mrtmrt15xn@yahoo.com.tw"]
+
+  spec.summary       = %q{Simply cache whatever you want by using cachers. Support Rails 3, 4, 5.}
+  spec.description   = %q{Simply cache whatever you want by using cachers which will help you maintain cached objects and expire them when they are changed. Support Rails 3, 4, 5.}
+  spec.homepage      = "https://github.com/khiav223577/active_model_cachers"
+  spec.license       = "MIT"
+
+  # Prevent pushing this gem to RubyGems.org by setting 'allowed_push_host', or
+  # delete this section to allow pushing this gem to any host.
+  #if spec.respond_to?(:metadata)
+  #  spec.metadata['allowed_push_host'] = "TODO: Set to 'http://mygemserver.com'"
+  #else
+  #  raise "RubyGems 2.0 or newer is required to protect against public gem pushes."
+  #end
+
+  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.bindir        = "exe"
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
+  spec.metadata      = {
+    'homepage_uri'      => 'https://github.com/khiav223577/active_model_cachers',
+    'changelog_uri'     => 'https://github.com/khiav223577/active_model_cachers/blob/master/CHANGELOG.md',
+    'source_code_uri'   => 'https://github.com/khiav223577/active_model_cachers',
+    'documentation_uri' => 'https://www.rubydoc.info/gems/active_model_cachers',
+    'bug_tracker_uri'   => 'https://github.com/khiav223577/active_model_cachers/issues',
+  }
+
+  spec.add_development_dependency 'bundler', '>= 1.17', '< 3.x'
+  spec.add_development_dependency "rake", "~> 12.0"
+  spec.add_development_dependency "sqlite3", "~> 1.3"
+  spec.add_development_dependency "minitest", "~> 5.0"
+
+  spec.add_dependency 'request_store', '>= 1.4.0', '< 1.6.0'
+  spec.add_dependency "activerecord", ">= 3"
+
+end

data/bin/console

@@ -1,14 +1,14 @@
-#!/usr/bin/env ruby
-
-require "bundler/setup"
-require "active_model_cachers"
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require "irb"
-IRB.start
+#!/usr/bin/env ruby
+
+require "bundler/setup"
+require "active_model_cachers"
+
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
+
+# (If you use this, don't forget to add pry to your Gemfile!)
+# require "pry"
+# Pry.start
+
+require "irb"
+IRB.start

data/bin/setup

@@ -1,8 +1,8 @@
-#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-set -vx
-
-bundle install --gemfile=gemfiles/3.2.gemfile
-
-# Do any other automated setup that you need to do here
+#!/usr/bin/env bash
+set -euo pipefail
+IFS=$'\n\t'
+set -vx
+
+bundle install --gemfile=gemfiles/3.2.gemfile
+
+# Do any other automated setup that you need to do here

data/gemfiles/3.2.gemfile

@@ -1,11 +1,11 @@
-source 'https://rubygems.org'
-
-gem "activerecord", "~> 3.2.0"
-gem "request_store", "~> 1.4.0"
-
-group :test do
-  gem "simplecov"
-end
-
-gemspec :path => "../"
-
+source 'https://rubygems.org'
+
+gem 'activerecord', '~> 3.2.0'
+gem 'request_store', '~> 1.4.0'
+
+group :test do
+  gem 'simplecov', '< 0.18'
+  gem 'sqlite3', '~> 1.3.6'
+end
+
+gemspec path: '../'

data/gemfiles/4.2.gemfile

@@ -1,11 +1,11 @@
-source 'https://rubygems.org'
-
-gem "activerecord", "~> 4.2.0"
-gem "request_store", "~> 1.4.0"
-
-group :test do
-  gem "simplecov"
-end
-
-gemspec :path => "../"
-
+source 'https://rubygems.org'
+
+gem 'activerecord', '~> 4.2.0'
+gem 'request_store', '~> 1.4.0'
+
+group :test do
+  gem 'simplecov', '< 0.18'
+  gem 'sqlite3', '~> 1.3.6'
+end
+
+gemspec path: '../'

data/gemfiles/5.0.gemfile

@@ -1,11 +1,11 @@
-source 'https://rubygems.org'
-
-gem "activerecord", "~> 5.0.0"
-gem "request_store", "~> 1.4.0"
-
-group :test do
-  gem "simplecov"
-end
-
-gemspec :path => "../"
-
+source 'https://rubygems.org'
+
+gem 'activerecord', '~> 5.0.0'
+gem 'request_store', '~> 1.4.0'
+
+group :test do
+  gem 'simplecov', '< 0.18'
+  gem 'sqlite3', '~> 1.3.6'
+end
+
+gemspec path: '../'

data/gemfiles/5.1.gemfile

@@ -1,11 +1,11 @@
-source 'https://rubygems.org'
-
-gem "activerecord", "~> 5.1.0"
-gem "request_store", "~> 1.4.0"
-
-group :test do
-  gem "simplecov"
-end
-
-gemspec :path => "../"
-
+source 'https://rubygems.org'
+
+gem 'activerecord', '~> 5.1.0'
+gem 'request_store', '~> 1.4.0'
+
+group :test do
+  gem 'simplecov', '< 0.18'
+  gem 'sqlite3', '~> 1.3.6'
+end
+
+gemspec path: '../'

data/gemfiles/5.2.gemfile

@@ -1,11 +1,11 @@
-source 'https://rubygems.org'
-
-gem "activerecord", "~> 5.2.0"
-gem "request_store", "~> 1.4.0"
-
-group :test do
-  gem "simplecov"
-end
-
-gemspec :path => "../"
-
+source 'https://rubygems.org'
+
+gem 'activerecord', '~> 5.2.0'
+gem 'request_store', '~> 1.4.0'
+
+group :test do
+  gem 'simplecov', '< 0.18'
+  gem 'sqlite3', '~> 1.3.6'
+end
+
+gemspec path: '../'

data/gemfiles/6.0.gemfile

@@ -0,0 +1,11 @@
+source 'https://rubygems.org'
+
+gem 'activerecord', '~> 6.0.0'
+gem 'request_store', '~> 1.4.1'
+
+group :test do
+  gem 'simplecov', '< 0.18'
+  gem 'sqlite3', '~> 1.4.1'
+end
+
+gemspec path: '../'

data/lib/active_model_cachers.rb

@@ -15,3 +15,14 @@ module ActiveModelCachers
 end
 
 ActiveRecord::Base.send(:extend, ActiveModelCachers::ActiveRecord::Extension)
+
+gem_version = Gem::Version.new(ActiveRecord::VERSION::STRING)
+if gem_version < Gem::Version.new('4')
+  require 'active_model_cachers/patches/patch_rails_3'
+end
+
+# https://github.com/rails/rails/pull/29018
+if gem_version >= Gem::Version.new('5') && gem_version < Gem::Version.new('5.2')
+  require 'active_model_cachers/patches/uninitialized_attribute'
+end
+

data/lib/active_model_cachers/active_record/attr_model.rb

@@ -1,103 +1,124 @@
-# frozen_string_literal: true
-module ActiveModelCachers
-  module ActiveRecord
-    class AttrModel
-      attr_reader :klass, :column, :reflect
-
-      def initialize(klass, column, primary_key: nil, foreign_key: nil)
-        @klass = klass
-        @column = column
-        @primary_key = primary_key
-        @foreign_key = foreign_key
-        @reflect = klass.reflect_on_association(column)
-      end
-
-      def association?
-        return (@reflect != nil)
-      end
-
-      def class_name
-        return if not association?
-        return @reflect.class_name
-      end
-
-      def join_table
-        return nil if @reflect == nil
-        options = @reflect.options
-        return options[:through] if options[:through]
-        return (options[:join_table] || @reflect.send(:derive_join_table)) if @reflect.macro == :has_and_belongs_to_many
-        return nil
-      end
-
-      def belongs_to?
-        return false if not association?
-        return @reflect.belongs_to?
-      end
-
-      def has_one?
-        return false if not association?
-        #return @reflect.has_one? # Rails 3 doesn't have this method
-        return false if @reflect.collection?
-        return false if @reflect.belongs_to?
-        return true
-      end
-
-      def primary_key
-        return @primary_key if @primary_key
-        return if not association?
-        return (@reflect.belongs_to? ? @reflect.klass : @reflect.active_record).primary_key
-      end
-
-      def foreign_key(reverse: false)
-        return @foreign_key if @foreign_key
-        return if not association?
-        # key may be symbol if specify foreign_key in association options
-        return @reflect.chain.last.foreign_key.to_s if reverse and join_table
-        return (@reflect.belongs_to? == reverse ? primary_key : @reflect.foreign_key).to_s
-      end
-
-      def single_association?
-        return false if not association?
-        return !collection?
-      end
-
-      def collection?
-        return false if not association?
-        return @reflect.collection?
-      end
-
-      def query_model(binding, id)
-        return query_self(binding, id) if @column == nil
-        return query_association(binding, id) if association?
-        return query_attribute(binding, id)
-      end
-
-      def extract_class_and_column
-        return [class_name, nil] if single_association?
-        return [@klass.to_s, @column]
-      end
-
-      private
-
-      def query_self(binding, id)
-        return binding if binding.is_a?(::ActiveRecord::Base)
-        return @klass.find_by(primary_key => id)
-      end
-
-      def query_attribute(binding, id)
-        return binding.send(@column) if binding.is_a?(::ActiveRecord::Base) and binding.has_attribute?(@column)
-        return @klass.where(id: id).limit(1).pluck(@column).first
-      end
-
-      def query_association(binding, id)
-        return binding.association(@column).load_target if binding.is_a?(::ActiveRecord::Base)
-        id = @reflect.active_record.where(id: id).limit(1).pluck(foreign_key).first if foreign_key != 'id'
-        case
-        when collection? ; return id ? @reflect.klass.where(@reflect.foreign_key => id).to_a : []
-        when has_one?    ; return id ? @reflect.klass.find_by(foreign_key(reverse: true) => id) : nil
-        else             ; return id ? @reflect.klass.find_by(primary_key => id) : nil
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+module ActiveModelCachers
+  module ActiveRecord
+    class AttrModel
+      attr_reader :klass, :column, :reflect
+
+      def initialize(klass, column, primary_key: nil, foreign_key: nil)
+        @klass = klass
+        @column = column
+        @primary_key = primary_key
+        @foreign_key = foreign_key
+        @reflect = klass.reflect_on_association(column)
+      end
+
+      def association?
+        return (@reflect != nil)
+      end
+
+      def class_name
+        return if not association?
+        return @reflect.class_name
+      end
+
+      def join_table
+        return nil if @reflect == nil
+        options = @reflect.options
+        return options[:through] if options[:through]
+        return (options[:join_table] || @reflect.send(:derive_join_table)) if @reflect.macro == :has_and_belongs_to_many
+        return nil
+      end
+
+      def join_table_class_name
+        join_table.try{|table_name| @klass.reflect_on_association(table_name).try(:class_name)  || through_klass.name }
+      end
+
+      def through_reflection
+        @klass.new.association(@column).reflection.through_reflection
+      end
+
+      def through_klass
+        through_reflection.try(:klass) || through_klass_for_rails_3
+      end
+
+      def belongs_to?
+        return false if not association?
+        return @reflect.belongs_to?
+      end
+
+      def has_one?
+        return false if not association?
+        #return @reflect.has_one? # Rails 3 doesn't have this method
+        return false if @reflect.collection?
+        return false if @reflect.belongs_to?
+        return true
+      end
+
+      def primary_key
+        return @primary_key if @primary_key
+        return if not association?
+        return (@reflect.belongs_to? ? @reflect.klass : @reflect.active_record).primary_key
+      end
+
+      def foreign_key(reverse: false)
+        return @foreign_key if @foreign_key
+        return if not association?
+        # key may be symbol if specify foreign_key in association options
+        return @reflect.chain.last.foreign_key.to_s if reverse and join_table
+        return (@reflect.belongs_to? == reverse ? primary_key : @reflect.foreign_key).to_s
+      end
+
+      def single_association?
+        return false if not association?
+        return !collection?
+      end
+
+      def collection?
+        return false if not association?
+        return @reflect.collection?
+      end
+
+      def query_model(binding, id)
+        return query_self(binding, id) if @column == nil
+        return query_association(binding, id) if association?
+        return query_attribute(binding, id)
+      end
+
+      def extract_class_and_column
+        return [class_name, nil] if single_association?
+        return [@klass.to_s, @column]
+      end
+
+      private
+
+      def query_self(binding, id)
+        return binding if binding.is_a?(::ActiveRecord::Base)
+        return @klass.find_by(primary_key => id)
+      end
+
+      def query_attribute(binding, id)
+        return binding.send(@column) if binding.is_a?(::ActiveRecord::Base) and binding.has_attribute?(@column)
+        return @klass.where(id: id).limit(1).pluck(@column).first
+      end
+
+      def query_association(binding, id)
+        return binding.association(@column).load_target if binding.is_a?(::ActiveRecord::Base)
+        id = @reflect.active_record.where(id: id).limit(1).pluck(foreign_key).first if foreign_key != 'id'
+        case
+        when collection? ; return id ? @reflect.klass.where(@reflect.foreign_key => id).to_a : []
+        when has_one?    ; return id ? @reflect.klass.find_by(foreign_key(reverse: true) => id) : nil
+        else             ; return id ? @reflect.klass.find_by(primary_key => id) : nil
+        end
+      end
+
+      def through_klass_for_rails_3
+        const_name = "HABTM_#{@reflect.klass.name.pluralize}"
+        @klass.const_defined?(const_name) ? @klass.const_get(const_name) : @klass.const_set(const_name, create_through_klass_for_rails_3)
+      end
+
+      def create_through_klass_for_rails_3
+        Class.new(::ActiveRecord::Base).tap{|s| s.table_name = join_table }
+      end
+    end
+  end
+end