enumerize 2.1.2 → 2.4.0

data/test/formtastic_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 Formtastic::FormBuilder.action_class_finder = Formtastic::ActionClassFinder
@@ -42,6 +44,12 @@ class FormtasticSpec < MiniTest::Spec
     end
   end
 
+  class Registration < Struct.new(:sex)
+    extend Enumerize
+
+    enumerize :sex, in: [:male, :female]
+  end
+
   before { $VERBOSE = nil }
   after  { $VERBOSE = true }
 
@@ -124,4 +132,21 @@ class FormtasticSpec < MiniTest::Spec
 
     assert_select 'input[type=text]'
   end
+
+  it 'renders select with enumerized values for non-ActiveModel object' do
+    concat(semantic_form_for(Registration.new, as: 'registration', url: '/') do |f|
+      f.input(:sex)
+    end)
+
+    assert_select 'select option[value=male]'
+    assert_select 'select option[value=female]'
+  end
+
+  it 'does not affect forms without object' do
+    concat(semantic_form_for('') do |f|
+      f.input(:name)
+    end)
+
+    assert_select 'input[type=text]'
+  end
 end

data/test/module_attributes_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 class ModuleAttributesSpec < MiniTest::Spec

data/test/mongo_mapper_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 begin
@@ -6,8 +8,7 @@ silence_warnings do
   require 'mongo_mapper'
 end
 
-MongoMapper.connection = Mongo::Connection.new('localhost', 27017)
-MongoMapper.database   = 'enumerize-test-suite-of-mongomapper'
+MongoMapper.connection = Mongo::Client.new(['localhost:27017'], database: 'enumerize-test-suite-of-mongomapper')
 
 describe Enumerize do
   class MongoMapperUser
@@ -16,9 +17,11 @@ describe Enumerize do
 
     key :sex
     key :role
+    key :foo
 
-    enumerize :sex, :in => %w[male female]
+    enumerize :sex,  :in => %w[male female]
     enumerize :role, :in => %w[admin user], :default => 'user'
+    enumerize :foo,  :in => %w[bar baz], :skip_validations => true
   end
 
   before { $VERBOSE = nil }
@@ -60,6 +63,12 @@ describe Enumerize do
     user.wont_be :valid?
   end
 
+  it 'does not validate inclusion when :skip_validations option passed' do
+    user = model.new
+    user.foo = 'wrong'
+    user.must_be :valid?
+  end
+
   it 'assigns value on loaded record' do
     model.delete_all
     model.create!(:sex => :male)

data/test/mongoid_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 begin
@@ -18,10 +20,16 @@ describe Enumerize do
 
     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 }
@@ -78,6 +86,20 @@ describe Enumerize do
     user.wont_be :valid?
   end
 
+  it 'does not validate inclusion when :skip_validations option passed' do
+    user = model.new
+    user.foo = 'wrong'
+    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])
+    user.mult.must_equal %w[one]
+    user.reload
+    user.mult.must_equal %w[two three]
+  end
+
   it 'assigns value on loaded record' do
     model.delete_all
     model.create!(:sex => :male)
@@ -99,17 +121,21 @@ describe Enumerize do
 
     user_1 = model.create!(sex: :male, role: :admin)
     user_2 = model.create!(sex: :female, role: :user)
+    user_3 = model.create!(skill: :pro, account_type: :premium)
 
     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.without_sex(:male).to_set.must_equal [user_2, user_3].to_set
+    model.without_sex(:female).to_set.must_equal [user_1, user_3].to_set
+    model.without_sex(:male, :female).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]
+    model.having_role(:user).to_a.must_equal [user_2, user_3]
+
+    model.pro.to_a.must_equal [user_3]
+    model.premium.to_a.must_equal [user_3]
   end
 
   it 'chains scopes' do

data/test/multiple_test.rb

@@ -1,57 +1,65 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 describe Enumerize::Base do
-  let(:klass) do
+  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
+    kklass.enumerize :foos, in: %w(a b), multiple: true
     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)
   end
 
   it 'sets default value as single value' do
