enumerize 2.0.0 → 2.7.0

data/test/mongoid_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 begin
@@ -11,17 +13,23 @@ Mongoid.configure do |config|
   config.options = { use_utc: true, include_root_in_json: true }
 end
 
-describe Enumerize do
+class MongoidTest < MiniTest::Spec
   class MongoidUser
     include Mongoid::Document
     extend Enumerize
 
     field :sex
     field :role
+    field :foo
+    field :skill
+
     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
+    enumerize :foo,    :in => %w[bar baz], :skip_validations => true
+    enumerize :skill,  :in => { noob: 0, casual: 1, pro: 2 }, scope: :shallow
+    enumerize :account_type, :in => %w[basic premium], scope: :shallow
   end
 
   before { $VERBOSE = nil }
@@ -32,7 +40,7 @@ describe Enumerize do
   it 'sets nil if invalid value is passed' do
     user = model.new
     user.sex = :invalid
-    user.sex.must_equal nil
+    expect(user.sex).must_be_nil
   end
 
   it 'saves value' do
@@ -40,7 +48,7 @@ describe Enumerize do
     user = model.new
     user.sex = :female
     user.save!
-    user.sex.must_equal 'female'
+    expect(user.sex).must_equal 'female'
   end
 
   it 'loads value' do
@@ -48,13 +56,13 @@ describe Enumerize do
     model.create!(:sex => :male)
     store_translations(:en, :enumerize => {:sex => {:male => 'Male'}}) do
       user = model.first
-      user.sex.must_equal 'male'
-      user.sex_text.must_equal 'Male'
+      expect(user.sex).must_equal 'male'
+      expect(user.sex_text).must_equal 'Male'
     end
   end
 
   it 'has default value' do
-    model.new.role.must_equal 'user'
+    expect(model.new.role).must_equal 'user'
   end
 
   it 'uses after_initialize callback to set default value' do
@@ -62,7 +70,7 @@ describe Enumerize do
     model.create!(sex: 'male', role: nil)
 
     user = model.where(sex: 'male').first
-    user.role.must_equal 'user'
+    expect(user.role).must_equal 'user'
   end
 
   it 'does not set default value for not selected attributes' do
@@ -75,7 +83,21 @@ describe Enumerize do
   it 'validates inclusion' do
     user = model.new
     user.role = 'wrong'
-    user.wont_be :valid?
+    expect(user).wont_be :valid?
+  end
+
+  it 'does not validate inclusion when :skip_validations option passed' do
+    user = model.new
+    user.foo = 'wrong'
+    expect(user).must_be :valid?
+  end
+
+  it 'sets value to enumerized field from db when record is reloaded' do
+    user = model.create!(mult: [:one])
+    model.find(user.id).update(mult: %i[two three])
+    expect(user.mult).must_equal %w[one]
+    user.reload
+    expect(user.mult).must_equal %w[two three]
   end
 
   it 'assigns value on loaded record' do
@@ -83,7 +105,7 @@ describe Enumerize do
     model.create!(:sex => :male)
     user = model.first
     user.sex = :female
-    user.sex.must_equal 'female'
+    expect(user.sex).must_equal 'female'
   end
 
   it 'loads multiple properly' do
@@ -91,25 +113,32 @@ describe Enumerize do
 
     model.create!(:mult => ['one', 'two'])
     user = model.first
-    user.mult.to_a.must_equal ['one', 'two']
+    expect(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)
+    user_1 = model.create!(sex: :male, skill: :noob, role: :admin, account_type: :basic)
+    user_2 = model.create!(sex: :female, skill: :noob, role: :user, account_type: :basic)
+    user_3 = model.create!(skill: :pro, account_type: :premium)
+
+    expect(model.with_sex(:male).to_a).must_equal [user_1]
+    expect(model.with_sex(:female).to_a).must_equal [user_2]
+    expect(model.with_sex(:male, :female).to_set).must_equal [user_1, user_2].to_set
+
+    expect(model.without_sex(:male).to_set).must_equal [user_2, user_3].to_set
+    expect(model.without_sex(:female).to_set).must_equal [user_1, user_3].to_set
+    expect(model.without_sex(:male, :female).to_a).must_equal [user_3]
 
