calculated_attributes 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 954ce2e582490fe3654d1d193bf8788b2a8e27df
-  data.tar.gz: 3fba4d9c4d1c4efbf988c9280d6af0b8b2fc7905
+SHA256:
+  metadata.gz: 75294a4fd8a1504df08bc397beaab706bb9095c6bd81ad96afac8e1dc0c69a12
+  data.tar.gz: 781fdbe8798f790f43e41872f92afe74601178f6b8c9648a9d8d7a0c27a1cccf
 SHA512:
-  metadata.gz: 6128772777526edf97a6fa6633adc8a643770a2e129054cb4aa74890a1cae3429f41fb3cf7bfb8c881bce79aeea304a3852d0fbb042cc2528e8e868f11a78266
-  data.tar.gz: 2d711c3c87b4cca7f71a1f512cd5e3de33b6c694664dee1e6cf2f2065ef3659c988732d74dfd20e42e9ba9819fdf664cc0b2a80a9533f96e657fd7939be94379
+  metadata.gz: 36ffdd30ac91c3c4b715a4d634d8b08a62dd1a2b629f642efa8acc5bc6d444f76e9a71b59f3cdd2af754db4631d76af6c6024e3a4ec3550411f60718b7819ec8
+  data.tar.gz: 9b40258eba9fa9002963fc1defe93b3ede2b255d351becbb50421f10a652a890597bbf4d110f4d25f3d34fe91c2b5f17aacb52f37c474600ae0c6d149943f95e

data/.circleci/config.yml

@@ -3,7 +3,7 @@ jobs:
   test:
     working_directory: ~/calculated_attributes
     docker:
-      - image: circleci/ruby:2.3
+      - image: circleci/ruby:2.5
         environment:
           GEM_HOME: ~/calculated_attributes/vendor/bundle
     steps:
@@ -12,7 +12,7 @@ jobs:
           key: dependency-cache-{{ checksum "calculated_attributes.gemspec" }}
       - run:
           name: bundle-install
-          command: bundle check || bundle install --jobs=4 --retry=3 
+          command: bundle check || bundle install --jobs=4 --retry=3
       - run:
           name: appraisal-install
           command: bundle exec appraisal install
@@ -26,7 +26,7 @@ jobs:
       - run:
           name: rubocop
           command: bundle exec rubocop
-      
+
 workflows:
   version: 2
   test:

data/.rubocop.yml

@@ -1,11 +1,8 @@
 AllCops:
-  TargetRubyVersion: 2.3
+  TargetRubyVersion: 2.5
   DisplayCopNames: true
   Exclude:
-    - lib/calculated_attributes/rails_3_patches.rb
-    - lib/calculated_attributes/rails_4_patches.rb
-    - lib/calculated_attributes/rails_5_patches.rb
-    - lib/calculated_attributes/rails_5_2_patches.rb
+    - lib/calculated_attributes/rails_*_patches.rb
 
 Metrics/AbcSize:
   Enabled: false
@@ -25,4 +22,7 @@ Style/FrozenStringLiteralComment:
   Enabled: false
 Style/PercentLiteralDelimiters:
   PreferredDelimiters:
