rails_compatibility 0.0.1 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7a818be9a687559746841473b529eca8dec7a850342ca9f943c9528318340e9
-  data.tar.gz: 4cdcc971d081bf02117c193fb738d4fe2f8d3a2d979a1aeaccf24afa2bf7962d
+  metadata.gz: 1f0a8bf0a252bd80fd89c2c9e74271704669413cf8f84ff57c8d7499057adcc4
+  data.tar.gz: cebe77b327bb26d893fb1397ac2c1b3ebf93ad387ae3a3d1befea255ab3cdf93
 SHA512:
-  metadata.gz: 7461f5853dd3c0edac4aa69a5bb3ab4776ea37e04663a2962f8fe555b1718cb8cdaf303ca6117ecad13da7c9fed61392583e93e0286570119a95d000f4798869
-  data.tar.gz: abae820380d89420793d2147ab836768876022f7ba49f210ac497fb23682227f8257557de03f30c76d4f8251f7eb19c22acde255914773f65334f4f12565021e
+  metadata.gz: c7ef487f53d011bc4fac483b592d26c64c6e110107bca035488885004f7e800de0c46b6af4fcad0fd01527823b11f154513eb9a56f8852cbdc418b9527ceeedd
+  data.tar.gz: 646e2089e7c6351fdcd54800a55cea5be2cd051aafbcfbed17e55e8affc5e52353abf1c2b4ddf76a3f7668b296e59bda9cb843a55f35f167bcced2a062476f99

data/.github/workflows/ruby.yml

@@ -0,0 +1,62 @@
+name: Ruby
+
+on:
+  push:
+    paths-ignore:
+      - 'README.md'
+      - 'CHANGELOG.md'
+  pull_request:
+    branches: [ master ]
+    paths-ignore:
+      - 'README.md'
+      - 'CHANGELOG.md'
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    name: Test
+    if: "contains(github.event.commits[0].message, '[ci skip]') == false"
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby:
+          - 2.2
+          - 2.6
+          - 2.7
+        gemfile:
+          - 3.2.gemfile
+          - 4.2.gemfile
+          - 5.0.gemfile
+          - 5.1.gemfile
+          - 5.2.gemfile
+          - 6.0.gemfile
+          - 6.1.gemfile
+        exclude:
+          - gemfile: 3.2.gemfile
+            ruby: 2.6
+          - gemfile: 3.2.gemfile
+            ruby: 2.7
+          - gemfile: 4.2.gemfile
+            ruby: 2.7
+          - gemfile: 6.0.gemfile
+            ruby: 2.2
+          - gemfile: 6.1.gemfile
+            ruby: 2.2
+    env:
+      BUNDLE_GEMFILE: "gemfiles/${{ matrix.gemfile }}"
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+    - name: Setup Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+    - name: Run tests
+      run: bundle exec rake
+    - name: Publish code coverage
+      if: ${{ success() }}
+      uses: paambaati/codeclimate-action@v2.7.5
+      env:
+        CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}

data/.gitignore

@@ -1,6 +1,7 @@
 /.bundle/
 /.yardoc
 /Gemfile.lock
