enum_ish 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 53a6b89fe82d91b0ae54a440f3ba3a4908af751b3b22064f3ddd085257f975d9
-  data.tar.gz: 033b3df71e3286482f86ad0cce38084cc7c745cf13c5c06ad3cec146c3a577ac
+  metadata.gz: 34d21d01c11cb32143d1ce656228165fc93059f820b60f2cc109668a61e70680
+  data.tar.gz: a26baa4da8d0ae6e5ad1dce8cdf169f24fbe79ec8ddc88acf5fb2180db817b6f
 SHA512:
-  metadata.gz: f55c27359c26b39c6500357594e318da8027198b45073bfd772d9ae9047f295d53e2c23ffabf54118cb308c399b8dce546e4db0a23e6564534a7a28c9f18bdfc
-  data.tar.gz: ca8144b132543120f9fb810398df2252ad8e1051c76e32242fef1d6029ab9a458b988902271c779580c6673fe1f6ac2cada24dd4b8ce7edf499669991721d21a
+  metadata.gz: cc05a7517f723a1df0f521e031d2c171ed6a3ad0614974326c52464ce5ecf7f89b5e591f0da34a15fac70212ab44ab883f64b7dff45b67ba865c153c2ebd3dd9
+  data.tar.gz: 8cb363ef8d2f7988dee963d3baef608b076484afa46268f1d08a7b21fe5ef12c736d09cb05ba3e6efaa01ce8b6acbf85f0748aef6d39a407338b499aa94f22c4

data/.github/workflows/ci.yml

@@ -4,7 +4,7 @@ on: [push, pull_request]
 
 jobs:
   test:
-    runs-on: ubuntu-16.04
+    runs-on: ubuntu-18.04
     strategy:
       fail-fast: false
       matrix:

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## 1.4.1
+
+* Avoid overwrite of superclass's `_enum_ish_enums`.
+* Filter ancestors for dictionary lookup.
+
 ## 1.4.0
 
 * Generate `not` scope for activerecord class.

data/lib/enum_ish.rb

@@ -22,6 +22,15 @@ module EnumIsh
   end
 
   def self.extended(klass)
+    super
     klass.class_attribute :_enum_ish_enums
+    klass.extend ClassMethods
+  end
+
+  module ClassMethods
+    def inherited(subclass)
+      super
+      subclass._enum_ish_enums = self._enum_ish_enums.dup
+    end
   end
 end

data/lib/enum_ish/dictionary.rb

@@ -2,7 +2,9 @@ module EnumIsh
   class Dictionary
     def initialize(klass, enum, options = {})
       @klass = klass
-      @dict = load(enum, options)
+      @enum = enum
+      @options = options
+      @dict = load_dict
     end
 
     def translate_value(value)
@@ -11,7 +13,7 @@ module EnumIsh
       else
         @dict[value] || value
       end
-   end
+    end
 
     def translate_options
       @dict.to_a.map { |value, label| [label, value] }
@@ -19,49 +21,52 @@ module EnumIsh
 
     private
 
-    def load(enum, options)
-      dict = translate_dict(enum, options)
-      filter(dict, options)
-    end
+    def load_dict
+      i18n = load_from_i18n.transform_keys { |k| k.to_s.to_sym }
 
-    def translate_dict(enum, options)
-      dict = load_dict(enum, options)
-      translated = enum.mapping.map { |k, v| dict[k] ? [k, dict[k]] : [k, v.to_s] }.to_h
-      translated = translated.map { |k, v| [enum.mapping[k], v] }.to_h unless enum.setting[:accessor]
-      translated
-    end
+      dict = {}
+      if @enum.setting[:accessor]
+        @enum.mapping.each { |k, v| dict[k] = i18n[k].to_s }
+      else
+        @enum.mapping.each { |k, v| dict[v] = i18n[k].to_s }
+      end
 
-    def load_dict(enum, options)
-      key = i18n_key(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
+      filter(dict)
     end
 
-    def i18n_key(enum, options)
-      [enum.name, options[:format]].compact.join('/')
-    end
+    def load_from_i18n
+      key = [@enum.name, @options[:format]].compact.join('/')
+      options = (@options[:i18n_options] || {}).merge(default: nil)
+      dict = I18n.t(:"enum_ish.#{@klass.name.underscore}.#{key}", **options)
+      return dict if dict
+
+      i18n_ancestors.each do |ancestor|
+        dict = I18n.t(:"enum_ish.#{ancestor.name.underscore}.#{key}", **options)
+        return dict if dict
+      end
+
+      dict = I18n.t(:"enum_ish.defaults.#{key}", **options)
+      return dict if dict
 
-    def i18n_options(enum, options)
-      key = i18n_key(enum, options)
-      opts = options[:i18n_options] || {}
-      opts.merge(default: i18n_ancestors(key) + [:"enum_ish.defaults.#{key}", enum.mapping.invert])
+      @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}" }
+    def i18n_ancestors
+      @klass.ancestors.drop(1)
+            .take_while { |a| a.name != 'ActiveRecord::Base' && a.name != 'Object' }
+            .select { |a| a.is_a?(Class) && !a.name.empty? }
     end
 
-    def filter(translated, options)
-      if options[:except]
-        except = Array(options[:except])
-        translated.reject! { |k, v| except.include?(k) }
+    def filter(dict)
+      if @options[:except]
+        except = Array(@options[:except])
+        dict.reject! { |k, v| except.include?(k) }
       end
-      if options[:only]
-        only = Array(options[:only])
-        translated.select! { |k, v| only.include?(k) }
+      if @options[:only]
+        only = Array(@options[:only])
+        dict.select! { |k, v| only.include?(k) }
       end
-      translated
+      dict
     end
   end
 end

data/lib/enum_ish/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enum_ish
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Yoshikazu Kaneta
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-05-05 00:00:00.000000000 Z
+date: 2021-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -142,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: A ruby and rails extension to generate enum-like methods