enumerize 2.6.1 → 2.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 07d568d0eb005ebea8b0ded7cb260d6c7792b1d676bd46f8441c7e33445e366c
-  data.tar.gz: b811acb983e8fac641fb2b9f9340089e8fd6149b1431af7f12446cb5203c39e1
+  metadata.gz: 66cd752f1d50a6396a45acd14ddc4f80c34adab4fdb858c48743f9f505b7adfc
+  data.tar.gz: 387784c9b8c8f5e7c2134900643ddd9465b1159c630ba6f0192bd8599f8deb68
 SHA512:
-  metadata.gz: b68609dbbc3eede78b640395ef59bf149f1bf00d7b55f2b03a1397430f4e8816bd6a19bdfe06151e28fb1a64a9595fe48893810b015899b00d4991af6539f5d7
-  data.tar.gz: 3999ab755693815c52779ca0124f6aec629a1dd639c41d33330211b0948f6f9d4aa3d79a3f20713bb99a508afa5b7e2b776a0465fe0c3c5a3c250043bbdfc0aa
+  metadata.gz: eddef8e043dd39c124b4a3ea946ec0c5a4b820f48e8fc43c46a8a37e8261fce9b3681aa4a2b52e69807d4bea78e3f8a70626728ce360d3d25f1baab996570f11
+  data.tar.gz: 681e5978eed5021f1c660c81a0574e7c1891285dca0b1468b65c27538b95b320df2ffc486892b241506bb01f867ad18c7f4ccd6d59acc3977e1581c453e86b24

data/.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"

data/.github/workflows/ruby.yml

@@ -23,7 +23,7 @@ jobs:
           - 5432:5432
         options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
       mysql:
-        image: mysql:5.6
+        image: mysql:5.7
         env:
           MYSQL_ROOT_PASSWORD: mysql
         ports:
@@ -32,12 +32,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: ['2.7', '3.0', '3.1']
+        ruby-version: ['3.0', '3.1', '3.2', '3.3']
+        test: ['minitest', 'rspec']
         gemfile:
-          - Gemfile
-          - Gemfile.rails60
           - Gemfile.rails61
           - Gemfile.rails70
+          - Gemfile.rails71
           - Gemfile.railsmaster
           - Gemfile.mongo_mapper
         db:
@@ -47,19 +47,18 @@ jobs:
         exclude:
           - gemfile: Gemfile.mongo_mapper
             db: postgresql
-          - ruby-version: '3.0'
-            gemfile: Gemfile
-          - ruby-version: '3.1'
-            gemfile: Gemfile
           - ruby-version: '3.0'
             gemfile: Gemfile.mongo_mapper
           - ruby-version: '3.1'
             gemfile: Gemfile.mongo_mapper
+          - ruby-version: '3.0'
+            gemfile: Gemfile.railsmaster
     env:
       BUNDLE_GEMFILE: "${{ matrix.gemfile }}"
       DB: "${{ matrix.db }}"
+      TEST_FRAMEWORK: "${{ matrix.test }}"
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:

data/.tool-versions

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

data/CHANGELOG.md

