enum_accessor 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4447e24f3730702d1e8941a42376605fa905064d
-  data.tar.gz: 9adf5320bb7fe9c8f1e8f719c54146fe8fade703
+  metadata.gz: d86255884f7966bd0e809b50e930e329c42d4b41
+  data.tar.gz: 6c54bd945c9ae2d6046b5e4b5b13b27dc8cdc01d
 SHA512:
-  metadata.gz: 30990654b79c136e12443358a3fae8470d91e0966affe68b8d93a9f65df7cbfd372c4f6c4100345aa7597f7521d03221d991a80a5ea3485077b81f5417063434
-  data.tar.gz: a308687d6221dab4b912d65e28be73266d9fdb90e0cc6b2591a4a2c47a00dc27537288e728688422030e2ef8dfaed0e681fc70eb09cd081368db8ba836a6416a
+  metadata.gz: 6a19a3a40b302f92ac389bde732a5c461d6b5927885eeefce29d5ab0fcede07dc49f98f295ce6504577a23705d4de303303e9a25703d962406791379b1db7be8
+  data.tar.gz: d02c42efa9212eba91bd9a90fdb6bf36f717786a55953319f4c892bb0201f8d69e765c3f1ef71570fe57b9ea46446f90af178354a7ff26978538be4b1cade89b

data/README.md

@@ -111,24 +111,28 @@ and now `human_*` methods return a translated string. It defaults to `humanize`
 
 ```ruby
 I18n.locale = :ja
-user.human_gender       # => '女'
-User.genders.human_dict # => { 'female' => '女', 'male' => '男' }
+user.human_gender         # => '女'
+User.genders.human_dict   # => { 'female' => '女', 'male' => '男' }
 
 I18n.locale = :en
-user.human_gender       # => 'Female'
-User.genders.human_dict # => { 'female' => 'Female', 'male' => 'Male' }
+user.human_gender         # => 'Female'
+User.genders.human_dict   # => { 'female' => 'Female', 'male' => 'Male' }
 ```
 
 ## Changelog
 
+- v1.1.0:
+  - Validate by default again.
+  - Added `:class_attribute` option to specify class attribute to hold definitions
+  - Cache translations on the fly
 - v1.0.0:
   - Drop support for Ruby 1.8
   - Now getter method returns a String rather than a Symbol
   - Do not validate by default
   - Added `where_gender(:female)` scope
-  - Removed the `_raw=` setter as it is now aware of the argument type
+  - Removed the `_raw=` as setter automatically handles both types
   - Removed constants (e.g. `User::GENDERS`) and now use the class attribute to save the definition
-- v0.3.0: Add support for `find_or_create_by`
+- v0.3.0: Add support for `find_or_create_by` - just pass integer value
 
 ## Other solutions
 

data/lib/enum_accessor.rb

@@ -7,8 +7,8 @@ module EnumAccessor
 
   module ClassMethods
     def enum_accessor(column, keys, options={})
-      definition = :"#{column}_enum_accessor"
-      class_attribute definition # will set instance accessor as well
+      definition = options[:class_attribute] || column.to_s.pluralize.to_sym
+      class_attribute definition
       send "#{definition}=", Definition.new(column, keys, self)
 
       # Getter
@@ -40,12 +40,7 @@ module EnumAccessor
 
       # Human-friendly print
       define_method("human_#{column}") do
-        self.class.send "human_#{column}", send(column)
-      end
-
-      # Class methods
-      define_singleton_method column.to_s.pluralize do
-        send(definition)
+        send(definition).human_dict[send(column)]
       end
 
       # Human-friendly print on class level
@@ -73,7 +68,7 @@ module EnumAccessor
       if options.has_key?(:validate) or options.has_key?(:validation_options)
         raise ArgumentError, 'validation options are updated. please refer to the documentation.'
       end
-      if options[:validates]
+      unless options[:validates] == false
         validation_options = options[:validates].is_a?(Hash) ? options[:validates] : {}
         validates column, { inclusion: { in: send(definition).dict.keys } }.merge(validation_options)
       end
@@ -95,11 +90,13 @@ module EnumAccessor
         @column = column
         @klass = klass
         @dict = dict.with_indifferent_access.freeze
+        @human_dict = {}
       end
 
       def human_dict
-        # Don't memoize - I18n.locale can change
-        Hash[@dict.keys.map{|key| [key, @klass.send("human_#{@column}", key)] }].with_indifferent_access
+        @human_dict[I18n.locale] ||= begin
+          Hash[@dict.keys.map{|key| [key, @klass.send("human_#{@column}", key)] }].with_indifferent_access.freeze
+        end
       end
     end
   end

data/lib/enum_accessor/version.rb

@@ -1,3 +1,3 @@
 module EnumAccessor
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end

data/spec/enum_accessor_spec.rb

@@ -43,15 +43,15 @@ describe EnumAccessor do
   it 'adds humanized methods' do
     I18n.locale = :ja
     expect(User.human_attribute_name(:gender)).to eq('性別')
-    expect(@user.human_gender).to eq('女')
-    expect(User.genders.human_dict[:female]).to eq('女')
     expect(User.genders.human_dict).to eq({ 'female' => '女', 'male' => '男' })
+    expect(User.genders.human_dict[:female]).to eq('女')
+    expect(@user.human_gender).to eq('女')
 
     I18n.locale = :en
     expect(User.human_attribute_name(:gender)).to eq('Gender')
-    expect(@user.human_gender).to eq('Female')
-    expect(User.genders.human_dict[:female]).to eq('Female')
     expect(User.genders.human_dict).to eq({ 'female' => 'Female', 'male' => 'Male' })
+    expect(User.genders.human_dict[:female]).to eq('Female')
+    expect(@user.human_gender).to eq('Female')
   end
 
   it 'adds class methods' do
@@ -72,9 +72,9 @@ describe EnumAccessor do
   end
 
   it 'adds validation' do
-    class UserValidate < ActiveRecord::Base
+    class UserNoValidate < ActiveRecord::Base
       self.table_name = :users
-      enum_accessor :gender, [:female, :male], validates: true
+      enum_accessor :gender, [:female, :male], validates: false
     end
 
     class UserValidateAllowNil < ActiveRecord::Base
@@ -82,7 +82,7 @@ describe EnumAccessor do
       enum_accessor :gender, [:female, :male], validates: { allow_nil: true }
     end
 
-    user = UserValidate.new
+    user = User.new
     user.gender = 'male'
     expect(user.valid?).to be_truthy
     user.gender = nil
@@ -90,6 +90,14 @@ describe EnumAccessor do
     user.gender = 'bogus' # Becomes nil
     expect(user.valid?).to be_falsey
 
+    user = UserNoValidate.new
+    user.gender = 'male'
+    expect(user.valid?).to be_truthy
+    user.gender = nil
+    expect(user.valid?).to be_truthy
+    user.gender = 'bogus' # Becomes nil
+    expect(user.valid?).to be_truthy
+
     user = UserValidateAllowNil.new
     user.gender = 'male'
     expect(user.valid?).to be_truthy

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enum_accessor
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Kenn Ejima
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-21 00:00:00.000000000 Z
+date: 2014-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport