enum_i18n_help 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 76bb74be3a1a0670111d867f84b3e041f349b5fa4bf76bcd795f8bae23762034
-  data.tar.gz: f30e313ad6e6b938454534555f3825bb0426ef2ad17a3d133b979054bc091fe5
+  metadata.gz: 4543061c2ee7addd180fd018efa37c020acde351e74938709c6dfe2b0226c67e
+  data.tar.gz: a0876d6852513c65f973f73bc91d7776e1a5dd63fdb5cc0bdbec357e7425ab46
 SHA512:
-  metadata.gz: 3c9d378525f87f997b29977b665bffd2a37db8e189cf24e589b3270dbdcde49d526f7cb9f756a1201aaf3eca3af5e6dc4161b188b4022a9d2b353b5b31abbccc
-  data.tar.gz: 81731573a78fa19d43e8c3391eca6734261326927dabd91e669c307045b39e40341226aedee3f627256bd65677fec5bb35ea54d40135fa4a9914ba76f692e3aa
+  metadata.gz: dded194adb1624f8de46c318389273f884604af938d79e2856c1fe0c8aac4b4045ab523bd28ea4c667cad728c730bae5b465e2f9f106f4f0bc727beafe15d556
+  data.tar.gz: c85b81eef37211c9edf64f194618b275e2b57e83b65a727df558dd53bae39d79a10244009604ed5a72112d6c37a5624d52fb2e6e4fe050db8ccfc15141612888

data/.travis.yml

@@ -1,10 +1,9 @@
 language: ruby
 rvm:
-  - 2.2.9
   - 2.3.5
   - 2.4.3
   - 2.5.0
 before_install:
-  - gem update --system
-  - gem install bundler -v 1.16.1
+  - gem update --system 2.7.10
+  - gem install bundler -v 2.1.4
 cache: bundler

data/enum_i18n_help.gemspec

@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "activerecord", "~> 5.0"
 
   spec.add_development_dependency "activesupport", "~> 5.0"
-  spec.add_development_dependency "bundler", "~> 1.16"
+  spec.add_development_dependency "bundler", "~> 2.1.4"
   spec.add_development_dependency "rake", ">= 12.3.3"
   spec.add_development_dependency "sqlite3"
   spec.add_development_dependency "rspec"

data/lib/enum_i18n_help/enum_i18n.rb

@@ -33,7 +33,12 @@ module EnumI18nHelp
 
         klass.instance_eval <<-METHOD, __FILE__, __LINE__ + 1
         def #{attr_name}_options
-          #{attr_value_hash}.merge((I18n.t "activerecord.attributes.#{klass.name.underscore}/#{attr_name}").reject{ |_, v| v.nil? }).invert.to_a
+          locale_definitions = I18n.t("activerecord.attributes.#{klass.name.underscore}/#{attr_name}")
+
+          #{attr_value_hash}
+            .merge(locale_definitions.reject{ |k, v| v.nil? || #{attr_value.keys}.exclude?(k.to_sym) })
+            .invert
+            .to_a
         end
         METHOD
       end

data/lib/enum_i18n_help/version.rb

@@ -1,3 +1,3 @@
 module EnumI18nHelp
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enum_i18n_help
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - ShuheiTsuji
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-17 00:00:00.000000000 Z
+date: 2020-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: 2.1.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: 2.1.4
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -162,7 +162,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Enum attributes with I18n and ActiveRecord support