enumerize 2.5.0 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c86135927c636fc672bb7371b83b78b6844716f70dd2b9fa19a255b35ce2a5ca
-  data.tar.gz: d1ac5ff95c2673d0743fab97725cf7abc939b157594545ad3e40dd9a1eefb841
+  metadata.gz: 7ed5759e8b7d540b7261ef4112d6ed175403650cd18f904e19c15826cc1b87b5
+  data.tar.gz: 44fdf94b2adcf41a5ffd35e415b9ff622dab59658fd2d16efac6f52ddd89bfcb
 SHA512:
-  metadata.gz: 811f624a3f6d92fa20bc988b80051103e441315eab1662f3f2b1b9b98a866984e247e1b823669a7f7645d13e5aa44aaf8e1e95e39294e8c27a28d96dfc87b572
-  data.tar.gz: 8c50e7946135c94719ac50149ab55ad1601d508b9cdf663e4542f220655b611899824af77a60873601d2193b01fc2611735f643c51d07d8d188213b478123149
+  metadata.gz: 0aab786d5ef4ebbd156211e9c659b6397facab2b1b075767f170ed706b7787d953baec2c3ffecb9a918d0cd3f87eecd541f41b7868045f4beafbb2584ca83fe3
+  data.tar.gz: 06af74a445ac38938b90e15e5e14cfc529332189328b86929a976593c376f46189ae6ded196ce1ca93c3c31d9f5b68b5ef03c91d65fe7e38d8a392ba88ef1dc6

data/.github/workflows/ruby.yml

@@ -32,7 +32,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: ['2.6', '2.7', '3.0.2']
+        ruby-version: ['2.7', '3.0', '3.1']
         gemfile:
           - Gemfile
           - Gemfile.rails60
@@ -47,14 +47,14 @@ jobs:
         exclude:
           - gemfile: Gemfile.mongo_mapper
             db: postgresql
-          - ruby-version: '3.0.2'
+          - ruby-version: '3.0'
             gemfile: Gemfile
-          - ruby-version: '3.0.2'
+          - ruby-version: '3.1'
+            gemfile: Gemfile
+          - ruby-version: '3.0'
+            gemfile: Gemfile.mongo_mapper
+          - ruby-version: '3.1'
             gemfile: Gemfile.mongo_mapper
