adaptive_alias 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f5938ea6d66ddde37c2f28e252297844a422d3431b37105c54b2246244880971
-  data.tar.gz: ad5e44e57886b67db5eaacc898a910b5b916d194e8eca3ad821851f9b9c4a35e
+  metadata.gz: 2fe3d8361642cc73cba568a7a131efa94f9e17eeada3f1af45990ff876abcb6d
+  data.tar.gz: befec070dac8af388634e02f5479a78d61ca4e7ddd10e7a489aeae2e2e7180e8
 SHA512:
-  metadata.gz: 2ed9da0a54fea620f1d31ebb8c6c15b11591eb5b34d96e21f699dd1c3c0acb64a9415ca224388688b8f6af1871f775b197a4876bf54e4abd24a59ec6ec154922
-  data.tar.gz: bcc8815527922cfb226c7ea8c718f25ed9d2f8cd029b0666ec567c9a2fb2ce3414596cbfc39e146d817be7ee8b2f36dfa6a304267ad60cb903ac3dc54706321e
+  metadata.gz: 2c676366d3132428d290da9291e886f06620d07836a56b87bb59d82f4dc84b86e8ba73f317a26b126d01bb4011a86c04d5653476c277b49d2f81d3728be5e973
+  data.tar.gz: d26cc5ad6eb77b9cba338788eafcb9f3826b7dbe4cc4afbf1dfd8e22f32bf626be7294bfd87f007e60db429f7294127f994eb4d402c9699cde83017b0b38b540

data/CHANGELOG.md

@@ -1,7 +1,12 @@
 ## Change Log
 
