adaptive_alias 0.1.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 81757ab8f4098990940d499ee2286c8c831fdac6462dfcafcd59b868ff596ec2
-  data.tar.gz: b88816e4745352dc63fb29a4d102a52935538bd0f5ef5591f8ce56e9057dc9d5
+  metadata.gz: 53def64d14130ef1552a0a427246706ce42fb8696dfba356c323adcef3c39f97
+  data.tar.gz: 7c6b4ed35d6a0c90d06b09368b1f0c1617abfffac05f153015f3a4a8878ec6a5
 SHA512:
-  metadata.gz: 60cb4e6e2f31787f93f6edf5415bd3fbe283999c50d0fba89d9e48e055a5c06ca7479ee8a158ec4618453352bc8034a18e9acbafae5905f4e4f2a7a0ee8ba54f
-  data.tar.gz: e80d6cdd3e41254d07e70e4440bc120b6940bfddb31f54709e97becafc18dd4eef2341832fc049d750e247e002a8097f4d9128697de0f657c8fdd1b47310d103
+  metadata.gz: 9c8b4ec7ad1588f922bf0af037061216699a056c023ea70975796c66dafd57cf254c5d4915a98cfa7e1b9836b53f61ca2961ea0b9aa399e2fe7dc55510192d23
+  data.tar.gz: c6a532d2f341729637a7ca9630fe1338ddeb5b553cc0ea897e6cb784d18adbd47db21254df82746a06e915c57a2f2567227436a9562eac21cb150174be16d5e7

data/CHANGELOG.md

@@ -1,10 +1,26 @@
 ## Change Log
 
+### [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) [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

@@ -0,0 +1,17 @@
+require 'active_record'
+
+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)
+        key = klass.attribute_aliases[key] || key
+        super(scope, table, key, value)
+      end
+    end
+  end
+end
+
+class ActiveRecord::Associations::AssociationScope
+  prepend AdaptiveAlias::ActiveModelPatches::ApplyScope
+end

data/lib/adaptive_alias/active_model_patches/read_attribute.rb

@@ -1,22 +1,31 @@
 require 'active_record'
 
-module ActiveRecord::AttributeMethods::Read
-  def read_attribute(attr_name, &block) # :nodoc:
-    name = attr_name.to_s
-    name = self.class.attribute_aliases[name] || name
+module AdaptiveAlias
+  module ActiveModelPatches
+    module ReadAttribute
+      def read_attribute(attr_name, &block) # :nodoc:
+        name = attr_name.to_s
+        name = self.class.attribute_aliases[name] || name
 
-    name = @primary_key if name == 'id' && @primary_key
-    _read_attribute(name, &block)
-  end
+        name = @primary_key if name == 'id' && @primary_key
+        _read_attribute(name, &block)
+      end
 
-  # This method exists to avoid the expensive primary_key check internally, without
-  # breaking compatibility with the write_attribute API
-  def _read_attribute(attr_name, &block) # :nodoc:
-    name = attr_name.to_s
-    name = self.class.attribute_aliases[name] || name
+      # This method exists to avoid the expensive primary_key check internally, without
+      # breaking compatibility with the write_attribute API
+      def _read_attribute(attr_name, &block) # :nodoc:
+        name = attr_name.to_s
+        name = self.class.attribute_aliases[name] || name
 
-    sync_with_transaction_state if @transaction_state&.finalized?
-    return yield(name) if block_given? and AdaptiveAlias.missing_value?(@attributes, self.class, name)
-    return @attributes.fetch_value(name, &block)
+        sync_with_transaction_state if @transaction_state&.finalized?
+        return yield(name) if block_given? and AdaptiveAlias.missing_value?(@attributes, self.class, name)
+        return @attributes.fetch_value(name, &block)
+      end
+    end
   end
 end
+
+# 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

@@ -1,18 +1,31 @@
 require 'active_model'
 
-module ActiveModel::AttributeMethods
-  module ClassMethods
-    def remove_proxy_call(mod, name)
-      mod.module_eval "remove_method(:'#{name}')", __FILE__, __LINE__ + 1
-    end
+module AdaptiveAlias
+  module ActiveModelPatches
+    module RemoveAliasAttribute
+      def remove_proxy_call(mod, name)
+        mod.module_eval "remove_method(:'#{name}')", __FILE__, __LINE__ + 1
+      end
 
-    def remove_alias_attribute(new_name)
-      self.attribute_aliases = attribute_aliases.except(new_name.to_s)
+      def remove_alias_attribute(new_name)
+        self.attribute_aliases = attribute_aliases.except(new_name.to_s)
 
-      attribute_method_matchers.each do |matcher|
-        matcher_new = matcher.method_name(new_name).to_s
-        remove_proxy_call self, matcher_new
+        attribute_method_matchers.each do |matcher|
+          matcher_new = matcher.method_name(new_name).to_s
+          remove_proxy_call self, matcher_new
+        end
       end
     end
   end
 end
+
+# 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

@@ -1,22 +1,25 @@
 require 'active_record'
 
-module ActiveRecord::AttributeMethods::Write
-  def write_attribute(attr_name, value)
-    name = attr_name.to_s
-    name = self.class.attribute_aliases[name] || name
+module AdaptiveAlias
+  module ActiveModelPatches
+    module WriteAttribute
+      def write_attribute(attr_name, value)
+        name = attr_name.to_s
+        name = self.class.attribute_aliases[name] || name
+        super(name, value)
+      end
 
