rails_compatibility 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb1e642696e0bacb7e1a3dc935f6a4d6d9392416520fa4c114e8e72d75df35d7
-  data.tar.gz: adc6156b40d3b0c7b142ced5bc29ade09860595460c7ff66a928beb8371ef5a2
+  metadata.gz: b65886e174af9d71e8b04ed12969bc7d9564255eb4deb4dfaa7d2732ad1c3b46
+  data.tar.gz: f8af6e2aaa5c0dde135b98c054c524571bc06f97e56a29e371ebcb981098d966
 SHA512:
-  metadata.gz: 1a5df2463304910b45227d8f7d0579aa98bb501fd4bcaebca299271ec8e483edab3198da546a878d6658f345e96db66ca0f1f2b141558aef208d3b9a1c476b12
-  data.tar.gz: 625584b400aba33cf595ae0ac887404ea3e9cde1645d5be2add2051ffd413eb01a8ba2990ff78b567be7870b92ed9d8f27d099371f56b8566f7b3d3f3c4c377e
+  metadata.gz: 0dd4cecb90bc3f668577338cff3d9571dc6386757644a9895aa2a2acd157f15faf3e97ee4c9fec60420f161533c2908d796d0fd4b491780b21bae399e6a61c9a
+  data.tar.gz: e862435b327c9baf0c7087dabf91a3e8079dc67ef833f9a1d12c92595965c4704e3a1aab106bc03ab5eac179e3c5fa840e53344f76fe6efec8dedeb573307167

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/.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.
@@ -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:
@@ -1123,7 +1122,7 @@ Layout/Tab:
   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

@@ -1,4 +1,7 @@
 ## Change Log
 
+### [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://travis-ci.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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'rails_compatibility'
-require 'active_record'
+require 'rails_compatibility/active_record'
 
 class << RailsCompatibility
   if ActiveRecord::Base.respond_to?(:attribute_types) # column_types was changed to attribute_types in Rails 5

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,30 @@
+# 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)
+      association_joins = [reflect.active_record.table_name]
+      return relation.construct_join_dependency(association_joins, Arel::Nodes::InnerJoin)
+    end
+  elsif GTE_RAILS_5_2
+    def construct_join_dependency(reflect, relation)
+      association_joins = [reflect.active_record.table_name]
+
+      join_dependency = ActiveRecord::Associations::JoinDependency.new(reflect.klass, relation.table, association_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)
+      association_joins = [reflect.active_record.table_name]
+      return ActiveRecord::Associations::JoinDependency.new(reflect.klass, association_joins, [])
+    end
+  end
+end

data/lib/rails_compatibility/unscope_where.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'active_record'
+require 'rails_compatibility/active_record'
 
 class << RailsCompatibility
   if ActiveRecord::VERSION::MAJOR < 4

data/lib/rails_compatibility/version.rb

@@ -1,3 +1,3 @@
 module RailsCompatibility
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_compatibility
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - khiav reoy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-18 00:00:00.000000000 Z
+date: 2021-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,9 +108,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rubocop.yml"
-- ".travis.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - LICENSE
@@ -125,8 +125,12 @@ 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/unscope_where.rb
 - lib/rails_compatibility/version.rb
 - rails_compatibility.gemspec
@@ -154,7 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.6
 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