adaptive_alias 0.0.2 → 0.0.3

data/CHANGELOG.md

@@ -1,4 +1,5 @@
 ## Change Log
 
-### [upcoming](https://github.com/khiav223577/adaptive_alias/compare/v0.0.1...HEAD) 2022/07/22
+### [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)
 - [#1](https://github.com/khiav223577/adaptive_alias/pull/1) Implement adaptive_alias features (@khiav223577)

data/CODE_OF_CONDUCT.md

@@ -1,49 +1,49 @@
-# Contributor Code of Conduct
-
-As contributors and maintainers of this project, and in the interest of
-fostering an open and welcoming community, we pledge to respect all people who
-contribute through reporting issues, posting feature requests, updating
-documentation, submitting pull requests or patches, and other activities.
-
-We are committed to making participation in this project a harassment-free
-experience for everyone, regardless of level of experience, gender, gender
-identity and expression, sexual orientation, disability, personal appearance,
-body size, race, ethnicity, age, religion, or nationality.
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery
-* Personal attacks
-* Trolling or insulting/derogatory comments
-* Public or private harassment
-* Publishing other's private information, such as physical or electronic
-  addresses, without explicit permission
-* Other unethical or unprofessional conduct
-
-Project maintainers have the right and responsibility to remove, edit, or
-reject comments, commits, code, wiki edits, issues, and other contributions
-that are not aligned to this Code of Conduct, or to ban temporarily or
-permanently any contributor for other behaviors that they deem inappropriate,
-threatening, offensive, or harmful.
-
-By adopting this Code of Conduct, project maintainers commit themselves to
-fairly and consistently applying these principles to every aspect of managing
-this project. Project maintainers who do not follow or enforce the Code of
-Conduct may be permanently removed from the project team.
-
-This code of conduct applies both within project spaces and in public spaces
-when an individual is representing the project or its community.
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting a project maintainer at mrtmrt15xn@yahoo.com.tw. All
-complaints will be reviewed and investigated and will result in a response that
-is deemed necessary and appropriate to the circumstances. Maintainers are
-obligated to maintain confidentiality with regard to the reporter of an
-incident.
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage],
-version 1.3.0, available at
-[http://contributor-covenant.org/version/1/3/0/][version]
-
-[homepage]: http://contributor-covenant.org
-[version]: http://contributor-covenant.org/version/1/3/0/
+# Contributor Code of Conduct
+
+As contributors and maintainers of this project, and in the interest of
+fostering an open and welcoming community, we pledge to respect all people who
+contribute through reporting issues, posting feature requests, updating
+documentation, submitting pull requests or patches, and other activities.
+
+We are committed to making participation in this project a harassment-free
+experience for everyone, regardless of level of experience, gender, gender
+identity and expression, sexual orientation, disability, personal appearance,
+body size, race, ethnicity, age, religion, or nationality.
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery
+* Personal attacks
+* Trolling or insulting/derogatory comments
+* Public or private harassment
+* Publishing other's private information, such as physical or electronic
+  addresses, without explicit permission
+* Other unethical or unprofessional conduct
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+By adopting this Code of Conduct, project maintainers commit themselves to
+fairly and consistently applying these principles to every aspect of managing
+this project. Project maintainers who do not follow or enforce the Code of
+Conduct may be permanently removed from the project team.
+
+This code of conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community.
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting a project maintainer at mrtmrt15xn@yahoo.com.tw. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. Maintainers are
+obligated to maintain confidentiality with regard to the reporter of an
+incident.
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 1.3.0, available at
+[http://contributor-covenant.org/version/1/3/0/][version]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/3/0/

data/LICENSE

@@ -1,21 +1,21 @@
-MIT License
-
-Copyright (c) 2020 Rumble Huang
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+MIT License
+
+Copyright (c) 2020 Rumble Huang
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/README.md

@@ -1,67 +1,67 @@
-# adaptive_alias
-
-[![Gem Version](https://img.shields.io/gem/v/adaptive_alias.svg?style=flat)](http://rubygems.org/gems/adaptive_alias)
-[![Build Status](https://github.com/khiav223577/adaptive_alias/workflows/Ruby/badge.svg)](https://github.com/khiav223577/adaptive_alias/actions)
-[![RubyGems](http://img.shields.io/gem/dt/adaptive_alias.svg?style=flat)](http://rubygems.org/gems/adaptive_alias)
-[![Code Climate](https://codeclimate.com/github/khiav223577/adaptive_alias/badges/gpa.svg)](https://codeclimate.com/github/khiav223577/adaptive_alias)
-[![Test Coverage](https://codeclimate.com/github/khiav223577/adaptive_alias/badges/coverage.svg)](https://codeclimate.com/github/khiav223577/adaptive_alias/coverage)
-
-Extend attribute_alias and make it be adaptive with realtime database schema.
-
-When we are going to rename a column, we may want to add a forward-patch so that we can use new column name before migration. And after migration, we may want to add a backward-patch so that those where are still using old column name will not be broken.
-Ideally, we switch from forward-patch to backward-patch right after migration:
-```rb
-                   ForwardPatch           migrate            BackwardPatch
-    |----------------------------------------|----------------------------------------|
-    
-``` 
-
-But in reality, it will take times to deploy and restart server to switch patch. There is a gap between migration and restart. So what will happen when db is migrated but server is not restarted?
-We need a way to automatically adjust the patch to adapt current schema.
-
-```rb
-                   ForwardPatch           migrate   restart     BackwardPatch
-    |----------------------------------------|---@-----|-------------------------------| 
-                          
-```
-
-This is what this gem wants to achieve. We don't want to do complex migrations, take care of backward-compatibiliy, and have any downtime.
-Just rely on this gem.
-
-
-## Supports
-- Ruby 2.6 ~ 2.7, 3.0 ~ 3.1
-- Rails 6.0, 6.1, 7.0
-
-## Installation
-
-```ruby
-gem 'adaptive_alias'
-```
-
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install adaptive_alias
-
-## Usage
-
-
-## Development
-
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
-
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
-
-## Contributing
-
-Bug reports and pull requests are welcome on GitHub at https://github.com/khiav223577/adaptive_alias. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
-
-
-## License
-
-The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
-
+# adaptive_alias
+
+[![Gem Version](https://img.shields.io/gem/v/adaptive_alias.svg?style=flat)](http://rubygems.org/gems/adaptive_alias)
+[![Build Status](https://github.com/khiav223577/adaptive_alias/workflows/Ruby/badge.svg)](https://github.com/khiav223577/adaptive_alias/actions)
+[![RubyGems](http://img.shields.io/gem/dt/adaptive_alias.svg?style=flat)](http://rubygems.org/gems/adaptive_alias)
+[![Code Climate](https://codeclimate.com/github/khiav223577/adaptive_alias/badges/gpa.svg)](https://codeclimate.com/github/khiav223577/adaptive_alias)
+[![Test Coverage](https://codeclimate.com/github/khiav223577/adaptive_alias/badges/coverage.svg)](https://codeclimate.com/github/khiav223577/adaptive_alias/coverage)
+
+Extend attribute_alias and make it be adaptive with realtime database schema.
+
+When we are going to rename a column, we may want to add a forward-patch so that we can use new column name before migration. And after migration, we may want to add a backward-patch so that those where are still using old column name will not be broken.
+Ideally, we switch from forward-patch to backward-patch right after migration:
+```rb
+                   ForwardPatch           migrate            BackwardPatch
+    |----------------------------------------|----------------------------------------|
+    
+``` 
+
+But in reality, it will take times to deploy and restart server to switch patch. There is a gap between migration and restart. So what will happen when db is migrated but server is not restarted?
+We need a way to automatically adjust the patch to adapt current schema.
+
+```rb
+                   ForwardPatch           migrate   restart     BackwardPatch
+    |----------------------------------------|---@-----|-------------------------------| 
+                          
+```
+
+This is what this gem wants to achieve. We don't want to do complex migrations, take care of backward-compatibiliy, and have any downtime.
+Just rely on this gem.
+
+
+## Supports
+- Ruby 2.6 ~ 2.7, 3.0 ~ 3.1
+- Rails 6.0, 6.1, 7.0
+
+## Installation
+
+```ruby
+gem 'adaptive_alias'
+```
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install adaptive_alias
+
+## Usage
+
+
+## Development
+
+After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+
+To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+
+## Contributing
+
+Bug reports and pull requests are welcome on GitHub at https://github.com/khiav223577/adaptive_alias. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+
+
+## License
+
+The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
+

data/Rakefile

@@ -1,10 +1,10 @@
-require 'bundler/gem_tasks'
-require 'rake/testtask'
-
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'test'
-  t.libs << 'lib'
-  t.test_files = FileList['test/**/*_test.rb']
-end
-
-task default: :test
+require 'bundler/gem_tasks'
+require 'rake/testtask'
+
+Rake::TestTask.new(:test) do |t|
+  t.libs << 'test'
+  t.libs << 'lib'
+  t.test_files = FileList['test/**/*_test.rb']
+end
+
+task default: :test

data/adaptive_alias.gemspec

@@ -1,44 +1,44 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'adaptive_alias/version'
-
-Gem::Specification.new do |spec|
-  spec.name          = 'adaptive_alias'
-  spec.version       = AdaptiveAlias::VERSION
-  spec.authors       = ['khiav reoy']
-  spec.email         = ['mrtmrt15xn@yahoo.com.tw']
-
-  spec.summary       = 'Extend attribute_alias and make it be adaptive with realtime database schema'
-  spec.description   = 'Extend attribute_alias and make it be adaptive with realtime database schema'
-  spec.homepage      = 'https://github.com/khiav223577/adaptive_alias'
-  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/adaptive_alias',
-    'changelog_uri'     => 'https://github.com/khiav223577/adaptive_alias/blob/master/CHANGELOG.md',
-    'source_code_uri'   => 'https://github.com/khiav223577/adaptive_alias',
-    'documentation_uri' => 'https://www.rubydoc.info/gems/adaptive_alias',
-    'bug_tracker_uri'   => 'https://github.com/khiav223577/adaptive_alias/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 'rails_compatibility', '>= 0.0.8'
-
-  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 'adaptive_alias/version'
+
+Gem::Specification.new do |spec|
+  spec.name          = 'adaptive_alias'
+  spec.version       = AdaptiveAlias::VERSION
+  spec.authors       = ['khiav reoy']
+  spec.email         = ['mrtmrt15xn@yahoo.com.tw']
+
+  spec.summary       = 'Extend attribute_alias and make it be adaptive with realtime database schema'
+  spec.description   = 'Extend attribute_alias and make it be adaptive with realtime database schema'
+  spec.homepage      = 'https://github.com/khiav223577/adaptive_alias'
+  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/adaptive_alias',
+    'changelog_uri'     => 'https://github.com/khiav223577/adaptive_alias/blob/master/CHANGELOG.md',
+    'source_code_uri'   => 'https://github.com/khiav223577/adaptive_alias',
+    'documentation_uri' => 'https://www.rubydoc.info/gems/adaptive_alias',
+    'bug_tracker_uri'   => 'https://github.com/khiav223577/adaptive_alias/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 'rails_compatibility', '>= 0.0.8'
+
+  spec.add_dependency 'activerecord', '>= 3'
+end

data/bin/console

@@ -1,14 +1,14 @@
-#!/usr/bin/env ruby
-
-require 'bundler/setup'
-require 'adaptive_alias'
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require 'irb'
-IRB.start
+#!/usr/bin/env ruby
+
+require 'bundler/setup'
+require 'adaptive_alias'
+
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
+
+# (If you use this, don't forget to add pry to your Gemfile!)
+# require "pry"
+# Pry.start
+
+require 'irb'
+IRB.start

data/bin/setup

@@ -1,8 +1,8 @@
-#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-set -vx
-
-bundle install --gemfile=gemfiles/4.2.gemfile
-
-# Do any other automated setup that you need to do here
+#!/usr/bin/env bash
+set -euo pipefail
+IFS=$'\n\t'
+set -vx
+
+bundle install --gemfile=gemfiles/4.2.gemfile
+
+# Do any other automated setup that you need to do here

data/gemfiles/6.0.gemfile

@@ -1,10 +1,11 @@
-source 'https://rubygems.org'
-
-gem 'activerecord', '~> 6.0.0'
-
-group :test do
-  gem 'simplecov', '< 0.18'
-  gem 'mysql2', '0.5.3'
-end
-
-gemspec path: '../'
+source 'https://rubygems.org'
+
+gem 'activerecord', '~> 6.0.0'
+
+group :test do
+  gem 'simplecov', '< 0.18'
+  gem 'mysql2', '0.5.3'
+  gem 'acts-as-taggable-on', '~> 7.0.0'
+end
+
+gemspec path: '../'

data/gemfiles/6.1.gemfile

@@ -1,10 +1,11 @@
-source 'https://rubygems.org'
-
-gem 'activerecord', '~> 6.1.3'
-
-group :test do
-  gem 'simplecov', '< 0.18'
-  gem 'mysql2', '0.5.3'
-end
-
-gemspec path: '../'
+source 'https://rubygems.org'
+
+gem 'activerecord', '~> 6.1.3'
+
+group :test do
+  gem 'simplecov', '< 0.18'
+  gem 'mysql2', '0.5.3'
+  gem 'acts-as-taggable-on', '~> 7.0.0'
+end
+
+gemspec path: '../'

data/gemfiles/7.0.gemfile

@@ -1,11 +1,12 @@
-source 'https://rubygems.org'
-
-gem 'zeitwerk'
-gem 'activerecord', '~> 7.0.0'
-
-group :test do
-  gem 'simplecov', '< 0.18'
-  gem 'mysql2', '0.5.3'
-end
-
-gemspec path: '../'
+source 'https://rubygems.org'
+
+gem 'zeitwerk'
+gem 'activerecord', '~> 7.0.0'
+
+group :test do
+  gem 'simplecov', '< 0.18'
+  gem 'mysql2', '0.5.3'
+  gem 'acts-as-taggable-on', '~> 9.0.0'
+end
+
+gemspec path: '../'

data/lib/adaptive_alias/active_model_patches/read_attribute.rb

@@ -1,20 +1,20 @@
-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
-
-    name = @primary_key if name == 'id' && @primary_key
-    _read_attribute(name, &block)
-  end
-
-  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 if block_given? && !@attributes.key?(name)
-    @attributes.fetch_value(name, &block)
-  end
-end
+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
+
+    name = @primary_key if name == 'id' && @primary_key
+    _read_attribute(name, &block)
+  end
+
+  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 if block_given? and AdaptiveAlias.missing_value?(@attributes, self.class, name)
+    return @attributes.fetch_value(name, &block)
+  end
+end

data/lib/adaptive_alias/active_model_patches/remove_alias_attribute.rb

@@ -1,27 +1,27 @@
-require 'active_model'
-
-module ActiveModel::AttributeMethods
-  module ClassMethods
-    def remove_proxy_call(mod, name)
-      defn = if NAME_COMPILABLE_REGEXP.match?(name)
-               "undef #{name}"
-             else
-               "remove_method(:'#{name}')"
-             end
-
-      mod.module_eval defn, __FILE__, __LINE__ + 1
-    end
-
-    def remove_alias_attribute(new_name)
-      # association_scope -> add_constraints -> last_chain_scope -> where!(key => model[foreign_key])
-      # self[attr_name] -> read_attribute(attr_name) -> attribute_aliases
-      # where! -> where_clause_factory.build -> attributes = predicate_builder.resolve_column_aliases(opts) -> attribute_aliases
-      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
-      end
-    end
-  end
-end
+require 'active_model'
+
+module ActiveModel::AttributeMethods
+  module ClassMethods
+    def remove_proxy_call(mod, name)
+      defn = if NAME_COMPILABLE_REGEXP.match?(name)
+               "undef #{name}"
+             else
+               "remove_method(:'#{name}')"
+             end
+
+      mod.module_eval defn, __FILE__, __LINE__ + 1
+    end
+
+    def remove_alias_attribute(new_name)
+      # association_scope -> add_constraints -> last_chain_scope -> where!(key => model[foreign_key])
+      # self[attr_name] -> read_attribute(attr_name) -> attribute_aliases
+      # where! -> where_clause_factory.build -> attributes = predicate_builder.resolve_column_aliases(opts) -> attribute_aliases
+      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
+      end
+    end
+  end
+end

data/lib/adaptive_alias/hooks/association.rb

@@ -1,13 +1,13 @@
-module AdaptiveAlias
-  module Hooks
-    module Association
-      def find_target(*)
-        AdaptiveAlias.rescue_statement_invalid(nil){ super }
-      end
-    end
-  end
-end
-
-class ActiveRecord::Associations::Association
-  prepend AdaptiveAlias::Hooks::Association
-end
+module AdaptiveAlias
+  module Hooks
+    module Association
+      def find_target(*)
+        AdaptiveAlias.rescue_statement_invalid(nil){ super }
+      end
+    end
+  end
+end
+
+class ActiveRecord::Associations::Association
+  prepend AdaptiveAlias::Hooks::Association
+end