enum_ish 1.3.3 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aad3607cc8b6c21e15582ee8ec3240d664c9c145c270f322f2e9cda3966ef920
-  data.tar.gz: 4dc14db67c76e0d7e23b8ce287605b1a10c965824b19aa45dc53f3f855a1b092
+  metadata.gz: 53a6b89fe82d91b0ae54a440f3ba3a4908af751b3b22064f3ddd085257f975d9
+  data.tar.gz: 033b3df71e3286482f86ad0cce38084cc7c745cf13c5c06ad3cec146c3a577ac
 SHA512:
-  metadata.gz: 9d4f274982727f7aa04b6b71b3a6017ba598fa27287065a1703412f94a58332eb478cb4ea7da0c218fbb2fd0f7cc08f5439c1520986ec7107a6fbd2b093a2133
-  data.tar.gz: a2038ffa1f1ab5ce99d5166565339f84b6711698537dda7c918d1db9873780bf60bfcdd2e7db38f68282ff58410d866f9b2a02a60d05c6d7e771b13c0dcbc82b
+  metadata.gz: f55c27359c26b39c6500357594e318da8027198b45073bfd772d9ae9047f295d53e2c23ffabf54118cb308c399b8dce546e4db0a23e6564534a7a28c9f18bdfc
+  data.tar.gz: ca8144b132543120f9fb810398df2252ad8e1051c76e32242fef1d6029ab9a458b988902271c779580c6673fe1f6ac2cada24dd4b8ce7edf499669991721d21a

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # CHANGELOG
 
+## 1.4.0
+
+* Generate `not` scope for activerecord class.
+* Add prefix option to define short predicate method.
+* Search translation including ancestor classes.
+* Support multiple arguments for scope.
+* Fix predicate and validation bugs for field with `accessor: true`.
+
 ## 1.3.3
 
 * Support rails 6.1.

data/README.md

@@ -121,6 +121,21 @@ user.status_enable?   #=> true
 user.status_disable?  #=> false
 ```
 
+Without prefix:
+
+```ruby
+class User
+  extend EnumIsh
+  attr_accessor :status
+  enum_ish :status, ['enable', 'disable'], predicate: { prefix: false }
+end
+
+user = User.new
+user.status = 'enable'
+user.enable?   #=> true
+user.disable?  #=> false
+```
+
 ### Accessor
 
 Generate getter and setter for aliased symbols instead of raw values:
@@ -164,6 +179,7 @@ class User < ActiveRecord::Base
 end
 
 User.with_status(:enable)  #=> SELECT "users".* FROM "users" WHERE "users"."status" = "enable"
+User.with_status_not(:enable)  #=> SELECT "users".* FROM "users" WHERE "users"."status" != 'enable'
 ```
 
 #### Validation

data/lib/enum_ish/active_record_definer.rb

@@ -38,9 +38,12 @@ module EnumIsh
 
     def define_scope(enum)
       @klass.class_eval do
-        scope "#{Config.scope_prefix}#{enum.name}#{Config.scope_suffix}", ->(value) {
+        scope "#{Config.scope_prefix}#{enum.name}#{Config.scope_suffix}", ->(*value) {
           where(enum.name => enum.mapping.fetch(value, value))
         }
+        scope "#{Config.scope_prefix}#{enum.name}_not#{Config.scope_suffix}", ->(*value) {
+          where.not(enum.name => enum.mapping.fetch(value, value))
+        }
       end
     end
   end

data/lib/enum_ish/definer.rb

@@ -32,13 +32,23 @@ module EnumIsh
 
     def define_predicate(enum)
       enum.mapping.each do |enum_key, enum_value|
+        method_name = if enum.setting[:predicate].is_a?(Hash) && enum.setting[:predicate][:prefix] == false
+          "#{enum_key}?"
+        else
+          "#{enum.name}_#{enum_key}?"
+        end
+        target_value = if enum.setting[:accessor]
+          enum_key
+        else
+          enum_value
+        end
         @klass.class_eval do
-          define_method "#{enum.name}_#{enum_key}?".tr('.', '_') do
+          define_method method_name.tr('.', '_') do
             value = public_send(enum.name)
             if value.is_a?(Array)
-              value == [enum_value]
+              value == [target_value]
             else
-              value == enum_value
+              value == target_value
             end
           end
         end
@@ -75,8 +85,13 @@ module EnumIsh
     end
 
     def define_validate(enum)
+      targets = if enum.setting[:accessor]
+        enum.mapping.keys
+      else
+        enum.mapping.values
+      end
       @klass.class_eval do
-        validates enum.name, inclusion: { in: enum.mapping.values }, allow_nil: true
+        validates enum.name, inclusion: { in: targets }, allow_nil: true
       end
     end
 

data/lib/enum_ish/dictionary.rb

@@ -33,7 +33,7 @@ module EnumIsh
 
     def load_dict(enum, options)
       key = i18n_key(enum, options)
-      dict = I18n.t("enum_ish.#{@klass.name.underscore}.#{key}", **i18n_options(enum, options))
+      dict = I18n.t("enum_ish.#{@klass.name.to_s.underscore}.#{key}", **i18n_options(enum, options))
       dict.map { |k, v| [k.to_s.to_sym, v.to_s] }.to_h
     end
 
@@ -44,7 +44,12 @@ module EnumIsh
     def i18n_options(enum, options)
       key = i18n_key(enum, options)
       opts = options[:i18n_options] || {}
-      opts.merge(default: [:"enum_ish.defaults.#{key}", enum.mapping.invert])
+      opts.merge(default: i18n_ancestors(key) + [:"enum_ish.defaults.#{key}", enum.mapping.invert])
+    end
+
+    def i18n_ancestors(key)
+      ancestors = @klass.ancestors.drop(1).select { |a| a.is_a?(Class) && !a.name.empty? }
+      ancestors.map { |a| :"enum_ish.#{a.name.underscore}.#{key}" }
     end
 
     def filter(translated, options)

data/lib/enum_ish/version.rb

@@ -1,3 +1,3 @@
 module EnumIsh
-  VERSION = '1.3.3'
+  VERSION = '1.4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enum_ish
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.4.0
 platform: ruby
 authors:
 - Yoshikazu Kaneta
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-01-23 00:00:00.000000000 Z
+date: 2021-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport