enumize 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 964991441bfdd0056de0e262ff27a7f5e4515eb3745f5f54934b1c181ef830dd
-  data.tar.gz: 04bb3a8efe106f6ea21237ad7a4f6de941cf86962ef121afab3c46e52b961346
+  metadata.gz: cf685498d632a17623a83b61d929a4fb8c43174d9552724bf9af878f801be60d
+  data.tar.gz: 303c0cca432f49647129331358e4505f05d249ec105cc2121b2fa85cd998730f
 SHA512:
-  metadata.gz: 65b4a563f9dac4243bd3cb8d022ee30ea51f7336f41b4fd021733bb188f789de91819c81d0431de6d856d6049cb5a6550dd9192cfb03851c4471d73598426a47
-  data.tar.gz: 244779b142c1ab079dfe5b41db6234c451ede8ebadeff7b31589c80a049a2bd70626bba314f684a6acc045e66f6c62dae6db0d2e939d6444b0908b480bdacdbc
+  metadata.gz: d0197ec642136e88cbf918684a34ec69b61e431a0625f0d32ffc404e55519b9db0090b0adc53462673bdd7b9de2c011eb220b1c9ca3141e6c31df65397ec9c1d
+  data.tar.gz: 889128831bcc45b2221202062530d5b37b2a1c4d1b2821ed5fafd4f0c5d5d8785c57e5faa47c24a5720131ddbdc88921c5158f88c1ab02af543d71f86cdeb91b

data/README.md

@@ -1,6 +1,6 @@
 # Enumize
 
-[![Build Status](https://travis-ci.org/huacnlee/enumize.svg?branch=master)](https://travis-ci.org/huacnlee/enumize)
+[![build](https://github.com/huacnlee/enumize/actions/workflows/build.yml/badge.svg)](https://github.com/huacnlee/enumize/actions/workflows/build.yml)
 
 Extend [ActiveRecord::Enum](https://api.rubyonrails.org/classes/ActiveRecord/Enum.html) for add more helpful methods, from [rails/rails#36503](https://github.com/rails/rails/pull/36503).
 
@@ -35,18 +35,18 @@ en:
           published: Published
           archived: Archived
         status_color:
-          draft: "#999999"
-          published: "green"
-          archived: "red"
+          draft: '#999999'
+          published: 'green'
+          archived: 'red'
 
 zh-CN:
   activerecord:
     enums:
       book:
         status:
-          draft: "草稿"
-          published: "已发布"
-          archived: "归档"
+          draft: '草稿'
+          published: '已发布'
+          archived: '归档'
 ```
 
 use the methods:
@@ -90,6 +90,7 @@ gem 'enumize'
 ```
 
 And then execute:
+
 ```bash
 $ bundle
 ```
@@ -109,7 +110,7 @@ module Dummy
     config.i18n.fallbacks = true
   end
 end
-````
+```
 
 ## License
 

data/Rakefile

@@ -10,12 +10,16 @@ require "rdoc/task"
 
 RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = "rdoc"
-  rdoc.title    = "Enumize"
+  rdoc.title = "Enumize"
   rdoc.options << "--line-numbers"
   rdoc.rdoc_files.include("README.md")
   rdoc.rdoc_files.include("lib/**/*.rb")
 end
 
+APP_RAKEFILE = File.expand_path("test/dummy/Rakefile", __dir__)
+load "rails/tasks/engine.rake"
+load "rails/tasks/statistics.rake"
+
 require "bundler/gem_tasks"
 
 require "rake/testtask"

data/lib/enumize/model.rb

@@ -5,46 +5,58 @@ module Enumize
     extend ActiveSupport::Concern
 
     class_methods do
-      def enum(opts)
-        super(opts)
+      if Rails.version.to_f < 7.0
+        def enum(opts)
+          super(opts)
 
+          opts.each do |name, values|
+            _enumize(name, values)
+          end
+        end
+      end
+
+      def _enum(name, values, **options)
+        super(name, values, **options)
+
+        _enumize(name, values, **options)
+      end
+
+      def _enumize(name, values, **options)
         klass = self
         singular_model_name = klass.name.singularize.underscore
         locale_prefix = "activerecord.enums.#{singular_model_name}"
 
-        opts.each do |name, values|
-          # def status_name; I18n.t("activerecord.enums.book.status.#{status}"); end
-          detect_enum_conflict!(name, "#{name}_name")
-          define_method("#{name}_name") do
-            return "" if self.send(name).nil?
-            I18n.t("#{locale_prefix}.#{name}.#{self.send(name)}")
-          rescue I18n::MissingTranslationData
-            self[field].titleize
-          end
+        # def status_name; I18n.t("activerecord.enums.book.status.#{status}"); end
+        detect_enum_conflict!(name, "#{name}_name")
+        define_method("#{name}_name") do
+          return "" if send(name).nil?
+          I18n.t("#{locale_prefix}.#{name}.#{send(name)}")
+        rescue I18n::MissingTranslationData
+          self[field].titleize
+        end
 
-          # def status_color; I18n.t("activerecord.enums.book.status_color.#{status}"); end
-          detect_enum_conflict!(name, "#{name}_color")
-          define_method("#{name}_color") do
-            return "black" if self.send(name).nil?
-            I18n.t("#{locale_prefix}.#{name}_color.#{self.send(name)}", raise: true)
-          rescue I18n::MissingTranslationData
-            return "black"
-          end
+        # def status_color; I18n.t("activerecord.enums.book.status_color.#{status}"); end
+        detect_enum_conflict!(name, "#{name}_color")
+        define_method("#{name}_color") do
+          return "black" if send(name).nil?
+          I18n.t("#{locale_prefix}.#{name}_color.#{send(name)}", raise: true)
+        rescue I18n::MissingTranslationData
+          return "black"
+        end
 
-          # def status_value; Book.statuses[self.status]; end
-          detect_enum_conflict!(name, "#{name}_value")
-          define_method("#{name}_value") do
-            return nil if self.send(name).nil?
-            klass.send(name.to_s.pluralize)[self[name]]
-          end
+        # def status_value; Book.statuses[self.status]; end
+        detect_enum_conflict!(name, "#{name}_value")
+        define_method("#{name}_value") do
+          return nil if send(name).nil?
+          klass.send(name.to_s.pluralize)[self[name]]
+        end
 
-          # Book.state_options # => [["Draft", "draft"], ["Published", "published"], ["Archived", "archived"]]
-          detect_enum_conflict!(name, "#{name}_options", true)
-          define_singleton_method("#{name}_options") do
-            self.send(name.to_s.pluralize).map do |k, _|
-              label = self.new(name => k).send("#{name}_name")
-              [label, k]
-            end
+        # Book.state_options # => [["Draft", "draft"], ["Published", "published"], ["Archived", "archived"]]
+        detect_enum_conflict!(name, "#{name}_options", true)
+        define_singleton_method("#{name}_options") do
+          send(name.to_s.pluralize).map do |k, _|
+            label = new(name => k).send("#{name}_name")
+            [label, k]
           end
         end
       end

data/lib/enumize/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Enumize
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enumize
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Jason Lee
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-06-24 00:00:00.000000000 Z
+date: 2021-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 5.0.0
 - !ruby/object:Gem::Dependency
-  name: mysql2
+  name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -56,7 +56,7 @@ homepage: https://github.com/huacnlee/enumize
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -71,8 +71,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Extend ActiveRecord::Enum for add more helpful methods.
 test_files: []