enum_help 0.0.16 → 0.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5b76ebfec1adf5d496385557f9425e1e1a95554c
-  data.tar.gz: eb49a08c37113ebf0852cad91e2f774d94493f47
+SHA256:
+  metadata.gz: 31095c38410d72dc36b68e0eb2fe538a2bb09246fd2195e80d3441e05fb6a697
+  data.tar.gz: 2c62a01900ee464b3de4cca4ebc17de9e8e53a5b3f3e211acbf224f52cc80c49
 SHA512:
-  metadata.gz: 80eb30b5f104314e567b1af238a1bb9f5122b4a35701f68788f287c57c84da92178bf6fd3431ba2e40b0a68748c451ecea5500137bc07d9e1bdd332543a89a78
-  data.tar.gz: 6784941159e554668851e44dfa4e4ad8f28b803d54c55e555a16f148c941bfbbba7958f2d52636375c397b0bf23145f700e08fd326f7b1c33096753cd641e55f
+  metadata.gz: b5626546f63adea2e0742ee1adf325f4ee9cf6d6673068d7b239d88f907a5b270e0c02e1b1207896bb5e635b9e4d892b204a6c4b18af14ec8c8bdda848fef136
+  data.tar.gz: ebaec0dbcb3423c2ce8c720f385df4091e713a6e06e1516985bba3bbf079f68921ee3dfd99520dde9f4e3d0e26039eb196becf7197d89eaf77016d7b0eeba894

data/.github/workflows/ci.yml

@@ -0,0 +1,44 @@
+name: CI
+
+on:
+  - push
+  - pull_request
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby-version:
+          - head
+          - 3.1
+          - "3.0"
+          - 2.7
+          - 2.6
+        rails-version:
+          - "edge"
+          - "~> 7.0.1"
+          - "~> 6.1.4"
+          - "~> 6.0.4"
+          - "~> 5.2.6"
+        exclude:
+          - ruby-version: head
+            rails-version: "~> 5.2.6"
+          - ruby-version: 3.1
+            rails-version: "~> 5.2.6"
+          - ruby-version: "3.0"
+            rails-version: "~> 5.2.6"
+          - ruby-version: 2.6
+            rails-version: "edge"
+          - ruby-version: 2.6
+            rails-version: "~> 7.0.1"
+    env:
+      RAILS_VERSION: "${{ matrix.rails-version }}"
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: "${{ matrix.ruby-version }}"
+          bundler-cache: true
+      - run: bundle exec rspec

data/.rspec

@@ -0,0 +1,3 @@
+--color
+--profile 3
+--format documentation

data/Gemfile

@@ -2,3 +2,17 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in enum_help.gemspec
 gemspec
