enumerize 2.8.1 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e8451ec4f75c5a22b6a9c6e337bece407942da5cb12f504b689582e56e1db55
-  data.tar.gz: cfd3f27f2fe811d1c23cf47e875da412b76efd0bae55d18f44d551eb56447507
+  metadata.gz: aa3e9016f87e07bed5c034618ffb19c15104b334adace5eb5cd7903a2a82cf47
+  data.tar.gz: 779be0d6f9644f0ad8019d03bf0c2e1d5638b62c531bd2aef69518f05bf7ae76
 SHA512:
-  metadata.gz: ccc0ed4ca53517171dcac492ae9fd618c17fb08b9b39f4f42b6d951cdc46defb3acc92f66ce345fbe13cb0a654db8d7800b4dc72c19cb0c4e3c4ab1c3088780c
-  data.tar.gz: bd8521f6e55b9af3283073e36197ea5fc5107d4114f297713b6a27ac221bcd98f2376a4803351eeb8c1a7b518c032b6bcc5d16a6c7750294753d0f64f76a4352
+  metadata.gz: 81aea0e826349ad121cfed3a44ee14566fcb7dbba7f78cca5ca5ad007f166edea65b8fdc79e64c441f4249c9f760bafae4918226a07eac54f8ab17a1c80e8f11
+  data.tar.gz: 719f1f33563b31f1f8c73d256c55a16d371ebf581ebddcdae60cb7b98ac0de5960ebcc44c55c836749662b73f1733aaeb437bbe4fc3ed0e4cc103bcdd4431493

data/.github/workflows/ruby.yml

@@ -8,7 +8,7 @@ on:
 
 jobs:
   test:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     services:
       mongodb:
         image: mongo:latest
@@ -32,12 +32,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: ['3.0', '3.1', '3.2', '3.3']
+        ruby-version: ['3.2', '3.3', '3.4', '4.0']
         test: ['minitest', 'rspec']
         gemfile:
-          - Gemfile.rails61
-          - Gemfile.rails70
-          - Gemfile.rails71
+          - Gemfile.rails72
+          - Gemfile.rails80
+          - Gemfile.rails81
           - Gemfile.railsmaster
           - Gemfile.mongo_mapper
         db:
@@ -47,18 +47,14 @@ jobs:
         exclude:
           - gemfile: Gemfile.mongo_mapper
             db: postgresql
-          - ruby-version: '3.0'
-            gemfile: Gemfile.mongo_mapper
-          - ruby-version: '3.1'
-            gemfile: Gemfile.mongo_mapper
-          - ruby-version: '3.0'
+          - ruby-version: '3.2'
             gemfile: Gemfile.railsmaster
     env:
       BUNDLE_GEMFILE: "${{ matrix.gemfile }}"
       DB: "${{ matrix.db }}"
       TEST_FRAMEWORK: "${{ matrix.test }}"
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v7
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:

data/.gitignore

@@ -3,6 +3,7 @@
 .bundle
 .config
 .ruby-version
