enumerize 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f08aba602317c54ffaf5f735e09a205a5d1a624c
-  data.tar.gz: 87f7613830f330b958dbd0a61f7a7ac89c262623
+  metadata.gz: 89ff95b68f2d587db0234b6cae3b434c904b8575
+  data.tar.gz: d758065069a4f5ab996281648c12df3a4ba70b1f
 SHA512:
-  metadata.gz: a0226ef792ee39084f80286b886880003659bec15c62e1e98938048e6b3accb03b04330591e92d42a2d79f94fb874d80fe14395b4007d3576ac1285bb0b3ff77
-  data.tar.gz: 48448538be205b068c3c7f01ca68c6780e7e4d2fd0db6f353455ab1462f8db587e744633cd605c7872b77f6bf6ecd353e1ba076998ebc04108e04322ab024c48
+  metadata.gz: 91ee9ff2df723ab6e83155fe4e9697f9e8dcf12cd11b42dbb0822de7da4c2050269561f51e316ec6ac71b3e3ea77cfc74c70eb899a24af34366cf6a657e9fa3b
+  data.tar.gz: 2e77cbb5dbe9abb980984ce5837ad41009ad5dddc9bf13ceae86dccb58d294feead696a6cbff41a517607587284ba26bb04bfa4d65b82e31e864fed6c72c6ccb

data/CHANGELOG.md