+
+gem 'bundler'
+gem 'rake'
+gem 'rspec'
+gem 'sqlite3'
+
+case version = ENV['RAILS_VERSION']
+when nil
+  gem 'rails', '~> 7.0'
+when 'edge'
+  gem 'rails', github: 'rails/rails'
+else
+  gem 'rails', version
+end

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.
@@ -17,7 +20,7 @@ Version 0.0.15 changes the behaviour of namespaced modules as per [this commit](
         abc:
           lorem: 'Ipsum'
       foo/bar/bat:
-        abc: 
+        def:
           lorem: 'Ipsum'
 
 To
@@ -29,7 +32,7 @@ To
             abc:
               lorem: 'Ipsum'
           bat:
-            abc: 
+            def:
               lorem: 'Ipsum'
 
 For different I18n backends, adjust accordingly as namespaced modules are now referenced by `.` rather than `/`.
@@ -58,7 +61,7 @@ In model file:
 ```ruby
 class Order < ActiveRecord::Base
   enum status: { "nopayment" => 0, "finished" => 1, "failed" => 2, "destroyed" => 3 }
-      
+
   def self.restricted_statuses
     statuses.except :failed, :destroyed
   end
@@ -88,7 +91,7 @@ In `_form.html.erb` using `simple_form`:
 <%= f.input :status %>
 ```
 
-This will generate select field with translations automaticlly.
+This will generate select field with translations automatically.
 
 And if you want to generate select except some values, then you can pass a collection option.
 
@@ -106,7 +109,7 @@ e.g.
 <%= f.input :status, as: :string %>
 ```
 
-From version 0.0.10, enum_help can automaticlly generate radio buttons with i18n labels.
+From version 0.0.10, enum_help can automatically generate radio buttons with i18n labels.
 
 e.g.
 ```erb
@@ -133,7 +136,7 @@ zh-cn:
 
 ## Notice
 If you want to use enum feature, field of your table can't be named with `reference`.
-When it is named with 'reference' and define enum in model file, there will be raise an error as below:
+When it is named with 'reference' and define enum in model file, there will be raised an error as below:
 
     NoMethodError: super: no superclass method `enum' for...
 
@@ -146,6 +149,7 @@ Thanks for all the [contributors](https://github.com/zmbacker/enum_help/graphs/c
 
 1. Fork it ( http://github.com/zmbacker/enum_help/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
+3. Run test `rspec`
+4. Commit your changes (`git commit -am 'Add some feature'`)
+5. Push to the branch (`git push origin my-new-feature`)
+6. Create new Pull Request

data/Rakefile

@@ -1 +1,2 @@
 require "bundler/gem_tasks"
+task :default => :spec

data/enum_help.gemspec

@@ -1,7 +1,7 @@
 # coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'enum_help/version'
+require "enum_help/version"
 
 Gem::Specification.new do |spec|
   spec.name          = "enum_help"
@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["zm.backer@gmail.com"]
   spec.summary       = %q{ Extends of ActiveRecord::Enum, which can used in simple_form and internationalization }
   spec.description   = %q{ Help ActiveRecord::Enum feature to work fine with I18n and simple_form.  }
-  spec.homepage      = ""
+  spec.homepage      = "https://github.com/zmbacker/enum_help"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files`.split($/)
@@ -18,6 +18,5 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.5"
-  spec.add_development_dependency "rake"
+  spec.add_dependency "activesupport", ">= 3.0.0"
 end

data/lib/enum_help/i18n.rb

@@ -2,12 +2,29 @@ module EnumHelp
 
   module I18n
 
-    # overwrite the enum method
-    def enum( definitions )
-      super( definitions )
-      definitions.each do |name, _|
-        Helper.define_attr_i18n_method(self, name)
-        Helper.define_collection_i18n_method(self, name)
+    if ActiveRecord::VERSION::MAJOR >= 7
+      # overwrite the enum method
+      def enum(name = nil, values = nil, **options)
+        super(name, values, **options)
+        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
+    else
+      # overwrite the enum method
+      def enum( definitions )
+        super( definitions )
+        definitions.each do |name, _|
+          Helper.define_attr_i18n_method(self, name)
+          Helper.define_collection_i18n_method(self, name)
+        end
       end
     end
 

data/lib/enum_help/railtie.rb

@@ -1,7 +1,9 @@
 module EnumHelp
   class Railtie < Rails::Railtie
     initializer "enum_help.i18n" do
-      ActiveRecord::Base.send :extend, EnumHelp::I18n
+      ActiveSupport.on_load(:active_record) do
+        extend EnumHelp::I18n
+      end
     end
   end
-end
+end

data/lib/enum_help/version.rb

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

data/spec/enum_i18n_help_spec.rb

@@ -0,0 +1,99 @@
+require 'spec_helper'
+
+EnumHelp::Railtie.initializers.each(&:run)
+
+class User < ActiveRecord::Base
+  if ActiveRecord.version < Gem::Version.new('6.1')
+    enum gender: [:male, :female]
+  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]
+end
+
+RSpec.describe EnumHelp::I18n do
+  describe '#enum' do
+    context 'With hash definitions' do
+      it 'responds defined _i18n method' do
+        expect(User.new).to respond_to("gender_i18n")
+      end
+
+      it 'responds defined genders_i18n method' do
+        expect(User).to respond_to("genders_i18n")
+      end
+    end
+
+    context 'With array definitions' do
+      it 'responds defined _i18n method' do
+        expect(User.new).to respond_to("status_i18n")
+      end
+
+      it 'responds defined status_i18n method' do
+        expect(User).to respond_to("statuses_i18n")
+      end
+    end
+  end
+
+  describe '#enum_key_i18n' do
+    describe 'user.gender' do
+      let(:gender) { "female" }
+      let(:user) { User.create(gender: gender) }
+
+
+      subject { user.gender_i18n }
+
+      context 'lang is zh-CN' do
+        before { I18n.locale = :"zh-CN" }
+
+        it { expect(I18n.locale).to eq :"zh-CN" }
+
+        context 'gender is male' do
+          let(:gender) { 'male' }
+          it { is_expected.to eq '男' }
+        end
+
+        context 'gender is female' do
+          let(:gender) { 'female' }
+          it { is_expected.to eq '女' }
+        end
+      end
+
+      context 'lang is en' do
+        before { I18n.locale = :en }
+
+        it { expect(I18n.locale).to eq :en }
+
+        context 'gender is male' do
+          let(:gender) { 'male' }
+          it { is_expected.to eq 'Male' }
+        end
+
+        context 'gender is female' do
+          let(:gender) { 'female' }
+          it { is_expected.to eq 'Female' }
+        end
+      end
+    end
+  end
+
+  describe '#enum_keys_i18n' do
+    subject { User.genders_i18n }
+
+    context 'lang is zh-CN' do
+      before { I18n.locale = :"zh-CN" }
+
+      it { expect(I18n.locale).to eq :"zh-CN" }
+      it { is_expected.to eq({"male"=>"男", "female"=>"女"}) }
+    end
+
+    context 'lang is en' do
+      before { I18n.locale = :en }
+
+      it { expect(I18n.locale).to eq :en }
+      it { is_expected.to eq({"male"=>"Male", "female"=>"Female"}) }
+    end
+  end
+end

