progne_tapera 0.5 → 2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 2c2a069aea2e81297eeac4d046451dbc3f94601c
-  data.tar.gz: b71391edfc0e159fbe3897b26181cf8db8042aa5
+SHA256:
+  metadata.gz: 453bfbf458de730766d872c7c38bd1f27731adc35ed619afe8202246e37fa9cd
+  data.tar.gz: 6e51e656f3c4df6d82fa1c7a6dc28a603c72ed615f712a246a2c2d688d35bce0
 SHA512:
-  metadata.gz: 6304fa68a8688b52add3af79d93912a5d0db3af98f15c12a0f6dff3408f4b63d21dcbb787ca72b882c344f0030cf43c1bf2c3b44a817a5b9832905475c670506
-  data.tar.gz: f0b24325729107a134e6994ca57196f9f18d2e657938b44ad10f2b54be30dad1435b21423c91366dcd859f885b57625cec8ba4793a307987213e30e384a5cb0b
+  metadata.gz: 9ce9d7440bbbf8d7adefd0e713f3f9098277d5e75dbc62cd2932f1e54c35f8d520cd5cef0297174b154611de4c9058fa936a15c629bde32743ac1dc1901dbe57
+  data.tar.gz: c27f37405a2e5703e0a6b9ed2783237ad4bd74daed09e01caa115a77ae1bf99f3c826b25a2e632789ca041c0ad3f9733795746cf8fe2fb71800f25df116a87d7

data/CHANGELOG.md

@@ -1,22 +1,46 @@
 # Progne Tapera Change Log 枚举库变更日志
 
 ## v0.1
+
 1. Enum Item class
 2. Enum List concern
 3. Enum Config concern
 4. Enum Code concern
 
 ## v0.1.1