-    klass.enumerize :foos, in: %w(a b c), default: 'b', multiple: true
+    kklass.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
+    kklass.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
+    kklass.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
+    kklass.enumerize :foos, in: %w(a b c), multiple: true
     object.wont_respond_to :foos_text
   end
 
   it "doesn't define _value method" do
-    klass.enumerize :foos, in: %w(a b c), multiple: true
+    kklass.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
+      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)
+    object.Foos.must_equal %w(a c)
+  end
 end

data/test/predicates_test.rb

@@ -1,48 +1,50 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 describe Enumerize::Predicates do
-  let(:klass) do
+  let(:kklass) do
     Class.new do
       extend Enumerize
     end
   end
 
-  let(:object) { klass.new }
+  let(:object) { kklass.new }
 
   it 'creates predicate methods' do
-    klass.enumerize(:foo, in: %w(a b), predicates: true)
+    kklass.enumerize(:foo, in: %w(a b), predicates: true)
     object.must_respond_to :a?
     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)
+    kklass.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)
+    kklass.enumerize(:foo, in: %w(a b), predicates: true, multiple: true)
     object.must_respond_to :a?
     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
   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
   end
 
   it 'prefixes methods' do
-    klass.enumerize(:foo, in: %w(a b), predicates: { prefix: 'bar' })
+    kklass.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?
@@ -50,13 +52,13 @@ describe Enumerize::Predicates do
   end
 
   it 'accepts only option' do
-    klass.enumerize(:foo, in: %w(a b), predicates: { only: :a })
+    kklass.enumerize(:foo, in: %w(a b), predicates: { only: :a })
     object.must_respond_to :a?
     object.wont_respond_to :b?
   end
 
   it 'accepts except option' do
-    klass.enumerize(:foo, in: %w(a b), predicates: { except: :a })
+    kklass.enumerize(:foo, in: %w(a b), predicates: { except: :a })
     object.wont_respond_to :a?
     object.must_respond_to :b?
   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])
+      kklass.enumerize(:foo, in: [:a, :b])
       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})
+      object.foo_enum.must_equal [['a text', 'a'], ['b text', 'b']]
     end
   end
 end

data/test/sequel_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 require 'sequel'
 require 'logger'
@@ -21,7 +23,9 @@ module SequelTest
     String :name
     String :interests
     String :status
+    Integer :skill
     String :account_type, default: "basic"
+    String :foo
   end
 
   DB.create_table :documents do
@@ -32,7 +36,7 @@ module SequelTest
   end
 
   class Document < Sequel::Model
-    extend Enumerize
+    plugin :enumerize
     enumerize :visibility, :in => [:public, :private, :protected], :scope => true, :default => :public
   end
 
@@ -47,15 +51,17 @@ module SequelTest
     plugin :dirty
     plugin :defaults_setter
     plugin :validation_helpers
-    extend Enumerize
+    plugin :enumerize
     include RoleEnum
 
-    enumerize :sex, :in => [:male, :female]
+    enumerize :sex, :in => [:male, :female], scope: :shallow
 
     enumerize :interests, :in => [:music, :sports, :dancing, :programming], :multiple => true
 
     enumerize :status, :in => { active: 1, blocked: 2 }, scope: true
 
+    enumerize :skill, :in => { noob: 0, casual: 1, pro: 2 }, scope: :shallow
+
     enumerize :account_type, :in => [:basic, :premium]
   end
 
@@ -67,6 +73,22 @@ module SequelTest
     end
   end
 
+  class SkipValidationsUser < Sequel::Model(:users)
+    include SkipValidationsEnum
+  end
+
+  class DoNotSkipValidationsUser < Sequel::Model(:users)
+    include DoNotSkipValidationsEnum
+  end
+
+  class SkipValidationsLambdaUser < Sequel::Model(:users)
+    include SkipValidationsLambdaEnum
+  end
+
+  class SkipValidationsLambdaWithParamUser < Sequel::Model(:users)
+    include SkipValidationsLambdaWithParamEnum
+  end
+
   describe Enumerize::SequelSupport do
     it 'sets nil if invalid value is passed' do
       user = User.new
