adaptive_alias 1.1.0 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2fe3d8361642cc73cba568a7a131efa94f9e17eeada3f1af45990ff876abcb6d
-  data.tar.gz: befec070dac8af388634e02f5479a78d61ca4e7ddd10e7a489aeae2e2e7180e8
+  metadata.gz: 7a49038a810d4dcbbd42effa1664ff3495966c9a097df8939f92632e5fae54ac
+  data.tar.gz: 3bee0518e9915af89ac616be205a73da6155e09d9f3d28947cd3cf9145e18660
 SHA512:
-  metadata.gz: 2c676366d3132428d290da9291e886f06620d07836a56b87bb59d82f4dc84b86e8ba73f317a26b126d01bb4011a86c04d5653476c277b49d2f81d3728be5e973
-  data.tar.gz: d26cc5ad6eb77b9cba338788eafcb9f3826b7dbe4cc4afbf1dfd8e22f32bf626be7294bfd87f007e60db429f7294127f994eb4d402c9699cde83017b0b38b540
+  metadata.gz: '094892c502fe7343c74a5dae66ab57b1bd21405a73cf38c390c41b12bfd8d01f39c5d9cec78920ca1a388e93be68e280c95041a3fae4d43f9a7ea9ed931f6d22'
+  data.tar.gz: 1c7e437b160e7ae6cbb8bb8624f654a220ed35fdbedae3a5a45a306f616bab4f7e62153c08cc874e59a806a7fd5bdc269a86c231180b597b333e9e2556e13acd

data/.github/workflows/ruby.yml

@@ -24,7 +24,7 @@ jobs:
         ruby:
           - 2.6
           - 2.7
-          - 3.0
+          - 3.0.4
           - 3.1
         gemfile:
           - 6.0.gemfile

data/.rubocop.yml

@@ -812,7 +812,7 @@ Style/NumericLiterals:
                  Add underscores to large numeric literals to improve their
                  readability.
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#underscores-in-numerics'
-  Enabled: true
+  Enabled: false
 
 Style/OneLineConditional:
   Description: >-

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 ## Change Log
 
+### [v1.1.1](https://github.com/khiav223577/adaptive_alias/compare/v1.1.0...v1.1.1) 2022/10/07
+- [#24](https://github.com/khiav223577/adaptive_alias/pull/24) [Fix] Disappeared value when instantiating all and then create / update multiple models one by one (@khiav223577)
+- [#23](https://github.com/khiav223577/adaptive_alias/pull/23) [Enhance] No need to determine missing value manually (@khiav223577)
+
+### [v1.1.0](https://github.com/khiav223577/adaptive_alias/compare/v1.0.0...v1.1.0) 2022/09/27
+- [#22](https://github.com/khiav223577/adaptive_alias/pull/22) [Fix] Creation via autosave(belongs_to) association  (@khiav223577)
+
 ### [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)

data/lib/adaptive_alias/active_model_patches/read_attribute.rb

@@ -18,7 +18,6 @@ module AdaptiveAlias
         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)
       end
     end

data/lib/adaptive_alias/hooks/active_record_persistence.rb

@@ -1,8 +1,46 @@
 module AdaptiveAlias
   module Hooks
     module ActiveRecordPersistence
+      def _update_record
+        AdaptiveAlias.rescue_statement_invalid(model: self) do
+          attribute_set_fix!
+          super
+        end
+      end
+
       def _create_record(*)
-        AdaptiveAlias.rescue_statement_invalid(model: self){ super }
+        AdaptiveAlias.rescue_statement_invalid(model: self) do
+          attribute_set_fix!
+          super
+        end
+      end
+
+      private
+
+      def attribute_set_fix!
+        if attribute_names.any?{|name| self.class.attribute_aliases[name] }
+          attributes = @attributes.instance_variable_get(:@attributes)
+          attributes = attributes.instance_variable_get(:@delegate_hash) if attributes.is_a?(ActiveModel::LazyAttributeHash)
+
+          delete_duplicate_keys!(attributes)
+
+          attributes.transform_keys! do |key|
+            self.class.attribute_aliases[key] || key
+          end
+        end
+      end
+
+      # delete duplicate keys caused by instantiate after migration but before patch removal.
+      def delete_duplicate_keys!(attributes)
+        duplicate_keys = {}
+        delete_keys = []
+        attributes.each do |key, _|
+          aliased_key = self.class.attribute_aliases[key] || key
+          delete_keys << key if duplicate_keys[aliased_key] # delete old key and keep the new one
+          duplicate_keys[aliased_key] = true
+        end
+
+        delete_keys.each{|s| attributes.delete(s) }
       end
     end
   end

data/lib/adaptive_alias/hooks/calculations.rb

@@ -0,0 +1,16 @@
+require 'active_record'
+
+module AdaptiveAlias
+  module Hooks
+    module Calculations
+      def perform_calculation(*)
+        AdaptiveAlias.rescue_statement_invalid(relation: self){ super }
+      end
+    end
+  end
+end
+
+# Nested module include is not supported until ruby 3.0
+class ActiveRecord::Relation
+  prepend AdaptiveAlias::Hooks::Calculations
+end

data/lib/adaptive_alias/patches/base.rb

@@ -63,7 +63,10 @@ module AdaptiveAlias
           next false if not patch.removable
           next false if patch.removed
           next false if klass.table_name != error_klass.table_name
-          next false if not expected_attribute_err_msgs.include?(error.message)
+
+          # Error highlight behavior in Ruby 3.1 pollutes the error message
+          error_msg = error.respond_to?(:original_message) ? error.original_message : error.message
+          next false if not expected_attribute_err_msgs.include?(error_msg)
 
           patch.remove!
           next true
@@ -88,7 +91,9 @@ module AdaptiveAlias
           next false if not patch.removable
           next false if patch.removed
 
-          ambiguous = expected_ambiguous_association_err_msgs.include?(error.message)
+          # Error highlight behavior in Ruby 3.1 pollutes the error message
+          error_msg = error.respond_to?(:original_message) ? error.original_message : error.message
+          ambiguous = expected_ambiguous_association_err_msgs.include?(error_msg)
 
           if ambiguous
             next false if relation and klass.table_name != relation.klass.table_name
@@ -97,17 +102,10 @@ module AdaptiveAlias
             next false if !relation and !reflection and !model
           end
 
-          next false if not expected_association_err_msgs.include?(error.message) and not ambiguous
+          next false if not expected_association_err_msgs.include?(error_msg) 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.1.0'
+  VERSION = '1.1.2'
 end

data/lib/adaptive_alias.rb

@@ -15,6 +15,7 @@ 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'
+require 'adaptive_alias/hooks/calculations'
 
 module AdaptiveAlias
   @log_interval = 10 * 60
@@ -70,13 +71,5 @@ module AdaptiveAlias
       klass.prepend(@model_modules[klass])
       return @model_modules[klass]
     end
-
-    def missing_value?(attributes, klass, name)
-      return false if attributes.key?(name)
-
-      old_name = klass.attribute_aliases.key(name)
-      return false if old_name == nil
-      return !!AdaptiveAlias.current_patches[[klass, old_name.to_sym, name.to_sym]]
-    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: adaptive_alias
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.2
 platform: ruby
 authors:
 - khiav reoy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-09-27 00:00:00.000000000 Z
+date: 2022-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -132,6 +132,7 @@ files:
 - 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/calculations.rb
 - lib/adaptive_alias/hooks/relation.rb
 - lib/adaptive_alias/hooks/singular_association.rb
 - lib/adaptive_alias/patches/backward_patch.rb