@@ -1,3 +1,35 @@
+## 2.8.0 (March 17, 2024)
+
+### bug fix
+
+* Fix a bug where the value of a false boolean attribute was not properly serialized because it was
+  treated as ruby's false in condition and that condition was never met. (by [@nashby](https://github.com/nashby))
+* Make `Enumerize::Value#as_json` return a string, not an instance of `Enumerize::Value` (by [@nashby](https://github.com/nashby))
+* Fix attribute type casting when Rails master is used (by [@nashby](https://github.com/nashby))
+* Fix bug with `ActiveRecord#reload` when enumerized attribute is an instance of `ActiveRecord::Store` and it's nil. (by [@4ndypanda](https://github.com/4ndypanda))
+* Fix attribute type casting when `ActiveRecord#dup` is used (by [@mihyaeru21](https://github.com/mihyaeru21))
+
+### enchancements
+
+* Support only Ruby 3+ and Rails 6.1+. (by [@nashby](https://github.com/nashby))
+* Allows the original options specified in enumerize to be retrieved from Enumerize::Attribute. (by [@okoshi-f](https://github.com/okoshi-f))
+
+## 2.7.0 (July 7, 2023)
+
+### bug fix
+
+* Warn about already defined predicate methods only when we generate predicate methods with `predicate: true` (by [@nashby](https://github.com/nashby))
+* Define `Type#cast` instead of deserialize to fix serialization issue. (by [@nashby](https://github.com/nashby))
+* Fix `Undefined method 'enumerize' for RSpec::ExampleGroups` (by [@softwaregravy](https://github.com/softwaregravy))
+
+### enchancements
+
+* Add support for procs as `i18n_scope` option value. (by [@nashby](https://github.com/nashby))
+
+  ```ruby
+  enumerize :color, in: %w[green blue], i18n_scope: proc { |value| "color" }
+  ```
+
 ## 2.6.1 (March 17, 2023)
 
 ### bug fix

data/Gemfile.global

@@ -3,9 +3,12 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'rake'
-gem 'rspec', :require => false
 
-gem 'pg', '~> 1.2.3', :platform => [:ruby, :mswin, :mingw]
+if ENV['TEST_FRAMEWORK'] == 'rspec'
+  gem 'rspec', :require => false
+end
+
+gem 'pg', '~> 1.5.3', :platform => [:ruby, :mswin, :mingw]
 gem 'sequel'
 gem 'simple_form'
 gem 'formtastic'

data/Gemfile.mongo_mapper

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

data/Gemfile.rails70

@@ -3,7 +3,6 @@ eval_gemfile('Gemfile.global')
 gem 'minitest', '~> 5.8'
 gem 'rails',    github: 'rails/rails', branch: '7-0-stable', require: false
 
-# TODO: Mongoid doesn't support Rails 7 yet. Uncomment when it's fixed https://jira.mongodb.org/browse/MONGOID-5193
-# gem 'mongoid',  github: 'mongodb/mongoid'
+gem 'mongoid',  github: 'mongodb/mongoid'
 
 gem 'sqlite3', :platform => [:ruby, :mswin, :mingw]

data/{Gemfile.rails60 → Gemfile.rails71}

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

data/README.md

@@ -46,8 +46,8 @@ Or install it yourself as:
 
 ## Supported Versions
 
-- Ruby 2.7+
-- Rails 5.2+
+- Ruby 3.0+
+- Rails 6.1+
 
 ## Usage
 
@@ -161,6 +161,7 @@ class Person
 
   enumerize :status, in: %w[student employed retired], i18n_scope: "status"
   enumerize :roles, in: %w[user admin], i18n_scope: ["user.roles", "roles"]
+  enumerize :color, in: %w[green blue], i18n_scope: proc { |value| "color" }
 end
 
 # localization file

data/Rakefile

@@ -4,7 +4,6 @@
 require "bundler/gem_tasks"
 
 require 'rake/testtask'
-require 'rspec/core/rake_task'
 
 Rake::TestTask.new do |t|
   t.libs << 'test'
@@ -12,6 +11,11 @@ Rake::TestTask.new do |t|
   t.verbose = true
 end
 
-RSpec::Core::RakeTask.new
+if ENV['TEST_FRAMEWORK'] == 'rspec'
+  require 'rspec/core/rake_task'
+  RSpec::Core::RakeTask.new
 
-task :default => [:test, :spec]
+  task :default => [:spec]
+else
+  task :default => [:test]
+end

data/lib/enumerize/activerecord.rb

@@ -21,7 +21,13 @@ module Enumerize
           require 'enumerize/hooks/uniqueness'
 
           unless options[:multiple]
-            if ::ActiveRecord.version >= ::Gem::Version.new("7.0.0.alpha")
+            if ::ActiveRecord.version >= ::Gem::Version.new("7.2.0.alpha")
+              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
@@ -74,7 +80,9 @@ module Enumerize
             end
 
             if store_attr.present?
-              reloaded.send("#{attr.name}=", reloaded.send(store_attr).with_indifferent_access[attr.name])
+              unless reloaded.send(store_attr).nil?
+                reloaded.send("#{attr.name}=", reloaded.send(store_attr).with_indifferent_access[attr.name])
+              end
             else
               reloaded.send("#{attr.name}=", reloaded[attr.name])
             end
@@ -110,16 +118,18 @@ module Enumerize
 
       def serialize(value)
         v = @attr.find_value(value)
-        (v && v.value) || value
-      end
-
-      alias type_cast_for_database serialize
+        return value unless v
 
-      def deserialize(value)
-        @attr.find_value(value)
+        v.value
       end
 
-      alias type_cast_from_database deserialize
+      def cast(value)
+        if value.is_a?(::Enumerize::Value)
+          value
+        else
+          @attr.find_value(@subtype.cast(value))
+        end
+      end
 
       def as_json(options = nil)
         {attr: @attr.name}.as_json(options)

data/lib/enumerize/attribute.rb

@@ -2,7 +2,7 @@
 
 module Enumerize
   class Attribute
-    attr_reader :klass, :name, :values, :default_value, :i18n_scope, :skip_validations_value
+    attr_reader :klass, :name, :values, :default_value, :i18n_scope, :skip_validations_value, :arguments
 
     def initialize(klass, name, options={})
       raise ArgumentError, ':in option is required' unless options[:in]
@@ -12,11 +12,8 @@ module Enumerize
 
       @klass  = klass
       @name   = name.to_sym
-
-      if options[:i18n_scope]
-        raise ArgumentError, ':i18n_scope option accepts only String or Array of strings' unless Array(options[:i18n_scope]).all? { |s| s.is_a?(String) }
-        @i18n_scope = options[:i18n_scope]
-      end
+      @i18n_scope = options[:i18n_scope]
+      @arguments = options
 
       value_class = options.fetch(:value_class, Value)
       @values = Array(options[:in]).map { |v| value_class.new(self, *v).freeze }

data/lib/enumerize/predicates.rb

@@ -69,8 +69,22 @@ module Enumerize
       end
 
       def build(klass)
+        warn_on_already_defined_methods
+
         klass.delegate(*names, to: @attr.name, prefix: @options[:prefix], allow_nil: true)
       end
+
+      def warn_on_already_defined_methods
+        names.each do |name|
+          method_name = [@options[:prefix], name].compact.join('_')
+
+          if @attr.klass.respond_to?(method_name)
+            warn(
+              "Predicate method `#{name}` is already defined as #{@attr.klass.name}##{name}. Use enumerize's :prefix option to avoid it"
+            )
+          end
+        end
+      end
     end
   end
 end

data/lib/enumerize/value.rb

@@ -10,16 +10,16 @@ module Enumerize
     attr_reader :value
 
     def initialize(attr, name, value=nil)
-      if self.class.method_defined?("#{name}?")
-        warn("It's not recommended to use `#{name}` as a field value since `#{name}?` is defined. (#{attr.klass.name}##{attr.name})")
-      end
-
       @attr  = attr
       @value = value.nil? ? name.to_s : value
 
       super(name.to_s)
 
-      @i18n_keys = @attr.i18n_scopes.map { |s| :"#{s}.#{self}" }
+      @i18n_keys = @attr.i18n_scopes.map do |s|
+        scope = Utils.call_if_callable(s, @value)
+
+        :"#{scope}.#{self}"
+      end
       @i18n_keys << :"enumerize.defaults.#{@attr.name}.#{self}"
       @i18n_keys << :"enumerize.#{@attr.name}.#{self}"
       @i18n_keys << ActiveSupport::Inflector.humanize(ActiveSupport::Inflector.underscore(self)) # humanize value if there are no translations
@@ -38,6 +38,10 @@ module Enumerize
       coder.represent_object(self.class.superclass, @value)
     end
 
+    def as_json(*)
+      to_s
+    end
+
     private
 
     def predicate_call(value)

data/lib/enumerize/version.rb

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

data/lib/enumerize.rb

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

data/test/activemodel_test.rb

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

data/test/activerecord_test.rb

@@ -3,7 +3,6 @@
 require 'test_helper'
 require 'active_record'
 require 'logger'
-
 db = (ENV['DB'] || 'sqlite3').to_sym
 
 silence_warnings do
@@ -60,6 +59,9 @@ silence_warnings do
 end
 
 ActiveRecord::Base.connection.instance_eval do
+  ActiveRecord::Migration.drop_table :users, if_exists: true
+  ActiveRecord::Migration.drop_table :documents, if_exists: true
+
   create_table :users do |t|
     t.string :sex
     t.string :role
@@ -71,6 +73,8 @@ ActiveRecord::Base.connection.instance_eval do
     t.integer :skill
     t.string :account_type, :default => :basic
     t.string :foo
+    t.boolean :newsletter_subscribed, default: true
+    t.json :store_accessor_store_with_no_defaults
   end
 
   create_table :documents do |t|
@@ -117,6 +121,10 @@ class User < ActiveRecord::Base
   enumerize :skill, :in => { noob: 0, casual: 1, pro: 2 }, scope: :shallow
 
   enumerize :account_type, :in => [:basic, :premium]
+  enumerize :newsletter_subscribed, in: { subscribed: true, unsubscribed: false }
+
+  store_accessor :store_accessor_store_with_no_defaults, [:origin]
+  enumerize :origin, in: [:browser, :app]
 
   # There is no column for relationship enumeration for testing purposes: model
   # should not be broken even if the associated column does not exist yet.
@@ -139,7 +147,7 @@ class SkipValidationsUser < ActiveRecord::Base
   include SkipValidationsEnum
 end
 
-class  DoNotSkipValidationsUser < ActiveRecord::Base
+class DoNotSkipValidationsUser < ActiveRecord::Base
   self.table_name = "users"
   include DoNotSkipValidationsEnum
 end
@@ -154,7 +162,7 @@ class SkipValidationsLambdaWithParamUser < ActiveRecord::Base
   include SkipValidationsLambdaWithParamEnum
 end
 
-class ActiveRecordTest < MiniTest::Spec
+class ActiveRecordTest < Minitest::Spec
   it 'sets nil if invalid value is passed' do
     user = User.new
     user.sex = :invalid
@@ -194,6 +202,15 @@ class ActiveRecordTest < MiniTest::Spec
     expect(user.language).must_equal 'en'
   end
 
+  it 'returns nil if store column is nil, uses .store_accessor, and has no default values for store\'s attributes' do
+    User.delete_all
+    user = User.create!
+    user.update_column(:store_accessor_store_with_no_defaults, nil)
+    user.reload
+    expect(user.store_accessor_store_with_no_defaults).must_be_nil
+    expect(user.origin).must_be_nil
+  end
+
   it 'has default value' do
     expect(User.new.role).must_equal 'user'
     expect(User.new.attributes['role']).must_equal 'user'
@@ -249,6 +266,15 @@ class ActiveRecordTest < MiniTest::Spec
     expect(user.interests).must_equal %w[music dancing]
   end
 
+  it 'has enumerized values in active record attributes after reload' do
+    User.delete_all
+    user = User.new
+    user.status = :blocked
+    user.save!
+    user.reload
+    expect(user.attributes["status"]).must_equal 'blocked'
+  end
+
   it 'validates inclusion when using write_attribute with string attribute' do
     user = User.new
     user.send(:write_attribute, 'role', 'wrong')
@@ -645,6 +671,28 @@ class ActiveRecordTest < MiniTest::Spec
     expect(sql).must_include 'LIKE \'%foo%\''
   end
 
+  it 'supports boolean column as enumerized field' do
+    User.delete_all
+
+    User.create!(newsletter_subscribed: true)
+    expect(User.find_by(newsletter_subscribed: true).newsletter_subscribed).must_equal 'subscribed'
+
+    User.create!(newsletter_subscribed: false)
+    expect(User.find_by(newsletter_subscribed: false).newsletter_subscribed).must_equal 'unsubscribed'
+  end
+
+  it 'has same value with original object when created by #dup' do
+    user1 = User.new(skill: :casual)
+    user2 = user1.dup
+    expect(user2.skill).must_equal 'casual'
+  end
+
+  it 'has same value with original object when created by #clone' do
+    user1 = User.new(skill: :casual)
+    user2 = user1.clone
+    expect(user2.skill).must_equal 'casual'
+  end
+
   if Rails::VERSION::MAJOR >= 6
     it 'supports AR#insert_all' do
       User.delete_all

data/test/attribute_map_test.rb

@@ -3,7 +3,7 @@
 require 'test_helper'
 
 module Enumerize
-  class AttributeMapTest < MiniTest::Spec
+  class AttributeMapTest < Minitest::Spec
     subject { AttributeMap.new }
 
     def make_attr(name)
@@ -52,7 +52,7 @@ module Enumerize
 
     it 'updates dependants' do
       attr = make_attr(:a)
-      dependant = MiniTest::Mock.new
+      dependant = Minitest::Mock.new
       dependant.expect(:<<, nil, [attr])
       subject.add_dependant dependant
       subject << attr

data/test/attribute_test.rb

@@ -2,7 +2,7 @@
 
 require 'test_helper'
 
-class AttributeTest < MiniTest::Spec
+class AttributeTest < Minitest::Spec
   def attr
     @attr ||= nil
   end
@@ -37,9 +37,12 @@ class AttributeTest < MiniTest::Spec
       build_attr nil, 'foo', :in => %w[a b], :i18n_scope => %w[bar buzz]
       expect(attr.i18n_scopes).must_equal %w[bar buzz]
     end
+  end
 
-    it 'accepts only string scopes' do
-      expect(proc { build_attr nil, 'foo', :in => %w[a b], :i18n_scope => [%w[bar buzz], "bar.buzz"] }).must_raise ArgumentError
+  describe 'arguments' do
+    it 'returns arguments' do
+      build_attr nil, :foo, :in => [:a, :b], :scope => true
+      expect(attr.arguments).must_equal({:in => [:a, :b], :scope => true})
     end
   end
 

data/test/base_test.rb

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

data/test/formtastic_test.rb

@@ -5,7 +5,7 @@ require 'test_helper'
 Formtastic::FormBuilder.action_class_finder = Formtastic::ActionClassFinder
 Formtastic::FormBuilder.input_class_finder  = Formtastic::InputClassFinder
 
-class FormtasticSpec < MiniTest::Spec
+class FormtasticSpec < Minitest::Spec
   include ViewTestHelper
   include Formtastic::Helpers::FormHelper
 

data/test/module_attributes_test.rb

@@ -2,7 +2,7 @@
 
 require 'test_helper'
 
-class ModuleAttributesSpec < MiniTest::Spec
+class ModuleAttributesSpec < Minitest::Spec
   it 'inherits attribute from the module' do
     mod = Module.new do
       extend Enumerize

data/test/mongo_mapper_test.rb

@@ -10,7 +10,7 @@ end
 
 MongoMapper.connection = Mongo::Client.new(['localhost:27017'], database: 'enumerize-test-suite-of-mongomapper')
 
-class MongoMapperTest < MiniTest::Spec
+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
 
-class MongoidTest < MiniTest::Spec
+class MongoidTest < Minitest::Spec
   class MongoidUser
     include Mongoid::Document
     extend Enumerize

data/test/multiple_test.rb

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

data/test/predicates_test.rb

@@ -2,10 +2,12 @@
 
 require 'test_helper'
 
-class PredicatesTest < MiniTest::Spec
+class PredicatesTest < Minitest::Spec
   let(:kklass) do
     Class.new do
       extend Enumerize
+
+      def self.c?; end
     end
   end
 
@@ -62,4 +64,22 @@ class PredicatesTest < MiniTest::Spec
     expect(object).wont_respond_to :a?
     expect(object).must_respond_to :b?
   end
+
+  it 'warns if predicate method is already defined' do
+    assert_output(nil, /`c\?` is already defined/) do
+      kklass.enumerize(:bar, in: %w(a b c), predicates: true)
+    end
+  end
+
+  it 'does not warn if predicate has prefix and does not collide with defined method' do
+    assert_output(nil, '') do
+      kklass.enumerize(:bar, in: %w(a b c), predicates: { prefix: 'bar' })
+    end
+  end
+
+  it 'does not warn if predicate method is already defined but enumerize does not generate predicates' do
+    assert_output(nil, '') do
+      kklass.enumerize(:bar, in: %w(a b c))
+    end
+  end
 end

data/test/rails_admin_test.rb

@@ -2,7 +2,7 @@
 
 require 'test_helper'
 
-class RailsAdminSpec < MiniTest::Spec
+class RailsAdminSpec < 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'
 
-class SequelTest < MiniTest::Spec
+class SequelTest < Minitest::Spec
   silence_warnings do
     DB = if RUBY_PLATFORM == 'java'
       Sequel.connect('jdbc:sqlite::memory:')

data/test/set_test.rb

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

data/test/simple_form_test.rb

@@ -3,7 +3,7 @@
 require 'test_helper'
 require 'simple_form/version'
 
-class SimpleFormSpec < MiniTest::Spec
+class SimpleFormSpec < Minitest::Spec
   include ViewTestHelper
   include SimpleForm::ActionViewExtensions::FormHelper
 

data/test/test_helper.rb

@@ -4,6 +4,7 @@ require 'minitest/autorun'
 require 'minitest/spec'
 require 'active_support/core_ext/kernel/reporting'
 require 'active_model'
+require 'active_job'
 require 'rails'
 begin
   require 'mongoid'
@@ -56,6 +57,6 @@ module MiscHelpers
   end
 end
 
-class MiniTest::Spec
+class Minitest::Spec
   include MiscHelpers
 end

data/test/value_test.rb

@@ -3,11 +3,14 @@
 require 'test_helper'
 require 'yaml'
 
-class ValueTest < MiniTest::Spec
+class ValueTest < Minitest::Spec
   class Model
   end
 
   class Attr < Struct.new(:values, :name, :i18n_scopes, :klass)
+    def value?(value)
+      values.include?(value)
+    end
   end
 
   let(:attr) { Attr.new([], "attribute_name", [], Model) }
@@ -84,6 +87,14 @@ class ValueTest < MiniTest::Spec
         expect(val.text).must_be :==, "Scope specific translation"
       end
     end
+
+    it 'allows to pass a proc as i18n_scopes param' do
+      attr.i18n_scopes = [proc { |v| "other.scope.#{v}" }]
+
+      store_translations(:en, :other => {:scope => {:"1" => {:test_value => "Scope specific translation"}}}) do
+        expect(val.text).must_be :==, "Scope specific translation"
+      end
+    end
   end
 
   describe 'boolean methods comparison' do
@@ -150,9 +161,12 @@ class ValueTest < MiniTest::Spec
     it 'no output if undefined boolean method' do
       assert_silent() { Enumerize::Value.new(attr, 'test_value') }
     end
+  end
 
-    it 'error output if defined boolean method' do
-      assert_output(nil, /`empty\?` is defined/) { Enumerize::Value.new(attr, 'empty') }
+  describe '#as_json' do
+    it 'returns String object, not Value object' do
+      expect(val.as_json.class).must_equal String
+      expect(val.as_json).must_equal 'test_value'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enumerize
 version: !ruby/object:Gem::Version
-  version: 2.6.1
+  version: 2.8.0
 platform: ruby
 authors:
 - Sergey Nartimov
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-17 00:00:00.000000000 Z
+date: 2024-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -31,16 +31,17 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
 - ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rspec"
+- ".tool-versions"
 - CHANGELOG.md
-- Gemfile
 - Gemfile.global
 - Gemfile.mongo_mapper
-- Gemfile.rails60
 - Gemfile.rails61
 - Gemfile.rails70
+- Gemfile.rails71
 - Gemfile.railsmaster
 - MIT-LICENSE
 - README.md
@@ -99,7 +100,7 @@ homepage: https://github.com/brainspec/enumerize
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -114,8 +115,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.4.7
+signing_key:
 specification_version: 4
 summary: Enumerated attributes with I18n and ActiveRecord/Mongoid/MongoMapper support
 test_files:

data/Gemfile

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