-          - ruby-version: '2.6'
-            gemfile: Gemfile.rails70
-          - ruby-version: '2.6'
-            gemfile: Gemfile.railsmaster
     env:
       BUNDLE_GEMFILE: "${{ matrix.gemfile }}"
       DB: "${{ matrix.db }}"

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 2.6.0 (March 7, 2023)
+
+### enhancements
+
+* Add `Enumerize::Attribute#value?`. This new method prevents the following breakage 
+  when autocorrecting with Performance/InefficientHashSearch cop. (by [@koic](https://github.com/koic))
+* Allow usage of kwargs with inheritance in Ruby 3.x. Support only Ruby 2.7+. (by [@mortik](https://github.com/mortik))
+
 ## 2.5.0 (December 24, 2021)
 
 ### enhancements

data/Gemfile

@@ -3,4 +3,4 @@ eval_gemfile('Gemfile.global')
 gem 'minitest', '~> 5.8'
 gem 'rails',    '~> 5.2.4', require: false
 gem 'mongoid'
-gem 'sqlite3', '~> 1.3.6', :platform => [:ruby, :mswin, :mingw]
+gem 'sqlite3', '~> 1.5', :platform => [:ruby, :mswin, :mingw]

data/README.md

@@ -1,4 +1,4 @@
-# Enumerize [![TravisCI](https://secure.travis-ci.org/brainspec/enumerize.svg?branch=master)](http://travis-ci.org/brainspec/enumerize)
+# Enumerize [![Ruby](https://github.com/brainspec/enumerize/actions/workflows/ruby.yml/badge.svg)](https://github.com/brainspec/enumerize/actions/workflows/ruby.yml)
 
 Enumerated attributes with I18n and ActiveRecord/Mongoid/MongoMapper/Sequel support
 
@@ -46,7 +46,7 @@ Or install it yourself as:
 
 ## Supported Versions
 
-- Ruby 2.6+
+- Ruby 2.7+
 - Rails 5.2+
 
 ## Usage
@@ -61,7 +61,7 @@ class User
 end
 ```
 
-Note that enumerized values are just identificators so if you want to use multi-word, etc. values then you should use `I18n` feature.
+Note that enumerized values are just identifiers so if you want to use multi-word, etc. values then you should use `I18n` feature.
 
 ---
 

data/enumerize.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Enumerize::VERSION
 
-  gem.required_ruby_version = '>= 1.9.3'
+  gem.required_ruby_version = '>= 2.7'
 
   gem.add_dependency('activesupport', '>= 3.2')
 end

data/lib/enumerize/activerecord.rb

@@ -122,7 +122,7 @@ module Enumerize
       alias type_cast_from_database deserialize
 
       def as_json(options = nil)
-        {attr: @attr.name, subtype: @subtype}.as_json(options)
+        {attr: @attr.name}.as_json(options)
       end
 
       def encode_with(coder)

data/lib/enumerize/attribute.rb

@@ -52,6 +52,10 @@ module Enumerize
       values.each { |value| yield value }
     end
 
+    def value?(value)
+      values.include?(value)
+    end
+
     def i18n_scopes
       @i18n_scopes ||= if i18n_scope
         Array(i18n_scope)

data/lib/enumerize/base.rb

@@ -49,7 +49,7 @@ module Enumerize
       end
     end
 
-    def initialize(*)
+    def initialize(*args, **kwargs)
       super
       _set_default_value_for_enumerized_attributes
     end
@@ -90,22 +90,26 @@ module Enumerize
 
     def _set_default_value_for_enumerized_attributes
       self.class.enumerized_attributes.each do |attr|
-        next if attr.default_value.nil?
-        begin
-          if respond_to?(attr.name)
-            attr_value = public_send(attr.name)
-          else
-            next
-          end
-
-          value_for_validation = _enumerized_values_for_validation[attr.name.to_s]
-
-          if (!attr_value || attr_value.empty?) && (!value_for_validation || value_for_validation.empty?)
-            value = Utils.call_if_callable(attr.default_value, self)
-            public_send("#{attr.name}=", value)
-          end
-        rescue ActiveModel::MissingAttributeError
+        _set_default_value_for_enumerized_attribute(attr)
+      end
+    end
+
+    def _set_default_value_for_enumerized_attribute(attr)
+      return if attr.default_value.nil?
+      begin
+        if respond_to?(attr.name)
+          attr_value = public_send(attr.name)
+        else
+          return
+        end
+
+        value_for_validation = _enumerized_values_for_validation[attr.name.to_s]
+
+        if (!attr_value || attr_value.empty?) && (!value_for_validation || value_for_validation.empty?)
+          value = Utils.call_if_callable(attr.default_value, self)
+          public_send("#{attr.name}=", value)
         end
+      rescue ActiveModel::MissingAttributeError
       end
     end
   end

data/lib/enumerize/mongoid.rb

@@ -24,6 +24,13 @@ module Enumerize
 
         reloaded
       end
+
+      private
+
+      def _set_default_value_for_enumerized_attribute(attr)
+        super
+      rescue Mongoid::Errors::AttributeNotLoaded
+      end
     end
   end
 end

data/lib/enumerize/predicatable.rb

@@ -17,7 +17,7 @@ module Enumerize
     end
 
     def predicate_method?(method)
-      method[-1] == '?' && @attr && @attr.values.include?(method[0..-2])
+      method[-1] == '?' && @attr && @attr.value?(method[0..-2])
     end
   end
 end

data/lib/enumerize/version.rb

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

data/lib/enumerize.rb

@@ -82,7 +82,7 @@ module Enumerize
   end
 
   begin
-    require 'rspec/matchers'
+    require 'rspec'
   rescue LoadError
   else
     require 'enumerize/integrations/rspec'

data/test/activemodel_test.rb

@@ -4,7 +4,7 @@ require 'test_helper'
 
 if defined?(::ActiveModel::Attributes)
 
-describe Enumerize do
+class ActiveModelTest < MiniTest::Spec
   class ActiveModelUser
     include ActiveModel::Model
     include ActiveModel::Attributes

data/test/activerecord_test.rb

@@ -8,6 +8,9 @@ db = (ENV['DB'] || 'sqlite3').to_sym
 
 silence_warnings do
   ActiveRecord::Migration.verbose = false
+  if ActiveRecord::Base.respond_to?(:use_yaml_unsafe_load)
+    ActiveRecord::Base.use_yaml_unsafe_load = true
+  end
   ActiveRecord::Base.logger = Logger.new(nil)
   ActiveRecord::Base.configurations = {
     'sqlite3' => {
@@ -151,7 +154,7 @@ class SkipValidationsLambdaWithParamUser < ActiveRecord::Base
   include SkipValidationsLambdaWithParamEnum
 end
 
-describe Enumerize::ActiveRecordSupport do
+class ActiveRecordTest < MiniTest::Spec
   it 'sets nil if invalid value is passed' do
     user = User.new
     user.sex = :invalid
@@ -511,7 +514,7 @@ describe Enumerize::ActiveRecordSupport do
     user = User.create(:status => :active)
     user.status = :blocked
 
-    assert_equal [1, 2], YAML.load(user.changes.to_yaml)[:status]
+    assert_equal [1, 2], unsafe_yaml_load(user.changes.to_yaml)[:status]
   end
 
   it 'does not change by the practical same value' do
@@ -630,7 +633,7 @@ describe Enumerize::ActiveRecordSupport do
   end
 
   it "doesn't break YAML serialization" do
-    user = YAML.load(User.create(status: :blocked).to_yaml)
+    user = unsafe_yaml_load(User.create(status: :blocked).to_yaml)
     expect(user.status).must_equal 'blocked'
   end
 

data/test/attribute_test.rb

@@ -2,7 +2,7 @@
 
 require 'test_helper'
 
-describe Enumerize::Attribute do
+class AttributeTest < MiniTest::Spec
   def attr
     @attr ||= nil
   end

data/test/base_test.rb

@@ -2,7 +2,7 @@
 
 require 'test_helper'
 
-describe Enumerize::Base do
+class BaseTest < MiniTest::Spec
   let(:kklass) do
     Class.new do
       extend Enumerize
@@ -201,4 +201,30 @@ describe Enumerize::Base do
     object.foo = :b
     expect(object.foo_value).must_equal 2
   end
+
+  it 'allows initialize method with arguments' do
+    klass = Class.new do
+      extend Enumerize
+
+      def initialize(argument, key_word_argument: nil); end
+    end
+
+    klass.new('arg1', key_word_argument: 'kwargs1')
+  end
+
+  it 'allows initialize method with arguments for inherited classes' do
+    parent_klass = Class.new do
+      def initialize(argument, key_word_argument: nil); end
+    end
+
+    klass = Class.new(parent_klass) do
+      extend Enumerize
+
+      def initialize(argument, key_word_argument: nil)
+        super
+      end
+    end
+
+    klass.new('arg1', key_word_argument: 'kwargs1')
+  end
 end

data/test/mongo_mapper_test.rb

@@ -10,7 +10,7 @@ end
 
 MongoMapper.connection = Mongo::Client.new(['localhost:27017'], database: 'enumerize-test-suite-of-mongomapper')
 
-describe Enumerize do
+class MongoMapperTest < MiniTest::Spec
   class MongoMapperUser
     include MongoMapper::Document
     extend Enumerize

data/test/mongoid_test.rb

@@ -13,7 +13,7 @@ Mongoid.configure do |config|
   config.options = { use_utc: true, include_root_in_json: true }
 end
 
-describe Enumerize do
+class MongoidTest < MiniTest::Spec
   class MongoidUser
     include Mongoid::Document
     extend Enumerize

data/test/multiple_test.rb

@@ -2,7 +2,7 @@
 
 require 'test_helper'
 
-describe Enumerize::Base do
+class MultipleTest < MiniTest::Spec
   let(:kklass) do
     Class.new do
       extend Enumerize

data/test/predicates_test.rb

@@ -2,7 +2,7 @@
 
 require 'test_helper'
 
-describe Enumerize::Predicates do
+class PredicatesTest < MiniTest::Spec
   let(:kklass) do
     Class.new do
       extend Enumerize

data/test/sequel_test.rb

@@ -5,7 +5,7 @@ require 'sequel'
 require 'logger'
 require 'jdbc/sqlite3' if RUBY_PLATFORM == 'java'
 
-module SequelTest
+class SequelTest < MiniTest::Spec
   silence_warnings do
     DB = if RUBY_PLATFORM == 'java'
       Sequel.connect('jdbc:sqlite::memory:')
@@ -89,256 +89,254 @@ module SequelTest
     include SkipValidationsLambdaWithParamEnum
   end
 
-  describe Enumerize::SequelSupport do
-    it 'sets nil if invalid value is passed' do
-      user = User.new
-      user.sex = :invalid
-      expect(user.sex).must_be_nil
-    end
+  it 'sets nil if invalid value is passed' do
+    user = User.new
+    user.sex = :invalid
+    expect(user.sex).must_be_nil
+  end
 
-    it 'saves value' do
-      User.filter{ true }.delete
-      user = User.new
-      user.sex = :female
-      user.save
-      expect(user.sex).must_equal 'female'
-    end
+  it 'saves value' do
+    User.filter{ true }.delete
+    user = User.new
+    user.sex = :female
+    user.save
+    expect(user.sex).must_equal 'female'
+  end
 
-    it 'loads value' do
-      User.filter{ true }.delete
-      User.create(:sex => :male)
-      store_translations(:en, :enumerize => {:sex => {:male => 'Male'}}) do
-        user = User.first
-        expect(user.sex).must_equal 'male'
-        expect(user.sex_text).must_equal 'Male'
-      end
+  it 'loads value' do
+    User.filter{ true }.delete
+    User.create(:sex => :male)
+    store_translations(:en, :enumerize => {:sex => {:male => 'Male'}}) do
+      user = User.first
+      expect(user.sex).must_equal 'male'
+      expect(user.sex_text).must_equal 'Male'
     end
+  end
 
-    it 'has default value' do
-      expect(User.new.role).must_equal 'user'
-      expect(User.new.values[:role]).must_equal 'user'
-    end
+  it 'has default value' do
+    expect(User.new.role).must_equal 'user'
+    expect(User.new.values[:role]).must_equal 'user'
+  end
 
-    it 'does not set default value for not selected attributes' do
-      User.filter{ true }.delete
-      User.create(:sex => :male)
+  it 'does not set default value for not selected attributes' do
+    User.filter{ true }.delete
+    User.create(:sex => :male)
 
-      assert_equal [:id], User.select(:id).first.values.keys
-    end
+    assert_equal [:id], User.select(:id).first.values.keys
+  end
 
-    it 'has default value with lambda' do
-      expect(User.new.lambda_role).must_equal 'admin'
-      expect(User.new.values[:lambda_role]).must_equal 'admin'
-    end
-    it 'uses after_initialize callback to set default value' do
-      User.filter{ true }.delete
-      User.create(sex: 'male', lambda_role: nil)
+  it 'has default value with lambda' do
+    expect(User.new.lambda_role).must_equal 'admin'
+    expect(User.new.values[:lambda_role]).must_equal 'admin'
+  end
+  it 'uses after_initialize callback to set default value' do
+    User.filter{ true }.delete
+    User.create(sex: 'male', lambda_role: nil)
 
-      user = User.where(:sex => 'male').first
-      expect(user.lambda_role).must_equal 'admin'
-    end
+    user = User.where(:sex => 'male').first
+    expect(user.lambda_role).must_equal 'admin'
+  end
 
-    it 'uses default value from db column' do
-      expect(User.new.account_type).must_equal 'basic'
-    end
+  it 'uses default value from db column' do
+    expect(User.new.account_type).must_equal 'basic'
+  end
 
-    it 'validates inclusion' do
-      user = User.new
-      user.role = 'wrong'
-      expect(user).wont_be :valid?
-      expect(user.errors[:role]).must_include 'is not included in the list'
-    end
+  it 'validates inclusion' do
+    user = User.new
+    user.role = 'wrong'
+    expect(user).wont_be :valid?
+    expect(user.errors[:role]).must_include 'is not included in the list'
+  end
 
-    it 'validates inclusion on mass assignment' do
-      assert_raises Sequel::ValidationFailed do
-        User.create(role: 'wrong')
-      end
+  it 'validates inclusion on mass assignment' do
+    assert_raises Sequel::ValidationFailed do
+      User.create(role: 'wrong')
     end
+  end
 
-    it "uses persisted value for validation if it hasn't been set" do
-      user = User.create :sex => :male
-      expect(User[user.id].read_attribute_for_validation(:sex)).must_equal 'male'
-    end
+  it "uses persisted value for validation if it hasn't been set" do
+    user = User.create :sex => :male
+    expect(User[user.id].read_attribute_for_validation(:sex)).must_equal 'male'
+  end
 
-    it 'is valid with empty string assigned' do
-      user = User.new
-      user.role = ''
-      expect(user).must_be :valid?
-    end
+  it 'is valid with empty string assigned' do
+    user = User.new
+    user.role = ''
+    expect(user).must_be :valid?
+  end
 
-    it 'stores nil when empty string assigned' do
-      user = User.new
-      user.role = ''
-      expect(user.values[:role]).must_be_nil
-    end
+  it 'stores nil when empty string assigned' do
+    user = User.new
+    user.role = ''
+    expect(user.values[:role]).must_be_nil
+  end
 
-    it 'validates inclusion when :skip_validations = false' do
-      user = DoNotSkipValidationsUser.new
-      user.foo = 'wrong'
-      expect(user).wont_be :valid?
-      expect(user.errors[:foo]).must_include 'is not included in the list'
-    end
+  it 'validates inclusion when :skip_validations = false' do
+    user = DoNotSkipValidationsUser.new
+    user.foo = 'wrong'
+    expect(user).wont_be :valid?
+    expect(user.errors[:foo]).must_include 'is not included in the list'
+  end
 
-    it 'does not validate inclusion when :skip_validations = true' do
-      user = SkipValidationsUser.new
-      user.foo = 'wrong'
-      expect(user).must_be :valid?
-    end
+  it 'does not validate inclusion when :skip_validations = true' do
+    user = SkipValidationsUser.new
+    user.foo = 'wrong'
+    expect(user).must_be :valid?
+  end
 
-    it 'supports :skip_validations option as lambda' do
-      user = SkipValidationsLambdaUser.new
-      user.foo = 'wrong'
-      expect(user).must_be :valid?
-    end
+  it 'supports :skip_validations option as lambda' do
+    user = SkipValidationsLambdaUser.new
+    user.foo = 'wrong'
+    expect(user).must_be :valid?
+  end
 
-    it 'supports :skip_validations option as lambda with a parameter' do
-      user = SkipValidationsLambdaWithParamUser.new
-      user.foo = 'wrong'
-      expect(user).must_be :valid?
-    end
+  it 'supports :skip_validations option as lambda with a parameter' do
+    user = SkipValidationsLambdaWithParamUser.new
+    user.foo = 'wrong'
+    expect(user).must_be :valid?
+  end
 
-    it 'supports multiple attributes' do
-      user = User.new
-      user.interests ||= []
-      expect(user.interests).must_be_empty
-      user.interests << "music"
-      expect(user.interests).must_equal %w(music)
-      user.save
-
-      user = User[user.id]
-      expect(user.interests).must_be_instance_of Enumerize::Set
-      expect(user.interests).must_equal %w(music)
-      user.interests << "sports"
-      expect(user.interests).must_equal %w(music sports)
-
-      user.interests = []
-      interests = user.interests
-      interests << "music"
-      expect(interests).must_equal %w(music)
-      interests << "dancing"
-      expect(interests).must_equal %w(music dancing)
-    end
+  it 'supports multiple attributes' do
+    user = User.new
+    user.interests ||= []
+    expect(user.interests).must_be_empty
+    user.interests << "music"
+    expect(user.interests).must_equal %w(music)
+    user.save
+
+    user = User[user.id]
+    expect(user.interests).must_be_instance_of Enumerize::Set
+    expect(user.interests).must_equal %w(music)
+    user.interests << "sports"
+    expect(user.interests).must_equal %w(music sports)
+
+    user.interests = []
+    interests = user.interests
+    interests << "music"
+    expect(interests).must_equal %w(music)
+    interests << "dancing"
+    expect(interests).must_equal %w(music dancing)
+  end
 
-    it 'returns invalid multiple value for validation' do
-      user = User.new
-      user.interests << :music
-      user.interests << :invalid
-      values = user.read_attribute_for_validation(:interests)
-      expect(values).must_equal %w(music invalid)
-    end
+  it 'returns invalid multiple value for validation' do
+    user = User.new
+    user.interests << :music
+    user.interests << :invalid
+    values = user.read_attribute_for_validation(:interests)
+    expect(values).must_equal %w(music invalid)
+  end
 
-    it 'validates multiple attributes' do
-      user = User.new
-      user.interests << :invalid
-      expect(user).wont_be :valid?
+  it 'validates multiple attributes' do
+    user = User.new
+    user.interests << :invalid
+    expect(user).wont_be :valid?
 
-      user.interests = Object.new
-      expect(user).wont_be :valid?
+    user.interests = Object.new
+    expect(user).wont_be :valid?
 
-      user.interests = ['music', '']
-      expect(user).must_be :valid?
-    end
+    user.interests = ['music', '']
+    expect(user).must_be :valid?
+  end
 
-    it 'stores custom values for multiple attributes' do
-      User.filter{ true }.delete
+  it 'stores custom values for multiple attributes' do
+    User.filter{ true }.delete
 
-      klass = Class.new(User)
-      klass.enumerize :interests, in: { music: 0, sports: 1, dancing: 2, programming: 3}, multiple: true
+    klass = Class.new(User)
+    klass.enumerize :interests, in: { music: 0, sports: 1, dancing: 2, programming: 3}, multiple: true
 
-      user = klass.new
-      user.interests << :music
-      expect(user.interests).must_equal %w(music)
-      user.save
+    user = klass.new
+    user.interests << :music
+    expect(user.interests).must_equal %w(music)
+    user.save
 
-      user = klass[user.id]
-      expect(user.interests).must_equal %w(music)
-    end
+    user = klass[user.id]
+    expect(user.interests).must_equal %w(music)
+  end
 
-    it 'adds scope' do
-      User.filter{ true }.delete
+  it 'adds scope' do
+    User.filter{ true }.delete
 
-      user_1 = User.create(sex: :female, skill: :noob, status: :active, role: :admin)
-      user_2 = User.create(sex: :female, skill: :casual, status: :blocked)
-      user_3 = User.create(sex: :male, skill: :pro)
+    user_1 = User.create(sex: :female, skill: :noob, status: :active, role: :admin)
+    user_2 = User.create(sex: :female, skill: :casual, status: :blocked)
+    user_3 = User.create(sex: :male, skill: :pro)
 
-      expect(User.with_status(:active).to_a).must_equal [user_1]
-      expect(User.with_status(:blocked).to_a).must_equal [user_2]
-      expect(User.with_status(:active, :blocked).to_set).must_equal [user_1, user_2].to_set
+    expect(User.with_status(:active).to_a).must_equal [user_1]
+    expect(User.with_status(:blocked).to_a).must_equal [user_2]
+    expect(User.with_status(:active, :blocked).to_set).must_equal [user_1, user_2].to_set
 
-      expect(User.without_status(:active).to_a).must_equal [user_2]
-      expect(User.without_status(:active, :blocked).to_a).must_equal []
+    expect(User.without_status(:active).to_a).must_equal [user_2]
+    expect(User.without_status(:active, :blocked).to_a).must_equal []
 
-      expect(User.having_role(:admin).to_a).must_equal [user_1]
-      expect(User.male.to_a).must_equal [user_3]
-      expect(User.pro.to_a).must_equal [user_3]
+    expect(User.having_role(:admin).to_a).must_equal [user_1]
+    expect(User.male.to_a).must_equal [user_3]
+    expect(User.pro.to_a).must_equal [user_3]
 
-      expect(User.not_male.to_set).must_equal [user_1, user_2].to_set
-      expect(User.not_pro.to_set).must_equal [user_1, user_2].to_set
-    end
+    expect(User.not_male.to_set).must_equal [user_1, user_2].to_set
+    expect(User.not_pro.to_set).must_equal [user_1, user_2].to_set
+  end
 
-    it 'allows either key or value as valid' do
-      user_1 = User.new(status: :active)
-      user_2 = User.new(status: 1)
-      user_3 = User.new(status: '1')
+  it 'allows either key or value as valid' do
+    user_1 = User.new(status: :active)
+    user_2 = User.new(status: 1)
+    user_3 = User.new(status: '1')
 
-      expect(user_1.status).must_equal 'active'
-      expect(user_2.status).must_equal 'active'
-      expect(user_3.status).must_equal 'active'
+    expect(user_1.status).must_equal 'active'
+    expect(user_2.status).must_equal 'active'
+    expect(user_3.status).must_equal 'active'
 
-      expect(user_1).must_be :valid?
-      expect(user_2).must_be :valid?
-      expect(user_3).must_be :valid?
-    end
+    expect(user_1).must_be :valid?
+    expect(user_2).must_be :valid?
+    expect(user_3).must_be :valid?
+  end
 
-    it 'supports defining enumerized attributes on abstract class' do
-      Document.filter{ true }.delete
+  it 'supports defining enumerized attributes on abstract class' do
+    Document.filter{ true }.delete
 
-      document = Document.new
-      document.visibility = :protected
-      expect(document.visibility).must_equal 'protected'
-    end
+    document = Document.new
+    document.visibility = :protected
+    expect(document.visibility).must_equal 'protected'
+  end
 
-    it 'supports defining enumerized scopes on abstract class' do
-      Document.filter{ true }.delete
+  it 'supports defining enumerized scopes on abstract class' do
+    Document.filter{ true }.delete
 
-      document_1 = Document.create(visibility: :public)
-      document_2 = Document.create(visibility: :private)
+    document_1 = Document.create(visibility: :public)
+    document_2 = Document.create(visibility: :private)
 
-      expect(Document.with_visibility(:public).to_a).must_equal [document_1]
-    end
+    expect(Document.with_visibility(:public).to_a).must_equal [document_1]
+  end
 
-    it 'validates uniqueness' do
-      user = User.create(status: :active, sex: "male")
+  it 'validates uniqueness' do
+    user = User.create(status: :active, sex: "male")
 
-      user = UniqStatusUser.new
-      user.sex = "male"
-      user.status = :active
-      expect(user.valid?).must_equal false
+    user = UniqStatusUser.new
+    user.sex = "male"
+    user.status = :active
+    expect(user.valid?).must_equal false
 
-      expect(user.errors[:status]).wont_be :empty?
-    end
+    expect(user.errors[:status]).wont_be :empty?
+  end
 
-    it "doesn't update record" do
-      Document.filter{ true }.delete
+  it "doesn't update record" do
+    Document.filter{ true }.delete
 
-      expected = Time.new(2010, 10, 10)
+    expected = Time.new(2010, 10, 10)
 
-      document = Document.new
-      document.updated_at = expected
-      document.save
+    document = Document.new
+    document.updated_at = expected
+    document.save
 
-      document = Document.last
-      document.save
+    document = Document.last
+    document.save
 
-      assert_equal expected, document.updated_at
-    end
+    assert_equal expected, document.updated_at
+  end
 
-    it 'changes from dirty should be serialized as scalar values' do
-      user = User.create(:status => :active)
-      user.status = :blocked
+  it 'changes from dirty should be serialized as scalar values' do
+    user = User.create(:status => :active)
+    user.status = :blocked
 
-      expected = { status: [1, 2] }.to_yaml
-      assert_equal expected, user.column_changes.to_yaml
-    end
+    expected = { status: [1, 2] }.to_yaml
+    assert_equal expected, user.column_changes.to_yaml
   end
 end

data/test/set_test.rb

@@ -3,7 +3,7 @@
 require 'test_helper'
 require 'yaml'
 
-describe Enumerize::Set do
+class SetTest < MiniTest::Spec
   let(:kklass) do
     Class.new do
       extend Enumerize

data/test/test_helper.rb

@@ -46,6 +46,14 @@ module MiscHelpers
       I18n.reload!
     end
   end
+
+  def unsafe_yaml_load(yaml)
+    if YAML.respond_to?(:unsafe_load)
+      YAML.unsafe_load(yaml)
+    else
+      YAML.load(yaml)
+    end
+  end
 end
 
 class MiniTest::Spec

data/test/value_test.rb

@@ -3,7 +3,7 @@
 require 'test_helper'
 require 'yaml'
 
-describe Enumerize::Value do
+class ValueTest < MiniTest::Spec
   class Model
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enumerize
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.6.0
 platform: ruby
 authors:
 - Sergey Nartimov
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-24 00:00:00.000000000 Z
+date: 2023-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -99,7 +99,7 @@ homepage: https://github.com/brainspec/enumerize
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -107,15 +107,37 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.9
-signing_key: 
+rubygems_version: 3.4.7
+signing_key:
 specification_version: 4
 summary: Enumerated attributes with I18n and ActiveRecord/Mongoid/MongoMapper support
-test_files: []
+test_files:
+- spec/enumerize/integrations/rspec/matcher_spec.rb
+- spec/spec_helper.rb
+- test/activemodel_test.rb
+- test/activerecord_test.rb
+- test/attribute_map_test.rb
+- test/attribute_test.rb
+- test/base_test.rb
+- test/formtastic_test.rb
+- test/module_attributes_test.rb
+- test/mongo_mapper_test.rb
+- test/mongoid_test.rb
+- test/multiple_test.rb
+- test/predicates_test.rb
+- test/rails_admin_test.rb
+- test/sequel_test.rb
+- test/set_test.rb
+- test/simple_form_test.rb
+- test/support/mock_controller.rb
+- test/support/shared_enums.rb
+- test/support/view_test_helper.rb
+- test/test_helper.rb
+- test/value_test.rb