@@ -1,3 +1,36 @@
+## 0.9.0 (December 11, 2014) ##
+
+### enhancements
+
+  * Add :value_class option (by [@lest](https://github.com/lest))
+  * Use 'defaults' scope in the localization file for the attributes that used across several models. This will help to avoid conflicting keys with model names and attribute names. Example:
+
+  ```yml
+    en:
+      enumerize:
+        defaults:
+          sex:
+            male: Male
+            female: Female
+  ```
+
+  You still can use the old solution without "default" scope:
+
+  ```yml
+    en:
+      enumerize:
+        sex:
+          male: Male
+          female: Female
+  ```
+  (by [@nashby](https://github.com/nashby))
+
+### bug fix
+  * Store values for validation using string keys (by [@nagyt234](https://github.com/nagyt234))
+  * Store custom values for multiple attributes (by [@lest](https://github.com/lest))
+  * Support validations after using AR#becomes (by [@lest](https://github.com/lest))
+  * Do not try to set attribute for not selected attributes (by [@dany1468](https://github.com/dany1468))
+
 ## 0.8.0 (March 4, 2014) ##
 
 ### enhancements

data/README.md

@@ -34,6 +34,17 @@ Note that enumerized values are just identificators so if you want to use multi-
 ActiveRecord:
 
 ```ruby
+class CreateUsers < ActiveRecord::Migration
+  def change
+    create_table :users do |t|
+      t.string :sex
+      t.string :role
+
+      t.timestamps
+    end
+  end
+end
+
 class User < ActiveRecord::Base
   extend Enumerize
 
@@ -78,14 +89,15 @@ en:
         female: "Female"
 ```
 
-or if you use `sex` attribute across several models you can use this:
+or if you use `sex` attribute across several models you can use `defaults` scope:
 
 ```ruby
 en:
   enumerize:
-    sex:
-      male: "Male"
-      female: "Female"
+    defaults:
+      sex:
+        male: "Male"
+        female: "Female"
 ```
 
 You can also pass `i18n_scope` option to specify scope (or array of scopes) storring the translations. Note that `i18n_scope` option does not accept scope as array:
@@ -314,6 +326,9 @@ end
 describe User do
   it { should enumerize(:sex).in(:male, :female) }
   it { should enumerize(:sex).in(:male, :female).with_default(:male) }
+
+  # or with RSpec 3 expect syntax
+  it { is_expected.to enumerize(:sex).in(:male, :female) }
 end
 ```
 

data/Rakefile

@@ -11,7 +11,7 @@ Rake::TestTask.new do |t|
 end
 
 RSpec::Core::RakeTask.new('default') do |t|
-  t.pattern = FileList['test/rspec_spec.rb']
+  t.pattern = 'test/rspec_spec.rb'
 end
 
 task :default => :test

data/lib/enumerize/activerecord.rb

@@ -45,7 +45,7 @@ module Enumerize
       # https://github.com/brainspec/enumerize/issues/74
       def write_attribute(attr_name, value)
         if self.class.enumerized_attributes[attr_name]
-          _enumerized_values_for_validation[attr_name] = value
+          _enumerized_values_for_validation[attr_name.to_s] = value
         end
 
         super
@@ -55,9 +55,7 @@ module Enumerize
       def becomes(klass)
         became = super
         klass.enumerized_attributes.each do |attr|
-          if attr.is_a? Multiple
-            became.send("#{attr.name}=", send(attr.name))
-          end
+          became.send("#{attr.name}=", send(attr.name))
         end
 
         became

data/lib/enumerize/attribute.rb

@@ -9,7 +9,10 @@ module Enumerize
 
       @klass  = klass
       @name   = name.to_sym
-      @values = Array(options[:in]).map { |v| Value.new(self, *v) }
+
+      value_class = options.fetch(:value_class, Value)
+      @values = Array(options[:in]).map { |v| value_class.new(self, *v) }
+
       @value_hash = Hash[@values.map { |v| [v.value.to_s, v] }]
       @value_hash.merge! Hash[@values.map { |v| [v.to_s, v] }]
 
@@ -84,8 +87,6 @@ module Enumerize
         end
 
         def #{name}=(new_value)
-          _enumerized_values_for_validation[:#{name}] = new_value.nil? ? nil : new_value.to_s
-
           allowed_value_or_nil = self.class.enumerized_attributes[:#{name}].find_value(new_value)
           allowed_value_or_nil = allowed_value_or_nil.value unless allowed_value_or_nil.nil?
 
@@ -96,6 +97,10 @@ module Enumerize
           else
             @#{name} = allowed_value_or_nil
           end
+
+          _enumerized_values_for_validation['#{name}'] = new_value.nil? ? nil : new_value.to_s
+
+          allowed_value_or_nil
         end
 
         def #{name}_text
@@ -131,19 +136,19 @@ module Enumerize
         end
 
         def #{name}=(values)
-          _enumerized_values_for_validation[:#{name}] = values.respond_to?(:map) ? values.map(&:to_s) : values
-
           @_#{name}_enumerized_set = Enumerize::Set.new(self, self.class.enumerized_attributes[:#{name}], values)
-          string_values = #{name}.values.map(&:to_str)
+          raw_values = #{name}.values.map(&:value)
 
           if defined?(super)
-            super string_values
+            super raw_values
           elsif respond_to?(:write_attribute, true)
-            write_attribute '#{name}', string_values
+            write_attribute '#{name}', raw_values
           else
-            @#{name} = string_values
+            @#{name} = raw_values
           end
 
+          _enumerized_values_for_validation['#{name}'] = values.respond_to?(:map) ? values.map(&:to_s) : values
+
           #{name}
         end
       RUBY

data/lib/enumerize/base.rb

@@ -50,6 +50,8 @@ module Enumerize
     end
 
     def read_attribute_for_validation(key)
+      key = key.to_s
+
       if _enumerized_values_for_validation.has_key?(key)
         _enumerized_values_for_validation[key]
       else
@@ -80,13 +82,13 @@ module Enumerize
       self.class.enumerized_attributes.each do |attr|
         # remove after dropping support for Rails 3.x
         # https://github.com/brainspec/enumerize/issues/101
-        attr_value = begin
-          public_send(attr.name)
+        begin
+          attr_value = public_send(attr.name)
         rescue ActiveModel::MissingAttributeError
-          nil
+          next
         end
 
-        if !attr_value && !_enumerized_values_for_validation.key?(attr.name)
+        if !attr_value && !_enumerized_values_for_validation.key?(attr.name.to_s)
           value = attr.default_value
 
           if value.respond_to?(:call)

data/lib/enumerize/predicates.rb

@@ -1,3 +1,5 @@
+require 'active_support/core_ext/module/delegation'
+
 module Enumerize
   # Predicate methods.
   #

data/lib/enumerize/set.rb

@@ -1,3 +1,5 @@
+require 'active_support/core_ext/module/delegation'
+
 module Enumerize
   class Set
     include Enumerable
@@ -8,12 +10,15 @@ module Enumerize
     def initialize(obj, attr, values)
       @obj    = obj
       @attr   = attr
-      @values = ::Set.new
+      @values = []
 
       if values.respond_to?(:each)
         values.each do |input|
           value = @attr.find_value(input)
-          @values << value if value
+
+          if value && !@values.include?(value)
+            @values << value
+          end
         end
       end
     end

data/lib/enumerize/value.rb

@@ -34,6 +34,7 @@ module Enumerize
     def i18n_keys
       @i18n_keys ||= begin
         i18n_keys = i18n_scopes
+        i18n_keys << [:"enumerize.defaults.#{@attr.name}.#{self}"]
         i18n_keys << [:"enumerize.#{@attr.name}.#{self}"]
         i18n_keys << self.humanize # humanize value if there are no translations
         i18n_keys.flatten

data/lib/enumerize/version.rb

@@ -1,3 +1,3 @@
 module Enumerize
-  VERSION = "0.8.0"
+  VERSION = "0.9.0"
 end

data/test/activerecord_test.rb

@@ -57,6 +57,7 @@ end
 
 class UniqStatusUser < User
   validates :status, uniqueness: true
+  validates :sex, presence: true
 end
 
 describe Enumerize::ActiveRecordSupport do
@@ -92,7 +93,8 @@ describe Enumerize::ActiveRecordSupport do
   it 'does not set default value for not selected attributes' do
     User.delete_all
     User.create!(:sex => :male)
-    User.select(:id).collect(&:id)
+
+    assert_equal ['id'], User.select(:id).first.attributes.keys
   end
 
   it 'has default value with lambda' do
@@ -128,9 +130,18 @@ describe Enumerize::ActiveRecordSupport do
     user.errors[:role].must_include 'is not included in the list'
   end
 
-  it 'validates inclusion when using write_attribute' do
+  it 'validates inclusion when using write_attribute with string attribute' do
+    user = User.new
+    user.send(:write_attribute, 'role', 'wrong')
+    user.read_attribute_for_validation(:role).must_equal 'wrong'
+    user.wont_be :valid?
+    user.errors[:role].must_include 'is not included in the list'
+  end
+
+  it 'validates inclusion when using write_attribute with symbol attribute' do
     user = User.new
     user.send(:write_attribute, :role, 'wrong')
+    user.read_attribute_for_validation(:role).must_equal 'wrong'
     user.wont_be :valid?
     user.errors[:role].must_include 'is not included in the list'
   end
@@ -199,6 +210,22 @@ describe Enumerize::ActiveRecordSupport do
     user.must_be :valid?
   end
 
+  it 'stores custom values for multiple attributes' do
+    User.delete_all
+
+    klass = Class.new(User)
+    klass.enumerize :interests, in: { music: 0, sports: 1, dancing: 2, programming: 3}, multiple: true
+
+    user = klass.new
+    user.interests << :music
+    user.read_attribute(:interests).must_equal [0]
+    user.interests.must_equal %w(music)
+    user.save
+
+    user = klass.find(user.id)
+    user.interests.must_equal %w(music)
+  end
+
   it 'adds scope' do
     User.delete_all
 
@@ -258,6 +285,18 @@ describe Enumerize::ActiveRecordSupport do
     user.errors[:status].wont_be :empty?
   end
 
+  it 'is valid after #becomes' do
+    User.delete_all
+    user = User.new
+    user.sex = :male
+    user.save!
+
+    uniq_user = User.find(user.id).becomes(UniqStatusUser)
+    uniq_user.valid?
+
+    uniq_user.errors.must_be_empty
+  end
+
   it 'supports multiple attributes in #becomes' do
     User.delete_all
 

data/test/attribute_test.rb

@@ -19,6 +19,12 @@ describe Enumerize::Attribute do
     attr.name.must_equal :foo
   end
 
+  it 'uses custom value class' do
+    value_class = Class.new(Enumerize::Value)
+    build_attr nil, 'foo', :in => %w[a b], :value_class => value_class
+    attr.values.first.must_be_instance_of value_class
+  end
+
   describe 'i18n scopes' do
     it 'returns scopes from options' do
       build_attr nil, 'foo', :in => %w[a b], :i18n_scope => %w[bar buzz]

data/test/value_test.rb

@@ -21,6 +21,12 @@ describe Enumerize::Value do
       end
     end
 
+    it 'uses default translation from the "default" section if its present' do
+      store_translations(:en, :enumerize => {:defaults => {:attribute_name => {:test_value => "Common translation"}}}) do
+        value.text.must_be :==, "Common translation"
+      end
+    end
+
     it 'uses model specific translation' do
       attr.i18n_scopes = ["enumerize.model_name.attribute_name"]
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enumerize
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Sergey Nartimov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-04 00:00:00.000000000 Z
+date: 2014-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -97,8 +97,27 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Enumerated attributes with I18n and ActiveRecord/Mongoid/MongoMapper support
-test_files: []
+test_files:
+- test/activerecord_test.rb
+- test/attribute_map_test.rb
+- test/attribute_test.rb
+- test/base_test.rb
+- test/formtastic_test.rb
+- test/module_attributes_test.rb
+- test/mongo_mapper_test.rb
+- test/mongoid_test.rb
+- test/multiple_test.rb
+- test/predicates_test.rb
+- test/rails_admin_test.rb
+- test/rspec_matcher_test.rb
+- test/rspec_spec.rb
+- test/set_test.rb
+- test/simple_form_test.rb
+- test/support/mock_controller.rb
+- test/support/view_test_helper.rb
+- test/test_helper.rb
+- test/value_test.rb