mongoid-enum-i18n 0.5.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 087290bda960e33c3f14b3387ce59ad351f30593
-  data.tar.gz: 1ec63ea56be4a178b7b85778fb14b055c9c984c1
+  metadata.gz: 6f2697ab8dedba626fab411b37eb87ce492dd9cf
+  data.tar.gz: f9e98f58cf870d461faf14d9b5f0ac37f0abba88
 SHA512:
-  metadata.gz: ea8f8e9c035c0a0a4215d634b9b6baa8fca03fcfe5d0963d6b3c6d3fa15bb5c01c7628ab5bfe64caa26edab87ae34143ed4bf95953a6d048222752cf7d05086d
-  data.tar.gz: f1ee6f58f2503852e2f09171c11a853dfb5a5d897f1979dcc2ae7b0315d66d14b281a2c742cdf340ecea625fb2678b96026d53a6182a7cf03adcea16f255db3d
+  metadata.gz: 5c67b99bbf20879322f801bc54e2f308dcba542b9795f72d9c2d679866b8320be3f4d06492eb5371db27d42116830d2bc7a5693cdb19e48400b2e1df7bfffd6c
+  data.tar.gz: 53458955e1a2df8ea3b01bd496d9c828e246063cf975da79f05576b2a079d9c9b03f68fcdf1d3aeca58b0866a62f19fbb5cb877d2685f37028cb09e7778968b5

data/lib/mongoid/enum.rb

@@ -23,8 +23,8 @@ module Mongoid
         set_values_constant field_name, values
 
         create_field field_name, options, values
-        create_i18n_helper field_name, options
-        create_values_helper field_name, options
+        create_i18n_helper model_name, field_name, options
+        create_values_helper model_name, field_name, options
 
         create_validations field_name, values, options
         define_value_scopes_and_accessors field_name, values, options
@@ -88,30 +88,30 @@ module Mongoid
         end
       end
 
-      def create_i18n_helper(field_name, options)
+      def create_i18n_helper(main_model, field_name, options)
         return if options[:i18n].is_a?(FalseClass)
         if options[:multiple]
           define_method("#{field_name}_i18n") do
             return if self[field_name].blank?
             self[field_name].map do |k|
-              I18n.translate("mongoid.enums.#{model_name.to_s.underscore}."\
+              I18n.translate("mongoid.enums.#{main_model.to_s.underscore}."\
                              "#{field_name}.#{k}")
             end
           end
         else
           define_method("#{field_name}_i18n") do
             return if self[field_name].blank?
-            I18n.translate("mongoid.enums.#{model_name.to_s.underscore}."\
+            I18n.translate("mongoid.enums.#{main_model.to_s.underscore}."\
                          "#{field_name}.#{self[field_name]}")
           end
         end
       end
 
-      def create_values_helper(field_name, options)
+      def create_values_helper(main_model, field_name, options)
         return if options[:i18n].is_a?(FalseClass)
         define_singleton_method("#{field_name}_values") do
-          I18n.translate("mongoid.enums.#{model_name.to_s.underscore}."\
-                         "#{field_name}").map {  |k, v| [v, k] }
+          I18n.translate("mongoid.enums.#{main_model.to_s.underscore}."\
+                         "#{field_name}").map { |k, v| [v, k] }
         end
       end
 

data/lib/mongoid/enum/version.rb

@@ -1,6 +1,6 @@
 module Mongoid
   # VERSION
   module Enum
-    VERSION = '0.5.0'
+    VERSION = '0.8.1'.freeze
   end
 end

data/mongoid-enum-i18n.gemspec

@@ -4,19 +4,19 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'mongoid/enum/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "mongoid-enum-i18n"
+  spec.name          = 'mongoid-enum-i18n'
   spec.version       = Mongoid::Enum::VERSION
-  spec.authors       = ["Nicholas Bruning", "Marcos Piccinini"]
-  spec.email         = ["nicholas@bruning.com.au"]
+  spec.authors       = ['Nicholas Bruning', 'Marcos Piccinini']
+  spec.email         = ['nicholas@bruning.com.au']
   spec.description   = %q{Heavily inspired by DDH's ActiveRecord::Enum, this little library is there to help you cut down the cruft in your models and make the world a happier place at the same time.}
   spec.summary       = %q{Sweet enum sugar for your Mongoid documents}
-  spec.homepage      = "https://github.com/thetron/mongoid-enum"
-  spec.license       = "MIT"
+  spec.homepage      = 'https://github.com/thetron/mongoid-enum'
+  spec.license       = 'MIT'
 
   spec.files         = `git ls-files`.split($/)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency "mongoid", "> 4.0.0"
+  spec.add_runtime_dependency 'mongoid', '> 4.0.0'
 end

data/spec/mongoid/enum_spec.rb

@@ -1,5 +1,6 @@
 require 'spec_helper'
 
+# Test Class
 class User
   include Mongoid::Document
   include Mongoid::Enum
@@ -11,6 +12,9 @@ class User
        required: false
 end
 
+class Admin < User
+end
+
 describe Mongoid::Enum do
   let(:klass) { User }
   let(:instance) { User.new }
@@ -77,7 +81,7 @@ describe Mongoid::Enum do
     end
   end
 
-  describe 'accessors'do
+  describe 'accessors' do
     context 'when singular' do
       describe 'setter' do
         it 'accepts strings' do
@@ -135,7 +139,7 @@ describe Mongoid::Enum do
         end
 
         it 'accepts arrays of strings' do
-          instance.roles = %w( author editor )
+          instance.roles = %w(author editor)
           instance.save
           puts instance.errors.full_messages
           instance.reload
@@ -143,12 +147,13 @@ describe Mongoid::Enum do
           expect(instance.roles).to include(:editor)
         end
 
-        it 'accepts arrays of symbols'  do
+        it 'accepts arrays of symbols' do
           instance.roles = [:author, :editor]
           expect(instance.roles).to include(:author)
           expect(instance.roles).to include(:editor)
         end
       end
+
       describe '{{value}}!' do
         context 'when field is nil' do
           it 'creates an array containing the value' do
@@ -267,5 +272,14 @@ describe Mongoid::Enum do
       expect(User.status_values)
         .to eq([['Awaiting Approval', :awaiting_approval]])
     end
+
+    it 'should use class where it was coded into' do
+      expect(Admin.status_values)
+        .to eq([['Awaiting Approval', :awaiting_approval]])
+    end
+
+    it 'should use class where it was coded into' do
+      expect(Admin.new.status_i18n).to eq('Awaiting Approval')
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-enum-i18n
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Nicholas Bruning
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-26 00:00:00.000000000 Z
+date: 2016-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -73,7 +73,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: Sweet enum sugar for your Mongoid documents