enum_help 0.0.18 → 0.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b1fb56c71d55485d1b9c413179c4ec402c4b3ea0b3e9ee362b213122f6fdc6c
-  data.tar.gz: 2e105e8b000e82fc026ebf56aecbd1de97ac944b8f20294615af88efaf95c49c
+  metadata.gz: 31095c38410d72dc36b68e0eb2fe538a2bb09246fd2195e80d3441e05fb6a697
+  data.tar.gz: 2c62a01900ee464b3de4cca4ebc17de9e8e53a5b3f3e211acbf224f52cc80c49
 SHA512:
-  metadata.gz: e4f0adcc0a7829ad4d44449eb930e76eed390ea39037f34fabcd640bff615a02ce0b63f6910264f532798381b58527eabf4392b64b77957bce28faf05f494a8a
-  data.tar.gz: ca449b158ab5a0c9a487e95300d0ad91b8581afda1dd28373bd29fb03ceb6a1d94977c0cb0a0ab38fbff462ce34f9807fb22467833313396e493cfdb387df5e5
+  metadata.gz: b5626546f63adea2e0742ee1adf325f4ee9cf6d6673068d7b239d88f907a5b270e0c02e1b1207896bb5e635b9e4d892b204a6c4b18af14ec8c8bdda848fef136
+  data.tar.gz: ebaec0dbcb3423c2ce8c720f385df4091e713a6e06e1516985bba3bbf079f68921ee3dfd99520dde9f4e3d0e26039eb196becf7197d89eaf77016d7b0eeba894

data/README.md

@@ -1,5 +1,8 @@
 # EnumHelp
 
+[![Gem Version](https://badge.fury.io/rb/enum_help.svg)](https://rubygems.org/gems/enum_help)
+[![Build Status](https://github.com/zmbacker/enum_help/actions/workflows/ci.yml/badge.svg)](https://github.com/zmbacker/enum_help/actions/workflows/ci.yml)
+
 Help ActiveRecord::Enum feature to work fine with I18n and simple_form.
 
 Make Enum field correctly generate select field.

data/lib/enum_help/i18n.rb

@@ -2,19 +2,22 @@ module EnumHelp
 
   module I18n
 
-    if ActiveRecord::VERSION::MAJOR == 7
+    if ActiveRecord::VERSION::MAJOR >= 7
       # overwrite the enum method
       def enum(name = nil, values = nil, **options)
         super(name, values, **options)
-
-        definitions = options.slice!(:_prefix, :_suffix, :_scopes, :_default)
-        definitions.each do |name, _|
+        if name # For new syntax in Rails7
           Helper.define_attr_i18n_method(self, name)
           Helper.define_collection_i18n_method(self, name)
+        else
+          definitions = options.slice!(:_prefix, :_suffix, :_scopes, :_default)
+          definitions.each do |name, _|
+            Helper.define_attr_i18n_method(self, name)
+            Helper.define_collection_i18n_method(self, name)
+          end
         end
       end
-    end
-    if ActiveRecord::VERSION::MAJOR < 7
+    else
       # overwrite the enum method
       def enum( definitions )
         super( definitions )

data/lib/enum_help/version.rb

@@ -1,3 +1,3 @@
 module EnumHelp
-  VERSION = "0.0.18"
+  VERSION = "0.0.19"
 end

data/spec/enum_i18n_help_spec.rb

@@ -5,8 +5,10 @@ EnumHelp::Railtie.initializers.each(&:run)
 class User < ActiveRecord::Base
   if ActiveRecord.version < Gem::Version.new('6.1')
     enum gender: [:male, :female]
-  else
+  elsif ActiveRecord.version < Gem::Version.new('7.0')
     enum gender: [:male, :female], _default: :male
+  else # Rails 7.0 or higher
+    enum :gender, [:male, :female], default: :male
   end
 
   enum status: %i[normal disable]

data/spec/fixtures/locales/en.yml

@@ -1,4 +1,4 @@
-zh-CN:
+en:
   activerecord:
     models:
       user: "User"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enum_help
 version: !ruby/object:Gem::Version
-  version: 0.0.18
+  version: 0.0.19
 platform: ruby
 authors:
 - Lester Zhao
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-08 00:00:00.000000000 Z
+date: 2022-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport