exnum 0.2.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a889d91abfec93390a88c459399ecf290eb423aa
-  data.tar.gz: 0b8ff8395450606497d5fad9ac1b30002393d0eb
+SHA256:
+  metadata.gz: a0eb597ee0732dc06f4b3bc40185a72b60e66deef74d5d316375a8d30edc1c91
+  data.tar.gz: f7feab5a390467426f4382b878e87dde7da108379474fc4088005407fe256471
 SHA512:
-  metadata.gz: 8ae6c85007d53ba42904d20ae51b93bb9b83c4457fd04b360ca001a61f5e03bdd6df34eaf63753f1c1a91c7f7dbae3a366341c966a360da4656cb2d744d94eef
-  data.tar.gz: a30f52b4f502f79f09f3a36c8ce42bfdb897faab41f913b8663c51f0568c5abeac0b36c2785129d6756898abf44a3d9ed055027be191fc2400cec82db2c11046
+  metadata.gz: e7d4dd9a76bc8d775247f57dc616cc00f9b2d290d3a61a560306f72eb0f46711cc35ea6d48ec400ed835fcc9879694fd6bca708bbcb4af7aac7443000f89ce45
+  data.tar.gz: b52fcad419966bd7ef14101e0984657e1b3949c03e6e6a6e4e15d2718d612c861d7db995226e57fd7899bec79b0a71634a1d7283a75fd98528fa850e6a793ff9

data/.circleci/config.yml

@@ -0,0 +1,32 @@
+version: 2.1
+
+orbs:
+  # https://circleci.com/developer/orbs/orb/circleci/ruby?version=1.4.0
+  ruby: circleci/ruby@1.4.0
+
+jobs:
+  build:
+    docker:
+      - image: 'cimg/ruby:3.1.1'
+    steps:
+      - checkout
+      - restore_cache:
+          name: Restore bundle cache
+          keys:
+            - bundle-3.1
+      - run:
+          name: Bundle Install
+          command: |
+            bundle config set --local path 'vendor/bundle'
+            bundle install --jobs=4 --retry=3
+      - save_cache:
+          name: Store bundle cache
+          key: bundle-3.1
+          paths:
+            - vendor/bundle
+      - ruby/rspec-test
+
+workflows:
+  build_and_test:
+    jobs:
+      - build

data/README.md