data/spec/fixtures/locales/en.yml

@@ -0,0 +1,16 @@
+en:
+  activerecord:
+    models:
+      user: "User"
+    attributes:
+      user:
+        id: "ID"
+        gender: "Gender"
+  enums:
+    user:
+      gender:
+        male: "Male"
+        female: "Female"
+      status:
+        normal: "Normal"
+        disable: "Disable"

data/spec/fixtures/locales/zh-CN.yml

@@ -0,0 +1,16 @@
+zh-CN:
+  activerecord:
+    models:
+      user: "用户"
+    attributes:
+      user:
+        id: "ID"
+        gender: "性别"
+  enums:
+    user:
+      gender:
+        male: "男"
+        female: "女"
+      status:
+        normal: "正常"
+        disable: "禁用"

data/spec/spec_helper.rb

@@ -0,0 +1,15 @@
+require "bundler/setup"
+
+require "rspec"
+
+require "rails"
+require "active_record"
+
+Bundler.require
+
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
+
+I18n.load_path += Dir["#{File.dirname(__FILE__)}/fixtures/locales/*.yml"]
+I18n.enforce_available_locales = false
+
+$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)

data/spec/support/setup_database.rb

@@ -0,0 +1,17 @@
+ActiveRecord::Base.configurations = { "test"=> {"adapter"=>"sqlite3", "database"=>":memory:"} }
+ActiveRecord::Base.establish_connection :test
+
+version = "#{ActiveRecord::VERSION::MAJOR}.#{ActiveRecord::VERSION::MINOR}"
+class CreateAllTables < ActiveRecord::Migration[version]
+  def change
+    create_table :users do |t|
+      t.integer :gender, null: false, default: 0, limit: 1
+      t.integer :status, null: false, default: 0, limit: 1
+
+      t.timestamps
+    end
+  end
+end
+
+ActiveRecord::Migration.verbose = false
+CreateAllTables.new.change

metadata

@@ -1,43 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: enum_help
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.19
 platform: ruby
 authors:
 - Lester Zhao
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-11-03 00:00:00.000000000 Z
+date: 2022-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.5'
-- !ruby/object:Gem::Dependency
-  name: rake
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: 3.0.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
 description: " Help ActiveRecord::Enum feature to work fine with I18n and simple_form.
   \ "
 email:
@@ -46,7 +32,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
+- ".rspec"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -57,11 +45,16 @@ files:
 - lib/enum_help/railtie.rb
 - lib/enum_help/simple_form.rb
 - lib/enum_help/version.rb
-homepage: ''
+- spec/enum_i18n_help_spec.rb
+- spec/fixtures/locales/en.yml
+- spec/fixtures/locales/zh-CN.yml
+- spec/spec_helper.rb
+- spec/support/setup_database.rb
+homepage: https://github.com/zmbacker/enum_help
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -76,9 +69,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: Extends of ActiveRecord::Enum, which can used in simple_form and internationalization
-test_files: []
+test_files:
+- spec/enum_i18n_help_spec.rb
+- spec/fixtures/locales/en.yml
+- spec/fixtures/locales/zh-CN.yml
+- spec/spec_helper.rb
+- spec/support/setup_database.rb