enumerize 0.8.0 → 2.0.0

data/test/activerecord_test.rb

@@ -15,13 +15,13 @@ ActiveRecord::Base.connection.instance_eval do
     t.string :lambda_role
     t.string :name
     t.string :interests
-    t.string :status
+    t.integer :status
     t.string :account_type, :default => :basic
   end
 
   create_table :documents do |t|
     t.string :visibility
-    t.timestamps
+    t.timestamps null: true
   end
 end
 
@@ -53,10 +53,19 @@ class User < ActiveRecord::Base
   enumerize :status, :in => { active: 1, blocked: 2 }, scope: true
 
   enumerize :account_type, :in => [:basic, :premium]
+
+  # There is no column for relationship enumeration for testing purposes: model
+  # should not be broken even if the associated column does not exist yet.
+  enumerize :relationship, :in => [:single, :married]
 end
 
 class UniqStatusUser < User
   validates :status, uniqueness: true
+  validates :sex, presence: true
+end
+
+class InterestsRequiredUser < User
+  validates :interests, presence: true
 end
 
 describe Enumerize::ActiveRecordSupport do
@@ -92,7 +101,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 +138,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
@@ -143,7 +162,7 @@ describe Enumerize::ActiveRecordSupport do
 
   it "uses persisted value for validation if it hasn't been set" do
     user = User.create! :sex => :male
-    User.find(user).read_attribute_for_validation(:sex).must_equal 'male'
+    User.find(user.id).read_attribute_for_validation(:sex).must_equal 'male'
   end
 
   it 'is valid with empty string assigned' do
@@ -179,6 +198,13 @@ describe Enumerize::ActiveRecordSupport do
     interests.must_equal %w(music dancing)
   end
 
+  it 'stores multiple value passed passed to new' do
+    user = User.new(interests: [:music, :dancing])
+    user.save!
+    user.interests.must_equal %w(music dancing)
+    User.find(user.id).interests.must_equal %w(music dancing)
+  end
+
   it 'returns invalid multiple value for validation' do
     user = User.new
     user.interests << :music
@@ -199,6 +225,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
 
@@ -215,6 +257,12 @@ describe Enumerize::ActiveRecordSupport do
     User.having_role(:admin).must_equal [user_1]
   end
 
+  it 'ignores not enumerized values that passed to the scope method' do
+    User.delete_all
+
+    User.with_status(:foo).must_equal []
+  end
+
   it 'allows either key or value as valid' do
     user_1 = User.new(status: :active)
     user_2 = User.new(status: 1)
@@ -258,6 +306,36 @@ describe Enumerize::ActiveRecordSupport do
     user.errors[:status].wont_be :empty?
   end
 
+  it 'validates presence with multiple attributes' do
+    user = InterestsRequiredUser.new
+    user.interests = []
+    user.valid?
+
+    user.errors[:interests].wont_be :empty?
+
+    user.interests = ['']
+    user.valid?
+
+    user.errors[:interests].wont_be :empty?
+
+    user.interests = [:dancing, :programming]
+    user.valid?
+
+    user.errors[:interests].must_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
 
@@ -291,7 +369,65 @@ describe Enumerize::ActiveRecordSupport 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
+    assert_equal [1, 2], YAML.load(user.changes.to_yaml)[:status]
+  end
+
+  it 'allows using update_all' do
+    User.delete_all
+
+    user = User.create(status: :active, account_type: :premium)
+
+    User.update_all(status: :blocked)
+    user.reload
+    user.status.must_equal 'blocked'
+
+    User.update_all(status: :active, account_type: :basic)
+    user.reload
+    user.status.must_equal 'active'
+    user.account_type.must_equal 'basic'
+  end
+
+  it 'allows using update_all for multiple enumerize' do
+    User.delete_all
+
+    klass = Class.new(User)
+    klass.enumerize :interests, in: { music: 0, sports: 1, dancing: 2, programming: 3}, multiple: true
+
+    user = klass.create(status: :active)
+    klass.update_all(status: :blocked, interests: [:music, :dancing])
+
+    user = klass.find(user.id)
+    user.status.must_equal 'blocked'
+    user.interests.must_equal %w(music dancing)
+  end
+
+  it 'allows using update_all with values' do
+    User.delete_all
+
+    user = User.create(status: :active)
+
+    User.update_all(status: 2)
+    user.reload
+    user.status.must_equal 'blocked'
+  end
+
+  it 'preserves string usage of update_all' do
+    User.delete_all
+
+    user = User.create(name: "Fred")
+
+    User.update_all("name = 'Frederick'")
+    user.reload
+    user.name.must_equal 'Frederick'
+  end
+
+  it 'preserves interpolated array usage of update_all' do
+    User.delete_all
+
+    user = User.create(name: "Fred")
+
+    User.update_all(["name = :name", {name: 'Frederick'}])
+    user.reload
+    user.name.must_equal 'Frederick'
   end
 end

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]
@@ -79,6 +85,18 @@ describe Enumerize::Attribute do
     end
   end
 