@@ -1,12 +1,10 @@
 # Exnum
 
 [![Gem Version](https://badge.fury.io/rb/exnum.svg)](https://badge.fury.io/rb/exnum)
-[![Build Status](https://travis-ci.org/Kta-M/exnum.svg?branch=master)](https://travis-ci.org/Kta-M/exnum)
-[![Code Climate](https://codeclimate.com/github/Kta-M/exnum/badges/gpa.svg)](https://codeclimate.com/github/Kta-M/exnum)
-[![Test Coverage](https://codeclimate.com/github/Kta-M/exnum/badges/coverage.svg)](https://codeclimate.com/github/Kta-M/exnum/coverage)
+[![CircleCI](https://circleci.com/gh/Kta-M/exnum.svg?style=svg)](https://circleci.com/gh/Kta-M/exnum)
 
 Exnum is enum extention for Rails.
-This gem extends enum about i18n and associated parameters.
+This gem extends enum about i18n, associated parameters, and array for select box.
 
 ## Installation
 
@@ -18,30 +16,51 @@ gem 'exnum'
 
 And then execute:
 
-    $ bundle
+```
+$ bundle
+```
 
 Or install it yourself as:
 
-    $ gem install exnum
+```
+$ gem install exnum
+```
 
 ## Usage
 
-ActiveRecord:
-```
+```ruby
 class User < ActiveRecord::Base
   # the value of the key "val" defines enum values
   # and the others defines associated parameters
   exnum role: {
-    guest:   {val: 10, label: :red },
-    general: {val: 20, label: :green, permission: false },
-    admin:   {val: 30, label: :blue,  permission: true},
+    guest:   {val: 10, label: :red,   selectable: true, },
+    general: {val: 20, label: :green, selectable: true,  permission: false},
+    admin:   {val: 30, label: :blue,  selectable: false, permission: true},
   }
 end
+```
 
+### Assosiated parameter extention
+```ruby
+User.role_labels
+# => {"guest" => :red, "general" => :green, "admin" => :blue}
+User.role_labels{|p| p[:selectable]}
+# => {"guest" => :red, "general" => :green}
+User.role_permissions
+# => {"guest" => nil, "general" => false, "admin" => true}
 ```
 
-I18n:
+```ruby
+user = User.new(role: :general)
+user.role_label
+# => :green
+user.role_permission
+# => false
 ```
+
+### I18n extention
+
+```yaml
 ja:
   activerecord:
     enum:
@@ -50,47 +69,51 @@ ja:
           guest:   ゲスト
           general: 一般ユーザー
           admin:   管理者
-
 ```
 
-Then you can use i18n extention
-```
+```ruby
 User.roles_i18n
 # => {"guest" => "ゲスト", "general" => "一般ユーザー", "admin" => "管理者"}
+User.roles_i18n{|p| p[:selectable]}
+# => {"guest" => "ゲスト", "general" => "一般ユーザー"}
+```
 
+```ruby
 user = User.new(role: :guest)
 user.role_i18n
 # => "ゲスト"
 ```
 
-and assosiated parameter extention.
+### Array for select box extention
+```ruby
+User.roles_for_select
+# => [["ゲスト", "guest"], ["一般ユーザー", "general"], ["管理者", "admin"]]
+User.roles_for_select{|p| p[:selectable]}
+# => [["ゲスト", "guest"], ["一般ユーザー", "general"]]
 ```
-User.role_labels
-# => {"guest" => :red, "general" => :green, "admin" => :blue}
-User.role_permissions
-# => {"guest" => nil, "general" => false, "admin" => true}
 
-user = User.new(role: :general)
-user.role_label
-# => :green
-user.role_permission
-# => false
+You can use it like this:
+```ruby
+<%= f.select :role, User.roles_for_select %>
 ```
 
-And of cause, you can use methods provided by `enum`.
-
-`exnum` can also use as well as `enum`.
-Then you can use extention only about i18n.
-```
+### enum
+Of course, you can use methods provided by `enum`.
+```ruby
 class User < ActiveRecord::Base
   exnum role: [:guest, :general, :admin]
 end
 ```
-```
+```ruby
 class User < ActiveRecord::Base
   exnum role: {guest: 10, general: 20, admin: 30}
 end
 ```
+```ruby
+class User < ActiveRecord::Base
+  exnum role: {guest: 10, general: 20, admin: 30}, _prefix: true
+end
+```
 
 ## Contributing
 
@@ -104,3 +127,4 @@ end
 
 The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
 
+

data/exnum.gemspec

@@ -19,11 +19,12 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'activerecord'
-  spec.add_development_dependency "bundler", "~> 1.12"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "sqlite3", "~> 1.0"
+  spec.add_dependency 'activerecord', "~> 7.0"
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "rspec_junit_formatter"
+  spec.add_development_dependency "sqlite3"
   spec.add_development_dependency "pry-rails"
-  spec.add_development_dependency "codeclimate-test-reporter"
+  spec.add_development_dependency "simplecov"
 end

data/lib/exnum/active_record/exnum.rb

@@ -1,8 +1,10 @@
 module ActiveRecord
   module Exnum
+
     def self.prepended(base)
       base.singleton_class.class_eval { self.prepend(ClassMethods) }
     end
+
     module ClassMethods
       def extended(base)
         base.class_attribute(:defined_params, instance_writer: false)
@@ -19,65 +21,77 @@ module ActiveRecord
     #--------------------------------------------------------------------------
 
     def exnum(definitions)
-      divided_definitions = definitions.inject({enums: {}, params: {}}) do |ret, (name, values)|
-        if !values.kind_of?(Hash)
-          ret[:enums][name]  = values
-        else
-          ret[:enums][name]  = extract_enums(name, values)
-          ret[:params][name] = extract_params(name, values)
+      enum_definitions = definitions.each_with_object({}) do |(name, values), ret|
+        ret[name] = extract_enums(values)
+      end
+      enum(**enum_definitions)
+
+      pram_definitions = definitions.each_with_object({}) do |(name, values), ret|
+        next if %i[_prefix _suffix].include?(name)
+
+        ret[name] = extract_params(values)
+        self.send(name.to_s.pluralize).each do |k, v|
+          ret[name][k.to_sym] ||= {}
+          ret[name][k.to_sym][:val] = v
         end
-        ret
       end
 
-      enum(divided_definitions[:enums])
-      enum_i18n(divided_definitions[:enums])
-      enum_param(divided_definitions[:params])
+      enum_i18n(pram_definitions)
+      enum_param(pram_definitions)
+      enum_for_select(pram_definitions)
     end
 
-    #--------------------------------------------------------------------------
+    #++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
     private
-    def extract_enums(_name, values)
-      values.inject({}) do |ret, (field, value)|
+    def extract_enums(values)
+      return values unless values.kind_of?(Hash)
+
+      values.each_with_object({}) do |(field, value), ret|
         ret[field.to_sym] = (value.kind_of?(Hash) ? value[:val] : value)
-        ret
       end
     end
 
-    def extract_params(_name, values)
-      values.inject({}) do |ret, (field, value)|
-        if value.kind_of?(Hash)
-          ret[field.to_sym] = value.reject{|k, _| k == :val}
-        end
-        ret
+    def extract_params(values)
+      return {} unless values.kind_of?(Hash)
+
+      target_values = values.select{|_field, value| value.kind_of?(Hash)}
+      target_values.each_with_object({}) do |(field, value), ret|
+        ret[field.to_sym] = value
       end
     end
 
-    def enum_i18n(definitions)
-      klass = self
-      definitions.delete(:_prefix)
-      definitions.delete(:_suffix)
+    #--------------------------------------------------------------------------
 
+    def enum_i18n(definitions)
       definitions.each do |name, values|
+        enum_i18n_class_method(name, values)
+        enum_i18n_instance_method(name)
+      end
+    end
 
-        # define class method which returns i18n string of each satus
-        method_name = "#{name.to_s.pluralize}_i18n"
-        detect_enum_conflict!(name, method_name, true)
-        klass.singleton_class.send(:define_method, method_name) do
-          i18n_hash = ActiveSupport::HashWithIndifferentAccess.new
-          values.inject(i18n_hash) do |ret, (enum_name, _value)|
-            ret[enum_name] = i18n_string(klass, name, enum_name)
-            ret
-          end
+    # define class method which returns i18n string of each satus
+    def enum_i18n_class_method(name, values)
+      klass = self
+      method_name = "#{name.to_s.pluralize}_i18n"
+      detect_enum_conflict!(name, method_name, true)
+      klass.singleton_class.send(:define_method, method_name) do |&block|
+        i18n_hash = ActiveSupport::HashWithIndifferentAccess.new
+        values.each_with_object(i18n_hash) do |(enum_name, value), ret|
+          next if block.present? && !block.call(value)
+          ret[enum_name] = i18n_string(klass, name, enum_name)
         end
+      end
+    end
 
-        # define instance method which returns current i18n string of the instance
-        method_name = "#{name}_i18n"
-        detect_enum_conflict!(name, method_name, false)
-        klass.send(:define_method, method_name) do
-          status = self.send(name)
-          status.nil? ? nil : klass.send(:i18n_string, klass, name, status)
-        end
+    # define instance method which returns current i18n string of the instance
+    def enum_i18n_instance_method(name)
+      klass = self
+      method_name = "#{name}_i18n"
+      detect_enum_conflict!(name, method_name, false)
+      klass.send(:define_method, method_name) do
+        status = self.send(name)
+        status.nil? ? nil : klass.send(:i18n_string, klass, name, status)
       end
     end
 
@@ -85,36 +99,68 @@ module ActiveRecord
       I18n.t("#{klass.i18n_scope}.enum.#{klass.model_name.i18n_key}.#{name}.#{enum_name}")
     end
 
+    #--------------------------------------------------------------------------
+
     def enum_param(definitions)
       klass = self
-      klass.defined_params = definitions
+      klass.defined_params.merge!(definitions)
 
       definitions.each do |name, values|
         param_names = values.values.map(&:keys).flatten.uniq
         param_names.each do |param_name|
+          enum_param_class_method(name, values, param_name)
+          enum_param_instance_method(name, values, param_name)
+        end
+      end
+    end
 
-          # define class methods which returns the parameter's values of each status
-          method_name = "#{name}_#{param_name.to_s.pluralize}"
-          detect_enum_conflict!(name, method_name, true)
-          klass.singleton_class.send(:define_method, method_name) do
-            param_hash = ActiveSupport::HashWithIndifferentAccess.new
-            values.inject(param_hash) do |ret, (enum_name, params)|
-              ret[enum_name] = params[param_name]
-              ret
-            end
-          end
-
-          # define instance methods which returns the parameter's current value of the instance
-          method_name = "#{name}_#{param_name}"
-          detect_enum_conflict!(name, method_name, false)
-          define_method(method_name) do
-            status = self.send(name)
-            return if status.nil?
-            defined_params[name][status.to_sym][param_name]
-          end
+    # define class methods which returns the parameter's values of each status
+    def enum_param_class_method(name, values, param_name)
+      klass = self
+      method_name = "#{name}_#{param_name.to_s.pluralize}"
+      detect_enum_conflict!(name, method_name, true)
+      klass.singleton_class.send(:define_method, method_name) do |&block|
+        param_hash = ActiveSupport::HashWithIndifferentAccess.new
+        values.each_with_object(param_hash) do |(enum_name, params), ret|
+          next if block.present? && !block.call(params)
+          ret[enum_name] = params[param_name]
         end
       end
     end
+
+    # define instance methods which returns the parameter's current value of the instance
+    def enum_param_instance_method(name, values, param_name)
+      method_name = "#{name}_#{param_name}"
+      detect_enum_conflict!(name, method_name, false)
+      define_method(method_name) do
+        status = self.send(name)
+        return if status.nil?
+        defined_params[name][status.to_sym][param_name]
+      end
+    end
+
+    #--------------------------------------------------------------------------
+
+    def enum_for_select(definitions)
+      definitions.each do |name, values|
+        param_names = values.values.map(&:keys).flatten.uniq
+        param_names.each do |param_name|
+          enum_for_select_class_method(name, values, param_name)
+        end
+      end
+    end
+
+    # define class methods which returns the array for select box
+    def enum_for_select_class_method(name, values, param_name)
+      klass = self
+      method_name = "#{name.to_s.pluralize}_for_select"
+      detect_enum_conflict!(name, method_name, true)
+      klass.singleton_class.send(:define_method, method_name) do |&block|
+        i18n_hash = klass.send("#{name.to_s.pluralize}_i18n", &block)
+        i18n_hash.to_a.map(&:reverse)
+      end
+    end
+
   end
 end
 

data/lib/exnum/version.rb

@@ -1,3 +1,3 @@
 module Exnum
-  VERSION = "0.2.0"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,85 +1,99 @@
 --- !ruby/object:Gem::Specification
 name: exnum
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Kta-M
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2016-09-04 00:00:00.000000000 Z
+date: 2022-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec_junit_formatter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry-rails
   requirement: !ruby/object:Gem::Requirement
@@ -95,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: codeclimate-test-reporter
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -116,9 +130,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
@@ -134,7 +148,7 @@ homepage: https://github.com/Kta-M/exnum
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -149,9 +163,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
-signing_key: 
+rubygems_version: 3.3.3
+signing_key:
 specification_version: 4
 summary: Enum extention for Rails
 test_files: []

data/.travis.yml

@@ -1,6 +0,0 @@
-sudo: false
-language: ruby
-rvm:
-  - 2.3.1
-before_install: gem install bundler -v 1.12.5
-script: CODECLIMATE_REPO_TOKEN=9eff3c4d9a268cc72972edde460103ef26b162565dafa64ef5b86649fd43427f bundle exec rake