enum_i18n_help 0.1.0 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a05fa1a83bcf0b57dc7b069d26e04f00adc5601d
-  data.tar.gz: b9c44c6df17fe122a4a3526dfa04ecf32019377d
+SHA256:
+  metadata.gz: 54e7e98f9c9b3c474d25558daec95b4ef48f0898a8703cd75175519eb007f981
+  data.tar.gz: db899682f0ed3a92868a80b89f4c2f9c1a73200834ab5605a8f0c034209726f0
 SHA512:
-  metadata.gz: 0da402a997a611d409cf4d5e73309f8870f48cab7d5bb24d056cb6a6c95269af84fa8d84b27365b1e818b7fee1ba314a6394dbb0ce9f73d69ef277c2b9e6e7ac
-  data.tar.gz: 5ae6dadd26a445f34f20d437cf29798a60ed3c3dfd8a7faf62608854e353235386908d14a78a12968238b1df60a9181c98b2d0c25cf4bb478001fd6358739932
+  metadata.gz: ef9fa6cc1ed747cdb5d50d60878af2b4d79556c248fe93952395dcb989c285f7433c142ed722fc2c4028258ae604d536ff7c7cfedd8ace5984812bef26a06317
+  data.tar.gz: f55edf6c6bbdea2871296be39216ad7d97c811581e4fd00923a57d7ee51e0c330b37f47f59bf0cb453b821f7020668f10deed9b639e57551fe66b46c3ba8c3c1

data/.travis.yml

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

data/README.md

@@ -1,8 +1,8 @@
 # EnumI18nHelp
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/enum_i18n_help`. To experiment with that code, run `bin/console` for an interactive prompt.
+Help ActiveRecord::Enum feature to work with I18n.
 
-TODO: Delete this and the text above, and describe your gem
+added a new Test::Unit to the existing EnumHelp gem and changed the namespace of I18n.
 
 ## Installation
 
@@ -22,22 +22,65 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
+model
 
-## Development
+```ruby
+class User < ActiveRecord::Base
+  enum role: { manager: 1, member: 2 }
+end
+```
 
-After checking out the repo, run `bin/setup` to install dependencies. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+I18n
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+```ruby
+ja:
+  activerecord:
+    attributes:
+      user/role:
+        manager: 管理者
+        member: 一般
+```
 
-## Contributing
+```ruby
+en:
+  activerecord:
+    attributes:
+      user/role:
+        manager: Manager
+        member: Member
+```
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/enum_i18n_help. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+### enum_column_text
 
-## License
+```ruby
+user = User.first
+user.role
+=> "manager"
+user.role_text
+=> "管理者"
+```
 
-The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
+change locale
 
-## Code of Conduct
+```ruby
+I18n.locale = :en
+user.role
+=> "manager"
+user.role_text
+=> "Manager"
+```
+
+### enum_column_options
+
+```ruby
+User.role_options
+=> [["管理者", :manager], ["一般", :member]]
+```
+
+## Contributing
 
-Everyone interacting in the EnumI18nHelp project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/[USERNAME]/enum_i18n_help/blob/master/CODE_OF_CONDUCT.md).
+1. Fork it ( https://github.com/ShuheiTsuji/enum_i18n_help )
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Add some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create new Pull Request

data/enum_i18n_help.gemspec

@@ -29,11 +29,11 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "activerecord", "~> 5.0"
+  spec.add_runtime_dependency "activerecord"
 
   spec.add_development_dependency "activesupport", "~> 5.0"
-  spec.add_development_dependency "bundler", "~> 1.16"
-  spec.add_development_dependency "rake", "~> 10.0"
+  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"
   spec.add_development_dependency "pry"

data/lib/enum_i18n_help/enum_i18n.rb

@@ -2,9 +2,16 @@ module EnumI18nHelp
   module EnumI18n
     def enum(definitions)
       super(definitions)
-      definitions.each do |key, value|
+      # super has defined enum.
+      # So defined_enums are available!
+      #
+      # To avoid defining methods multiple times,
+      # slices hash to get enums called this time.
+      #
+      # Be careful not to destroy defined_enum, such as using merge!
+      defined_enums.slice(*definitions.keys.map(&:to_s)).each_pair do |key, value|
         EnumAttribute.define_text_method!(self, key)
-        EnumAttribute.define_options_method!(self, key, value)
+        EnumAttribute.define_options_method!(self, key, value.symbolize_keys)
       end
     end
   end
@@ -15,17 +22,25 @@ module EnumI18nHelp
       def define_text_method!(klass, enum_key)
         klass.class_eval <<-METHOD, __FILE__, __LINE__ + 1
         def #{enum_key}_text
+          return if #{enum_key}.nil?
+
           I18n.t "activerecord.attributes.#{klass.name.underscore}/#{enum_key}." + #{enum_key}, default: #{enum_key}.humanize
         end
         METHOD
       end
 
+      # This method assume that attr_value is a symbolized hash
       def define_options_method!(klass, attr_name, attr_value)
         attr_value_hash = attr_value.keys.map { |key| [key, key.to_s.humanize] }.to_h
 
         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.0"
+  VERSION = "0.1.5"
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: enum_i18n_help
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.5
 platform: ruby
 authors:
 - ShuheiTsuji
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-09 00:00:00.000000000 Z
+date: 2020-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -44,28 +44,28 @@ 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
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -131,6 +131,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
@@ -161,8 +162,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Enum attributes with I18n and ActiveRecord support