+/gemfiles/*.gemfile.lock
 /_yardoc/
 /coverage/
 /doc/

data/.rubocop.yml

@@ -1,3 +1,7 @@
+require:
+  - rubocop-performance
+  - rubocop-rails
+
 AllCops:
   DisabledByDefault: true
   Exclude: []
@@ -73,10 +77,6 @@ Layout/EndAlignment:
   Description: 'Align ends correctly.'
   Enabled: true
 
-Lint/EndInMethod:
-  Description: 'END blocks should not be placed inside method definitions.'
-  Enabled: true
-
 Lint/EnsureReturn:
   Description: 'Do not use return in an ensure block.'
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-return-ensure'
@@ -90,7 +90,7 @@ Lint/FormatParameterMismatch:
   Description: 'The number of parameters to format/sprint must match the fields.'
   Enabled: true
 
-Lint/HandleExceptions:
+Lint/SuppressedException:
   Description: "Don't suppress exception."
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#dont-hide-exceptions'
   Enabled: true
@@ -139,7 +139,7 @@ Lint/ShadowingOuterLocalVariable:
                  for block arguments or block local variables.
   Enabled: true
 
-Lint/StringConversionInInterpolation:
+Lint/RedundantStringCoercion:
   Description: 'Checks for Object#to_s usage in string interpolation.'
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-to-s'
   Enabled: true
@@ -148,7 +148,7 @@ Lint/UnderscorePrefixedVariableName:
   Description: 'Do not use prefix `_` for a variable that is used.'
   Enabled: true
 
-Lint/UnneededCopDisableDirective:
+Lint/RedundantCopDisableDirective:
   Description: >-
                  Checks for rubocop:disable comments that can be removed.
                  Note: this cop is not disabled when disabling all cops.
@@ -178,7 +178,7 @@ Lint/UselessAssignment:
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#underscore-unused-vars'
   Enabled: true
 
-Lint/UselessComparison:
+Lint/BinaryOperatorWithIdenticalOperands:
   Description: 'Checks for comparison of something with itself.'
   Enabled: true
 
@@ -221,7 +221,7 @@ Metrics/CyclomaticComplexity:
                  of test cases needed to validate a method.
   Enabled: true
 
-Metrics/LineLength:
+Layout/LineLength:
   Description: 'Limit lines to 120 characters.'
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#80-character-limits'
   Max: 120
@@ -285,7 +285,7 @@ Performance/ReverseEach:
   Reference: 'https://github.com/JuanitoFatas/fast-ruby#enumerablereverseeach-vs-enumerablereverse_each-code'
   Enabled: true
 
-Performance/Sample:
+Style/Sample:
   Description: >-
                   Use `sample` instead of `shuffle.first`,
                   `shuffle.last`, and `shuffle[Fixnum]`.
@@ -353,7 +353,7 @@ Rails/TimeZone:
   Description: 'Checks the correct usage of time zone aware methods.'
   StyleGuide: 'https://github.com/bbatsov/rails-style-guide#time'
   Reference: 'http://danilenko.org/2012/7/6/rails_timezones'
-  Enabled: true
+  Enabled: false
 
 Rails/Validation:
   Description: 'Use validates :attribute, hash of validations.'
@@ -375,21 +375,21 @@ Style/Alias:
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#alias-method'
   Enabled: true
 
-Layout/AlignArray:
+Layout/ArrayAlignment:
   Description: >-
                  Align the elements of an array literal if they span more than
                  one line.
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#align-multiline-arrays'
   Enabled: true
 
-Layout/AlignHash:
+Layout/HashAlignment:
   Description: >-
                  Align the elements of a hash literal if they span more than
                  one line.
   EnforcedHashRocketStyle: table
   Enabled: true
 
-Layout/AlignParameters:
+Layout/ParameterAlignment:
   Description: >-
                  Align the parameters of a method call if they span more
                  than one line.
@@ -448,10 +448,6 @@ Style/BlockDelimiters:
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#single-line-blocks'
   Enabled: true
 
-Style/BracesAroundHashParameters:
-  Description: 'Enforce braces style around hash parameters.'
-  Enabled: true
-
 Style/CaseEquality:
   Description: 'Avoid explicit use of the case equality operator(===).'
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-case-equality'
@@ -596,7 +592,7 @@ Style/EndBlock:
 Layout/EndOfLine:
   Description: 'Use Unix-style line endings.'
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#crlf'
-  Enabled: true
+  Enabled: false
 
 Style/EvenOdd:
   Description: 'Favor the use of Fixnum#even? && Fixnum#odd?'
@@ -617,14 +613,14 @@ Layout/InitialIndentation:
     Checks the indentation of the first non-blank non-comment line in a file.
   Enabled: true
 
-Layout/IndentFirstArgument:
+Layout/FirstArgumentIndentation:
   Description: 'Checks the indentation of the first parameter in a method call.'
   Enabled: true
 
-Style/FlipFlop:
+Lint/FlipFlop:
   Description: 'Checks for flip flops'
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-flip-flops'
-  Enabled: true
+  Enabled: false
 
 Style/For:
   Description: 'Checks use of for or each in multiline loops.'
@@ -634,9 +630,12 @@ Style/For:
 Style/FormatString:
   Description: 'Enforce the use of Kernel#sprintf, Kernel#format or String#%.'
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#sprintf'
-  EnforcedStyle: sprintf
+  EnforcedStyle: percent
   Enabled: true
 
+Style/FormatStringToken:
+  Enabled: false
+
 Style/GlobalVars:
   Description: 'Do not introduce global variables.'
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#instance-vars'
@@ -676,14 +675,14 @@ Layout/IndentationWidth:
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#spaces-indentation'
   Enabled: true
 
-Layout/IndentFirstArrayElement:
+Layout/FirstArrayElementIndentation:
   Description: >-
                  Checks the indentation of the first element in an array
                  literal.
   EnforcedStyle: consistent
   Enabled: true
 
-Layout/IndentFirstHashElement:
+Layout/FirstHashElementIndentation:
   Description: 'Checks the indentation of the first key in a hash literal.'
   EnforcedStyle: consistent
   Enabled: true
@@ -862,7 +861,7 @@ Style/PercentQLiterals:
 Style/PerlBackrefs:
   Description: 'Avoid Perl-style regex back references.'
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-perl-regexp-last-matchers'
-  Enabled: true
+  Enabled: false
 
 Naming/PredicateName:
   Description: 'Check the names of predicate methods.'
@@ -940,11 +939,11 @@ Style/SingleLineBlockParams:
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#reduce-blocks'
   Methods:
     - reduce:
-        - acc
-        - elem
+        - sum
+        - v
     - inject:
-        - acc
-        - elem
+        - sum
+        - v
   Enabled: true
 
 Style/SingleLineMethods:
@@ -1118,12 +1117,12 @@ Style/SymbolProc:
   Description: 'Use symbols as procs instead of blocks when possible.'
   Enabled: true
 
-Layout/Tab:
+Layout/IndentationStyle:
   Description: 'No hard tabs.'
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#spaces-indentation'
   Enabled: true
 
-Layout/TrailingBlankLines:
+Layout/TrailingEmptyLines:
   Description: 'Checks trailing blank lines and final newline.'
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#newline-eof'
   Enabled: true
@@ -1178,11 +1177,11 @@ Style/UnlessElse:
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-else-with-unless'
   Enabled: true
 
-Style/UnneededCapitalW:
+Style/RedundantCapitalW:
   Description: 'Checks for %W when interpolation is not needed.'
   Enabled: true
 
-Style/UnneededPercentQ:
+Style/RedundantPercentQ:
   Description: 'Checks for %q/%Q when single quotes or double quotes would do.'
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#percent-q'
   Enabled: true

data/CHANGELOG.md

@@ -0,0 +1,21 @@
+## Change Log
+
+### [v0.0.5](https://github.com/khiav223577/rails_compatibility/compare/v0.0.4...v0.0.5) 2021/05/05
+- [#10](https://github.com/khiav223577/rails_compatibility/pull/10) Implement #pick (@khiav223577)
+- [#9](https://github.com/khiav223577/rails_compatibility/pull/9) refactor: use GTE_RAILS_4_0 (@khiav223577)
+
+### [v0.0.4](https://github.com/khiav223577/rails_compatibility/compare/v0.0.3...v0.0.4) 2021/04/10
+- [#8](https://github.com/khiav223577/rails_compatibility/pull/8) Fix: join dependency construct wrongly when HABTM associations have custom name (@khiav223577)
+
+### [v0.0.3](https://github.com/khiav223577/rails_compatibility/compare/v0.0.2...v0.0.3) 2021/02/09
+- [#7](https://github.com/khiav223577/rails_compatibility/pull/7) Implement #build_joins (@khiav223577)
+- [#6](https://github.com/khiav223577/rails_compatibility/pull/6) Support Rails 6.1 (@khiav223577)
+- [#5](https://github.com/khiav223577/rails_compatibility/pull/5) Migrating from Travis CI to GitHub Actions (@khiav223577)
+- [#4](https://github.com/khiav223577/rails_compatibility/pull/4) Fix: test files should not be included in coverage (@khiav223577)
+- [#3](https://github.com/khiav223577/rails_compatibility/pull/3) Support Ruby 2.7 (@khiav223577)
+
+### [v0.0.2](https://github.com/khiav223577/rails_compatibility/compare/v0.0.1...v0.0.2) 2019/12/18
+- [#2](https://github.com/khiav223577/rails_compatibility/pull/2) Implement `attribute_types` (@khiav223577)
+
+### v0.0.1 2019/12/17
+- [#1](https://github.com/khiav223577/rails_compatibility/pull/1) Implement `unscope_where` (@khiav223577)

data/README.md

@@ -1,16 +1,18 @@
 # RailsCompatibility
 
 [![Gem Version](https://img.shields.io/gem/v/rails_compatibility.svg?style=flat)](http://rubygems.org/gems/rails_compatibility)
-[![Build Status](https://travis-ci.org/khiav223577/rails_compatibility.svg?branch=master)](https://travis-ci.org/khiav223577/rails_compatibility)
+[![Build Status](https://github.com/khiav223577/rails_compatibility/workflows/Ruby/badge.svg)](https://github.com/khiav223577/rails_compatibility/actions)
 [![RubyGems](http://img.shields.io/gem/dt/rails_compatibility.svg?style=flat)](http://rubygems.org/gems/rails_compatibility)
 [![Code Climate](https://codeclimate.com/github/khiav223577/rails_compatibility/badges/gpa.svg)](https://codeclimate.com/github/khiav223577/rails_compatibility)
 [![Test Coverage](https://codeclimate.com/github/khiav223577/rails_compatibility/badges/coverage.svg)](https://codeclimate.com/github/khiav223577/rails_compatibility/coverage)
 
+## Supports
+- Ruby 2.2 ~ 2.7
+- Rails 3.2, 4.2, 5.0, 5.1, 5.2, 6.0
+
 ## Installation
 
 Provides cross-rails methods for you to upgrade rails, backport features, create easy-to-maintain gems, and so on.
-Support Rails 3.2, 4.2, 5.0, 5.1, 5.2, 6.0.
-Support Ruby 2.2 ~ 2.6
 
 ```ruby
 gem 'rails_compatibility'

data/gemfiles/3.2.gemfile

@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 gem 'activerecord', '~> 3.2.0'
 
 group :test do
-  gem 'simplecov'
+  gem 'simplecov', '< 0.18'
   gem 'sqlite3', '~> 1.3.6'
 end
 

data/gemfiles/4.2.gemfile

@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 gem 'activerecord', '~> 4.2.0'
 
 group :test do
-  gem 'simplecov'
+  gem 'simplecov', '< 0.18'
   gem 'sqlite3', '~> 1.3.6'
 end
 

data/gemfiles/5.0.gemfile

@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 gem 'activerecord', '~> 5.0.0'
 
 group :test do
-  gem 'simplecov'
+  gem 'simplecov', '< 0.18'
   gem 'sqlite3', '~> 1.3.6'
 end
 

data/gemfiles/5.1.gemfile

@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 gem 'activerecord', '~> 5.1.0'
 
 group :test do
-  gem 'simplecov'
+  gem 'simplecov', '< 0.18'
   gem 'sqlite3', '~> 1.3.6'
 end
 

data/gemfiles/5.2.gemfile

@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 gem 'activerecord', '~> 5.2.0'
 
 group :test do
-  gem 'simplecov'
+  gem 'simplecov', '< 0.18'
   gem 'sqlite3', '~> 1.3.6'
 end
 

data/gemfiles/6.0.gemfile

@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 gem 'activerecord', '~> 6.0.0'
 
 group :test do
-  gem 'simplecov'
+  gem 'simplecov', '< 0.18'
   gem 'sqlite3', '~> 1.4.1'
 end
 

data/gemfiles/6.1.gemfile

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

data/lib/rails_compatibility/active_record.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require 'rails_compatibility'
+require 'active_record'
+
+class << RailsCompatibility
+  GTE_RAILS_6_1 = Gem::Version.new(ActiveRecord::VERSION::STRING) >= Gem::Version.new('6.1.0')
+  GTE_RAILS_6_0 = Gem::Version.new(ActiveRecord::VERSION::STRING) >= Gem::Version.new('6.0.0')
+  GTE_RAILS_5_2 = Gem::Version.new(ActiveRecord::VERSION::STRING) >= Gem::Version.new('5.2.0')
+  GTE_RAILS_5_1 = Gem::Version.new(ActiveRecord::VERSION::STRING) >= Gem::Version.new('5.1.0')
+  GTE_RAILS_5_0 = Gem::Version.new(ActiveRecord::VERSION::STRING) >= Gem::Version.new('5.0.0')
+  GTE_RAILS_4_0 = Gem::Version.new(ActiveRecord::VERSION::STRING) >= Gem::Version.new('4.0.0')
+end

data/lib/rails_compatibility/attribute_types.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require 'rails_compatibility'
+require 'rails_compatibility/active_record'
+
+class << RailsCompatibility
+  if ActiveRecord::Base.respond_to?(:attribute_types) # column_types was changed to attribute_types in Rails 5
+    def attribute_types(klass)
+      klass.attribute_types
+    end
+  elsif ActiveRecord::Base.respond_to?(:column_types) # Rails 4
+    def attribute_types(klass)
+      klass.column_types
+    end
+  else # In Rails 3
+    def attribute_types(klass)
+      klass.columns_hash
+    end
+  end
+end

data/lib/rails_compatibility/build_joins.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+require 'rails_compatibility'
+require 'rails_compatibility/construct_join_dependency'
+require 'rails_compatibility/active_record'
+
+class << RailsCompatibility
+  if GTE_RAILS_6_1
+    def build_joins(reflect, relation)
+      join_dependency = construct_join_dependency(reflect, relation)
+      joins = join_dependency.join_constraints([], relation.alias_tracker, relation.references_values)
+      return joins
+    end
+  elsif GTE_RAILS_6_0
+    def build_joins(reflect, relation)
+      join_dependency = construct_join_dependency(reflect, relation)
+      joins = join_dependency.join_constraints([], relation.alias_tracker)
+      return joins
+    end
+  elsif GTE_RAILS_5_2
+    def build_joins(reflect, relation)
+      join_dependency = construct_join_dependency(reflect, relation)
+      joins = join_dependency.join_constraints([], Arel::Nodes::InnerJoin, relation.alias_tracker)
+      return joins
+    end
+  elsif GTE_RAILS_5_0
+    def build_joins(reflect, relation)
+      join_dependency = construct_join_dependency(reflect, relation)
+      info = join_dependency.join_constraints([], Arel::Nodes::InnerJoin)[0]
+      return info.joins
+    end
+  elsif GTE_RAILS_4_0
+    def build_joins(reflect, relation)
+      join_dependency = construct_join_dependency(reflect, relation)
+      info = join_dependency.join_constraints([])[0]
+      return info.joins
+    end
+  else
+    def build_joins(reflect, relation)
+      join_dependency = construct_join_dependency(reflect, relation)
+      return join_dependency.join_associations
+    end
+  end
+end

data/lib/rails_compatibility/construct_join_dependency.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+require 'rails_compatibility'
+require 'rails_compatibility/active_record'
+
+class << RailsCompatibility
+  if GTE_RAILS_6_0
+    def construct_join_dependency(reflect, relation)
+      joins = inverse_association_joins(reflect)
+      return relation.construct_join_dependency(joins, Arel::Nodes::InnerJoin)
+    end
+  elsif GTE_RAILS_5_2
+    def construct_join_dependency(reflect, relation)
+      joins = inverse_association_joins(reflect)
+
+      join_dependency = ActiveRecord::Associations::JoinDependency.new(reflect.klass, relation.table, joins)
+
+      root = join_dependency.send(:join_root)
+
+      join_dependency.instance_variable_set(:@alias_tracker, relation.alias_tracker)
+      join_dependency.send(:construct_tables!, root)
+      return join_dependency
+    end
+  else
+    def construct_join_dependency(reflect, _relation)
+      joins = inverse_association_joins(reflect)
+      return ActiveRecord::Associations::JoinDependency.new(reflect.klass, joins, [])
+    end
+  end
+
+  private
+
+  def inverse_association_joins(reflect)
+    [reflect.options[:inverse_of] || reflect.active_record.table_name]
+  end
+end

data/lib/rails_compatibility/has_include.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require 'rails_compatibility'
+require 'rails_compatibility/active_record'
+
+class << RailsCompatibility
+  if GTE_RAILS_6_1
+    def has_include?(relation, column_name)
+      relation.send(:has_include?, column_name)
+    end
+  elsif GTE_RAILS_5_0
+    def has_include?(relation, column_name)
+      relation.dup.send(:has_include?, column_name)
+    end
+  else
+    def has_include?(relation, column_name)
+      relation.send(:has_include?, column_name)
+    end
+  end
+end

data/lib/rails_compatibility/pick.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'rails_compatibility/active_record'
+
+class << RailsCompatibility
+  if GTE_RAILS_6_0
+    def pick(relation, *args)
+      relation.pick(*args)
+    end
+  elsif GTE_RAILS_4_0
+    def pick(relation, *args)
+      relation.limit(1).pluck(*args).first
+    end
+  else
+    def pick(relation, *args)
+      model = relation.first
+
+      return nil if model == nil
+      return model[args.first] if args.size == 1
+      return args.map{|s| model[s] }
+    end
+  end
+end

data/lib/rails_compatibility/unscope_where.rb

@@ -1,15 +1,15 @@
 # frozen_string_literal: true
 
-require 'active_record'
+require 'rails_compatibility/active_record'
 
 class << RailsCompatibility
-  if ActiveRecord::VERSION::MAJOR < 4
+  if GTE_RAILS_4_0
     def unscope_where(relation)
-      relation.dup.tap{|s| s.where_values = [] }
+      relation.unscope(:where)
     end
   else
     def unscope_where(relation)
-      relation.unscope(:where)
+      relation.dup.tap{|s| s.where_values = [] }
     end
   end
 end

data/lib/rails_compatibility/version.rb

@@ -1,3 +1,3 @@
 module RailsCompatibility
-  VERSION = '0.0.1'
+  VERSION = '0.0.6'
 end

data/rails_compatibility.gemspec

@@ -1,43 +1,44 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'rails_compatibility/version'
-
-Gem::Specification.new do |spec|
-  spec.name          = 'rails_compatibility'
-  spec.version       = RailsCompatibility::VERSION
-  spec.authors       = ['khiav reoy']
-  spec.email         = ['mrtmrt15xn@yahoo.com.tw']
-
-  spec.summary       = 'Provides cross-rails methods for you to upgrade rails, backport features, create easy-to-maintain gems, and so on.'
-  spec.description   = 'Provides cross-rails methods for you to upgrade rails, backport features, create easy-to-maintain gems, and so on.'
-  spec.homepage      = 'https://github.com/khiav223577/rails_compatibility'
-  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/rails_compatibility',
-    'changelog_uri'     => 'https://github.com/khiav223577/rails_compatibility/blob/master/CHANGELOG.md',
-    'source_code_uri'   => 'https://github.com/khiav223577/rails_compatibility',
-    'documentation_uri' => 'https://www.rubydoc.info/gems/rails_compatibility',
-    'bug_tracker_uri'   => 'https://github.com/khiav223577/rails_compatibility/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 'activerecord', '>= 3'
-end
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'rails_compatibility/version'
+
+Gem::Specification.new do |spec|
+  spec.name          = 'rails_compatibility'
+  spec.version       = RailsCompatibility::VERSION
+  spec.authors       = ['khiav reoy']
+  spec.email         = ['mrtmrt15xn@yahoo.com.tw']
+
+  spec.summary       = 'Provides cross-rails methods for you to upgrade rails, backport features, create easy-to-maintain gems, and so on.'
+  spec.description   = 'Provides cross-rails methods for you to upgrade rails, backport features, create easy-to-maintain gems, and so on.'
+  spec.homepage      = 'https://github.com/khiav223577/rails_compatibility'
+  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/rails_compatibility',
+    'changelog_uri'     => 'https://github.com/khiav223577/rails_compatibility/blob/master/CHANGELOG.md',
+    'source_code_uri'   => 'https://github.com/khiav223577/rails_compatibility',
+    'documentation_uri' => 'https://www.rubydoc.info/gems/rails_compatibility',
+    'bug_tracker_uri'   => 'https://github.com/khiav223577/rails_compatibility/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_development_dependency 'backports', '~> 3.15.0'
+
+  spec.add_dependency 'activerecord', '>= 3'
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_compatibility
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.6
 platform: ruby
 authors:
 - khiav reoy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-17 00:00:00.000000000 Z
+date: 2021-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,6 +72,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: backports
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.15.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.15.0
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -94,9 +108,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rubocop.yml"
-- ".travis.yml"
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - LICENSE
 - LICENSE.txt
@@ -110,7 +125,14 @@ files:
 - gemfiles/5.1.gemfile
 - gemfiles/5.2.gemfile
 - gemfiles/6.0.gemfile
+- gemfiles/6.1.gemfile
 - lib/rails_compatibility.rb
+- lib/rails_compatibility/active_record.rb
+- lib/rails_compatibility/attribute_types.rb
+- lib/rails_compatibility/build_joins.rb
+- lib/rails_compatibility/construct_join_dependency.rb
+- lib/rails_compatibility/has_include.rb
+- lib/rails_compatibility/pick.rb
 - lib/rails_compatibility/unscope_where.rb
 - lib/rails_compatibility/version.rb
 - rails_compatibility.gemspec
@@ -138,7 +160,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.14
 signing_key: 
 specification_version: 4
 summary: Provides cross-rails methods for you to upgrade rails, backport features,

data/.travis.yml

@@ -1,34 +0,0 @@
-sudo: false
-env:
-  global:
-    - CC_TEST_REPORTER_ID=bc86bdb762b05f34d8c71dd53717ea5b3a83bda4b5a4ba684037d20076a186ec
-language: ruby
-rvm:
-  - 2.2
-  - 2.6
-gemfile:
-  - gemfiles/3.2.gemfile
-  - gemfiles/4.2.gemfile
-  - gemfiles/5.0.gemfile
-  - gemfiles/5.1.gemfile
-  - gemfiles/5.2.gemfile
-  - gemfiles/6.0.gemfile
-matrix:
-  exclude:
-    - gemfile: gemfiles/3.2.gemfile
-      rvm: 2.6
-    - gemfile: gemfiles/4.0.gemfile
-      rvm: 2.6
-    - gemfile: gemfiles/6.0.gemfile
-      rvm: 2.2
-before_install:
-  - gem i rubygems-update -v '<3' && update_rubygems
-  - gem install bundler -v 1.17.3
-  - gem --version
-  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
-  - chmod +x ./cc-test-reporter
-  - ./cc-test-reporter before-build
-script:
-  - bundle exec rake test
-after_script:
-  - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT