enumerize 0.7.0 → 0.8.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: f08aba602317c54ffaf5f735e09a205a5d1a624c
+  data.tar.gz: 87f7613830f330b958dbd0a61f7a7ac89c262623
+SHA512:
+  metadata.gz: a0226ef792ee39084f80286b886880003659bec15c62e1e98938048e6b3accb03b04330591e92d42a2d79f94fb874d80fe14395b4007d3576ac1285bb0b3ff77
+  data.tar.gz: 48448538be205b068c3c7f01ca68c6780e7e4d2fd0db6f353455ab1462f8db587e744633cd605c7872b77f6bf6ecd353e1ba076998ebc04108e04322ab024c48

data/.travis.yml

@@ -9,11 +9,8 @@ gemfile:
 rvm:
   - 1.9.3
   - 2.0.0
+  - 2.1.0
   - jruby-19mode
-  - rbx-19mode
-matrix:
-  allow_failures:
-    - rvm: jruby-19mode
 notifications:
   email:
     recipients:

data/CHANGELOG.md

@@ -1,3 +1,20 @@
+## 0.8.0 (March 4, 2014) ##
+
+### enhancements
+  * Integration with SimpleForm's `input_field` (by [@nashby](https://github.com/nashby))
+  * Support multiple attributes in Active Record #becomes method (by [@lest](https://github.com/lest))
+  * Add ability to specify localization scope with `i18n_scope` option (by [@dreamfall](https://github.com/dreamfall))
+
+### bug fix
+  * Fix Rails Admin integration when custom values are used (by [@brenes](https://github.com/brenes))
+  * Fix RSpec integration using enumerize with Spring (by [@winston](https://github.com/winston))
+  * Return proper RSpec failure message for enumerized attribute with default value (by [@nashby](https://github.com/nashby))
+  * Return proper RSpec description for enumerized attribute without default value (by [@andreygerasimchuk](https://github.com/andreygerasimchuk))
+  * Do not try to set default value for not selected attributes (by [@nashby](https://github.com/nashby))
+  * Fix uniqueness validation with Active Record (by [@lest](https://github.com/lest))
+  * Fix loading of attributes with multiple: true in mongoid (by [glebtv](https://github.com/glebtv))
+  * Serialize value as scalar type (by [@ka8725](https://github.com/ka8725))
+
 ## 0.7.0 (August 21, 2013) ##
 
 ### enhancements
@@ -22,7 +39,7 @@
 
 ### enhancements
   * Use inclusion error message for invalid values (by [@lest](https://github.com/lest))
-  * Add `:only` and `except` options to the `Attribute#options` method. (by [@thehappycoder](https://github.com/thehappycoder))
+  * Add `:only` and `except` options to the `Attribute#options` method. (by [@thehappycoder](https://github.com/thehappycoder) and [@randoum](https://github.com/randoum))
   * ActiveRecord scopes. (by [@lest](https://github.com/lest), [@banyan](https://github.com/banyan) and [@nashby](https://github.com/nashby))
   * Support for RailsAdmin (by [@drewda](https://github.com/drewda))
 

data/Gemfile

@@ -10,6 +10,13 @@ gem 'rails', '~> 3.2.0', :require => false
 gem 'sqlite3', :platform => [:ruby, :mswin, :mingw]
 gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
 
+platforms :rbx do
+  gem 'rubysl', '~> 2.0'
+  gem 'psych'
+  gem 'rubinius-developer_tools'
+  gem 'rubysl-test-unit'
+end
+
 gem 'mongoid'
 gem 'mongo_mapper'
 gem 'simple_form'

data/Gemfile.rails4

@@ -6,11 +6,18 @@ gem 'rake'
 gem 'minitest', '~> 4.1'
 gem 'rspec', :require => false
 
-gem 'rails', '4.0.0', :require => false
+gem 'rails', '4.0.1', :require => false
 gem 'sqlite3', :platform => [:ruby, :mswin, :mingw]
 gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
 
-gem 'mongoid', github: 'mongoid/mongoid'
+platforms :rbx do
+  gem 'rubysl', '~> 2.0'
+  gem 'psych'
+  gem 'rubinius-developer_tools'
+  gem 'rubysl-test-unit'
+end
+
+gem 'mongoid', github: 'mongoid/mongoid', ref: 'f91feef0a0c6b83a1b878e154f1014536aa1c298'
 gem 'mongo_mapper', github: 'jnunemaker/mongomapper'
-gem 'simple_form', github: 'plataformatec/simple_form'
+gem 'simple_form'
 gem 'formtastic', github: 'justinfrench/formtastic'

data/README.md

@@ -28,6 +28,9 @@ class User
 end
 ```
 
+Note that enumerized values are just identificators so if you want to use multi-word, etc. values you should use `I18n` feature.
+
+
 ActiveRecord:
 
 ```ruby
@@ -85,6 +88,30 @@ en:
       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:
+
+
+```ruby
+class Person
+  extend Enumerize
+  extend ActiveModel::Naming
+
+  enumerize :sex, in: %w[male female], i18n_scope: "sex"
+  enumerize :color, in: %w[black white], i18n_scope: ["various.colors", "colors"]
+end
+
+# localization file
+en:
+  sex:
+    male: "Male"
+    female: "Female"
+  various:
+    colors:
+      black: "Black"
+  colors:
+    white: "White"
+```
+
 Note that if you want to use I18n feature with plain Ruby object don't forget to extend it with `ActiveModel::Naming`:
 
 ```ruby
@@ -188,6 +215,9 @@ user = User.new
 user.role = :user
 user.role #=> 'user'
 user.role_value #=> 1
+
+User.role.find_value(:user).value #=> 1
+User.role.find_value(:admin).value #=> 2
 ```
 
 ActiveRecord scopes:
@@ -287,6 +317,21 @@ describe User do
 end
 ```
 
+### Minitest with Shoulda
+
+You can use the RSpec matcher with shoulda in your tests by adding two lines in your `test_helper.rb` inside `class ActiveSupport::TestCase` definition:
+
+```ruby
+class ActiveSupport::TestCase
+  ActiveRecord::Migration.check_pending!
+
+  require 'enumerize/integrations/rspec'
+  extend Enumerize::Integrations::RSpec
+
+  ...
+end
+```
+
 ### Other Integrations
 
 Enumerize integrates with the following automatically:

data/lib/enumerize/activerecord.rb

@@ -1,26 +1,22 @@
 module Enumerize
-  module ActiveRecord
+  module ActiveRecordSupport
     def enumerize(name, options={})
       super
 
-      if options[:scope]
-        _enumerize_module.dependent_eval do
-          if defined?(::ActiveRecord::Base) && self < ::ActiveRecord::Base
+      _enumerize_module.dependent_eval do
+        if defined?(::ActiveRecord::Base) && self < ::ActiveRecord::Base
+          if options[:scope]
             _define_scope_methods!(name, options)
+          end
 
-            class_eval do
-              # https://github.com/brainspec/enumerize/issues/74
-              def write_attribute(attr_name, value)
-                _enumerized_values_for_validation[attr_name] = value
+          include InstanceMethods
 
-                super
-              end
+          # Since Rails use `allocate` method on models and initializes them with `init_with` method.
+          # This way `initialize` method is not being called, but `after_initialize` callback always gets triggered.
+          after_initialize :_set_default_value_for_enumerized_attributes
 
-              # Since Rails use `allocate` method on models and initializes them with `init_with` method.
-              # This way `initialize` method is not being called, but `after_initialize` callback always gets triggered.
-              after_initialize :_set_default_value_for_enumerized_attributes
-            end
-          end
+          # https://github.com/brainspec/enumerize/issues/111
+          require 'enumerize/hooks/uniqueness'
         end
       end
     end
@@ -44,5 +40,28 @@ module Enumerize
         end
       end
     end
+
+    module InstanceMethods
+      # 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
+        end
+
+        super
+      end
+
+      # Support multiple enumerized attributes
+      def becomes(klass)
+        became = super
+        klass.enumerized_attributes.each do |attr|
+          if attr.is_a? Multiple
+            became.send("#{attr.name}=", send(attr.name))
+          end
+        end
+
+        became
+      end
+    end
   end
 end

data/lib/enumerize/attribute.rb

@@ -1,6 +1,6 @@
 module Enumerize
   class Attribute
-    attr_reader :name, :values, :default_value
+    attr_reader :name, :values, :default_value, :i18n_scope
 
     def initialize(klass, name, options={})
       raise ArgumentError, ':in option is required' unless options[:in]
@@ -13,6 +13,11 @@ module Enumerize
       @value_hash = Hash[@values.map { |v| [v.value.to_s, v] }]
       @value_hash.merge! Hash[@values.map { |v| [v.to_s, v] }]
 
+      if options[:i18n_scope]
+        raise ArgumentError, ':i18n_scope option accepts only String or Array of strings' unless Array(options[:i18n_scope]).all? { |s| s.is_a?(String) }
+        @i18n_scope = options[:i18n_scope]
+      end
+
       if options[:default]
         @default_value = find_default_value(options[:default])
         raise ArgumentError, 'invalid default value' unless @default_value
@@ -31,8 +36,14 @@ module Enumerize
       @value_hash[value.to_s] unless value.nil?
     end
 
-    def i18n_suffix
-      @klass.model_name.i18n_key if @klass.respond_to?(:model_name)
+    def i18n_scopes
+      @i18n_scopes ||= if i18n_scope
+        scopes = Array(i18n_scope)
+      elsif @klass.respond_to?(:model_name)
+        scopes = ["enumerize.#{@klass.model_name.i18n_key}.#{name}"]
+      else
+        []
+      end
     end
 
     def options(options = {})
@@ -105,6 +116,8 @@ module Enumerize
           unless defined?(@_#{name}_enumerized_set)
             if defined?(super)
               self.#{name} = super
+            elsif respond_to?(:read_attribute)
+              self.#{name} = read_attribute(:#{name})
             else
               if defined?(@#{name})
                 self.#{name} = @#{name}

data/lib/enumerize/base.rb

@@ -78,7 +78,15 @@ module Enumerize
 
     def _set_default_value_for_enumerized_attributes
       self.class.enumerized_attributes.each do |attr|
-        if !public_send(attr.name) && !_enumerized_values_for_validation.key?(attr.name)
+        # remove after dropping support for Rails 3.x
+        # https://github.com/brainspec/enumerize/issues/101
+        attr_value = begin
+          public_send(attr.name)
+        rescue ActiveModel::MissingAttributeError
+          nil
+        end
+
+        if !attr_value && !_enumerized_values_for_validation.key?(attr.name)
           value = attr.default_value
 
           if value.respond_to?(:call)

data/lib/enumerize/hooks/simple_form.rb

@@ -7,9 +7,22 @@ module Enumerize
 
       included do
         alias_method_chain :input, :enumerize
+        alias_method_chain :input_field, :enumerize
       end
 
       def input_with_enumerize(attribute_name, options={}, &block)
+        add_input_options_for_enumerized_attribute(attribute_name, options)
+        input_without_enumerize(attribute_name, options, &block)
+      end
+
+      def input_field_with_enumerize(attribute_name, options={})
+        add_input_options_for_enumerized_attribute(attribute_name, options)
+        input_field_without_enumerize(attribute_name, options)
+      end
+
+      private
+
+      def add_input_options_for_enumerized_attribute(attribute_name, options)
         klass = object.class
 
         if klass.respond_to?(:enumerized_attributes) && (attr = klass.enumerized_attributes[attribute_name])
@@ -19,8 +32,6 @@ module Enumerize
             options[:input_html] = options.fetch(:input_html, {}).merge(:multiple => true)
           end
         end
-
-        input_without_enumerize(attribute_name, options, &block)
       end
     end
   end

data/lib/enumerize/hooks/uniqueness.rb

@@ -0,0 +1,23 @@
+require 'active_support/concern'
+
+module Enumerize
+  module Hooks
+    module UniquenessValidator
+      extend ActiveSupport::Concern
+
+      included do
+        alias_method_chain :validate_each, :enumerize
+      end
+
+      def validate_each_with_enumerize(record, name, value)
+        if record.class.respond_to?(:enumerized_attributes) && (attr = record.class.enumerized_attributes[name])
+          value = attr.find_value(value).try(:value)
+        end
+
+        validate_each_without_enumerize(record, name, value)
+      end
+    end
+  end
+end
+
+::ActiveRecord::Validations::UniquenessValidator.send :include, Enumerize::Hooks::UniquenessValidator

data/lib/enumerize/integrations/rails_admin.rb

@@ -7,7 +7,7 @@ module Enumerize
 
         _enumerize_module.module_eval <<-RUBY, __FILE__, __LINE__ + 1
           def #{name}_enum
-            self.class.enumerized_attributes[:#{name}].options
+            self.class.enumerized_attributes[:#{name}].values.map{|v| [v.text, v.value]}
           end
         RUBY
       end

data/lib/enumerize/integrations/rspec/matcher.rb

@@ -22,7 +22,7 @@ module Enumerize
           message  = " expected :#{attr} to allow value#{values.size == 1 ? nil : 's'}: #{quote_values(values)},"
           message += " but it allows #{quote_values(enumerized_values)} instead"
 
-          if default
+          if default && !matches_default_value?
             message  = " expected :#{attr} to have #{default.inspect} as default value,"
             message += " but it sets #{enumerized_default.inspect} instead"
           end
@@ -33,6 +33,8 @@ module Enumerize
         def description
           description  = "enumerize :#{attr} in: #{quote_values(values)}"
           description += " with #{default.inspect} as default value" if default
+
+          description
         end
 
         def matches?(subject)

data/lib/enumerize/value.rb

@@ -4,21 +4,23 @@ module Enumerize
   class Value < String
     include Predicatable
 
+    attr_reader :value
+
     def initialize(attr, name, value=nil)
       @attr  = attr
-      @value = value || name.to_s
+      @value = value.nil? ? name.to_s : value
 
       super(name.to_s)
     end
 
-    def value
-      @value
-    end
-
     def text
       I18n.t(i18n_keys[0], :default => i18n_keys[1..-1])
     end
 
+    def encode_with(coder)
+      coder.represent_object(self.class.superclass, @value)
+    end
+
     private
 
     def define_query_method(value)
@@ -31,19 +33,15 @@ module Enumerize
 
     def i18n_keys
       @i18n_keys ||= begin
-        i18n_keys = []
-        i18n_keys << i18n_scope(i18n_suffix)
-        i18n_keys << i18n_scope
+        i18n_keys = i18n_scopes
+        i18n_keys << [:"enumerize.#{@attr.name}.#{self}"]
         i18n_keys << self.humanize # humanize value if there are no translations
+        i18n_keys.flatten
       end
     end
 
-    def i18n_scope(suffix = nil)
-      :"enumerize.#{suffix}#{@attr.name}.#{self}"
-    end
-
-    def i18n_suffix
-      "#{@attr.i18n_suffix}." if @attr.i18n_suffix
+    def i18n_scopes
+      @attr.i18n_scopes.map { |s| :"#{s}.#{self}" }
     end
   end
 end

data/lib/enumerize/version.rb

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

data/lib/enumerize.rb

@@ -8,11 +8,12 @@ module Enumerize
   autoload :Set,          'enumerize/set'
   autoload :Base,         'enumerize/base'
   autoload :Module,       'enumerize/module'
-  autoload :ActiveRecord, 'enumerize/activerecord'
   autoload :Predicates,   'enumerize/predicates'
   autoload :Predicatable, 'enumerize/predicatable'
   autoload :ModuleAttributes, 'enumerize/module_attributes'
 
+  autoload :ActiveRecordSupport, 'enumerize/activerecord'
+
   def self.included(base)
     ActiveSupport::Deprecation.warn '`include Enumerize` was deprecated. Please use `extend Enumerize`.', caller
     extended(base)
@@ -21,7 +22,7 @@ module Enumerize
   def self.extended(base)
     base.send :include, Enumerize::Base
     base.extend Enumerize::Predicates
-    base.extend Enumerize::ActiveRecord
+    base.extend Enumerize::ActiveRecordSupport
 
     if defined?(::RailsAdmin)
       require 'enumerize/integrations/rails_admin'
@@ -49,7 +50,10 @@ module Enumerize
   rescue LoadError
   end
 
-  if defined?(::RSpec)
+  begin
+    require 'rspec/matchers'
+  rescue LoadError
+  else
     require 'enumerize/integrations/rspec'
   end
 end

data/test/activerecord_test.rb

@@ -21,6 +21,7 @@ ActiveRecord::Base.connection.instance_eval do
 
   create_table :documents do |t|
     t.string :visibility
+    t.timestamps
   end
 end
 
@@ -54,7 +55,11 @@ class User < ActiveRecord::Base
   enumerize :account_type, :in => [:basic, :premium]
 end
 
-describe Enumerize::ActiveRecord do
+class UniqStatusUser < User
+  validates :status, uniqueness: true
+end
+
+describe Enumerize::ActiveRecordSupport do
   it 'sets nil if invalid value is passed' do
     user = User.new
     user.sex = :invalid
@@ -84,6 +89,12 @@ describe Enumerize::ActiveRecord do
     User.new.attributes['role'].must_equal 'user'
   end
 
+  it 'does not set default value for not selected attributes' do
+    User.delete_all
+    User.create!(:sex => :male)
+    User.select(:id).collect(&:id)
+  end
+
   it 'has default value with lambda' do
     User.new.lambda_role.must_equal 'admin'
     User.new.attributes['lambda_role'].must_equal 'admin'
@@ -189,6 +200,8 @@ describe Enumerize::ActiveRecord do
   end
 
   it 'adds scope' do
+    User.delete_all
+
     user_1 = User.create!(status: :active, role: :admin)
     user_2 = User.create!(status: :blocked)
 
@@ -217,15 +230,68 @@ describe Enumerize::ActiveRecord do
   end
 
   it 'supports defining enumerized attributes on abstract class' do
+    Document.delete_all
+
     document = Document.new
     document.visibility = :protected
     document.visibility.must_equal 'protected'
   end
 
   it 'supports defining enumerized scopes on abstract class' do
+    Document.delete_all
+
     document_1 = Document.create!(visibility: :public)
     document_2 = Document.create!(visibility: :private)
 
     Document.with_visibility(:public).must_equal [document_1]
   end
+
+  it 'validates uniqueness' do
+    user = User.new
+    user.status = :active
+    user.save!
+
+    user = UniqStatusUser.new
+    user.status = :active
+    user.valid?
+
+    user.errors[:status].wont_be :empty?
+  end
+
+  it 'supports multiple attributes in #becomes' do
+    User.delete_all
+
+    uniq_user = UniqStatusUser.new
+    uniq_user.interests = [:sports, :dancing]
+    uniq_user.sex = :male
+    uniq_user.save!
+
+    user = uniq_user.becomes(User)
+
+    user.sex.must_equal uniq_user.sex
+    user.interests.must_equal uniq_user.interests
+  end
+
+  it "doesn't update record" do
+    Document.delete_all
+
+    expected = Time.utc(2010, 10, 10)
+
+    document = Document.new
+    document.updated_at = expected
+    document.save!
+
+    document = Document.last
+    document.save!
+
+    assert_equal expected, document.updated_at
+  end
+
+  it 'changes from dirty should be serialized as scalar values' do
+    user = User.create(:status => :active)
+    user.status = :blocked
+
+    expected = ActiveSupport::HashWithIndifferentAccess.new(status: [1, 2]).to_yaml
+    assert_equal expected, user.changes.to_yaml
+  end
 end

data/test/attribute_test.rb

@@ -19,6 +19,17 @@ describe Enumerize::Attribute do
     attr.name.must_equal :foo
   end
 
+  describe 'i18n scopes' do
+    it 'returns scopes from options' do
+      build_attr nil, 'foo', :in => %w[a b], :i18n_scope => %w[bar buzz]
+      attr.i18n_scopes.must_equal %w[bar buzz]
+    end
+
+    it 'accepts only string scopes' do
+      proc { build_attr nil, 'foo', :in => %w[a b], :i18n_scope => [%w[bar buzz], "bar.buzz"] }.must_raise ArgumentError
+    end
+  end
+
   describe 'options for select' do
     it 'returns all options for select' do
       store_translations(:en, :enumerize => {:foo => {:a => 'a text', :b => 'b text'}}) do
@@ -67,4 +78,35 @@ describe Enumerize::Attribute do
       attr.find_value(2).must_equal 'b'
     end
   end
+
+  describe 'values hash with zero' do
+    before do
+      build_attr nil, :foo, :in => {:a => 1, :b => 2, :c => 0}
+    end
+
+    it 'returns hash keys as values' do
+      attr.values.must_equal %w[a b c]
+    end
+
+    it 'finds values by hash values' do
+      attr.find_value(1).must_equal 'a'
+      attr.find_value(2).must_equal 'b'
+      attr.find_value(0).must_equal 'c'
+    end
+  end
+
+  describe 'boolean values hash' do
+    before do
+      build_attr nil, :foo, :in => {:a => true, :b => false}
+    end
+
+    it 'returns hash keys as values' do
+      attr.values.must_equal %w[a b]
+    end
+
+    it 'finds values by hash values' do
+      attr.find_value(true).must_equal 'a'
+      attr.find_value(false).must_equal 'b'
+    end
+  end
 end

data/test/mongoid_test.rb

@@ -19,6 +19,7 @@ describe Enumerize do
     field :role
     enumerize :sex, :in => %w[male female]
     enumerize :role, :in => %w[admin user], :default => 'user'
+    enumerize :mult, :in => %w[one two three four], :multiple => true
   end
 
   before { $VERBOSE = nil }
@@ -67,4 +68,12 @@ describe Enumerize do
     user.sex = :female
     user.sex.must_equal 'female'
   end
+
+  it 'loads multiple properly' do
+    model.delete_all
+
+    model.create!(:mult => ['one', 'two'])
+    user = model.first
+    user.mult.to_a.must_equal ['one', 'two']
+  end
 end

data/test/rails_admin_test.rb

@@ -15,4 +15,11 @@ class RailsAdminSpec < MiniTest::Spec
       object.foo_enum.must_equal [['a text', 'a'], ['b text', 'b']]
     end
   end
+
+  it 'defines enum properly for custom values enumerations' do
+    store_translations(:en, :enumerize => {:foo => {:a => 'a text', :b => 'b text'}}) do
+      klass.enumerize(:foo, in: {:a => 1, :b => 2})
+      object.foo_enum.must_equal [['a text', 1], ['b text', 2]]
+    end
+  end
 end

data/test/rspec_matcher_test.rb

@@ -15,6 +15,22 @@ describe Enumerize::Integrations::RSpec do
   let(:should) { Should.new }
   let(:object) { klass.new }
 
+  describe '#description' do
+    before do
+      klass.enumerize(:sex, :in => [:male, :female])
+    end
+
+    it 'returns description without default value' do
+      matcher = should.enumerize(:sex).in(:male, :female)
+      matcher.description.must_equal 'enumerize :sex in: "female", "male"'
+    end
+
+    it 'returns description with default value' do
+      matcher = should.enumerize(:sex).in(:male, :female).with_default(:male)
+      matcher.description.must_equal 'enumerize :sex in: "female", "male" with "male" as default value'
+    end
+  end
+
   describe '#matches?' do
     before do
       klass.enumerize(:sex, :in => [:male, :female])
@@ -49,5 +65,12 @@ describe Enumerize::Integrations::RSpec do
       expected = ' expected :sex to have "foo" as default value, but it sets "male" instead'
       matcher.failure_message.must_equal expected
     end
+
+    it 'returns failure message for ivalid :in option with default value' do
+      matcher = should.enumerize(:sex).in(:bar).with_default(:male)
+      matcher.subject = object
+      expected = ' expected :sex to allow value: "bar", but it allows "female", "male" instead'
+      matcher.failure_message.must_equal expected
+    end
   end
 end

data/test/simple_form_test.rb

@@ -44,6 +44,15 @@ class SimpleFormSpec < MiniTest::Spec
   let(:user) { User.new }
   let(:post) { Post.new }
 
+  it 'renders select with enumerized values using input_field' do
+    concat(simple_form_for(user) do |f|
+      f.input_field(:sex)
+    end)
+
+    assert_select 'select option[value=male]'
+    assert_select 'select option[value=female]'
+  end
+
   it 'renders select with enumerized values' do
     concat(simple_form_for(user) do |f|
       f.input(:sex)

data/test/value_test.rb

@@ -13,7 +13,7 @@ describe Enumerize::Value do
   end
 
   describe 'translation' do
-    let(:attr)  { Struct.new(:values, :name, :i18n_suffix).new([], "attribute_name", "model_name") }
+    let(:attr)  { Struct.new(:values, :name, :i18n_scopes).new([], "attribute_name", []) }
 
     it 'uses common translation' do
       store_translations(:en, :enumerize => {:attribute_name => {:test_value => "Common translation"}}) do
@@ -22,12 +22,16 @@ describe Enumerize::Value do
     end
 
     it 'uses model specific translation' do
+      attr.i18n_scopes = ["enumerize.model_name.attribute_name"]
+
       store_translations(:en, :enumerize => {:model_name => {:attribute_name => {:test_value => "Model Specific translation"}}}) do
         value.text.must_be :==, "Model Specific translation"
       end
     end
 
     it 'uses model specific translation rather than common translation' do
+      attr.i18n_scopes = ["enumerize.model_name.attribute_name"]
+
       store_translations(:en, :enumerize => {:attribute_name => {:test_value => "Common translation"}, :model_name => {:attribute_name => {:test_value => "Model Specific translation"}}}) do
         value.text.must_be :==, "Model Specific translation"
       end
@@ -38,6 +42,22 @@ describe Enumerize::Value do
         value.text.must_be :==, "Test value"
       end
     end
+
+    it 'uses specified in options translation scope' do
+      attr.i18n_scopes = ["other.scope"]
+
+      store_translations(:en, :other => {:scope => {:test_value => "Scope specific translation"}}) do
+        value.text.must_be :==, "Scope specific translation"
+      end
+    end
+
+    it 'uses first found translation scope from options' do
+      attr.i18n_scopes = ["nonexistent.scope", "other.scope"]
+
+      store_translations(:en, :other => {:scope => {:test_value => "Scope specific translation"}}) do
+        value.text.must_be :==, "Scope specific translation"
+      end
+    end
   end
 
   describe 'boolean methods comparison' do
@@ -78,4 +98,10 @@ describe Enumerize::Value do
       value.wont_respond_to :some_method?
     end
   end
+
+  describe 'serialization' do
+    it 'should be serialized to yaml as string value' do
+      assert_equal YAML.dump('test_value'), YAML.dump(value)
+    end
+  end
 end

metadata

@@ -1,32 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: enumerize
 version: !ruby/object:Gem::Version
-  version: 0.7.0
-  prerelease: 
+  version: 0.8.0
 platform: ruby
 authors:
 - Sergey Nartimov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-21 00:00:00.000000000 Z
+date: 2014-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
-    none: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
-    none: false
-  prerelease: false
-  name: activesupport
 description: Enumerated attributes with I18n and ActiveRecord/Mongoid/MongoMapper
   support
 email: team@brainspec.com
@@ -34,8 +31,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - Gemfile.rails4
@@ -51,6 +48,7 @@ files:
 - lib/enumerize/form_helper.rb
 - lib/enumerize/hooks/formtastic.rb
 - lib/enumerize/hooks/simple_form.rb
+- lib/enumerize/hooks/uniqueness.rb
 - lib/enumerize/integrations/rails_admin.rb
 - lib/enumerize/integrations/rspec.rb
 - lib/enumerize/integrations/rspec/matcher.rb
@@ -82,29 +80,25 @@ files:
 - test/value_test.rb
 homepage: https://github.com/brainspec/enumerize
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      hash: 2859816307703102675
       version: '0'
-      segments:
-      - 0
-  none: false
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Enumerated attributes with I18n and ActiveRecord/Mongoid/MongoMapper support
 test_files: []