rails_compatibility 0.0.4 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d628f314ad4219a50d3f0d4a72b69254ae956c1d1e63a0db6870143ceba6ffd
-  data.tar.gz: c5e489ed0997e8d8dfab6828c24d4d8c513e2c9aaa0a12a0d858db0cf3b224c3
+  metadata.gz: e10843554c7729ecd8fb3b9ef7418fc458cb92ad18da1f4e6ce2829dd5ab1566
+  data.tar.gz: bdea2e8109abd52b32df8ca66675bc6ae3cd9a5ad3c6e1b73081d0344526e25b
 SHA512:
-  metadata.gz: 25c8eaa141e7dcf885ea0a3640032686092c4779f8382d76b8da9d1744359924d6b805e8b52b723ccbfc0cd6f9783765f88723e1071d891604a4573ea7907363
-  data.tar.gz: d7346c65e318fc062248678ce9e9e2d9200ad86bbd0eee6395afba7720127267b85ca53bbf8ebe5066a3fdc65db6fc78cd85ea7fe1475c9a15b74c990f8014e8
+  metadata.gz: f80ced4f5e1e7c22d04262c170fb478d46aa17c02a767cc37af0b4f170e634de81d1bf6824857e4f41bbeed846eb7365b28ee670e11262dd3da0b457ea2ea06e
+  data.tar.gz: b30469894f18200d7d102ddfe9f0308cda268c66236da7f7b6c6f53827a41616f03a871d92da95f89cd903485c139415ef0637c5c3605778fc928b9ebb661277

data/.github/workflows/ruby.yml

@@ -23,6 +23,8 @@ jobs:
           - 2.2
           - 2.6
           - 2.7
+          - 3.0
+          - 3.1
         gemfile:
           - 3.2.gemfile
           - 4.2.gemfile
@@ -31,32 +33,57 @@ jobs:
           - 5.2.gemfile
           - 6.0.gemfile
           - 6.1.gemfile
+          - 7.0.gemfile
         exclude:
           - gemfile: 3.2.gemfile
             ruby: 2.6
           - gemfile: 3.2.gemfile
             ruby: 2.7
+          - gemfile: 3.2.gemfile
+            ruby: 3.0
+          - gemfile: 3.2.gemfile
+            ruby: 3.1
           - gemfile: 4.2.gemfile
             ruby: 2.7
+          - gemfile: 4.2.gemfile
+            ruby: 3.0
+          - gemfile: 4.2.gemfile
+            ruby: 3.1
+          - gemfile: 5.0.gemfile
+            ruby: 3.0
+          - gemfile: 5.0.gemfile
+            ruby: 3.1
+          - gemfile: 5.1.gemfile
+            ruby: 3.0
+          - gemfile: 5.1.gemfile
+            ruby: 3.1
+          - gemfile: 5.2.gemfile
+            ruby: 3.0
+          - gemfile: 5.2.gemfile
+            ruby: 3.1
           - gemfile: 6.0.gemfile
             ruby: 2.2
           - gemfile: 6.1.gemfile
             ruby: 2.2
+          - gemfile: 7.0.gemfile
+            ruby: 2.2
+          - gemfile: 7.0.gemfile
+            ruby: 2.6
     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 }}
+      - 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

@@ -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
 
@@ -1117,7 +1117,7 @@ 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

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 ## Change Log
 
+### [v0.0.7](https://github.com/khiav223577/rails_compatibility/compare/v0.0.6...v0.0.7) 2021/06/10
+- [#12](https://github.com/khiav223577/rails_compatibility/pull/12) Implement #apply_join_dependency (@khiav223577)
+
+### [v0.0.6](https://github.com/khiav223577/rails_compatibility/compare/v0.0.5...v0.0.6) 2021/06/10
+- [#11](https://github.com/khiav223577/rails_compatibility/pull/11) Implement #has_include? (@khiav223577)
+
+### [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)

data/README.md

@@ -7,8 +7,8 @@
 [![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
+- Ruby 2.2 ~ 2.7, 3.0 ~ 3.1
+- Rails 3.2, 4.2, 5.0, 5.1, 5.2, 6.0, 6.1, 7.0
 
 ## Installation
 

data/gemfiles/7.0.gemfile

@@ -0,0 +1,12 @@
+source 'https://rubygems.org'
+
+gem 'zeitwerk'
+gem 'activerecord', '~> 7.0.0'
+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

@@ -4,6 +4,7 @@ require 'rails_compatibility'
 require 'active_record'
 
 class << RailsCompatibility
+  GTE_RAILS_7_0 = Gem::Version.new(ActiveRecord::VERSION::STRING) >= Gem::Version.new('7.0.0')
   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')

data/lib/rails_compatibility/apply_join_dependency.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require 'rails_compatibility'
+require 'rails_compatibility/active_record'
+
+class << RailsCompatibility
+  if GTE_RAILS_5_2
+    def apply_join_dependency(relation)
+      relation.send(:apply_join_dependency)
+    end
+  elsif GTE_RAILS_5_1
+    def apply_join_dependency(relation)
+      relation.send(:construct_relation_for_association_calculations)
+    end
+  elsif GTE_RAILS_5_0
+    def apply_join_dependency(relation)
+      relation.dup.send(:construct_relation_for_association_calculations)
+    end
+  else
+    def apply_join_dependency(relation)
+      relation.send(:construct_relation_for_association_calculations)
+    end
+  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/setup_autoload_paths.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require 'rails_compatibility'
+
+class << RailsCompatibility
+  if ActiveSupport::VERSION::MAJOR >= 7
+    def setup_autoload_paths(paths)
+      require 'zeitwerk'
+      loader = Zeitwerk::Loader.new
+
+      paths.each do |path|
+        ActiveSupport::Dependencies.autoload_paths << path
+        loader.push_dir(path)
+      end
+
+      loader.setup
+    end
+  else
+    def setup_autoload_paths(paths)
+      paths.each do |path|
+        ActiveSupport::Dependencies.autoload_paths << path
+      end
+    end
+  end
+end

data/lib/rails_compatibility/unscope_where.rb

@@ -3,13 +3,13 @@
 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.4'
+  VERSION = '0.0.8'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_compatibility
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.8
 platform: ruby
 authors:
 - khiav reoy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-04-10 00:00:00.000000000 Z
+date: 2022-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -126,11 +126,16 @@ files:
 - gemfiles/5.2.gemfile
 - gemfiles/6.0.gemfile
 - gemfiles/6.1.gemfile
+- gemfiles/7.0.gemfile
 - lib/rails_compatibility.rb
 - lib/rails_compatibility/active_record.rb
+- lib/rails_compatibility/apply_join_dependency.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/setup_autoload_paths.rb
 - lib/rails_compatibility/unscope_where.rb
 - lib/rails_compatibility/version.rb
 - rails_compatibility.gemspec