-    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
+    expect(model.having_role(:admin).to_a).must_equal [user_1]
+    expect(model.having_role(:user).to_a).must_equal [user_2, user_3]
 
-    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 []
+    expect(model.pro.to_a).must_equal [user_3]
+    expect(model.premium.to_a).must_equal [user_3]
 
-    model.having_role(:admin).to_a.must_equal [user_1]
-    model.having_role(:user).to_a.must_equal [user_2]
+    expect(model.not_pro.to_set).must_equal [user_1, user_2].to_set
+    expect(model.not_premium.to_set).must_equal [user_1, user_2].to_set
   end
 
   it 'chains scopes' do
@@ -119,14 +148,14 @@ describe Enumerize do
     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]
+    expect(model.with_status(:notice, :warning).with_status(:notice, :error).to_a).must_equal [user_1]
+    expect(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 []
+    expect(model.with_sex(:foo)).must_equal []
   end
 end
 

data/test/multiple_test.rb

@@ -1,57 +1,65 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
-describe Enumerize::Base do
-  let(:klass) do
+class MultipleTest < MiniTest::Spec
+  let(:kklass) do
     Class.new do
       extend Enumerize
     end
   end
 
   let(:subklass) do
-    Class.new(klass)
+    Class.new(kklass)
   end
 
-  let(:object) { klass.new }
+  let(:object) { kklass.new }
 
   it 'returns [] when not set' do
-    klass.enumerize :foos, in: %w(a b), multiple: true
-    object.foos.must_equal []
+    kklass.enumerize :foos, in: %w(a b), multiple: true
+    expect(object.foos).must_equal []
   end
 
   it 'returns setted array' do
-    klass.enumerize :foos, in: %w(a b c), multiple: true
+    kklass.enumerize :foos, in: %w(a b c), multiple: true
     object.foos = %w(a c)
-    object.foos.must_equal %w(a c)
+    expect(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)
+    kklass.enumerize :foos, in: %w(a b c), default: 'b', multiple: true
+    expect(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)
+    kklass.enumerize :foos, in: %w(a b c), default: %w(b), multiple: true
+    expect(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)
+    kklass.enumerize :foos, in: %w(a b c), default: %w(b c), multiple: true
+    expect(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
+    kklass.enumerize :foos, in: %w(a b c), multiple: true
+    expect(object).wont_respond_to :foos_text
   end
 
   it "doesn't define _value method" do
-    klass.enumerize :foos, in: %w(a b c), multiple: true
-    object.wont_respond_to :foos_value
+    kklass.enumerize :foos, in: %w(a b c), multiple: true
+    expect(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
+      kklass.enumerize :foos, in: %w(a b c), multiple: true, scope: true
     end
   end
+
+  it 'assign a name with the first letter capitalized' do
+    kklass.enumerize :Foos, in: %w(a b c), multiple: true
+    object.Foos = %w(a c)
+    expect(object.Foos).must_equal %w(a c)
+  end
 end

data/test/predicates_test.rb

@@ -1,63 +1,85 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
-describe Enumerize::Predicates do
-  let(:klass) do
+class PredicatesTest < MiniTest::Spec
+  let(:kklass) do
     Class.new do
       extend Enumerize
+
+      def self.c?; end
     end
   end
 
-  let(:object) { klass.new }
+  let(:object) { kklass.new }
 
   it 'creates predicate methods' do
-    klass.enumerize(:foo, in: %w(a b), predicates: true)
-    object.must_respond_to :a?
-    object.must_respond_to :b?
+    kklass.enumerize(:foo, in: %w(a b), predicates: true)
+    expect(object).must_respond_to :a?
+    expect(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?
+    kklass.enumerize(:foo, in: %w(foo-bar bar-foo), predicates: true)
+    expect(object).must_respond_to :foo_bar?
+    expect(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?
-    object.must_respond_to :b?
+    kklass.enumerize(:foo, in: %w(a b), predicates: true, multiple: true)
+    expect(object).must_respond_to :a?
+    expect(object).must_respond_to :b?
   end
 
   it 'checks values' do
-    klass.enumerize(:foo, in: %w(a b), predicates: true)
+    kklass.enumerize(:foo, in: %w(a b), predicates: true)
     object.foo = 'a'
-    object.a?.must_equal true
-    object.b?.must_equal false
+    expect(object.a?).must_equal true
+    expect(object.b?).must_equal false
   end
 
   it 'checks values on multiple attribute' do
-    klass.enumerize(:foo, in: %w(a b), predicates: true, multiple: true)
+    kklass.enumerize(:foo, in: %w(a b), predicates: true, multiple: true)
     object.foo << :a
-    object.a?.must_equal true
-    object.b?.must_equal false
+    expect(object.a?).must_equal true
+    expect(object.b?).must_equal false
   end
 
   it 'prefixes methods' do
-    klass.enumerize(:foo, in: %w(a b), predicates: { prefix: 'bar' })
-    object.wont_respond_to :a?
-    object.wont_respond_to :b?
-    object.must_respond_to :bar_a?
-    object.must_respond_to :bar_b?
+    kklass.enumerize(:foo, in: %w(a b), predicates: { prefix: 'bar' })
+    expect(object).wont_respond_to :a?
+    expect(object).wont_respond_to :b?
+    expect(object).must_respond_to :bar_a?
+    expect(object).must_respond_to :bar_b?
   end
 
   it 'accepts only option' do
-    klass.enumerize(:foo, in: %w(a b), predicates: { only: :a })
-    object.must_respond_to :a?
-    object.wont_respond_to :b?
+    kklass.enumerize(:foo, in: %w(a b), predicates: { only: :a })
+    expect(object).must_respond_to :a?
+    expect(object).wont_respond_to :b?
   end
 
   it 'accepts except option' do
-    klass.enumerize(:foo, in: %w(a b), predicates: { except: :a })
-    object.wont_respond_to :a?
-    object.must_respond_to :b?
+    kklass.enumerize(:foo, in: %w(a b), predicates: { except: :a })
+    expect(object).wont_respond_to :a?
+    expect(object).must_respond_to :b?
+  end
+
+  it 'warns if predicate method is already defined' do
+    assert_output(nil, /`c\?` is already defined/) do
+      kklass.enumerize(:bar, in: %w(a b c), predicates: true)
+    end
+  end
+
+  it 'does not warn if predicate has prefix and does not collide with defined method' do
+    assert_output(nil, '') do
+      kklass.enumerize(:bar, in: %w(a b c), predicates: { prefix: 'bar' })
+    end
+  end
+
+  it 'does not warn if predicate method is already defined but enumerize does not generate predicates' do
+    assert_output(nil, '') do
+      kklass.enumerize(:bar, in: %w(a b c))
+    end
   end
 end

data/test/rails_admin_test.rb

@@ -1,25 +1,27 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 class RailsAdminSpec < MiniTest::Spec
-  let(:klass) do
+  let(:kklass) do
     Class.new do
       extend Enumerize
     end
   end
 
-  let(:object) { klass.new }
+  let(:object) { kklass.new }
 
   it 'defines enum method' do
     store_translations(:en, :enumerize => {:foo => {:a => 'a text', :b => 'b text'}}) do
-      klass.enumerize(:foo, in: [:a, :b])
-      object.foo_enum.must_equal [['a text', 'a'], ['b text', 'b']]
+      kklass.enumerize(:foo, in: [:a, :b])
+      expect(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]]
+      kklass.enumerize(:foo, in: {:a => 1, :b => 2})
+      expect(object.foo_enum).must_equal [['a text', 'a'], ['b text', 'b']]
     end
   end
 end