-    '%w': ()
+    "%w": ()
+Style/StringLiterals:
+  Exclude:
+    - gemfiles/*.gemfile

data/.ruby-version

@@ -1 +1 @@
-2.3.1
+2.5.3

data/.tool-versions

@@ -0,0 +1 @@
+ruby 2.5.3

data/Appraisals

@@ -1,11 +1,3 @@
-appraise 'rails3' do
-  gem 'activerecord', '~> 3.2'
-end
-
-appraise 'rails4_1' do
-  gem 'activerecord', '~> 4.1'
-end
-
 appraise 'rails4_2' do
   gem 'activerecord', '~> 4.2'
 end
@@ -19,5 +11,10 @@ appraise 'rails5_1' do
 end
 
 appraise 'rails5_2' do
-  gem 'activerecord', '~> 5.2.0.rc1'
+  gem 'activerecord', '~> 5.2'
+end
+
+appraise 'rails6_0' do
+  gem 'activerecord', '~> 6.0'
+  gem 'sqlite3', '~> 1.4'
 end

data/README.md

@@ -1,4 +1,4 @@
-[![Gem Version](https://badge.fury.io/rb/calculated_attributes.svg)](https://badge.fury.io/rb/calculated_attributes) 
+[![Gem Version](https://badge.fury.io/rb/calculated_attributes.svg)](https://badge.fury.io/rb/calculated_attributes)
 [![CircleCI](https://circleci.com/gh/aha-app/calculated_attributes.svg?style=shield)](https://circleci.com/gh/aha-app/calculated_attributes)
 
 # CalculatedAttributes
@@ -35,7 +35,7 @@ class Post < ActiveRecord::Base
 ...
 end
 ```
-    
+
 Then, the comments count may be accessed as follows:
 
 ```ruby
@@ -43,7 +43,7 @@ Post.scoped.calculated(:comments_count).first.comments_count
 Post.scoped.calculated(comments_count_by_user: user).first.comments_count_by_user
 #=> 5
 ```
-    
+
 Multiple calculated attributes may be attached to each model. If we add a `Tag` model that also has a `post_id`, we can update the Post model as following:
 
 ```ruby
@@ -96,19 +96,23 @@ class Post < ActiveRecord::Base
 end
 ```
 
-## Known Issues
+## Version support
+
+Patches are included to support Rails 3.2, 4.x, 5.x, and 6.x. However, only 4.2 and up are tested and actively maintained.
+
+## Known issues
 
-In Rails 4.x, you cannot call `count` on a relation with calculated attributes, e.g.
+In Rails 4.x and up, you cannot call `count` on a relation with calculated attributes, e.g.
 
 ```ruby
 Post.scoped.calculated(:comments_count).count
 ```
 
-will error. This is because of an [ActiveRecord issue](https://github.com/rails/rails/blob/master/activerecord/lib/active_record/relation/calculations.rb#L368-L375) that does not permit Arel nodes in the count method.
+will error because ActiveRecord does not permit Arel nodes in the count method.
 
 ## Contributing
 
-1. Fork it ( https://github.com/aha-app/calculated_attributes/fork )
+1. Fork it (https://github.com/aha-app/calculated_attributes/fork)
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

data/calculated_attributes.gemspec

@@ -1,6 +1,4 @@
-# coding: utf-8
-
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'calculated_attributes/version'
 
@@ -22,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 1.15'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.1'
-  spec.add_development_dependency 'rubocop', '~> 0.49.0'
+  spec.add_development_dependency 'rubocop', '~> 0.74.0'
   spec.add_development_dependency 'sqlite3', '~> 1.3.10'
 
   spec.add_dependency 'activerecord', '>= 3.2.20'

data/gemfiles/rails4_2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    calculated_attributes (0.3.0)
+    calculated_attributes (0.4.0)
       activerecord (>= 3.2.20)
 
 GEM
@@ -25,18 +25,17 @@ GEM
       rake
       thor (>= 0.14.0)
     arel (6.0.0)
-    ast (2.3.0)
+    ast (2.4.0)
     builder (3.2.2)
     diff-lcs (1.2.5)
     i18n (0.7.0)
-    json (1.8.3)
+    jaro_winkler (1.5.3)
+    json (1.8.5)
     minitest (5.7.0)
-    parallel (1.11.2)
-    parser (2.4.0.0)
-      ast (~> 2.2)
-    powerpack (0.1.1)
-    rainbow (2.2.2)
-      rake
+    parallel (1.17.0)
+    parser (2.6.4.0)
+      ast (~> 2.4.0)
+    rainbow (3.0.0)
     rake (10.4.2)
     rspec (3.3.0)
       rspec-core (~> 3.3.0)
@@ -51,20 +50,20 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.3.0)
     rspec-support (3.3.0)
-    rubocop (0.49.1)
+    rubocop (0.74.0)
+      jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
-      parser (>= 2.3.3.1, < 3.0)
-      powerpack (~> 0.1)
-      rainbow (>= 1.99.1, < 3.0)
+      parser (>= 2.6)
+      rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.8.1)
+      unicode-display_width (>= 1.4.0, < 1.7)
+    ruby-progressbar (1.10.1)
     sqlite3 (1.3.10)
     thor (0.19.4)
     thread_safe (0.3.5)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    unicode-display_width (1.3.0)
+    unicode-display_width (1.6.0)
 
 PLATFORMS
   ruby
@@ -76,8 +75,8 @@ DEPENDENCIES
   calculated_attributes!
   rake (~> 10.0)
   rspec (~> 3.1)
-  rubocop (~> 0.49.0)
+  rubocop (~> 0.74.0)
   sqlite3 (~> 1.3.10)
 
 BUNDLED WITH
-   1.16.1
+   1.17.0

data/gemfiles/rails5_0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    calculated_attributes (0.3.0)
+    calculated_attributes (0.4.0)
       activerecord (>= 3.2.20)
 
 GEM
@@ -23,17 +23,16 @@ GEM
       rake
       thor (>= 0.14.0)
     arel (7.1.1)
-    ast (2.3.0)
+    ast (2.4.0)
     concurrent-ruby (1.0.2)
     diff-lcs (1.2.5)
     i18n (0.7.0)
+    jaro_winkler (1.5.3)
     minitest (5.9.0)
-    parallel (1.11.2)
-    parser (2.4.0.0)
-      ast (~> 2.2)
-    powerpack (0.1.1)
-    rainbow (2.2.2)
-      rake
+    parallel (1.17.0)
+    parser (2.6.4.0)
+      ast (~> 2.4.0)
+    rainbow (3.0.0)
     rake (10.5.0)
     rspec (3.5.0)
       rspec-core (~> 3.5.0)
@@ -48,20 +47,20 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.5.0)
     rspec-support (3.5.0)
-    rubocop (0.49.1)
+    rubocop (0.74.0)
+      jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
-      parser (>= 2.3.3.1, < 3.0)
-      powerpack (~> 0.1)
-      rainbow (>= 1.99.1, < 3.0)
+      parser (>= 2.6)
+      rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.8.1)
+      unicode-display_width (>= 1.4.0, < 1.7)
+    ruby-progressbar (1.10.1)
     sqlite3 (1.3.11)
     thor (0.19.4)
     thread_safe (0.3.5)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    unicode-display_width (1.3.0)
+    unicode-display_width (1.6.0)
 
 PLATFORMS
   ruby
@@ -73,8 +72,8 @@ DEPENDENCIES
   calculated_attributes!
   rake (~> 10.0)
   rspec (~> 3.1)
-  rubocop (~> 0.49.0)
+  rubocop (~> 0.74.0)
   sqlite3 (~> 1.3.10)
 
 BUNDLED WITH
-   1.16.1
+   1.17.0

data/gemfiles/rails5_1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    calculated_attributes (0.3.0)
+    calculated_attributes (0.4.0)
       activerecord (>= 3.2.20)
 
 GEM
@@ -23,17 +23,16 @@ GEM
       rake
       thor (>= 0.14.0)
     arel (8.0.0)
-    ast (2.3.0)
+    ast (2.4.0)
     concurrent-ruby (1.0.5)
     diff-lcs (1.3)
     i18n (0.8.6)
+    jaro_winkler (1.5.3)
     minitest (5.10.2)
-    parallel (1.11.2)
-    parser (2.4.0.0)
-      ast (~> 2.2)
-    powerpack (0.1.1)
-    rainbow (2.2.2)
-      rake
+    parallel (1.17.0)
+    parser (2.6.4.0)
+      ast (~> 2.4.0)
+    rainbow (3.0.0)
     rake (10.5.0)
     rspec (3.6.0)
       rspec-core (~> 3.6.0)
@@ -48,20 +47,20 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.6.0)
     rspec-support (3.6.0)
-    rubocop (0.49.1)
+    rubocop (0.74.0)
+      jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
-      parser (>= 2.3.3.1, < 3.0)
-      powerpack (~> 0.1)
-      rainbow (>= 1.99.1, < 3.0)
+      parser (>= 2.6)
+      rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.8.1)
+      unicode-display_width (>= 1.4.0, < 1.7)
+    ruby-progressbar (1.10.1)
     sqlite3 (1.3.13)
     thor (0.19.4)
     thread_safe (0.3.6)
     tzinfo (1.2.3)
       thread_safe (~> 0.1)
-    unicode-display_width (1.3.0)
+    unicode-display_width (1.6.0)
 
 PLATFORMS
   ruby
@@ -73,8 +72,8 @@ DEPENDENCIES
   calculated_attributes!
   rake (~> 10.0)
   rspec (~> 3.1)
-  rubocop (~> 0.49.0)
+  rubocop (~> 0.74.0)
   sqlite3 (~> 1.3.10)
 
 BUNDLED WITH
-   1.16.1
+   1.17.0

data/gemfiles/rails5_2.gemfile

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "~> 5.2.0.rc1"
+gem "activerecord", "~> 5.2"
 
 gemspec path: "../"

data/gemfiles/rails5_2.gemfile.lock

@@ -1,21 +1,21 @@
 PATH
   remote: ..
   specs:
-    calculated_attributes (0.3.0)
+    calculated_attributes (0.4.0)
       activerecord (>= 3.2.20)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (5.2.0.rc1)
-      activesupport (= 5.2.0.rc1)
-    activerecord (5.2.0.rc1)
-      activemodel (= 5.2.0.rc1)
-      activesupport (= 5.2.0.rc1)
+    activemodel (5.2.3)
+      activesupport (= 5.2.3)
+    activerecord (5.2.3)
+      activemodel (= 5.2.3)
+      activesupport (= 5.2.3)
       arel (>= 9.0)
-    activesupport (5.2.0.rc1)
+    activesupport (5.2.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (~> 0.7)
+      i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     appraisal (2.2.0)
@@ -24,58 +24,57 @@ GEM
       thor (>= 0.14.0)
     arel (9.0.0)
     ast (2.4.0)
-    concurrent-ruby (1.0.5)
+    concurrent-ruby (1.1.5)
     diff-lcs (1.3)
-    i18n (0.9.5)
+    i18n (1.6.0)
       concurrent-ruby (~> 1.0)
+    jaro_winkler (1.5.3)
     minitest (5.11.3)
-    parallel (1.12.1)
-    parser (2.5.0.0)
+    parallel (1.17.0)
+    parser (2.6.4.0)
       ast (~> 2.4.0)
-    powerpack (0.1.1)
-    rainbow (2.2.2)
-      rake
+    rainbow (3.0.0)
     rake (10.5.0)
-    rspec (3.7.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.1)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
+    rspec (3.8.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+    rspec-core (3.8.2)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.4)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.1)
-    rubocop (0.49.1)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.2)
+    rubocop (0.74.0)
+      jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
-      parser (>= 2.3.3.1, < 3.0)
-      powerpack (~> 0.1)
-      rainbow (>= 1.99.1, < 3.0)
+      parser (>= 2.6)
+      rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.9.0)
+      unicode-display_width (>= 1.4.0, < 1.7)
+    ruby-progressbar (1.10.1)
     sqlite3 (1.3.13)
-    thor (0.20.0)
+    thor (0.20.3)
     thread_safe (0.3.6)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    unicode-display_width (1.3.0)
+    unicode-display_width (1.6.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord (~> 5.2.0.rc1)
+  activerecord (~> 5.2)
   appraisal (~> 2.2.0)
   bundler (~> 1.15)
   calculated_attributes!
   rake (~> 10.0)
   rspec (~> 3.1)
-  rubocop (~> 0.49.0)
+  rubocop (~> 0.74.0)
   sqlite3 (~> 1.3.10)
 
 BUNDLED WITH
-   1.16.1
+   1.17.0

data/gemfiles/{rails3.gemfile → rails6_0.gemfile}

@@ -2,6 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "~> 3.2"
+gem "activerecord", "~> 6.0"
+gem "sqlite3", "~> 1.4"
 
 gemspec path: "../"

data/gemfiles/rails6_0.gemfile.lock

@@ -0,0 +1,80 @@
+PATH
+  remote: ..
+  specs:
+    calculated_attributes (0.4.0)
+      activerecord (>= 3.2.20)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (6.0.0)
+      activesupport (= 6.0.0)
+    activerecord (6.0.0)
+      activemodel (= 6.0.0)
+      activesupport (= 6.0.0)
+    activesupport (6.0.0)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+      zeitwerk (~> 2.1, >= 2.1.8)
+    appraisal (2.2.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    ast (2.4.0)
+    concurrent-ruby (1.1.5)
+    diff-lcs (1.3)
+    i18n (1.6.0)
+      concurrent-ruby (~> 1.0)
+    jaro_winkler (1.5.3)
+    minitest (5.11.3)
+    parallel (1.17.0)
+    parser (2.6.4.0)
+      ast (~> 2.4.0)
+    rainbow (3.0.0)
+    rake (10.5.0)
+    rspec (3.8.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+    rspec-core (3.8.2)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.4)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.2)
+    rubocop (0.74.0)
+      jaro_winkler (~> 1.5.1)
+      parallel (~> 1.10)
+      parser (>= 2.6)
+      rainbow (>= 2.2.2, < 4.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 1.7)
+    ruby-progressbar (1.10.1)
+    sqlite3 (1.4.1)
+    thor (0.20.3)
+    thread_safe (0.3.6)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
+    unicode-display_width (1.6.0)
+    zeitwerk (2.1.10)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (~> 6.0)
+  appraisal (~> 2.2.0)
+  bundler (~> 1.15)
+  calculated_attributes!
+  rake (~> 10.0)
+  rspec (~> 3.1)
+  rubocop (~> 0.74.0)
+  sqlite3 (~> 1.4)
+
+BUNDLED WITH
+   1.17.0

data/lib/calculated_attributes/rails_6_patches.rb

@@ -0,0 +1,65 @@
+module ActiveRecord
+  module AttributeMethods
+    module ClassMethods
+      # Generates all the attribute related methods for columns in the database
+      # accessors, mutators and query methods.
+      def define_attribute_methods # :nodoc:
+        return false if @attribute_methods_generated
+        # Use a mutex; we don't want two threads simultaneously trying to define
+        # attribute methods.
+        generated_attribute_methods.synchronize do
+          return false if @attribute_methods_generated
+          superclass.define_attribute_methods unless base_class?
+          columns_to_define =
+            if defined?(calculated) && calculated.instance_variable_get('@calculations')
+              calculated_keys = calculated.instance_variable_get('@calculations').keys
+              attribute_names.reject { |c| calculated_keys.include? c.intern }
+            else
+              attribute_names
+            end
+          super(columns_to_define)
+          @attribute_methods_generated = true
+          @attribute_methods_generated = true
+        end
+      end
+    end
+  end
+
+  module Associations
+    class JoinDependency
+      attr_writer :calculated_columns
+
+      def instantiate(result_set, &block)
+        primary_key = aliases.column_alias(join_root, join_root.primary_key)
+
+        seen = Hash.new { |i, object_id|
+          i[object_id] = Hash.new { |j, child_class|
+            j[child_class] = {}
+          }
+        }
+
+        model_cache = Hash.new { |h, klass| h[klass] = {} }
+        parents = model_cache[join_root]
+        column_aliases = aliases.column_aliases join_root
+
+        message_bus = ActiveSupport::Notifications.instrumenter
+
+        payload = {
+          record_count: result_set.length,
+          class_name: join_root.base_klass.name
+        }
+
+        message_bus.instrument("instantiation.active_record", payload) do
+          result_set.each { |row_hash|
+            parent_key = primary_key ? row_hash[primary_key] : row_hash
+            parent = parents[parent_key] ||= join_root.instantiate(row_hash, column_aliases, &block)
+            @calculated_columns.each { |column| parent[column.right] = model[column.right] } if @calculated_columns
+            construct(parent, join_root, row_hash, seen, model_cache)
+          }
+        end
+
+        parents.values
+      end
+    end
+  end
+end

data/lib/calculated_attributes/version.rb

@@ -1,3 +1,3 @@
 module CalculatedAttributes
-  VERSION = '0.3.0'.freeze
+  VERSION = '0.4.0'.freeze
 end

data/lib/calculated_attributes.rb

@@ -4,12 +4,14 @@ require 'active_record'
 # Include patches.
 require 'calculated_attributes/rails_patches'
 require 'calculated_attributes/arel_patches'
-raise "Unsupported ActiveRecord version: #{ActiveRecord::VERSION::MAJOR}" unless [3, 4, 5].include? ActiveRecord::VERSION::MAJOR
+raise "Unsupported ActiveRecord version: #{ActiveRecord::VERSION::MAJOR}" unless [3, 4, 5, 6].include? ActiveRecord::VERSION::MAJOR
 
-if Gem::Version.new(ActiveRecord::VERSION::STRING) <= Gem::Version.new('5.1.4')
-  require "calculated_attributes/rails_#{ActiveRecord::VERSION::MAJOR}_patches"
-else
+# Rails 5.2 has its own patches which are different from 5.0/5.1. In every other
+# case, just require the patch file for the major version.
+if Gem::Version.new(ActiveRecord::VERSION::STRING).canonical_segments.take(2) == [5, 2]
   require 'calculated_attributes/rails_5_2_patches'
+else
+  require "calculated_attributes/rails_#{ActiveRecord::VERSION::MAJOR}_patches"
 end
 
 # Include model code.

data/spec/lib/calculated_attributes_spec.rb

@@ -119,12 +119,7 @@ describe 'calculated_attributes' do
 
   context 'when eager loading models' do
     it 'includes calculated attributes' do
-      scope =
-        case ActiveRecord::VERSION::MAJOR
-        when 5 then model_scoped(Post).includes(:comments).references(:comments)
-        when 4 then model_scoped(Post).includes(:comments).references(:comments)
-        when 3 then model_scoped(Post).eager_load(:comments)
-        end
+      scope = model_scoped(Post).includes(:comments).references(:comments)
       expect(scope.first.comments_count).to eq(1)
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calculated_attributes
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Zach Schneider
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-21 00:00:00.000000000 Z
+date: 2019-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appraisal
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.49.0
+        version: 0.74.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.49.0
+        version: 0.74.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -120,16 +120,13 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".ruby-version"
+- ".tool-versions"
 - Appraisals
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - calculated_attributes.gemspec
-- gemfiles/rails3.gemfile
-- gemfiles/rails3.gemfile.lock
-- gemfiles/rails4_1.gemfile
-- gemfiles/rails4_1.gemfile.lock
 - gemfiles/rails4_2.gemfile
 - gemfiles/rails4_2.gemfile.lock
 - gemfiles/rails5_0.gemfile
@@ -138,6 +135,8 @@ files:
 - gemfiles/rails5_1.gemfile.lock
 - gemfiles/rails5_2.gemfile
 - gemfiles/rails5_2.gemfile.lock
+- gemfiles/rails6_0.gemfile
+- gemfiles/rails6_0.gemfile.lock
 - lib/calculated_attributes.rb
 - lib/calculated_attributes/arel_patches.rb
 - lib/calculated_attributes/model_methods.rb
@@ -145,6 +144,7 @@ files:
 - lib/calculated_attributes/rails_4_patches.rb
 - lib/calculated_attributes/rails_5_2_patches.rb
 - lib/calculated_attributes/rails_5_patches.rb
+- lib/calculated_attributes/rails_6_patches.rb
 - lib/calculated_attributes/rails_patches.rb
 - lib/calculated_attributes/version.rb
 - spec/lib/calculated_attributes_spec.rb
@@ -172,7 +172,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Automatically add calculated attributes to ActiveRecord models.

data/gemfiles/rails3.gemfile.lock

@@ -1,78 +0,0 @@
-PATH
-  remote: ..
-  specs:
-    calculated_attributes (0.3.0)
-      activerecord (>= 3.2.20)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activemodel (3.2.21)
-      activesupport (= 3.2.21)
-      builder (~> 3.0.0)
-    activerecord (3.2.21)
-      activemodel (= 3.2.21)
-      activesupport (= 3.2.21)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activesupport (3.2.21)
-      i18n (~> 0.6, >= 0.6.4)
-      multi_json (~> 1.0)
-    appraisal (2.2.0)
-      bundler
-      rake
-      thor (>= 0.14.0)
-    arel (3.0.3)
-    ast (2.3.0)
-    builder (3.0.4)
-    diff-lcs (1.2.5)
-    i18n (0.7.0)
-    multi_json (1.11.1)
-    parallel (1.11.2)
-    parser (2.4.0.0)
-      ast (~> 2.2)
-    powerpack (0.1.1)
-    rainbow (2.2.2)
-      rake
-    rake (10.4.2)
-    rspec (3.3.0)
-      rspec-core (~> 3.3.0)
-      rspec-expectations (~> 3.3.0)
-      rspec-mocks (~> 3.3.0)
-    rspec-core (3.3.0)
-      rspec-support (~> 3.3.0)
-    rspec-expectations (3.3.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
-    rspec-mocks (3.3.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
-    rspec-support (3.3.0)
-    rubocop (0.49.1)
-      parallel (~> 1.10)
-      parser (>= 2.3.3.1, < 3.0)
-      powerpack (~> 0.1)
-      rainbow (>= 1.99.1, < 3.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.8.1)
-    sqlite3 (1.3.10)
-    thor (0.19.4)
-    tzinfo (0.3.44)
-    unicode-display_width (1.3.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activerecord (~> 3.2)
-  appraisal (~> 2.2.0)
-  bundler (~> 1.15)
-  calculated_attributes!
-  rake (~> 10.0)
-  rspec (~> 3.1)
-  rubocop (~> 0.49.0)
-  sqlite3 (~> 1.3.10)
-
-BUNDLED WITH
-   1.16.1

data/gemfiles/rails4_1.gemfile

@@ -1,7 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "activerecord", "~> 4.1"
-
-gemspec path: "../"

data/gemfiles/rails4_1.gemfile.lock

@@ -1,83 +0,0 @@
-PATH
-  remote: ..
-  specs:
-    calculated_attributes (0.3.0)
-      activerecord (>= 3.2.20)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activemodel (4.1.11)
-      activesupport (= 4.1.11)
-      builder (~> 3.1)
-    activerecord (4.1.11)
-      activemodel (= 4.1.11)
-      activesupport (= 4.1.11)
-      arel (~> 5.0.0)
-    activesupport (4.1.11)
-      i18n (~> 0.6, >= 0.6.9)
-      json (~> 1.7, >= 1.7.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.1)
-      tzinfo (~> 1.1)
-    appraisal (2.2.0)
-      bundler
-      rake
-      thor (>= 0.14.0)
-    arel (5.0.1.20140414130214)
-    ast (2.3.0)
-    builder (3.2.2)
-    diff-lcs (1.2.5)
-    i18n (0.7.0)
-    json (1.8.3)
-    minitest (5.7.0)
-    parallel (1.11.2)
-    parser (2.4.0.0)
-      ast (~> 2.2)
-    powerpack (0.1.1)
-    rainbow (2.2.2)
-      rake
-    rake (10.4.2)
-    rspec (3.3.0)
-      rspec-core (~> 3.3.0)
-      rspec-expectations (~> 3.3.0)
-      rspec-mocks (~> 3.3.0)
-    rspec-core (3.3.1)
-      rspec-support (~> 3.3.0)
-    rspec-expectations (3.3.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
-    rspec-mocks (3.3.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
-    rspec-support (3.3.0)
-    rubocop (0.49.1)
-      parallel (~> 1.10)
-      parser (>= 2.3.3.1, < 3.0)
-      powerpack (~> 0.1)
-      rainbow (>= 1.99.1, < 3.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.8.1)
-    sqlite3 (1.3.10)
-    thor (0.19.4)
-    thread_safe (0.3.5)
-    tzinfo (1.2.2)
-      thread_safe (~> 0.1)
-    unicode-display_width (1.3.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activerecord (~> 4.1)
-  appraisal (~> 2.2.0)
-  bundler (~> 1.15)
-  calculated_attributes!
-  rake (~> 10.0)
-  rspec (~> 3.1)
-  rubocop (~> 0.49.0)
-  sqlite3 (~> 1.3.10)
-
-BUNDLED WITH
-   1.16.1