@@ -75,7 +97,7 @@ module SequelTest
     end
 
     it 'saves value' do
-      User.filter.delete
+      User.filter{ true }.delete
       user = User.new
       user.sex = :female
       user.save
@@ -83,7 +105,7 @@ module SequelTest
     end
 
     it 'loads value' do
-      User.filter.delete
+      User.filter{ true }.delete
       User.create(:sex => :male)
       store_translations(:en, :enumerize => {:sex => {:male => 'Male'}}) do
         user = User.first
@@ -98,7 +120,7 @@ module SequelTest
     end
 
     it 'does not set default value for not selected attributes' do
-      User.filter.delete
+      User.filter{ true }.delete
       User.create(:sex => :male)
 
       assert_equal [:id], User.select(:id).first.values.keys
@@ -109,7 +131,7 @@ module SequelTest
       User.new.values[:lambda_role].must_equal 'admin'
     end
     it 'uses after_initialize callback to set default value' do
-      User.filter.delete
+      User.filter{ true }.delete
       User.create(sex: 'male', lambda_role: nil)
 
       user = User.where(:sex => 'male').first
@@ -150,6 +172,31 @@ module SequelTest
       user.values[:role].must_be_nil
     end
 
+    it 'validates inclusion when :skip_validations = false' do
+      user = DoNotSkipValidationsUser.new
+      user.foo = 'wrong'
+      user.wont_be :valid?
+      user.errors[:foo].must_include 'is not included in the list'
+    end
+
+    it 'does not validate inclusion when :skip_validations = true' do
+      user = SkipValidationsUser.new
+      user.foo = 'wrong'
+      user.must_be :valid?
+    end
+
+    it 'supports :skip_validations option as lambda' do
+      user = SkipValidationsLambdaUser.new
+      user.foo = 'wrong'
+      user.must_be :valid?
+    end
+
+    it 'supports :skip_validations option as lambda with a parameter' do
+      user = SkipValidationsLambdaWithParamUser.new
+      user.foo = 'wrong'
+      user.must_be :valid?
+    end
+
     it 'supports multiple attributes' do
       user = User.new
       user.interests ||= []
@@ -193,7 +240,7 @@ module SequelTest
     end
 
     it 'stores custom values for multiple attributes' do
-      User.filter.delete
+      User.filter{ true }.delete
 
       klass = Class.new(User)
       klass.enumerize :interests, in: { music: 0, sports: 1, dancing: 2, programming: 3}, multiple: true
@@ -208,10 +255,11 @@ module SequelTest
     end
 
     it 'adds scope' do
-      User.filter.delete
+      User.filter{ true }.delete
 
       user_1 = User.create(status: :active, role: :admin)
       user_2 = User.create(status: :blocked)
+      user_3 = User.create(sex: :male, skill: :pro)
 
       User.with_status(:active).to_a.must_equal [user_1]
       User.with_status(:blocked).to_a.must_equal [user_2]
@@ -221,6 +269,8 @@ module SequelTest
       User.without_status(:active, :blocked).to_a.must_equal []
 
       User.having_role(:admin).to_a.must_equal [user_1]
+      User.male.to_a.must_equal [user_3]
+      User.pro.to_a.must_equal [user_3]
     end
 
     it 'allows either key or value as valid' do
@@ -238,7 +288,7 @@ module SequelTest
     end
 
     it 'supports defining enumerized attributes on abstract class' do
-      Document.filter.delete
+      Document.filter{ true }.delete
 
       document = Document.new
       document.visibility = :protected
@@ -246,7 +296,7 @@ module SequelTest
     end
 
     it 'supports defining enumerized scopes on abstract class' do
-      Document.filter.delete
+      Document.filter{ true }.delete
 
       document_1 = Document.create(visibility: :public)
       document_2 = Document.create(visibility: :private)
@@ -266,7 +316,7 @@ module SequelTest
     end
 
     it "doesn't update record" do
-      Document.filter.delete
+      Document.filter{ true }.delete
 
       expected = Time.new(2010, 10, 10)