-    name = @primary_key if name == 'id' && @primary_key
-    _write_attribute(name, value)
+      # This method exists to avoid the expensive primary_key check internally, without
+      # breaking compatibility with the write_attribute API
+      def _write_attribute(attr_name, value) # :nodoc:
+        name = attr_name.to_s
+        name = self.class.attribute_aliases[name] || name
+        super(name, value)
+      end
+    end
   end
+end
 
-  # This method exists to avoid the expensive primary_key check internally, without
-  # breaking compatibility with the write_attribute API
-  def _write_attribute(attr_name, value) # :nodoc:
-    name = attr_name.to_s
-    name = self.class.attribute_aliases[name] || name
-
-    sync_with_transaction_state if @transaction_state&.finalized?
-    @attributes.write_from_user(name, value)
-    value
-  end
+class ActiveRecord::Base
+  prepend AdaptiveAlias::ActiveModelPatches::WriteAttribute
 end

data/lib/adaptive_alias/hooks/association.rb

@@ -2,11 +2,11 @@ module AdaptiveAlias
   module Hooks
     module Association
       def find_target(*)
-        AdaptiveAlias.rescue_statement_invalid(nil){ super }
+        AdaptiveAlias.rescue_statement_invalid(nil, reflection){ super }
       end
 
       def create!(attributes = {}, &block)
-        AdaptiveAlias.rescue_statement_invalid(association_scope){ super }
+        AdaptiveAlias.rescue_statement_invalid(association_scope, reflection){ super }
       end
     end
   end

data/lib/adaptive_alias/hooks/relation.rb

@@ -2,15 +2,15 @@ module AdaptiveAlias
   module Hooks
     module Relation
       def pluck(*)
-        AdaptiveAlias.rescue_statement_invalid(self){ super }
+        AdaptiveAlias.rescue_statement_invalid(self, nil){ super }
       end
 
       def select_all(*)
-        AdaptiveAlias.rescue_statement_invalid(self){ super }
+        AdaptiveAlias.rescue_statement_invalid(self, nil){ super }
       end
 
       def exec_queries(*)
-        AdaptiveAlias.rescue_statement_invalid(self){ super }
+        AdaptiveAlias.rescue_statement_invalid(self, nil){ super }
       end
     end
   end

data/lib/adaptive_alias/patches/backward_patch.rb

@@ -15,7 +15,9 @@ module AdaptiveAlias
         super
         @klass.remove_alias_attribute(@old_column)
         @klass.define_attribute_method(@old_column)
-        ForwardPatch.new(@klass, @old_column, @new_column).apply!
+        new_patch = ForwardPatch.new(@klass, @old_column, @new_column)
+        new_patch.apply!
+        return new_patch
       end
     end
   end

data/lib/adaptive_alias/patches/base.rb

@@ -46,6 +46,9 @@ module AdaptiveAlias
 
         expected_association_err_msgs = [
           "Mysql2::Error: Unknown column '#{klass.table_name}.#{current_column}' in 'where clause'".freeze,
+        ].freeze
+
+        expected_ambiguous_association_err_msgs = [
           "Mysql2::Error: Unknown column '#{current_column}' in 'field list'".freeze,
         ].freeze
 
@@ -64,21 +67,33 @@ module AdaptiveAlias
           next true
         end
 
-        @fix_association = proc do |target, error|
+        @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!
 
-          if target
-            hash = target.where_values_hash
-            hash[alias_column] = hash.delete(current_column) if hash.key?(current_column)
-            hash[alias_column.to_s] = hash.delete(current_column.to_s) if hash.key?(current_column.to_s)
-            target.instance_variable_set(:@arel, nil)
-            target.unscope!(:where).where!(hash)
+          if relation
+            relation.where_clause.send(:predicates).each do |node|
+              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
 
+          reflection.clear_association_scope_cache if reflection
+
           next true
         end
       end

data/lib/adaptive_alias/patches/forward_patch.rb

@@ -15,7 +15,9 @@ module AdaptiveAlias
         super
         @klass.remove_alias_attribute(@new_column)
         @klass.define_attribute_method(@new_column)
-        BackwardPatch.new(@klass, @old_column, @new_column).apply!
+        new_patch = BackwardPatch.new(@klass, @old_column, @new_column)
+        new_patch.apply!
+        return new_patch
       end
     end
   end

data/lib/adaptive_alias/version.rb

@@ -1,3 +1,3 @@
 module AdaptiveAlias
-  VERSION = '0.1.0'
+  VERSION = '0.2.2'
 end

data/lib/adaptive_alias.rb

@@ -4,6 +4,7 @@ require 'adaptive_alias/version'
 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/patches/backward_patch'
 require 'adaptive_alias/patches/forward_patch'
 
@@ -32,19 +33,19 @@ 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
       end
     end
 
-    def rescue_statement_invalid(relation, &block)
+    def rescue_statement_invalid(relation, reflection, &block)
       yield
     rescue ActiveRecord::StatementInvalid => error
-      raise error if AdaptiveAlias.current_patches.all?{|_key, patch| !patch.fix_association.call(relation, error) }
+      raise error if AdaptiveAlias.current_patches.all?{|_key, patch| !patch.fix_association.call(relation, reflection, error) }
 
-      result = rescue_statement_invalid(relation, &block)
+      result = rescue_statement_invalid(relation, reflection, &block)
       AdaptiveAlias.current_patches.each_value(&:mark_removable)
       return result
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: adaptive_alias
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.2
 platform: ruby
 authors:
 - khiav reoy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-08-01 00:00:00.000000000 Z
+date: 2022-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -123,6 +123,7 @@ files:
 - gemfiles/6.1.gemfile
 - gemfiles/7.0.gemfile
 - lib/adaptive_alias.rb
+- lib/adaptive_alias/active_model_patches/apply_scope.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