enum_ish 1.2.2 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 17969b00055223b32c415d1dffeb22855a8efa1de17aa46fbf0cf51114f65de5
-  data.tar.gz: 9fcc271cbd49bc7ad4e670b88a3c8120f21a8e6b38d8192b1705d7fd94811f85
+  metadata.gz: aad3607cc8b6c21e15582ee8ec3240d664c9c145c270f322f2e9cda3966ef920
+  data.tar.gz: 4dc14db67c76e0d7e23b8ce287605b1a10c965824b19aa45dc53f3f855a1b092
 SHA512:
-  metadata.gz: b3449674e452b6d28fb71ce522fff9ffcece57d56c396e09911a2d21aa23071ea633df22b02fd1691e5c51d269c19ebdebbfadeee48ef08e106153fbc755194c
-  data.tar.gz: ffe384c257c5f77bd684b17fcdba46f4e1b4cc3486d1d1dc6ef3304f8b8c0a950c42f68be4255cc62e495279279804ef6fb74ebbbdcfe64627e491430525bc2c
+  metadata.gz: 9d4f274982727f7aa04b6b71b3a6017ba598fa27287065a1703412f94a58332eb478cb4ea7da0c218fbb2fd0f7cc08f5439c1520986ec7107a6fbd2b093a2133
+  data.tar.gz: a2038ffa1f1ab5ce99d5166565339f84b6711698537dda7c918d1db9873780bf60bfcdd2e7db38f68282ff58410d866f9b2a02a60d05c6d7e771b13c0dcbc82b

data/.github/workflows/ci.yml

@@ -0,0 +1,47 @@
+name: CI
+
+on: [push, pull_request]
+
+jobs:
+  test:
+    runs-on: ubuntu-16.04
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: [2.3, 2.4, 2.5, 2.6, 2.7, 3.0]
+        gemfile: ['rails50', 'rails51', 'rails52', 'rails60', 'rails61']
+        exclude:
+          - ruby: 2.3
+            gemfile: rails60
+          - ruby: 2.3
+            gemfile: rails61
+          - ruby: 2.4
+            gemfile: rails60
+          - ruby: 2.4
+            gemfile: rails61
+          - ruby: 3.0
+            gemfile: rails50
+          - ruby: 3.0
+            gemfile: rails51
+          - ruby: 3.0
+            gemfile: rails52
+
+    name: ruby ${{ matrix.ruby }}, ${{ matrix.gemfile }}
+
+    env:
+      BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile
+
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+        bundler-cache: true
+    - name: Prepare test
+      run: |
+        cd spec/dummy
+        BUNDLE_GEMFILE=../../${{ env.BUNDLE_GEMFILE }} RAILS_ENV=test bundle exec rake db:create db:migrate db:seed
+        cd ../..
+    - name: Run test
+      run: |
+        bundle exec rspec

data/CHANGELOG.md

@@ -1,5 +1,25 @@
 # CHANGELOG
 
+## 1.3.3
+
+* Support rails 6.1.
+
+## 1.3.2
+
+* Fix deprecation warning for ruby 2.7.
+
+## 1.3.1
+
+* Fix default value for model included ActiveModel.
+
+## 1.3.0
+
+* Support array field.
+
+## 1.2.3
+
+* Keep enum definitions as a hash internally.
+
 ## 1.2.2
 
 * Support assignment of string in addition to symbol.

data/gemfiles/rails61.gemfile

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gem "rails", "~> 6.1.0"
+
+gemspec path: "../"

data/lib/enum_ish.rb

@@ -11,9 +11,8 @@ module EnumIsh
   def enum_ish(name, map, config = {})
     enum = Enum.new(name, map, config)
 
-    self.class_attribute :_enum_ish_enums unless self.respond_to?(:_enum_ish_enums)
-    self._enum_ish_enums ||= []
-    self._enum_ish_enums << enum
+    self._enum_ish_enums ||= {}
+    self._enum_ish_enums[name.to_sym] = enum
 
     if defined?(ActiveRecord::Base) && self.ancestors.include?(ActiveRecord::Base)
       ActiveRecordDefiner.new(self).define(enum)
@@ -21,4 +20,8 @@ module EnumIsh
       Definer.new(self).define(enum)
     end
   end
+
+  def self.extended(klass)
+    klass.class_attribute :_enum_ish_enums
+  end
 end

data/lib/enum_ish/active_record_definer.rb

@@ -24,7 +24,13 @@ module EnumIsh
           enum.mapping.fetch(value, value)
         end
 
-        decorate_attribute_type(enum.name, :enum) do |subtype|
+        args =
+          if ActiveRecord.version > Gem::Version.new('6.1.0.a')
+            [enum.name]
+          else
+            [enum.name, :enum]
+          end
+        decorate_attribute_type(*args) do |subtype|
           EnumIsh::ActiveRecordEnumType.new(enum.name, enum.mapping, subtype)
         end
       end

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
@@ -45,15 +49,15 @@ module EnumIsh
       mod = Module.new
       mod.module_eval do
         define_method :initialize do |*args|
+          super(*args)
           if respond_to?(enum.name) && public_send(enum.name).nil?
             default = enum.setting[:default]
             default = instance_exec(&default) if default.kind_of?(Proc)
             public_send("#{enum.name}=", default)
           end
-          super(*args)
         end
       end
-      @klass.prepend mod
+      @klass.send(:include, mod)
     end
 
     def define_accessor(enum)
@@ -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]
@@ -20,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.underscore}.#{key}", **i18n_options(enum, options))
       dict.map { |k, v| [k.to_s.to_sym, v.to_s] }.to_h
     end
 

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.2'
+  VERSION = '1.3.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enum_ish
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.3.3
 platform: ruby
 authors:
 - Yoshikazu Kaneta
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-13 00:00:00.000000000 Z
+date: 2021-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -101,9 +101,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -114,6 +114,7 @@ files:
 - gemfiles/rails51.gemfile
 - gemfiles/rails52.gemfile
 - gemfiles/rails60.gemfile
+- gemfiles/rails61.gemfile
 - lib/enum_ish.rb
 - lib/enum_ish/active_record_definer.rb
 - lib/enum_ish/active_record_enum_type.rb
@@ -141,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: A ruby and rails extension to generate enum-like methods

data/.travis.yml

@@ -1,23 +0,0 @@
-language: ruby
-rvm:
-  - 2.3
-  - 2.4
-  - 2.5
-  - 2.6
-gemfile:
-  - gemfiles/rails50.gemfile
-  - gemfiles/rails51.gemfile
-  - gemfiles/rails52.gemfile
-  - gemfiles/rails60.gemfile
-matrix:
-  exclude:
-  - rvm: 2.3
-    gemfile: gemfiles/rails60.gemfile
-  - rvm: 2.4
-    gemfile: gemfiles/rails60.gemfile
-before_script:
-  - cd spec/dummy
-  - bundle exec rake db:create db:migrate db:seed RAILS_ENV=test
-  - cd ../..
-script:
-  - bundle exec rspec