+  it 'sets up shortcut methods for each value' do
+    build_attr nil, :foo, :in => {:a => 1, :b => 2}
+
+    attr.must_respond_to :a
+    attr.must_respond_to :b
+
+    attr.a.value.must_equal 1
+    attr.b.value.must_equal 2
+    attr.a.text.must_equal 'A'
+    attr.b.text.must_equal 'B'
+  end
+
   describe 'values hash with zero' do
     before do
       build_attr nil, :foo, :in => {:a => 1, :b => 2, :c => 0}
@@ -93,6 +111,10 @@ describe Enumerize::Attribute do
       attr.find_value(2).must_equal 'b'
       attr.find_value(0).must_equal 'c'
     end
+
+    it 'finds all values by hash values' do
+      attr.find_values(1, 2, 0).must_equal ['a', 'b', 'c']
+    end
   end
 
   describe 'boolean values hash' do

data/test/base_test.rb

@@ -41,7 +41,7 @@ describe Enumerize::Base do
     end
   end
 
-  it 'scopes translation by i18 key' do
+  it 'scopes translation by i18n key' do
     def klass.model_name
       name = "ExampleClass"
       def name.i18n_key
@@ -171,7 +171,7 @@ describe Enumerize::Base do
 
     object = klass.new
     object.foo.must_be_nil
-    object.attributes.must_equal({:foo => nil})
+    object.attributes.must_equal({})
 
     object.foo = 'test'
     object.foo.must_equal 'test'

data/test/formtastic_test.rb

@@ -1,16 +1,7 @@
 require 'test_helper'
-require 'rails'
-
-module Formtastic
-  module Helpers
-    module InputHelper
-      remove_method :input_class
-      def input_class(as)
-        input_class_with_const_defined(as)
-      end
-    end
-  end
-end
+
+Formtastic::FormBuilder.action_class_finder = Formtastic::ActionClassFinder
+Formtastic::FormBuilder.input_class_finder  = Formtastic::InputClassFinder
 
 class FormtasticSpec < MiniTest::Spec
   include ViewTestHelper

data/test/mongo_mapper_test.rb

@@ -1,5 +1,7 @@
 require 'test_helper'
 
+begin
+
 silence_warnings do
   require 'mongo_mapper'
 end
@@ -66,3 +68,7 @@ describe Enumerize do
     user.sex.must_equal 'female'
   end
 end
+
+rescue LoadError
+  # Skip
+end

data/test/mongoid_test.rb

@@ -1,13 +1,14 @@
 require 'test_helper'
 
+begin
+
 silence_warnings do
   require 'mongoid'
 end
 
 Mongoid.configure do |config|
-  config.sessions = { :default => { :database => 'enumerize-test-suite', hosts: ['127.0.0.1:27017'] } }
-  config.use_utc = true
-  config.include_root_in_json = true
+  config.connect_to('enumerize-test-suite')
+  config.options = { use_utc: true, include_root_in_json: true }
 end
 
 describe Enumerize do
@@ -17,9 +18,10 @@ describe Enumerize do
 
     field :sex
     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
+    enumerize :sex,    :in => %w[male female], scope: true
+    enumerize :status, :in => %w[notice warning error], scope: true
+    enumerize :role,   :in => %w[admin user], :default => 'user', scope: :having_role
+    enumerize :mult,   :in => %w[one two three four], :multiple => true
   end
 
   before { $VERBOSE = nil }