+.tool-versions
 .yardoc
 .idea/
 enumerize.iml

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+## 3.0.0 (August 4, 2026)
+
+### bug fix
+
+* Fixed `Enumerize::ActiveModelAttributesSupport::Type` to wrap values in `#cast` so enumerized readers on plain `ActiveModel::Attributes` objects return an `Enumerize::Value` (and value predicates keep working) on Rails 8.1. Rails 8.1 reordered attribute-method module inclusion so the generated reader can outrank enumerize's module; assignment reads go through `#cast`, which previously returned the raw value. See #482.
+* Fixed `Enumerize::ActiveModelAttributesSupport::Type#deserialize` to properly handle arrays for `multiple: true` attributes. Previously, deserializing an array would return `nil` instead of the enumerated values. This bug only affected ActiveModel::Attributes usage (not ActiveRecord) and was exposed when used with gems like store_model v2.0.0+ that call `deserialize` during load.
+* Allow an object to `#becomes` a non-Enumerize model.
+* Fix `Type#cast` to support Rails 8.0 bulk operations. (by [@snaka](https://github.com/snaka))
+
+### enchancements
+
+* Support only Ruby 3.1+ and Rails 7.0+. (by [@nashby](https://github.com/nashby))
+* Ensure that `enumerize` is agnostic to whether the key to a store accessor is a `String` or `Symbol`. (by [@4ndypanda](https://github.com/4ndypanda))
+
 ## 2.8.1 (March 25, 2024)
 
 ### bug fix

data/Gemfile.global

@@ -8,7 +8,7 @@ if ENV['TEST_FRAMEWORK'] == 'rspec'
   gem 'rspec', :require => false
 end
 
-gem 'pg', '~> 1.5.3', :platform => [:ruby, :mswin, :mingw]
+gem 'pg', '~> 1.5.3', platforms: [:ruby, :mswin, :mingw]
 gem 'sequel'
 gem 'simple_form'
 gem 'formtastic'

data/Gemfile.mongo_mapper

@@ -1,6 +1,9 @@
 eval_gemfile('Gemfile.global')
 
 gem 'minitest', '~> 5.8'
-gem 'rails',    github: 'rails/rails', branch: '7-0-stable', require: false
+gem 'rails',    github: 'rails/rails', branch: '7-2-stable', require: false
 gem 'mongo_mapper'
-gem 'sqlite3', :platform => [:ruby, :mswin, :mingw]
+
+# This Rails version has a pessimistic version constraint on sqlite3:
+# https://github.com/rails/rails/blob/7-2-stable/Gemfile#L160
+gem 'sqlite3', '~> 1.6', '>= 1.6.6', platforms: [:ruby, :mswin, :mingw]

data/Gemfile.rails72

@@ -0,0 +1,8 @@
+eval_gemfile('Gemfile.global')
+
+gem 'minitest', '~> 5.8'
+gem 'rails',    github: 'rails/rails', branch: '7-2-stable', require: false
+
+gem 'mongoid',  github: 'mongodb/mongoid'
+
+gem 'sqlite3', platforms: [:ruby, :mswin, :mingw]

data/Gemfile.rails80

@@ -0,0 +1,8 @@
+eval_gemfile('Gemfile.global')
+
+gem 'minitest', '~> 5.8'
+gem 'rails',    github: 'rails/rails', branch: '8-0-stable', require: false
+
+gem 'mongoid',  github: 'mongodb/mongoid'
+
+gem 'sqlite3', platforms: [:ruby, :mswin, :mingw]

data/Gemfile.rails81

@@ -0,0 +1,8 @@
+eval_gemfile('Gemfile.global')
+
+gem 'minitest', '~> 5.8'
+gem 'rails',    github: 'rails/rails', branch: '8-1-stable', require: false
+
+gem 'mongoid',  github: 'mongodb/mongoid'
+
+gem 'sqlite3', platforms: [:ruby, :mswin, :mingw]

data/Gemfile.railsmaster

@@ -2,4 +2,4 @@ eval_gemfile('Gemfile.global')
 
 gem 'minitest', '~> 5.8'
 gem 'rails',    github: 'rails/rails', branch: 'main', require: false
-gem 'sqlite3', :platform => [:ruby, :mswin, :mingw]
+gem 'sqlite3', platforms: [:ruby, :mswin, :mingw]

data/README.md

@@ -46,8 +46,8 @@ Or install it yourself as:
 
 ## Supported Versions
 
-- Ruby 3.0+
-- Rails 6.1+
+- Ruby 3.1+
+- Rails 7.0+
 
 ## Usage
 
@@ -306,7 +306,7 @@ It's also possible to store enumerized attribute value using custom values (e.g.
 class User < ActiveRecord::Base
   extend Enumerize
 
-  enumerize :role, in: {:user => 1, :admin => 2}
+  enumerize :role, in: { user: 1, admin: 2 }
 end
 
 user = User.new
@@ -325,8 +325,8 @@ User.role.find_value(:admin).value #=> 2
 ```ruby
 class User < ActiveRecord::Base
   extend Enumerize
-  enumerize :role, :in => [:user, :admin], scope: true
-  enumerize :status, :in => { student: 1, employed: 2, retired: 3 }, scope: :having_status
+  enumerize :role, in: [:user, :admin], scope: true
+  enumerize :status, in: { student: 1, employed: 2, retired: 3 }, scope: :having_status
 end
 
 User.with_role(:admin)
@@ -346,8 +346,8 @@ Adds named scopes to the class directly.
 ```ruby
 class User < ActiveRecord::Base
   extend Enumerize
-  enumerize :status, :in => [:student, :employed, :retired], scope: :shallow
-  enumerize :role, :in => { user: 1, admin: 2 }, scope: :shallow
+  enumerize :status, in: [:student, :employed, :retired], scope: :shallow
+  enumerize :role, in: { user: 1, admin: 2 }, scope: :shallow
 end
 
 User.student
@@ -422,7 +422,7 @@ and if you want it as radio buttons:
 
 ```erb
 <%= simple_form_for @user do |f| %>
-  <%= f.input :status, :as => :radio_buttons %>
+  <%= f.input :status, as: :radio_buttons %>
 <% end %>
 ```
 
@@ -442,7 +442,7 @@ and if you want it as radio buttons:
 
 ```erb
 <%= semantic_form_for @user do |f| %>
-  <%= f.input :status, :as => :radio %>
+  <%= f.input :status, as: :radio %>
 <% end %>
 ```
 

data/enumerize.gemspec

@@ -15,8 +15,14 @@ Gem::Specification.new do |gem|
   gem.name          = "enumerize"
   gem.require_paths = ["lib"]
   gem.version       = Enumerize::VERSION
-
-  gem.required_ruby_version = '>= 2.7'
+  gem.metadata      = {
+    "homepage_uri"      => "https://github.com/brainspec/enumerize",
+    "changelog_uri"     => "https://github.com/brainspec/enumerize/blob/main/CHANGELOG.md",
+    "source_code_uri"   => "https://github.com/brainspec/enumerize",
+    "bug_tracker_uri"   => "https://github.com/brainspec/enumerize/issues",
+    "wiki_uri"          => "https://github.com/brainspec/enumerize/wiki"
+  }
+  gem.required_ruby_version = '>= 3.2'
 
   gem.add_dependency('activesupport', '>= 3.2')
 end

data/lib/enumerize/activemodel.rb

@@ -40,7 +40,29 @@ module Enumerize
       end
 
       def deserialize(value)
-        @attr.find_value(value)
+        return nil if value.nil?
+
+        # Use find_values for arrays on multiple: true attributes
+        # Otherwise use find_value for single values
+        if value.is_a?(Array) && @attr.arguments[:multiple]
+          @attr.find_values(*value)
+        else
+          @attr.find_value(value)
+        end
+      end
+
+      def cast(value)
+        case value
+        when nil
+          return super
+        when Array
+          if @attr.arguments[:multiple]
+            found = @attr.find_values(*value)
+            return found.presence || super
+          end
+        end
+
+        @attr.find_value(value) || value
       end
     end
   end

data/lib/enumerize/activerecord.rb

@@ -21,24 +21,10 @@ module Enumerize
           require 'enumerize/hooks/uniqueness'
 
           unless options[:multiple]
-            if ::ActiveRecord.version >= ::Gem::Version.new("7.2.0.alpha")
-              attribute(name)
+            attribute(name)
 
-              decorate_attributes([name]) do |_, subtype|
-                Type.new(enumerized_attributes[name], subtype)
-              end
-            elsif ::ActiveRecord.version >= ::Gem::Version.new("7.0.0.alpha")
-              attribute(name) do |subtype|
-                Type.new(enumerized_attributes[name], subtype)
-              end
-            elsif ::ActiveRecord.version >= ::Gem::Version.new("6.1.0.alpha")
-              decorate_attribute_type(name.to_s) do |subtype|
-                Type.new(enumerized_attributes[name], subtype)
-              end
-            else
-              decorate_attribute_type(name, :enumerize) do |subtype|
-                Type.new(enumerized_attributes[name], subtype)
-              end
+            decorate_attributes([name]) do |_, subtype|
+              Type.new(enumerized_attributes[name], subtype)
             end
           end
         end
@@ -58,6 +44,8 @@ module Enumerize
       # Support multiple enumerized attributes
       def becomes(klass)
         became = super
+        return became unless became.respond_to?(:enumerized_attributes)
+
         klass.enumerized_attributes.each do |attr|
           # Rescue when column associated to the enum does not exist.
           begin
@@ -76,7 +64,7 @@ module Enumerize
           begin
             # Checks first if the enumerized attribute is in ActiveRecord::Store
             store_attr, _ = reloaded.class.stored_attributes.detect do |_store_attr, keys|
-              keys.include?(attr.name)
+              keys.map(&:to_sym).include?(attr.name)
             end
 
             if store_attr.present?
@@ -125,12 +113,14 @@ module Enumerize
 
       def cast(value)
         return value if @subtype.is_a?(Type)
+        return value if value.is_a?(::Enumerize::Value)
 
-        if value.is_a?(::Enumerize::Value)
-          value
-        else
-          @attr.find_value(@subtype.cast(value))
-        end
+        # First try to find the enumerize value directly
+        enumerize_value = @attr.find_value(value)
+        return enumerize_value if enumerize_value
+
+        # If not found, delegate to subtype then try to find value
+        @attr.find_value(@subtype.cast(value))
       end
 
       def as_json(options = nil)

data/lib/enumerize/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Enumerize
-  VERSION = '2.8.1'
+  VERSION = '3.0.0'
 end

data/spec/enumerize/integrations/rspec/matcher_spec.rb

@@ -107,14 +107,14 @@ RSpec.describe Enumerize::Integrations::RSpec::Matcher do
       end
 
       it 'rejects wrong keys' do
-        message = 'Expected Model to define enumerize :sex in: "{:boy=>0, :girl=>1}"'
+        message = "Expected Model to define enumerize :sex in: \"#{{boy: 0, girl: 1}.inspect}\""
         expect do
           expect(subject).to enumerize(:sex).in(boy: 0, girl: 1)
         end.to fail_with(message)
       end
 
       it 'rejects wrong values' do
-        message = 'Expected Model to define enumerize :sex in: "{:male=>2, :female=>3}"'
+        message = "Expected Model to define enumerize :sex in: \"#{{male: 2, female: 3}.inspect}\""
         expect do
         expect(subject).to enumerize(:sex).in(male: 2, female: 3)
         end.to fail_with(message)

data/spec/spec_helper.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'logger'
 require 'rails'
 require 'enumerize'
 require 'rspec/matchers/fail_matchers'

data/test/activemodel_test.rb

@@ -20,6 +20,19 @@ class ActiveModelTest < Minitest::Spec
     validates :interests, presence: true
   end
 
+  # No plain `attribute` is declared before `enumerize` here. On Rails 8.1 the
+  # ActiveModel-generated attribute-method module then outranks enumerize's own
+  # reader module in the ancestor chain, so reads resolve through the type's
+  # #cast. This model reproduces the raw-value regression that #cast fixes.
+  class CastActiveModelUser
+    include ActiveModel::Model
+    include ActiveModel::Attributes
+    extend Enumerize
+
+    enumerize :sex, :in => %w[male female]
+    enumerize :role, :in => %w[admin user], :default => 'user'
+  end
+
   let(:model) { ActiveModelUser }
 
   it 'initialize value' do
@@ -107,6 +120,182 @@ class ActiveModelTest < Minitest::Spec
 
     expect(user.errors[:interests]).must_be_empty
   end
+
+  describe 'Type#deserialize' do
+    it 'deserializes single value' do
+      type = model.attribute_types['sex']
+      result = type.deserialize('male')
+      expect(result).must_be_instance_of Enumerize::Value
+      expect(result.to_s).must_equal 'male'
+    end
+
+    it 'returns nil for nil single value' do
+      type = model.attribute_types['sex']
+      result = type.deserialize(nil)
+      expect(result).must_be_nil
+    end
+
+    it 'returns nil for invalid single value' do
+      type = model.attribute_types['sex']
+      result = type.deserialize('invalid')
+      expect(result).must_be_nil
+    end
+
+    it 'treats array as invalid for non-multiple attribute' do
+      type = model.attribute_types['sex']
+      result = type.deserialize(['male', 'female'])
+      expect(result).must_be_nil
+    end
+
+    it 'deserializes array of valid values for multiple attribute' do
+      type = model.attribute_types['interests']
+      result = type.deserialize(['music', 'sports'])
+      expect(result).must_be_instance_of Array
+      expect(result.map(&:to_s)).must_equal ['music', 'sports']
+    end
+
+    it 'deserializes empty array for multiple attribute' do
+      type = model.attribute_types['interests']
+      result = type.deserialize([])
+      expect(result).must_equal []
+    end
+
+    it 'filters out invalid values from array' do
+      type = model.attribute_types['interests']
+      result = type.deserialize(['music', 'invalid', 'sports'])
+      expect(result.map(&:to_s)).must_equal ['music', 'sports']
+    end
+
+    it 'returns nil for nil array value' do
+      type = model.attribute_types['interests']
+      result = type.deserialize(nil)
+      expect(result).must_be_nil
+    end
+
+    it 'preserves values through serialize/deserialize cycle for single value' do
+      type = model.attribute_types['sex']
+      user = model.new(sex: 'female')
+
+      serialized = type.serialize(user.sex)
+      expect(serialized).must_equal 'female'
+
+      deserialized = type.deserialize(serialized)
+      expect(deserialized.to_s).must_equal 'female'
+    end
+
+    it 'preserves values through serialize/deserialize cycle for multiple values' do
+      type = model.attribute_types['interests']
+      user = model.new(interests: ['music', 'programming'])
+
+      # Serialize the entire set
+      serialized = user.interests.map { |v| type.serialize(v) }
+      expect(serialized).must_equal ['music', 'programming']
+
+      # Deserialize back
+      deserialized = type.deserialize(serialized)
+      expect(deserialized.map(&:to_s)).must_equal ['music', 'programming']
+    end
+  end
+
+  describe 'Type#cast' do
+    it 'casts single valid value to Enumerize::Value' do
+      type = model.attribute_types['sex']
+      result = type.cast('male')
+      expect(result).must_be_instance_of Enumerize::Value
+      expect(result.to_s).must_equal 'male'
+    end
+
+    it 'returns nil for nil single value' do
+      type = model.attribute_types['sex']
+      result = type.cast(nil)
+      expect(result).must_be_nil
+    end
+
+    it 'returns original value for invalid single value' do
+      type = model.attribute_types['sex']
+      result = type.cast('invalid')
+      expect(result).must_equal 'invalid'
+    end
+
+    it 'casts array of valid values for multiple attribute' do
+      type = model.attribute_types['interests']
+      result = type.cast(['music', 'sports'])
+      expect(result).must_be_instance_of Array
+      expect(result.map(&:to_s)).must_equal ['music', 'sports']
+    end
+
+    it 'returns empty array as-is for multiple attribute' do
+      type = model.attribute_types['interests']
+      result = type.cast([])
+      expect(result).must_equal []
+    end
+
+    it 'filters out invalid values when at least one is valid' do
+      type = model.attribute_types['interests']
+      result = type.cast(['music', 'invalid', 'sports'])
+      expect(result.map(&:to_s)).must_equal ['music', 'sports']
+    end
+
+    it 'returns array as-is when all values are invalid for multiple attribute' do
+      type = model.attribute_types['interests']
+      result = type.cast(['invalid1', 'invalid2'])
+      expect(result).must_equal ['invalid1', 'invalid2']
+    end
+
+    it 'returns nil for nil value on multiple attribute' do
+      type = model.attribute_types['interests']
+      result = type.cast(nil)
+      expect(result).must_be_nil
+    end
+  end
+
+  describe 'Type#cast (model reader)' do
+    # Regression coverage for the Rails 8.1 attribute-method module ordering
+    # change: when no plain `attribute` precedes `enumerize`, the generated
+    # reader outranks enumerize's module, so reads go through #cast and must
+    # still return an Enumerize::Value. Without the #cast override the first
+    # two examples fail on Rails 8.1 (raw String/Symbol instead of a value).
+    it 'wraps a user-assigned value so predicate methods work' do
+      user = CastActiveModelUser.new(sex: 'male')
+      expect(user.sex).must_be_instance_of Enumerize::Value
+      expect(user.sex.male?).must_equal true
+      expect(user.sex.female?).must_equal false
+    end
+
+    it 'wraps a value assigned after initialization' do
+      user = CastActiveModelUser.new
+      user.sex = :female
+      expect(user.sex).must_be_instance_of Enumerize::Value
+      expect(user.sex.female?).must_equal true
+    end
+
+    it 'wraps the default value' do
+      user = CastActiveModelUser.new
+      expect(user.role).must_be_instance_of Enumerize::Value
+      expect(user.role.user?).must_equal true
+    end
+
+    it 'returns nil when nil is assigned' do
+      user = CastActiveModelUser.new(sex: 'male')
+      user.sex = nil
+      expect(user.sex).must_be_nil
+    end
+
+    it 'keeps an invalid value assignable so inclusion validation still rejects it' do
+      # The reader's return for an invalid value is ordering-dependent (nil when
+      # enumerize's writer wins on Rails <= 8.0, the raw value when the generated
+      # reader wins on Rails 8.1); the portable guarantee is that validation fails.
+      user = CastActiveModelUser.new(sex: 'invalid')
+      expect(user).wont_be :valid?
+      expect(user.errors[:sex]).wont_be :empty?
+    end
+
+    it 'leaves multiple: true attributes as an unmangled Enumerize::Set' do
+      user = ActiveModelUser.new(interests: [:music, :programming])
+      expect(user.interests).must_be_instance_of Enumerize::Set
+      expect(user.interests.to_a).must_equal %w[music programming]
+    end
+  end
 end
 
 else

data/test/activerecord_test.rb

@@ -108,10 +108,11 @@ class User < ActiveRecord::Base
   extend Enumerize
   include RoleEnum
 
-  store :settings, accessors: [:language]
+  store :settings, accessors: [:language, 'country_code']
 
   enumerize :sex, :in => [:male, :female], scope: :shallow
   enumerize :language, :in => [:en, :jp]
+  enumerize :country_code, :in => [:us, :ca]
 
   serialize :interests, type: Array
   enumerize :interests, :in => [:music, :sports, :dancing, :programming], :multiple => true
@@ -211,6 +212,15 @@ class ActiveRecordTest < Minitest::Spec
     expect(user.origin).must_be_nil
   end
 
+  it 'saves stored attribute value for store accessor with string key' do
+    User.delete_all
+    user = User.new
+    user.country_code = :us
+    user.save!
+    user.reload
+    expect(user.country_code).must_equal 'us'
+  end
+
   it 'has default value' do
     expect(User.new.role).must_equal 'user'
     expect(User.new.attributes['role']).must_equal 'user'
@@ -521,6 +531,25 @@ class ActiveRecordTest < Minitest::Spec
     expect(user.interests).must_equal uniq_user.interests
   end
 
+  it 'allows an object to #becomes a non-Enumerize model' do
+    class NonEnumerizeUser < ActiveRecord::Base
+      self.table_name = "users"
+    end
+
+    class EnumerizeUser < NonEnumerizeUser
+      extend Enumerize
+
+      enumerize :role, in: [:admin, :ghost]
+    end
+    EnumerizeUser.delete_all
+
+    user = EnumerizeUser.create(role: :admin)
+    expect(user.role).must_equal 'admin'
+
+    non_enumerize_user = user.becomes(NonEnumerizeUser)
+    expect(non_enumerize_user).must_be :valid?
+  end
+
   it "doesn't update record" do
     Document.delete_all
 
@@ -702,29 +731,129 @@ class ActiveRecordTest < Minitest::Spec
     expect(admin.account_type).must_equal 'pro'
   end
 
-  if Rails::VERSION::MAJOR >= 6
-    it 'supports AR#insert_all' do
-      User.delete_all
+  it 'supports AR#insert_all' do
+    User.delete_all
 
-      User.insert_all([{ sex: :male }])
-      User.insert_all([{ status: :active }])
-      User.insert_all([{ interests: [:music, :sports] }])
+    User.insert_all([{ sex: :male }])
+    User.insert_all([{ status: :active }])
+    User.insert_all([{ interests: [:music, :sports] }])
 
-      expect(User.exists?(sex: :male)).must_equal true
-      expect(User.exists?(status: :active)).must_equal true
-      expect(User.exists?(interests: [:music, :sports])).must_equal true
-    end
+    expect(User.exists?(sex: :male)).must_equal true
+    expect(User.exists?(status: :active)).must_equal true
+    expect(User.exists?(interests: [:music, :sports])).must_equal true
+  end
 
-    it 'supports AR#upsert_all' do
-      User.delete_all
+  it 'supports AR#upsert_all' do
+    User.delete_all
 
-      User.upsert_all([{ sex: :male }])
-      User.upsert_all([{ status: :active }])
-      User.upsert_all([{ interests: [:music, :sports] }])
+    User.upsert_all([{ sex: :male }])
+    User.upsert_all([{ status: :active }])
+    User.upsert_all([{ interests: [:music, :sports] }])
 
-      expect(User.exists?(sex: :male)).must_equal true
-      expect(User.exists?(status: :active)).must_equal true
-      expect(User.exists?(interests: [:music, :sports])).must_equal true
-    end
+    expect(User.exists?(sex: :male)).must_equal true
+    expect(User.exists?(status: :active)).must_equal true
+    expect(User.exists?(interests: [:music, :sports])).must_equal true
+  end
+
+  it 'Type#cast returns Enumerize::Value for valid symbols' do
+    type = User.type_for_attribute('status')
+    result = type.cast(:active)
+
+    expect(result).must_be_instance_of Enumerize::Value
+    expect(result.to_s).must_equal 'active'
+    expect(result.value).must_equal 1
+  end
+
+  it 'Type#cast returns Enumerize::Value for integers' do
+    type = User.type_for_attribute('status')
+    result = type.cast(1)
+
+    expect(result).must_be_instance_of Enumerize::Value
+    expect(result.to_s).must_equal 'active'
+    expect(result.value).must_equal 1
+  end
+
+  it 'Type#cast returns Enumerize::Value for valid string keys' do
+    type = User.type_for_attribute('status')
+    result = type.cast('active')
+
+    expect(result).must_be_instance_of Enumerize::Value
+    expect(result.to_s).must_equal 'active'
+    expect(result.value).must_equal 1
+  end
+
+  it 'Type#cast returns nil for invalid values' do
+    type = User.type_for_attribute('status')
+    result = type.cast(:invalid)
+
+    expect(result).must_be_nil
+  end
+
+  it 'Type#cast preserves existing Enumerize::Value objects' do
+    type = User.type_for_attribute('status')
+    original_value = User.enumerized_attributes[:status].find_value(:active)
+    result = type.cast(original_value)
+
+    expect(result).must_equal original_value
+  end
+
+  it 'insert_all with mixed value types works correctly' do
+    User.delete_all
+
+    User.insert_all([
+      { sex: :male, status: :active },
+      { sex: 'female', status: 2 },
+      { sex: :male, status: 'blocked' }
+    ])
+
+    users = User.all.to_a
+    expect(users.size).must_equal 3
+    
+    expect(users[0].sex).must_equal 'male'
+    expect(users[0].status).must_equal 'active'
+    
+    expect(users[1].sex).must_equal 'female'
+    expect(users[1].status).must_equal 'blocked'
+    
+    expect(users[2].sex).must_equal 'male'
+    expect(users[2].status).must_equal 'blocked'
+  end
+
+  it 'insert_all handles invalid enum values gracefully' do
+    User.delete_all
+
+    User.insert_all([
+      { sex: :invalid_sex, status: 999 }  # Use invalid integer for status
+    ])
+
+    user = User.first
+    expect(user.sex).must_be_nil
+    expect(user.status).must_be_nil
+  end
+
+  it 'upsert_all with different value formats works correctly' do
+    User.delete_all
+
+    User.upsert_all([
+      { id: 1, sex: :male, status: 1 },
+      { id: 2, sex: 'female', status: :blocked }
+    ])
+
+    User.upsert_all([
+      { id: 1, sex: 'male', status: :active },
+      { id: 3, sex: :female, status: 2 }
+    ])
+
+    users = User.order(:id).to_a
+    expect(users.size).must_equal 3
+    
+    expect(users[0].sex).must_equal 'male'
+    expect(users[0].status).must_equal 'active'
+    
+    expect(users[1].sex).must_equal 'female'
+    expect(users[1].status).must_equal 'blocked'
+    
+    expect(users[2].sex).must_equal 'female'
+    expect(users[2].status).must_equal 'blocked'
   end
 end

data/test/test_helper.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'logger'
 require 'minitest/autorun'
 require 'minitest/spec'
 require 'active_support/core_ext/kernel/reporting'

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: enumerize
 version: !ruby/object:Gem::Version
-  version: 2.8.1
+  version: 3.0.0
 platform: ruby
 authors:
 - Sergey Nartimov
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-25 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -35,13 +34,12 @@ files:
 - ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rspec"
-- ".tool-versions"
 - CHANGELOG.md
 - Gemfile.global
 - Gemfile.mongo_mapper
-- Gemfile.rails61
-- Gemfile.rails70
-- Gemfile.rails71
+- Gemfile.rails72
+- Gemfile.rails80
+- Gemfile.rails81
 - Gemfile.railsmaster
 - MIT-LICENSE
 - README.md
@@ -99,8 +97,12 @@ files:
 homepage: https://github.com/brainspec/enumerize
 licenses:
 - MIT
-metadata: {}
-post_install_message:
+metadata:
+  homepage_uri: https://github.com/brainspec/enumerize
+  changelog_uri: https://github.com/brainspec/enumerize/blob/main/CHANGELOG.md
+  source_code_uri: https://github.com/brainspec/enumerize
+  bug_tracker_uri: https://github.com/brainspec/enumerize/issues
+  wiki_uri: https://github.com/brainspec/enumerize/wiki
 rdoc_options: []
 require_paths:
 - lib
@@ -108,15 +110,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
-signing_key:
+rubygems_version: 4.0.6
 specification_version: 4
 summary: Enumerated attributes with I18n and ActiveRecord/Mongoid/MongoMapper support
 test_files:

data/.tool-versions

@@ -1 +0,0 @@
-ruby 2.7.8

data/Gemfile.rails61

@@ -1,6 +0,0 @@
-eval_gemfile('Gemfile.global')
-
-gem 'minitest', '~> 5.8'
-gem 'rails',    github: 'rails/rails', branch: '6-1-stable', require: false
-gem 'mongoid',  github: 'mongodb/mongoid'
-gem 'sqlite3', :platform => [:ruby, :mswin, :mingw]

data/Gemfile.rails70

@@ -1,8 +0,0 @@
-eval_gemfile('Gemfile.global')
-
-gem 'minitest', '~> 5.8'
-gem 'rails',    github: 'rails/rails', branch: '7-0-stable', require: false
-
-gem 'mongoid',  github: 'mongodb/mongoid'
-
-gem 'sqlite3', :platform => [:ruby, :mswin, :mingw]

data/Gemfile.rails71

@@ -1,8 +0,0 @@
-eval_gemfile('Gemfile.global')
-
-gem 'minitest', '~> 5.8'
-gem 'rails',    github: 'rails/rails', branch: '7-1-stable', require: false
-
-gem 'mongoid',  github: 'mongodb/mongoid'
-
-gem 'sqlite3', :platform => [:ruby, :mswin, :mingw]