adaptive_alias 0.2.0 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 26cc1e7589ccce6ae23b91968e01b0c419efbd482ce217c5c2efceaef33cb35d
-  data.tar.gz: ef91b943cb0aeb07a1f9ac8370195d5f75fe48ce3c3908cc7f546ead6719fe7a
+  metadata.gz: b0944e33c0d1dc0b83a734d921c7dadc3f37eaccd2356deebd9775168a98470c
+  data.tar.gz: 3132d4d8a7de8e5325a8505a79f377daf227322f045e2bdc08ec41443d182348
 SHA512:
-  metadata.gz: 9969274e1e866cc6ff99349a0da832044c3171fc654e9603afd4151846f9ac82cd31c76513ff865e4669d0dc96eb7abedd62225331eb46a769bbcb4bed681fec
-  data.tar.gz: 9fad3f81d3bd1e4d768d43c94e476719a0e0a6b0af0fd7bf82fe89fae0195dcb877f8b73fb91c9d09fd0650ebfd82c12277a61616799fb710d94f9b80b008b97
+  metadata.gz: 4cf0abcab7059c77833a1eb3e04672bb26fa8f5d86c5d710d2fb603a0ef12fd07cad2e8acc04eb9e8ae2b8b1b39d09dd1c50382143cd4fcb55d6d5ff648ec6be
+  data.tar.gz: ba28c61c515149710cffa4a97b23e4870e4b01f2da7e9114034e728e44cefe02a421c839ca1e8667c054660c274f78b0839bf9fd3eee5062b3ea03ff39554b33

data/CHANGELOG.md

@@ -1,15 +1,33 @@
 ## Change Log
 
