enum_errors_away 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a042969d984fbb4972117e18c9a8f8d95b3cf83cd517ff8bfa52d2fd5356bdd2
-  data.tar.gz: cce23409d8eafac9e6cd2a8230127ef6060644f81fc6bd7b5871bb15cfc2ddb4
+  metadata.gz: 2b399f229db92482813751b010f00f4e21eb0a82997e5f9e6c7356fa44c4ee56
+  data.tar.gz: b0d640513ae8d2c7a678da4d46271dfcc3ca2f83990731a4042257c8e2167a41
 SHA512:
-  metadata.gz: 6fd2754ab0fc90df56e0170f6b61f37083c7a9ccdb111acc831bcba1d5bf1a0e473ee2dd12114b2f651ba5d3b2c1f5895dc86833200e1248259450aa2c6394c4
-  data.tar.gz: d12a7d77b11ad0644d1c65d4aa6b17773d4eef109d1f856af9f590574de7b2b3fd6a2b16d54d05481e4e2afc7f1f365b2403e2b22d44f65df7534508545e858c
+  metadata.gz: c49582d5796dec9b0c9644506bb678976adcd3d541e97f594afdb4ba0533c3a3ea67fbdfb8607aab65b6ca3ece85295c546d1e1764ab258af7227e7e863df9ff
+  data.tar.gz: 1464ddcb152dc952bdae1f216b263495969975729767e9d3622f18862a0e00c1ddbe29f344e93b127d9383949cb0351349c9edaf29091984baaa7346c5ab504d

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## [0.4.0] - 2025-12-05
+
+Change the way we define the fallback. 
+Declare attribute if there's no column for it.
+
 ## [0.3.1] - 2025-11-28
 
 ### Fixed

data/lib/enum_errors_away/active_record_extension.rb

@@ -27,37 +27,36 @@ module EnumErrorsAway
                         { name => values }
                       end
 
-        # Pre-declare attributes for enum names that don't exist as columns
+        # Pre-declare attributes for enum names that don't have a database column.
+        # We check columns_hash to avoid overriding the column's type.
         definitions.each do |enum_name, enum_values|
           next if enum_name.nil? || enum_name.to_s.empty?
-          next if enum_values.nil?
 
           begin
             enum_name_str = enum_name.to_s
-            # @type var enum_name: Symbol | String
-            attribute enum_name, :integer if !attribute_types.key?(enum_name_str) && !columns_hash.key?(enum_name_str)
+            # Only declare attribute if there's no column for it
+            next if columns_hash.key?(enum_name_str)
+
+            # Determine attribute type from enum values:
+            # - If all values are integers (or array), use :integer
+            # - If any value is a string, use :string
+            attr_type = if enum_values.is_a?(Array)
+                          :integer
+                        elsif enum_values.is_a?(Hash) && enum_values.values.any? { |v| v.is_a?(String) }
+                          :string
+                        else
+                          :integer
+                        end
+
+            attribute enum_name, attr_type
           rescue ActiveRecord::StatementInvalid, ActiveRecord::ConnectionNotEstablished
-            # Ignore database errors during schema introspection
+            # Silently ignore database errors - the enum may fail later,
+            # but that's the expected behavior without this gem
           end
         end
 
         # Call the original enum method
-        begin
-          super(name, values, **options)
-        rescue ArgumentError, RuntimeError => e
-          raise e unless e.message.include?('Undeclared attribute type for enum')
-
-          # Fallback: declare missing attributes and retry
-          definitions.each do |enum_name, enum_values|
-            next if enum_name.nil? || enum_name.to_s.empty?
-            next if enum_values.nil?
-
-            enum_name_str = enum_name.to_s
-            # @type var enum_name: Symbol | String
-            attribute enum_name, :integer unless attribute_types.key?(enum_name_str)
-          end
-          super(name, values, **options)
-        end
+        super(name, values, **options)
       end
       # rubocop:enable Metrics/AbcSize
       # rubocop:enable Metrics/MethodLength

data/lib/enum_errors_away/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EnumErrorsAway
-  VERSION = '0.3.1'
+  VERSION = '0.4.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: enum_errors_away
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Sampo Kuokkanen