@@ -55,6 +57,21 @@ describe Enumerize do
     model.new.role.must_equal 'user'
   end
 
+  it 'uses after_initialize callback to set default value' do
+    model.delete_all
+    model.create!(sex: 'male', role: nil)
+
+    user = model.where(sex: 'male').first
+    user.role.must_equal 'user'
+  end
+
+  it 'does not set default value for not selected attributes' do
+    model.delete_all
+    model.create!(sex: :male)
+
+    assert_equal ['_id'], model.only(:id).first.attributes.keys
+  end
+
   it 'validates inclusion' do
     user = model.new
     user.role = 'wrong'
@@ -76,4 +93,43 @@ describe Enumerize do
     user = model.first
     user.mult.to_a.must_equal ['one', 'two']
   end
+
+  it 'adds scope' do
+    model.delete_all
+
+    user_1 = model.create!(sex: :male, role: :admin)
+    user_2 = model.create!(sex: :female, role: :user)
+
+    model.with_sex(:male).to_a.must_equal [user_1]
+    model.with_sex(:female).to_a.must_equal [user_2]
+    model.with_sex(:male, :female).to_set.must_equal [user_1, user_2].to_set
+
+    model.without_sex(:male).to_a.must_equal [user_2]
+    model.without_sex(:female).to_a.must_equal [user_1]
+    model.without_sex(:male, :female).to_a.must_equal []
+
+    model.having_role(:admin).to_a.must_equal [user_1]
+    model.having_role(:user).to_a.must_equal [user_2]
+  end
+
+  it 'chains scopes' do
+    model.delete_all
+
+    user_1 = model.create!(status: :notice)
+    user_2 = model.create!(status: :warning)
+    user_3 = model.create!(status: :error)
+
+    model.with_status(:notice, :warning).with_status(:notice, :error).to_a.must_equal [user_1]
+    model.with_status(:notice, :warning).union.with_status(:notice, :error).to_a.must_equal [user_1, user_2, user_3]
+  end
+
+  it 'ignores not enumerized values that passed to the scope method' do
+    model.delete_all
+
+    model.with_sex(:foo).must_equal []
+  end
+end
+
+rescue LoadError
+  # Skip
 end

data/test/multiple_test.rb

@@ -24,6 +24,21 @@ describe Enumerize::Base do
     object.foos.must_equal %w(a c)
   end
 
+  it 'sets default value as single value' do
+    klass.enumerize :foos, in: %w(a b c), default: 'b', multiple: true
+    object.foos.must_equal %w(b)
+  end
+
+  it 'sets default value as array of one element' do
+    klass.enumerize :foos, in: %w(a b c), default: %w(b), multiple: true
+    object.foos.must_equal %w(b)
+  end
+
+  it 'sets default value as array of several elements' do
+    klass.enumerize :foos, in: %w(a b c), default: %w(b c), multiple: true
+    object.foos.must_equal %w(b c)
+  end
+
   it "doesn't define _text method" do
     klass.enumerize :foos, in: %w(a b c), multiple: true
     object.wont_respond_to :foos_text
@@ -33,4 +48,10 @@ describe Enumerize::Base do
     klass.enumerize :foos, in: %w(a b c), multiple: true
     object.wont_respond_to :foos_value
   end
+
+  it "cannot define multiple with scope" do
+    assert_raises ArgumentError do
+      klass.enumerize :foos, in: %w(a b c), multiple: true, scope: true
+    end
+  end
 end

data/test/predicates_test.rb

@@ -15,6 +15,12 @@ describe Enumerize::Predicates do
     object.must_respond_to :b?
   end
 
+  it 'creates predicate methods when enumerized values have dash in it' do
+    klass.enumerize(:foo, in: %w(foo-bar bar-foo), predicates: true)
+    object.must_respond_to :foo_bar?
+    object.must_respond_to :bar_foo?
+  end
+
   it 'creates predicate methods on multiple attribute' do
     klass.enumerize(:foo, in: %w(a b), predicates: true, multiple: true)
     object.must_respond_to :a?