-1. Improved the Ruby Gem Specification to depend on [rails](https://github.com/rails/rails) v4.2
+
+1. Improved the Ruby Gem Specification to depend on [rails](https://github.com/rails/rails) v4.2.
 
 ## v0.2
-1. Improved the Enum Config concern to support the customized enum i18n name
+
+1. Improved the Enum Config concern to support the customized enum i18n name.
 
 ## v0.3
-1. Improved the Enum Config concern to support the overloaded enum i18n name
+
+1. Improved the Enum Config concern to support the overloaded enum i18n name.
 
 ## v0.4
-1. Improved the Enum List concern to add the .``lookup`` method
+
+1. Improved the Enum List concern to add the .``lookup`` method.
 
 ## v0.5
-1. Improve the Enum Code concern to be able to be extended by lambda
+
+1. Improved the Enum Config concern to be able to be extended by lambda.
+
+## v0.5.1
+
+1. Improved the Enum config concern for the Item Methods module.
+
+## v0.5.2
+
+1. Improved the Enum Config concern for the Item Methods module.
+
+## v1.0
+
+1. Improved the Ruby Gem Specification to depend on [rails](https://github.com/rails/rails) v6.0, bundler v2.0, rake v13.0, & rspec v3.9.
+
+## v2.0
+
+1. Improved the compatibility for Ruby 3.0.
+2. Improved the Enum List concern for the Item Methods module.
+3. Improved the Enum Config concern to remove support for the Item Methods module.

data/Gemfile.lock

@@ -1,133 +1,161 @@
 PATH
   remote: .
   specs:
-    progne_tapera (0.4)
-      rails (>= 4.2)
+    progne_tapera (2.0)
+      rails (~> 6.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.0.0.1)
-      actionpack (= 5.0.0.1)
-      nio4r (~> 1.2)
-      websocket-driver (~> 0.6.1)
-    actionmailer (5.0.0.1)
-      actionpack (= 5.0.0.1)
-      actionview (= 5.0.0.1)
-      activejob (= 5.0.0.1)
+    actioncable (6.1.4)
+      actionpack (= 6.1.4)
+      activesupport (= 6.1.4)
+      nio4r (~> 2.0)
+      websocket-driver (>= 0.6.1)
+    actionmailbox (6.1.4)
+      actionpack (= 6.1.4)
+      activejob (= 6.1.4)
+      activerecord (= 6.1.4)
+      activestorage (= 6.1.4)
+      activesupport (= 6.1.4)
+      mail (>= 2.7.1)
+    actionmailer (6.1.4)
+      actionpack (= 6.1.4)
+      actionview (= 6.1.4)
+      activejob (= 6.1.4)
+      activesupport (= 6.1.4)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.0.0.1)
-      actionview (= 5.0.0.1)
-      activesupport (= 5.0.0.1)
-      rack (~> 2.0)
-      rack-test (~> 0.6.3)
+    actionpack (6.1.4)
+      actionview (= 6.1.4)
+      activesupport (= 6.1.4)
+      rack (~> 2.0, >= 2.0.9)
+      rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.0.0.1)
-      activesupport (= 5.0.0.1)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actiontext (6.1.4)
+      actionpack (= 6.1.4)
+      activerecord (= 6.1.4)
+      activestorage (= 6.1.4)
+      activesupport (= 6.1.4)
+      nokogiri (>= 1.8.5)
+    actionview (6.1.4)
+      activesupport (= 6.1.4)
       builder (~> 3.1)
-      erubis (~> 2.7.0)
+      erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    activejob (5.0.0.1)
-      activesupport (= 5.0.0.1)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    activejob (6.1.4)
+      activesupport (= 6.1.4)
       globalid (>= 0.3.6)
-    activemodel (5.0.0.1)
-      activesupport (= 5.0.0.1)
-    activerecord (5.0.0.1)
-      activemodel (= 5.0.0.1)
-      activesupport (= 5.0.0.1)
-      arel (~> 7.0)
-    activesupport (5.0.0.1)
+    activemodel (6.1.4)
+      activesupport (= 6.1.4)
+    activerecord (6.1.4)
+      activemodel (= 6.1.4)
+      activesupport (= 6.1.4)
+    activestorage (6.1.4)
+      actionpack (= 6.1.4)
+      activejob (= 6.1.4)
+      activerecord (= 6.1.4)
+      activesupport (= 6.1.4)
+      marcel (~> 1.0.0)
+      mini_mime (>= 1.1.0)
+    activesupport (6.1.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (~> 0.7)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    arel (7.1.4)
-    builder (3.2.2)
-    concurrent-ruby (1.0.2)
-    diff-lcs (1.2.5)
-    erubis (2.7.0)
-    globalid (0.3.7)
-      activesupport (>= 4.1.0)
-    i18n (0.7.0)
-    loofah (2.0.3)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    builder (3.2.4)
+    concurrent-ruby (1.1.9)
+    crass (1.0.6)
+    diff-lcs (1.4.4)
+    erubi (1.10.0)
+    globalid (0.5.2)
+      activesupport (>= 5.0)
+    i18n (1.8.10)
+      concurrent-ruby (~> 1.0)
+    loofah (2.11.0)
+      crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    mail (2.6.4)
-      mime-types (>= 1.16, < 4)
-    method_source (0.8.2)
-    mime-types (3.1)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
-    mini_portile2 (2.1.0)
-    minitest (5.9.1)
-    nio4r (1.2.1)
-    nokogiri (1.6.8.1)
-      mini_portile2 (~> 2.1.0)
-    rack (2.0.1)
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rails (5.0.0.1)
-      actioncable (= 5.0.0.1)
-      actionmailer (= 5.0.0.1)
-      actionpack (= 5.0.0.1)
-      actionview (= 5.0.0.1)
-      activejob (= 5.0.0.1)
-      activemodel (= 5.0.0.1)
-      activerecord (= 5.0.0.1)
-      activesupport (= 5.0.0.1)
-      bundler (>= 1.3.0, < 2.0)
-      railties (= 5.0.0.1)
+    mail (2.7.1)
+      mini_mime (>= 0.1.1)
+    marcel (1.0.1)
+    method_source (1.0.0)
+    mini_mime (1.1.0)
+    mini_portile2 (2.6.1)
+    minitest (5.14.4)
+    nio4r (2.5.8)
+    nokogiri (1.12.2)
+      mini_portile2 (~> 2.6.1)
+      racc (~> 1.4)
+    racc (1.5.2)
+    rack (2.2.3)
+    rack-test (1.1.0)
+      rack (>= 1.0, < 3)
+    rails (6.1.4)
+      actioncable (= 6.1.4)
+      actionmailbox (= 6.1.4)
+      actionmailer (= 6.1.4)
+      actionpack (= 6.1.4)
+      actiontext (= 6.1.4)
+      actionview (= 6.1.4)
+      activejob (= 6.1.4)
+      activemodel (= 6.1.4)
+      activerecord (= 6.1.4)
+      activestorage (= 6.1.4)
+      activesupport (= 6.1.4)
+      bundler (>= 1.15.0)
+      railties (= 6.1.4)
       sprockets-rails (>= 2.0.0)
-    rails-dom-testing (2.0.1)
-      activesupport (>= 4.2.0, < 6.0)
-      nokogiri (~> 1.6.0)
-    rails-html-sanitizer (1.0.3)
-      loofah (~> 2.0)
-    railties (5.0.0.1)
-      actionpack (= 5.0.0.1)
-      activesupport (= 5.0.0.1)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.3.0)
+      loofah (~> 2.3)
+    railties (6.1.4)
+      actionpack (= 6.1.4)
+      activesupport (= 6.1.4)
       method_source
-      rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
-    rake (11.3.0)
-    rspec (3.5.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.2)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
+      rake (>= 0.13)
+      thor (~> 1.0)
+    rake (13.0.6)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-mocks (3.5.0)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-support (3.5.0)
-    sprockets (3.7.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
+    sprockets (4.0.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.2.0)
+    sprockets-rails (3.2.2)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    thor (0.19.1)
-    thread_safe (0.3.5)
-    tzinfo (1.2.2)
-      thread_safe (~> 0.1)
-    websocket-driver (0.6.4)
+    thor (1.1.0)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.2)
+    websocket-extensions (0.1.5)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.12)
+  bundler (~> 2.0)
   progne_tapera!