+### [v1.0.0](https://github.com/khiav223577/adaptive_alias/compare/v0.2.4...v1.0.0) 2022/09/22
+- [#21](https://github.com/khiav223577/adaptive_alias/pull/21) [Fix] Model with ignored_columns or calling find_by directly on model class with aliased column argument will fail (@khiav223577)
+- [#20](https://github.com/khiav223577/adaptive_alias/pull/20) [Fix] Problems with STI classes and models that uses same table name (@khiav223577)
+- [#19](https://github.com/khiav223577/adaptive_alias/pull/19) [Fix] Rescue the error when doing direct access to target table's field (@khiav223577)
+
 ### [v0.2.4](https://github.com/khiav223577/adaptive_alias/compare/v0.2.3...v0.2.4) 2022/08/18
-- [#18](https://github.com/khiav223577/adaptive_alias/pull/18) [Fix] get model from a relation with join will not generate right query (after migration) (@khiav223577)
+- [#18](https://github.com/khiav223577/adaptive_alias/pull/18) [Fix] Get model from a relation with join will not generate right query (after migration) (@khiav223577)
 
 ### [v0.2.3](https://github.com/khiav223577/adaptive_alias/compare/v0.2.2...v0.2.3) 2022/08/17
 - [#17](https://github.com/khiav223577/adaptive_alias/pull/17) [Feature] Support joins (@khiav223577)

data/lib/adaptive_alias/hooks/active_record_core.rb

@@ -2,11 +2,11 @@ module AdaptiveAlias
   module Hooks
     module ActiveRecordCore
       def find(*)
-        AdaptiveAlias.rescue_statement_invalid(nil, nil){ super }
+        AdaptiveAlias.rescue_statement_invalid{ super }
       end
 
       def find_by(*)
-        AdaptiveAlias.rescue_statement_invalid(nil, nil){ super }
+        AdaptiveAlias.rescue_statement_invalid{ super }
       end
     end
   end

data/lib/adaptive_alias/hooks/active_record_persistence.rb

@@ -0,0 +1,14 @@
+module AdaptiveAlias
+  module Hooks
+    module ActiveRecordPersistence
+      def _create_record(*)
+        AdaptiveAlias.rescue_statement_invalid(model: self){ super }
+      end
+    end
+  end
+end
+
+# Nested module include is not supported until ruby 3.0
+class ActiveRecord::Base
+  prepend AdaptiveAlias::Hooks::ActiveRecordPersistence
+end

data/lib/adaptive_alias/hooks/association.rb

@@ -2,11 +2,7 @@ module AdaptiveAlias
   module Hooks
     module Association
       def find_target(*)
-        AdaptiveAlias.rescue_statement_invalid(nil, reflection){ super }
-      end
-
-      def create!(attributes = {}, &block)
-        AdaptiveAlias.rescue_statement_invalid(association_scope, reflection){ super }
+        AdaptiveAlias.rescue_statement_invalid(reflection: 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, nil){ super }
+        AdaptiveAlias.rescue_statement_invalid(relation: self){ super }
       end
 
       def select_all(*)
-        AdaptiveAlias.rescue_statement_invalid(self, nil){ super }
+        AdaptiveAlias.rescue_statement_invalid(relation: self){ super }
       end
 
       def exec_queries(*)
-        AdaptiveAlias.rescue_statement_invalid(self, nil){ super }
+        AdaptiveAlias.rescue_statement_invalid(relation: self){ super }
       end
     end
   end

data/lib/adaptive_alias/patches/base.rb

@@ -84,7 +84,7 @@ module AdaptiveAlias
           end
         end
 
-        @fix_association = proc do |relation, reflection, error|
+        @fix_association = proc do |relation, reflection, model, error|
           next false if not patch.removable
           next false if patch.removed
 
@@ -93,12 +93,21 @@ module AdaptiveAlias
           if ambiguous
             next false if relation and klass.table_name != relation.klass.table_name
             next false if reflection and klass.table_name != reflection.klass.table_name
+            next false if model and klass.table_name != model.class.table_name
+            next false if !relation and !reflection and !model
           end
 
           next false if not expected_association_err_msgs.include?(error.message) and not ambiguous
 
           patch.remove!
 
+          if model
+            attributes = model.instance_variable_get(:@attributes).instance_variable_get(:@attributes)
+            attributes.transform_keys! do |key|
+              key == current_column.to_s ? alias_column.to_s : key
+            end
+          end
+
           if relation
             relation.reset # reset @arel
 

data/lib/adaptive_alias/version.rb

@@ -1,3 +1,3 @@
 module AdaptiveAlias
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end

data/lib/adaptive_alias.rb

@@ -14,6 +14,7 @@ require 'adaptive_alias/hooks/association_scope'
 require 'adaptive_alias/hooks/singular_association'
 require 'adaptive_alias/hooks/relation'
 require 'adaptive_alias/hooks/active_record_core'
+require 'adaptive_alias/hooks/active_record_persistence'
 
 module AdaptiveAlias
   @log_interval = 10 * 60
@@ -42,12 +43,12 @@ module AdaptiveAlias
       end
     end
 
-    def rescue_statement_invalid(relation, reflection, &block)
+    def rescue_statement_invalid(relation: nil, reflection: nil, model: nil, &block)
       yield
     rescue ActiveRecord::StatementInvalid => error
-      raise error if AdaptiveAlias.current_patches.all?{|_key, patch| !patch.fix_association.call(relation, reflection, error) }
+      raise error if AdaptiveAlias.current_patches.all?{|_key, patch| !patch.fix_association.call(relation, reflection, model, error) }
 
-      result = rescue_statement_invalid(relation, reflection, &block)
+      result = rescue_statement_invalid(relation: relation, reflection: reflection, model: model, &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: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - khiav reoy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-09-22 00:00:00.000000000 Z
+date: 2022-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -129,6 +129,7 @@ files:
 - lib/adaptive_alias/active_model_patches/remove_alias_attribute.rb
 - lib/adaptive_alias/active_model_patches/write_attribute.rb
 - lib/adaptive_alias/hooks/active_record_core.rb
+- lib/adaptive_alias/hooks/active_record_persistence.rb
 - lib/adaptive_alias/hooks/association.rb
 - lib/adaptive_alias/hooks/association_scope.rb
 - lib/adaptive_alias/hooks/relation.rb