+### [upcoming](https://github.com/khiav223577/adaptive_alias/compare/v0.2.2...HEAD) 2022/08/15
+- [#16](https://github.com/khiav223577/adaptive_alias/pull/16) [Enhance] No need to clone node (@khiav223577)
+- [#15](https://github.com/khiav223577/adaptive_alias/pull/15) [Test] Add test cases to test calling pluck on same model (@khiav223577)
+
+### [v0.2.2](https://github.com/khiav223577/adaptive_alias/compare/v0.2.1...v0.2.2) 2022/08/11
+- [#14](https://github.com/khiav223577/adaptive_alias/pull/14) [Fix] Fail to use backward-patch when target column has already been migrated (@khiav223577)
+
+### [v0.2.1](https://github.com/khiav223577/adaptive_alias/compare/v0.2.0...v0.2.1) 2022/08/11
+- [#13](https://github.com/khiav223577/adaptive_alias/pull/13) [Fix] Nested module include is not supported until ruby 3.0 (@khiav223577)
+- [#12](https://github.com/khiav223577/adaptive_alias/pull/12) [Test] Add test cases to test column_names (@khiav223577)
+
+### [v0.2.0](https://github.com/khiav223577/adaptive_alias/compare/v0.1.0...v0.2.0) 2022/08/05
+- [#11](https://github.com/khiav223577/adaptive_alias/pull/11) [Feature] Support polymorphic (@khiav223577)
+- [#10](https://github.com/khiav223577/adaptive_alias/pull/10) [Enhance] Prevent adding methods directly in class / module (@khiav223577)
+- [#9](https://github.com/khiav223577/adaptive_alias/pull/9) [Enhance] Prevent changing original order of where conditions (@khiav223577)
+- [#8](https://github.com/khiav223577/adaptive_alias/pull/8) [Test] Make sure we are reset to use original patch when some test cases fail (@khiav223577)
+- [#7](https://github.com/khiav223577/adaptive_alias/pull/7) [Test] Add test cases to test destroy (@khiav223577)
+
 ### [v0.1.0](https://github.com/khiav223577/adaptive_alias/compare/v0.0.3...v0.1.0) 2022/08/01
-- [#6](https://github.com/khiav223577/adaptive_alias/pull/6) Deal with creating records (@khiav223577)
-- [#5](https://github.com/khiav223577/adaptive_alias/pull/5) Prevent infinite loop if something went wrong (@khiav223577)
-- [#4](https://github.com/khiav223577/adaptive_alias/pull/4) Fix: attributes writer method should be defined after schema changes (@khiav223577)
+- [#6](https://github.com/khiav223577/adaptive_alias/pull/6) [Feature] Deal with creating records (@khiav223577)
+- [#5](https://github.com/khiav223577/adaptive_alias/pull/5) [Enhance] Prevent infinite loop if something went wrong (@khiav223577)
+- [#4](https://github.com/khiav223577/adaptive_alias/pull/4) [Fix] Attributes writer method should be defined after schema changes (@khiav223577)
 
 ### [v0.0.3](https://github.com/khiav223577/adaptive_alias/compare/v0.0.2...v0.0.3) 2022/07/27
-- [#3](https://github.com/khiav223577/adaptive_alias/pull/3) Fix: prevent calling custom column names from raising missing attributes (@khiav223577)
+- [#3](https://github.com/khiav223577/adaptive_alias/pull/3) [Fix] Prevent calling custom column names from raising missing attributes (@khiav223577)
 
 ### [v0.0.2](https://github.com/khiav223577/adaptive_alias/compare/v0.0.1...v0.0.2) 2022/07/26
-- [#2](https://github.com/khiav223577/adaptive_alias/pull/2) Doesn't need rails_compatibility in runtime (@khiav223577)
+- [#2](https://github.com/khiav223577/adaptive_alias/pull/2) [Enhance] Doesn't need rails_compatibility in runtime (@khiav223577)
 
 ### v0.0.1 2022/07/22
-- [#1](https://github.com/khiav223577/adaptive_alias/pull/1) Implement adaptive_alias features (@khiav223577)
+- [#1](https://github.com/khiav223577/adaptive_alias/pull/1) [Feature] Implement adaptive_alias features (@khiav223577)

data/lib/adaptive_alias/active_model_patches/apply_scope.rb

@@ -4,7 +4,7 @@ module AdaptiveAlias
   module ActiveModelPatches
     module ApplyScope
       def apply_scope(scope, table, key, value)
-        klass = table.instance_variable_get(:@klass) || table.send(:type_caster).send(:types)
+        klass = table.instance_variable_get(:@klass) || table.klass
         key = klass.attribute_aliases[key] || key
         super(scope, table, key, value)
       end

data/lib/adaptive_alias/active_model_patches/arel_table.rb

@@ -0,0 +1,26 @@
+require 'active_record'
+
+module AdaptiveAlias
+  module ActiveModelPatches
+    module ArelTable
+      def [](name)
+        name = name.to_s if name.is_a?(Symbol)
+        klass = self.klass
+        name = klass.attribute_aliases[name] || name if klass
+        super
+      end
+
+      def klass
+        return @type_caster.instance_variable_get(:@klass) if @type_caster.is_a?(ActiveRecord::TypeCaster::Connection)
+        return @type_caster.send(:types) if @type_caster.is_a?(ActiveRecord::TypeCaster::Map)
+      end
+    end
+  end
+end
+
+# https://github.com/rails/rails/commit/1ac40f16c5bc5246a4aaeab0558eb1c3078b3c6e
+if Gem::Version.new(ActiveRecord::VERSION::STRING) < Gem::Version.new('6.1')
+  class Arel::Table
+    prepend AdaptiveAlias::ActiveModelPatches::ArelTable
+  end
+end

data/lib/adaptive_alias/active_model_patches/read_attribute.rb

@@ -25,6 +25,7 @@ module AdaptiveAlias
   end
 end
 
-module ActiveRecord::AttributeMethods::Read
+# Nested module include is not supported until ruby 3.0
+class ActiveRecord::Base
   prepend AdaptiveAlias::ActiveModelPatches::ReadAttribute
 end

data/lib/adaptive_alias/active_model_patches/remove_alias_attribute.rb

@@ -19,6 +19,13 @@ module AdaptiveAlias
   end
 end
 
-module ActiveModel::AttributeMethods::ClassMethods
-  include AdaptiveAlias::ActiveModelPatches::RemoveAliasAttribute
+# Nested module include is not supported until ruby 3.0
+if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('3')
+  AdaptiveAlias::ActiveModelPatches::RemoveAliasAttribute.instance_methods.each do |method|
+    ActiveModel::AttributeMethods::ClassMethods.define_method(method, AdaptiveAlias::ActiveModelPatches::RemoveAliasAttribute.instance_method(method))
+  end
+else
+  module ActiveModel::AttributeMethods::ClassMethods
+    include AdaptiveAlias::ActiveModelPatches::RemoveAliasAttribute
+  end
 end

data/lib/adaptive_alias/active_model_patches/write_attribute.rb

@@ -20,6 +20,6 @@ module AdaptiveAlias
   end
 end
 
-module ActiveRecord::AttributeMethods::Write
+class ActiveRecord::Base
   prepend AdaptiveAlias::ActiveModelPatches::WriteAttribute
 end

data/lib/adaptive_alias/patches/base.rb

@@ -46,6 +46,10 @@ module AdaptiveAlias
 
         expected_association_err_msgs = [
           "Mysql2::Error: Unknown column '#{klass.table_name}.#{current_column}' in 'where clause'".freeze,
+          "Mysql2::Error: Unknown column '#{klass.table_name}.#{current_column}' in 'on clause'".freeze,
+        ].freeze
+
+        expected_ambiguous_association_err_msgs = [
           "Mysql2::Error: Unknown column '#{current_column}' in 'field list'".freeze,
         ].freeze
 
@@ -67,7 +71,15 @@ module AdaptiveAlias
         @fix_association = proc do |relation, reflection, error|
           next false if not patch.removable
           next false if patch.removed
-          next false if not expected_association_err_msgs.include?(error.message)
+
+          ambiguous = expected_ambiguous_association_err_msgs.include?(error.message)
+
+          if ambiguous
+            next false if relation and klass != relation.klass
+            next false if reflection and klass != reflection.klass
+          end
+
+          next false if not expected_association_err_msgs.include?(error.message) and not ambiguous
 
           patch.remove!
 
@@ -76,7 +88,6 @@ module AdaptiveAlias
               next if node.left.name != current_column.to_s
               next if klass.table_name != node.left.relation.name
 
-              node.left = node.left.clone
               node.left.name = alias_column.to_s
             end
           end

data/lib/adaptive_alias/version.rb

@@ -1,3 +1,3 @@
 module AdaptiveAlias
-  VERSION = '0.2.0'
+  VERSION = '0.2.3'
 end

data/lib/adaptive_alias.rb

@@ -5,6 +5,7 @@ require 'adaptive_alias/active_model_patches/read_attribute'
 require 'adaptive_alias/active_model_patches/write_attribute'
 require 'adaptive_alias/active_model_patches/remove_alias_attribute'
 require 'adaptive_alias/active_model_patches/apply_scope'
+require 'adaptive_alias/active_model_patches/arel_table'
 require 'adaptive_alias/patches/backward_patch'
 require 'adaptive_alias/patches/forward_patch'
 
@@ -33,7 +34,7 @@ module AdaptiveAlias
         extend ActiveSupport::Concern
 
         included do
-          patch = (column_names.include?(new_column) ? Patches::BackwardPatch : Patches::ForwardPatch).new(self, old_column, new_column)
+          patch = (column_names.include?(new_column.to_s) ? Patches::BackwardPatch : Patches::ForwardPatch).new(self, old_column, new_column)
           patch.apply!
           patch.mark_removable
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: adaptive_alias
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.3
 platform: ruby
 authors:
 - khiav reoy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-08-05 00:00:00.000000000 Z
+date: 2022-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -124,6 +124,7 @@ files:
 - gemfiles/7.0.gemfile
 - lib/adaptive_alias.rb
 - lib/adaptive_alias/active_model_patches/apply_scope.rb
+- lib/adaptive_alias/active_model_patches/arel_table.rb
 - lib/adaptive_alias/active_model_patches/read_attribute.rb
 - lib/adaptive_alias/active_model_patches/remove_alias_attribute.rb
 - lib/adaptive_alias/active_model_patches/write_attribute.rb