enumerize 2.7.0 → 2.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a2c0c71e8e7b38b6ec3eb0e0f53429a21465bd1dcea61ea87761a497fa9f55ab
-  data.tar.gz: b2803acb5138d2a471ddf84cbcc8b5b3fde56507e8f6db7135ea7ea6f50f5f98
+  metadata.gz: 7e8451ec4f75c5a22b6a9c6e337bece407942da5cb12f504b689582e56e1db55
+  data.tar.gz: cfd3f27f2fe811d1c23cf47e875da412b76efd0bae55d18f44d551eb56447507
 SHA512:
-  metadata.gz: 3cb1506ba0eed847bf0e8f09df719ad06f88034b3f58988046bad0f36ecbcabf8e43f8b31f2e38160f15cf0d7886667fbc36a59b91b73f85a6b09efd6d925877
-  data.tar.gz: 4e927b95541a1cd89584d65c7abc5bd1ab7b0fdcda8abaa7e9c53c7b0b4c0e928c5a2055e0c160ffd0e1b295f276d534909f0411c0c6ea35342ee10f2dca9380
+  metadata.gz: ccc0ed4ca53517171dcac492ae9fd618c17fb08b9b39f4f42b6d951cdc46defb3acc92f66ce345fbe13cb0a654db8d7800b4dc72c19cb0c4e3c4ab1c3088780c
+  data.tar.gz: bd8521f6e55b9af3283073e36197ea5fc5107d4114f297713b6a27ac221bcd98f2376a4803351eeb8c1a7b518c032b6bcc5d16a6c7750294753d0f64f76a4352

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,13 +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:
@@ -48,20 +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,25 @@
+## 2.8.1 (March 25, 2024)
+
+### bug fix
+
+* Support enumerization of the same attribute in child classes. (by [@nashby](https://github.com/nashby))
+
+## 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
@@ -5,7 +27,7 @@
 * 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))

data/Gemfile.global

@@ -8,7 +8,7 @@ if ENV['TEST_FRAMEWORK'] == 'rspec'
   gem 'rspec', :require => false
 end
 
-gem 'pg', '~> 1.2.3', :platform => [:ruby, :mswin, :mingw]
+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
 

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,20 @@ module Enumerize
 
       def serialize(value)
         v = @attr.find_value(value)
-        (v && v.value) || value
-      end
+        return value unless v
 
-      alias type_cast_for_database serialize
+        v.value
+      end
 
       def cast(value)
-        @attr.find_value(value)
-      end
+        return value if @subtype.is_a?(Type)
 
-      alias type_cast_from_database cast
+        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]
@@ -13,6 +13,7 @@ module Enumerize
       @klass  = klass
       @name   = name.to_sym
       @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/value.rb

@@ -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.7.0'
+  VERSION = '2.8.1'
 end

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|
@@ -109,7 +113,7 @@ class User < ActiveRecord::Base
   enumerize :sex, :in => [:male, :female], scope: :shallow
   enumerize :language, :in => [:en, :jp]
 
-  serialize :interests, Array
+  serialize :interests, type: Array
   enumerize :interests, :in => [:music, :sports, :dancing, :programming], :multiple => true
 
   enumerize :status, :in => { active: 1, blocked: 2 }, scope: true
@@ -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'
@@ -654,6 +671,37 @@ 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
+
+  it 'works when child class calls enumerize second time' do
+    class AdminUser < User
+      enumerize :account_type, in: [:basic, :premium, :pro]
+    end
+
+    admin = AdminUser.create(account_type: 'pro')
+    expect(admin.account_type).must_equal 'pro'
+  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
@@ -39,6 +39,13 @@ class AttributeTest < MiniTest::Spec
     end
   end
 
+  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
+
   describe 'options for select' do
     it 'returns all options for select' do
       store_translations(:en, :enumerize => {:foo => {:a => 'a text', :b => 'b text'}}) do

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,7 +2,7 @@
 
 require 'test_helper'
 
-class PredicatesTest < MiniTest::Spec
+class PredicatesTest < Minitest::Spec
   let(:kklass) do
     Class.new do
       extend Enumerize

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,7 +3,7 @@
 require 'test_helper'
 require 'yaml'
 
-class ValueTest < MiniTest::Spec
+class ValueTest < Minitest::Spec
   class Model
   end
 
@@ -162,4 +162,11 @@ class ValueTest < MiniTest::Spec
       assert_silent() { Enumerize::Value.new(attr, 'test_value') }
     end
   end
+
+  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.7.0
+  version: 2.8.1
 platform: ruby
 authors:
 - Sergey Nartimov
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-07 00:00:00.000000000 Z
+date: 2024-03-25 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.5.3
+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]