-  rake (~> 11.3)
-  rspec (~> 3.5)
+  rake (~> 13.0)
+  rspec (~> 3.0)
 
 BUNDLED WITH
-   1.12.5
+   2.2.13

data/README.md

@@ -1,6 +1,8 @@
 # Progne Tapera
 
+[![Documentation](http://img.shields.io/badge/docs-rdoc.info-blue.svg)](http://www.rubydoc.info/gems/progne_tapera/frames)
 [![License](https://img.shields.io/badge/license-MIT-green.svg)](http://opensource.org/licenses/MIT)
+
 [![Gem Version](https://badge.fury.io/rb/progne_tapera.svg)](https://badge.fury.io/rb/progne_tapera)
 [![Dependency Status](https://gemnasium.com/badges/github.com/topbitdu/progne_tapera.svg)](https://gemnasium.com/github.com/topbitdu/progne_tapera)
 
@@ -97,21 +99,28 @@ app/types/ethnicity.rb
 ```ruby
 class Ethnicity < ActiveRecord::Type::Value
 
-  include ProgneTapera::EnumConfig
+  # The Item Methods module must be defined before the ``enum :china_ethnicity`` code block, so it could be called there.
+  module ItemMethods
 
-  enum :china_ethnicity
-  # 用 :china_ethnicity 指定的 i18n 资源。
+    extend ActiveSupport::Concern
 
-  module ItemMethods
+    included do |includer|
+
+      def major?
+        'HA'==code
+      end
+      # Ethnicity::HAN.major? returns true
+      # Ethnicity::MONGEL.major? returns false
 
-    def major?
-      'HA'==code
     end
-    # Ethnicity::HAN.major? returns true
-    # Ethnicity::MONGEL.major? returns false
 
   end
 
+  include ProgneTapera::EnumConfig
+
+  enum :china_ethnicity
+  # 用 :china_ethnicity 指定的 i18n 资源。
+
 end
 ```
 
@@ -169,19 +178,31 @@ include ProgneTapera::EnumCode
 
 ### Enum List concern
 
-The Enum List concern do the following tasks for the includer automatically:  
-1. Include the Enumerable module  
-2. Define the .enum_name method as: ``enum_name(name = nil)``  
-3. Define the .item_defined? method as: ``item_defined?(item)``  
-4. Define the .add_item method as: ``add_item(item)``  
-5. Define the .safe_add_item method as: ``safe_add_item(item)``  
-6. Define the .enum_constants method as: ``enum_constants``  
-7. Define the .all method as: ``all``  
-8. Define the .selected method as: ``selected(&block)``  
-9. Define the .each method as: ``each(&block)``  
+The Enum List concern do the following tasks for the includer automatically:
+1. Include the Enumerable module
+
+2. Define the .enum_name method as: ``enum_name(name = nil)``
+
+3. Define the .item_defined? method as: ``item_defined?(item)``
+
+4. Define the .add_item method as: ``add_item(item)``
+
+5. Define the .safe_add_item method as: ``safe_add_item(item)``
+
+6. Define the .enum_constants method as: ``enum_constants``
+
+7. Define the .all method as: ``all``
+
+8. Define the .selected method as: ``selected(&block)``
+
+9. Define the .each method as: ``each(&block)``
+
 10. Define the .lookup method as: ``lookup(code)``
-11. Define the .form_options method as: ``form_options(&block)``  
-12. Define the .deserialize method as: ``deserialize(value)``  
+
+11. Define the .form_options method as: ``form_options(&block)``
+
+12. Define the .deserialize method as: ``deserialize(value)``
+
 13. Define the .serialize method as: ``serialize(value)``
 
 ```ruby
@@ -194,9 +215,11 @@ Gender.form_options        # { '男' => '1', '女' => '2', '未指定' => '9' }
 
 ### Enum Config concern
 
-The Enum Config concern do the following tasks for the includer automatically:  
-1. Include the Enum List concern  
+The Enum Config concern do the following tasks for the includer automatically:
+1. Include the Enum List concern
+
 2. Define the .enum method as: ``enum(name = nil, localized_name = name, &block)``
+
 3. Define the .overload_enum_i18n method as: ``overload_enum_i18n(localized_name = nil)``
 
 config/locales/enum.zh-CN.yml
@@ -239,7 +262,7 @@ Ethnicity::YI.localized_name   # '彝'
 
 ### Enum Code concern
 
-The Enum Code concern do the following tasks for the includer automatically:  
+The Enum Code concern do the following tasks for the includer automatically:
 1. Define the .code method as: ``code(field, enum)``
 
 

data/ROADMAP.md

@@ -1,22 +1,46 @@
 # Progne Tapera Road Map 枚举库线路图
 
 ## v0.1
+
 1. Enum Item class
 2. Enum List concern
 3. Enum Config concern
 4. Enum Code concern
 
 ## v0.1.1
-1. Improve the Ruby Gem Specification to depend on [rails](https://github.com/rails/rails) v4.2
+
+1. Improve the Ruby Gem Specification to depend on [rails](https://github.com/rails/rails) v4.2.
 
 ## v0.2
-1. Improve the Enum Config concern to support the customized enum i18n name
+
+1. Improve the Enum Config concern to support the customized enum i18n name.
 
 ## v0.3
-1. Improve the Enum Config concern to support the overloaded enum i18n name
+
+1. Improve the Enum Config concern to support the overloaded enum i18n name.
 
 ## v0.4
-1. Improve the Enum List concern to add the .``lookup`` method
+
+1. Improve the Enum List concern to add the .``lookup`` method.
 
 ## v0.5
-1. Improve the Enum Code concern to be able to be extended by lambda
+
+1. Improve the Enum Code concern to be able to be extended by lambda.
+
+## v0.5.1
+
+1. Improve the Enum config concern for the Item Methods module.
+
+## v0.5.2
+
+1. Improve the Enum Config concern for the Item Methods module.
+
+## v1.0
+
+1. Improve the Ruby Gem Specification to depend on [rails](https://github.com/rails/rails) v6.0, bundler v2.0, rake v13.0, & rspec v3.9.
+
+## v2.0
+
+1. Improve the compatibility for Ruby 3.0.
+2. Improve the Enum List concern for the Item Methods module.
+3. Improve the Enum Config concern to remove support for the Item Methods module.

data/lib/progne_tapera.rb

@@ -1,5 +1,7 @@
 require 'progne_tapera/version'
 
+require 'rails'
+
 require 'progne_tapera/enum_list'
 require 'progne_tapera/enum_item'
 require 'progne_tapera/enum_config'

data/lib/progne_tapera/enum_code.rb

@@ -1,23 +1,36 @@
-module ProgneTapera::EnumCode
+##
+# Enum Code 是在模型层配置知识层枚举的关注点，提供 .code 宏方法。
 
-  extend ActiveSupport::Concern
+module ProgneTapera
 
-  included do |includer|
-  end
+  module EnumCode
 
-  module ClassMethods
+    extend ActiveSupport::Concern
 
-    def code(field, enum)
-      code_field_name = :"#{field}_code"
-      validates code_field_name, inclusion: enum.all.map { |item| item.code }
-      instance_eval do
-        define_method field do
-          enum.select { |item| item.code==send(code_field_name.to_sym) }.first
-        end
-        define_method "#{field}=" do |value|
-          send "#{code_field_name}=".to_sym, value.code
+    included do |includer|
+    end
+
+    #module ClassMethods
+    class_methods do
+
+      ##
+      # 为关注的类提供以下逻辑：
+      # 1. 验证 ``field``_code 字段的值，是否在枚举类型的定义中。
+      # 2. 定义 ``field`` 方法，用于获取枚举型的值。
+      # 3. 定义 ``field``= 方法，用于为枚举型字段赋值。
+      def code(field, enum)
+        code_field_name = :"#{field}_code"
+        validates code_field_name, inclusion: enum.all.map { |item| item.code }
+        instance_eval do
+          define_method field do
+            enum.select { |item| item.code==send(code_field_name.to_sym) }.first
+          end
+          define_method "#{field}=" do |value|
+            send "#{code_field_name}=".to_sym, value.code
+          end
         end
       end
+
     end
 
   end

data/lib/progne_tapera/enum_config.rb

@@ -1,44 +1,66 @@
-module ProgneTapera::EnumConfig
+##
+# Enum Config 是知识层枚举类型的配置关注点。提供 .enum 和 .overload_enum_i18n 方法。
 
-  extend  ActiveSupport::Concern
-  include ProgneTapera::EnumList
+module ProgneTapera
 
-  included do |includer|
-  end
+  module EnumConfig
 
-  module ClassMethods
+    extend  ActiveSupport::Concern
+    include ProgneTapera::EnumList
 
-    def enum(name = nil, localized_name = name)
+    included do |includer|
+    end
 
-      if block_given?
+    #module ClassMethods
+    class_methods do
 
-        yield.each do |key, value|
-          options = value.map { |k, v| [ k.to_sym, v ] }.to_h
-          code    = options.delete :code
-          safe_add_item ProgneTapera::EnumItem.new(code, key.to_s, options)
-        end
+      ##
+      # 为枚举类型提供 .enum 方法。如：
+      # enum :gender
+      # # 或
+      # enum :gender, :localized_gender
+      # 第一个参数是枚举类型在配置文件中存储的枚举项的 key 。
+      # 第二个参数是枚举类型在国际化配置文件中存储的枚举项文本的 key 。如果不提供第二个参数，则自动使用第一个参数进行查找。
+      def enum(name = nil, localized_name = name)
+
+        if block_given?
+
+          yield.each do |key, value|
+            options = value.map { |k, v| [ k.to_sym, v ] }.to_h
+            #options[:optional] = true if options[:optional].nil?
+            code    = options.delete :code
+            safe_add_item ProgneTapera::EnumItem.new(code, key.to_s, options)
+          end
 
-      else
+        else
 
-        name         = enum_name(name).to_s
-        enumerations = Rails.configuration.enum[name]
-        raise ArgumentError.new("The enum.#{name} was not configured in the config/enum.yml file.") if enumerations.blank?
+          name         = enum_name(name).to_s
+          enumerations = Rails.configuration.enum[name]
+          raise ArgumentError.new("The enum.#{name} was not configured in the config/enum.yml file.") if enumerations.blank?
+
+          enumerations.each do |key, value|
+            options = value.map { |k, v| [ k.to_sym, v ] }.to_h
+            #options[:optional] = false
+            code    = options.delete :code
+            options[:localized_name] = I18n.t "enum.#{localized_name||name}.#{key}"
+            item = ProgneTapera::EnumItem.new code, key, options
+
+            safe_add_item item
+          end
 
-        enumerations.each do |key, value|
-          options = value.map { |k, v| [ k.to_sym, v ] }.to_h
-          code    = options.delete :code
-          options[:localized_name] = I18n.t "enum.#{localized_name||name}.#{key}"
-          safe_add_item ProgneTapera::EnumItem.new(code, key, options)
         end
 
       end
 
-    end
+      ##
+      # 为枚举类型提供 .overload_enum_i18n 方法。如：
+      # overload_enum_i18n :your_gender_i18n_key
+      def overload_enum_i18n(localized_name = nil)
 
-    def overload_enum_i18n(localized_name = nil)
+        each do |enum_item|
+          enum_item.options[:localized_name] = I18n.t "enum.#{localized_name}.#{enum_item.name}"
+        end
 
-      each do |enum_item|
-        enum_item.options[:localized_name] = I18n.t "enum.#{localized_name}.#{enum_item.name}"
       end
 
     end

data/lib/progne_tapera/enum_item.rb

@@ -1,42 +1,53 @@
-require 'rails'
+##
+# Enum Item 是枚举项。
+# enum_item = ProgneTapera::EnumItem.new '1', 'male', { localized_name: '男' }
 
-class ProgneTapera::EnumItem
+module ProgneTapera
 
-  attr_reader :code, :name, :options
+  class EnumItem
 
-  # code = HA (value)
-  # name = han
-  # options = { localized_name: '汉' }
-  # -> constant: HAN
-  def initialize(code, name, options = {})
+    attr_reader :code, :name, :options
 
-    raise ArgumentError.new('The code argument is required.') if code.blank?
-    raise ArgumentError.new('The name argument is required.') if name.blank?
+    ##
+    # code = HA (value)
+    # name = han
+    # options = { localized_name: '汉' }
+    # -> constant: HAN
+    def initialize(code, name, options = {})
 
-    @code    = code
-    @name    = name
-    @options = options
+      raise ArgumentError.new('The code argument is required.') if code.blank?
+      raise ArgumentError.new('The name argument is required.') if name.blank?
 
-    @options.each do |key, value|
-      class_eval do
-        define_method(key.to_sym) do
-          @options[key] #value
+      @code    = code
+      @name    = name
+      @options = options
+
+      @options.each do |key, value|
+        EnumItem.class_eval do
+          define_method(key.to_sym) do
+            @options[key] #value
+          end
         end
       end
+
     end
 
-  end
+    ##
+    # 判断两个枚举项的 #code 字段是否相等。
+    def ==(that)
+      self.code==that.code
+    end
 
-  def ==(that)
-    self.code==that.code
-  end
+    ##
+    # 根据 #code 字段的值，比较大小。
+    def <=>(that)
+      self.code<=>that.code
+    end
 
-  def <=>(that)
-    self.code<=>that.code
-  end
+    def constant_name
+      name.to_s.upcase
+    end
 
-  def constant_name
-    name.to_s.upcase
   end
 
 end

data/lib/progne_tapera/enum_list.rb

@@ -1,80 +1,115 @@
-require 'rails'
+##
+# Enum List 是知识层枚举列表的领域逻辑关注点。
 
-module ProgneTapera::EnumList
+module ProgneTapera
 
-  extend ActiveSupport::Concern
+  module EnumList
 
-  included do |includer|
-  end
-
-  module ClassMethods
-
-    include Enumerable
-
-    # Define the Enum type
-    def enum_name(name = nil)
-      return @enum_name if @enum_name.present?
-      @enum_name = (name||self.name.demodulize.underscore).to_sym
-    end
-
-    # Define the Enum Items
-    def item_defined?(item)
-      const_defined? item.constant_name
-    end
-
-    def add_item(item)
-      raise ArgumentError.new "The #{item.inspect} item should be an instance of ProgneTapera::EnumItem." unless item.is_a?    ProgneTapera::EnumItem
-      raise ArgumentError.new "The #{item.constant_name} enum item was defined already."                  if     item_defined? item
-
-      item_methods_module = "#{self.name}::ItemMethods".safe_constantize
-      item.class.include item_methods_module if item_methods_module.present?
-
-      const_set item.constant_name, item
-    end
-
-    def safe_add_item(item)
-      const_set item.constant_name, item if item.is_a?(ProgneTapera::EnumItem)&&!item_defined?(item)
-    end
-
-    # Infrastructure for the Enumerable
-    def enum_constants
-      constants.select { |constant|
-        value = const_get constant
-        value.is_a? ProgneTapera::EnumItem
-      }
-    end
-
-    def all
-      enum_constants.map { |constant| const_get constant }
-    end
-
-    def selected
-      block_given? ? yield(all) : all
-    end
-
-    # Enumerable
-    def each(&block)
-      all.each &block
-    end
+    extend ActiveSupport::Concern
 
-    # Lookup
-    def lookup(code)
-      select { |item| item.code==code }.first
+    included do |includer|
     end
 
-    # Form Option
-    def form_options(&block)
-      items = block_given? ? selected(&block) : selected
-      items.map { |item| [ item.localized_name, item.code ] }.to_h
-    end
-
-    # ActiveRecord::Type::Value
-    def deserialize(value)
-      select { |item| item.code==value }
-    end
+    # module ClassMethods
+    class_methods do
+
+      include Enumerable
+
+      # Define the Enum type
+
+      ##
+      # 向枚举类型提供枚举的配置名。如果不提供配置名则根据枚举类型的名称自动猜测。如：
+      # eumu_name
+      # # 或
+      # enum_name :gender
+      def enum_name(name = nil)
+        return @enum_name if @enum_name.present?
+        @enum_name = (name||self.name.demodulize.underscore).to_sym
+      end
+
+      # Define the Enum Items
+
+      ##
+      # 判断指定的枚举项是否已经定义。如：
+      # item_defined? male
+      def item_defined?(item)
+        const_defined? item.constant_name
+      end
+
+      def add_item(item)
+        raise ArgumentError.new "The #{item.inspect} item should be an instance of ProgneTapera::EnumItem." unless item.is_a?    ProgneTapera::EnumItem
+        raise ArgumentError.new "The #{item.constant_name} enum item was defined already."                  if     item_defined? item
+
+        const_set item.constant_name, item
+        after_add_item item
+      end
+
+      ##
+      # 以安全的方式向一个枚举列表中添加一个枚举项。如果该枚举项已经在枚举列表中，则不添加。如：
+      # Gender.safe_add_item male
+      # Gender.safe_add_item female
+      # Gender.safe_add_item male   # male won't be added twice.
+      def safe_add_item(item)
+        const_set item.constant_name, item if item.is_a?(ProgneTapera::EnumItem)&&!item_defined?(item)
+        after_add_item item
+      end
+
+      def after_add_item(item)
+        item_method_module = "#{self.name}::ItemMethods".safe_constantize
+        item.instance_eval do
+          item.extend item_method_module
+        end if item_method_module.present?
+      end
+
+      # Destroy or Update the Enum Items
+      #def clear_optional_items
+        #
+      #end
+
+      # Infrastructure for the Enumerable
+      def enum_constants
+        constants.select { |constant|
+          value = const_get constant
+          value.is_a? ProgneTapera::EnumItem
+        }
+      end
+
+      ##
+      # 列出所有的枚举型。如：
+      # Gender.all
+      def all
+        enum_constants.map { |constant| const_get constant }
+      end
+
+      def selected
+        block_given? ? yield(all) : all
+      end
+
+      # Enumerable
+      def each(&block)
+        all.each &block
+      end
+
+      # Lookup
+      def lookup(code)
+        select { |item| item.code==code }.first
+      end
+
+      # Form Option
+      def form_options(&block)
+        items = block_given? ? selected(&block) : selected
+        items.map { |item| [ item.localized_name, item.code ] }.to_h
+      end
+
+      # ActiveRecord::Type::Value
+      def deserialize(value)
+        select { |item| item.code==value }
+      end
+
+      def serialize(value)
+        value.respond_to?(:code) ? value.code : value
+      end
 
-    def serialize(value)
-      value.respond_to?(:code) ? value.code : value
     end
 
   end

data/lib/progne_tapera/version.rb

@@ -1,3 +1,3 @@
 module ProgneTapera
-  VERSION = '0.5'
+  VERSION = '2.0'
 end

data/progne_tapera.gemspec

@@ -18,10 +18,10 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = [ 'lib' ]
 
-  spec.add_dependency 'rails', '>= 4.2'
+  spec.add_dependency 'rails', '~> 6.0'
 
-  spec.add_development_dependency 'bundler', '~> 1.12'
-  spec.add_development_dependency 'rake',    '~> 11.3'
-  spec.add_development_dependency 'rspec',   '~> 3.5'
+  spec.add_development_dependency 'bundler', '~> 2.0'
+  spec.add_development_dependency 'rake',    '~> 13.0'
+  spec.add_development_dependency 'rspec',   '~> 3.0'
 
 end

data/spec/progne_tapera/enum_list_spec.rb

@@ -5,6 +5,7 @@ describe ProgneTapera::EnumList do
   let :subject do
     class GenderEnum
       include ProgneTapera::EnumList
+      #include ProgneTapera::EnumConfig
       module ItemMethods
         def hello(name)
           case code
@@ -23,9 +24,9 @@ describe ProgneTapera::EnumList do
   let :not_specified do ProgneTapera::EnumItem.new '9', :not_specified, localized_name: '未指定' end
 
   before :each do
-    subject.add_item male          unless subject.item_defined? male
-    subject.add_item female        unless subject.item_defined? female
-    subject.add_item not_specified unless subject.item_defined? not_specified
+    subject.safe_add_item male
+    subject.safe_add_item female
+    subject.safe_add_item not_specified
   end
 
   after :each do

metadata

@@ -1,71 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: progne_tapera
 version: !ruby/object:Gem::Version
-  version: '0.5'
+  version: '2.0'
 platform: ruby
 authors:
 - Topbit Du
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-12-16 00:00:00.000000000 Z
+date: 2021-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.3'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.3'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.0'
 description: Progne Tapera is a Rails-based configurable enumeration implementation.
   Progne Tapera is the Brown-chested Martin in Latin. Progne Tapera 是基于 Rails 的可配置的枚举实现。Progne
   Tapera 是棕胸崖燕的拉丁学名。
@@ -98,7 +98,7 @@ homepage: https://github.com/topbitdu/progne_tapera
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -113,9 +113,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.4
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Rails-based configurable enumeration 基于 Rails 的可配置的枚举
 test_files: