rails_compatibility 0.0.5 → 0.0.6

data/gemfiles/6.1.gemfile

@@ -1,11 +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: '../'
+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.rb

@@ -1 +1 @@
-require 'rails_compatibility/version'
+require 'rails_compatibility/version'

data/lib/rails_compatibility/active_record.rb

@@ -1,13 +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
+# 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,20 +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
+# 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

@@ -1,44 +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
+# 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

@@ -1,36 +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
+# 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

@@ -1,23 +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
+# 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 'rails_compatibility/active_record'
-
-class << RailsCompatibility
-  if GTE_RAILS_4_0
-    def unscope_where(relation)
-      relation.unscope(:where)
-    end
-  else
-    def unscope_where(relation)
-      relation.dup.tap{|s| s.where_values = [] }
-    end
-  end
-end
+# frozen_string_literal: true
+
+require 'rails_compatibility/active_record'
+
+class << RailsCompatibility
+  if GTE_RAILS_4_0
+    def unscope_where(relation)
+      relation.unscope(:where)
+    end
+  else
+    def unscope_where(relation)
+      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.5'
-end
+module RailsCompatibility
+  VERSION = '0.0.6'
+end

data/rails_compatibility.gemspec

@@ -1,44 +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_development_dependency 'backports', '~> 3.15.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