enum_ish 1.2.3 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58df4091edebc5965ce060bd1342f7088f4749aaa18977c76655b44fa823245d
-  data.tar.gz: 3e97c949be6dc3a88bc03aa20fd5317e681cc68681857581bc9d24abc0fcb38c
+  metadata.gz: b366f9ef0d71e73ff92c214008d0459135a03cc5aa6b32d944c1bdc5c5042d8e
+  data.tar.gz: a428a5f900c77c1caf3c6c9344cbc30e4cee6f10e99868d5b1b18d481bc5ed5c
 SHA512:
-  metadata.gz: 2a08c825b4b4e77c904f77cf5088026d34dd66439c9553a47cce1abecc4dd7d52cc9514c3b48f9fab81d7bef4263bd0eb5e3cea34afdbbc446513e672a5f0276
-  data.tar.gz: 62bd16fd0c155a7ca5144be68fb12d3b413996ce1a316caf70ede933842ce757d315054f47641d6a9de5b2dd1b1cc4744745c735a845c9cece3550d465e53622
+  metadata.gz: d0cfa988dc99c79277ae238f9235743655ec7b51e1ca6e8a3df22951b91e2091193926ca76c5e449663dc2ed64734652303dec847ee377709fba1f9f013a3efc
+  data.tar.gz: 48b90411d86d74ef8a4c62d0676deb93d0a784376acbb5127fdfd08b9778d46cef8d8c38b85ae754e609ae496f817568d16289f759069934f8e7188a502d9663

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 1.3.0
+
+* Support array field.
+
 ## 1.2.3
 
 * Keep enum definitions as a hash internally.

data/lib/enum_ish/definer.rb

@@ -15,27 +15,31 @@ module EnumIsh
     def define_text(enum)
       @klass.class_eval do
         define_method "#{Config.text_prefix}#{enum.name}#{Config.text_suffix}" do |options = {}|
-          value = public_send(enum.name)
-          dic = Dictionary.new(self.class).load(enum, options)
-          dic[value] || value
+          dict = Dictionary.new(self.class, enum, options)
+          dict.translate_value(public_send(enum.name))
         end
-      end        
+      end
     end
 
     def define_options(enum)
       @klass.class_eval do
         define_singleton_method "#{Config.options_prefix}#{enum.name}#{Config.options_suffix}" do |options = {}|
-          dic = Dictionary.new(self).load(enum, options)
-          dic.to_a.map { |value, label| [label, value] }
+          dict = Dictionary.new(self, enum, options)
+          dict.translate_options
         end
       end
     end
 
     def define_predicate(enum)
-      enum.mapping.each do |key, value|
+      enum.mapping.each do |enum_key, enum_value|
         @klass.class_eval do
-          define_method "#{enum.name}_#{key}?".tr('.', '_') do
-            public_send(enum.name) == value
+          define_method "#{enum.name}_#{enum_key}?".tr('.', '_') do
+            value = public_send(enum.name)
+            if value.is_a?(Array)
+              value == [enum_value]
+            else
+              value == enum_value
+            end
           end
         end
       end
@@ -62,10 +66,10 @@ module EnumIsh
           instance_variable_get("@#{enum.name}")
         end
         define_method "#{enum.name}" do
-          enum.mapping.invert[instance_variable_get("@#{enum.name}")]
+          enum.to_sym(instance_variable_get("@#{enum.name}"))
         end
         define_method "#{enum.name}=" do |value|
-          instance_variable_set("@#{enum.name}", enum.mapping.fetch(value, value))
+          instance_variable_set("@#{enum.name}", enum.to_raw(value))
         end
       end
     end

data/lib/enum_ish/dictionary.rb

@@ -1,17 +1,30 @@
 module EnumIsh
   class Dictionary
-    def initialize(klass)
+    def initialize(klass, enum, options = {})
       @klass = klass
+      @dict = load(enum, options)
     end
 
-    def load(enum, options = {})
-      translated = translate(enum, options)
-      filter(translated, options)
+    def translate_value(value)
+      if value.is_a?(Array)
+        value.map { |v| @dict[v] || v }
+      else
+        @dict[value] || value
+      end
+   end
+
+    def translate_options
+      @dict.to_a.map { |value, label| [label, value] }
     end
 
     private
 
-    def translate(enum, options)
+    def load(enum, options)
+      dict = translate_dict(enum, options)
+      filter(dict, options)
+    end
+
+    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]

data/lib/enum_ish/enum.rb

@@ -10,6 +10,23 @@ module EnumIsh
       @setting = init_setting(setting)
     end
 
+    def to_raw(value)
+      if value.is_a?(Array)
+        value.map { |v| @mapping.fetch(v, v) }
+      else
+        @mapping.fetch(value, value)
+      end
+    end
+
+    def to_sym(value)
+      inverted = @mapping.invert
+      if value.is_a?(Array)
+        value.map { |v| inverted[v] }
+      else
+        inverted[value]
+      end
+    end
+
     private
 
     def init_mapping(mapping)

data/lib/enum_ish/version.rb

@@ -1,3 +1,3 @@
 module EnumIsh
-  VERSION = '1.2.3'
+  VERSION = '1.3.0'
 end

metadata

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