enumerize 2.4.0 → 2.6.0

data/lib/enumerize/base.rb

@@ -49,7 +49,7 @@ module Enumerize
       end
     end
 
-    def initialize(*)
+    def initialize(*args, **kwargs)
       super
       _set_default_value_for_enumerized_attributes
     end
@@ -90,22 +90,26 @@ module Enumerize
 
     def _set_default_value_for_enumerized_attributes
       self.class.enumerized_attributes.each do |attr|
-        next if attr.default_value.nil?
-        begin
-          if respond_to?(attr.name)
-            attr_value = public_send(attr.name)
-          else
-            next
-          end
-
-          value_for_validation = _enumerized_values_for_validation[attr.name.to_s]
-
-          if (!attr_value || attr_value.empty?) && (!value_for_validation || value_for_validation.empty?)
-            value = Utils.call_if_callable(attr.default_value, self)
-            public_send("#{attr.name}=", value)
-          end
-        rescue ActiveModel::MissingAttributeError
+        _set_default_value_for_enumerized_attribute(attr)
+      end
+    end
+
+    def _set_default_value_for_enumerized_attribute(attr)
+      return if attr.default_value.nil?
+      begin
+        if respond_to?(attr.name)
+          attr_value = public_send(attr.name)
+        else
+          return
+        end
+
+        value_for_validation = _enumerized_values_for_validation[attr.name.to_s]
+
+        if (!attr_value || attr_value.empty?) && (!value_for_validation || value_for_validation.empty?)
+          value = Utils.call_if_callable(attr.default_value, self)
+          public_send("#{attr.name}=", value)
         end
+      rescue ActiveModel::MissingAttributeError
       end
     end
   end

data/lib/enumerize/mongoid.rb

@@ -24,6 +24,13 @@ module Enumerize
 
         reloaded
       end
+
+      private
+
+      def _set_default_value_for_enumerized_attribute(attr)
+        super
+      rescue Mongoid::Errors::AttributeNotLoaded
+      end
     end
   end
 end

data/lib/enumerize/predicatable.rb

@@ -17,7 +17,7 @@ module Enumerize
     end
 
     def predicate_method?(method)
-      method[-1] == '?' && @attr && @attr.values.include?(method[0..-2])
+      method[-1] == '?' && @attr && @attr.value?(method[0..-2])
     end
   end
 end

data/lib/enumerize/scope/activerecord.rb

@@ -42,6 +42,10 @@ module Enumerize
           define_singleton_method(value_obj) do
             where(attribute_name => value_obj.value)
           end
+
+          define_singleton_method("not_#{value_obj}") do
+            where.not(attribute_name => value_obj.value)
+          end
         end
       end
     end

data/lib/enumerize/scope/mongoid.rb

@@ -39,6 +39,10 @@ module Enumerize
           define_singleton_method(value_obj) do
             self.in(attribute_name => value_obj.value)
           end
+
+          define_singleton_method("not_#{value_obj}") do
+            self.not_in(attribute_name => value_obj.value)
+          end
         end
       end
     end

data/lib/enumerize/scope/sequel.rb

@@ -45,6 +45,10 @@ module Enumerize
           def_dataset_method(value_obj) do
             where(attribute_name => value_obj.value.to_s)
           end
+
+          def_dataset_method("not_#{value_obj}") do
+            exclude(attribute_name => value_obj.value.to_s)
+          end
         end
       end
     end

data/lib/enumerize/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Enumerize
-  VERSION = '2.4.0'
+  VERSION = '2.6.0'
 end

data/lib/enumerize.rb

@@ -82,7 +82,7 @@ module Enumerize
   end
 
   begin
-    require 'rspec/matchers'
+    require 'rspec'
   rescue LoadError
   else
     require 'enumerize/integrations/rspec'

data/test/activemodel_test.rb

@@ -4,7 +4,7 @@ require 'test_helper'
 
 if defined?(::ActiveModel::Attributes)
 
-describe Enumerize do
+class ActiveModelTest < MiniTest::Spec
   class ActiveModelUser
     include ActiveModel::Model
     include ActiveModel::Attributes
@@ -24,50 +24,50 @@ describe Enumerize do
 
   it 'initialize value' do
     user = model.new(:name => 'active_model_user', :sex => :male, :role => :user, :interests => [:music, :programming])
-    user.sex.must_equal 'male'
-    user.sex_text.must_equal 'Male'
-    user.role.must_equal 'user'
-    user.role_text.must_equal 'User'
-    user.interests.must_equal %w(music programming)
+    expect(user.sex).must_equal 'male'
+    expect(user.sex_text).must_equal 'Male'
+    expect(user.role).must_equal 'user'
+    expect(user.role_text).must_equal 'User'
+    expect(user.interests).must_equal %w(music programming)
   end
 
   it 'sets nil if invalid value is passed' do
     user = model.new
     user.sex = :invalid
-    user.sex.must_be_nil
+    expect(user.sex).must_be_nil
   end
 
   it 'stores value' do
     user = model.new
     user.sex = :female
-    user.sex.must_equal 'female'
+    expect(user.sex).must_equal 'female'
   end
 
   it 'has default value' do
-    model.new.role.must_equal 'user'
+    expect(model.new.role).must_equal 'user'
   end
 
   it 'validates inclusion' do
     user = model.new
     user.role = 'wrong'
-    user.wont_be :valid?
+    expect(user).wont_be :valid?
   end
 
   it 'supports multiple attributes' do
     user = ActiveModelUser.new
-    user.interests.must_be_instance_of Enumerize::Set
-    user.interests.must_be_empty
+    expect(user.interests).must_be_instance_of Enumerize::Set
+    expect(user.interests).must_be_empty
     user.interests << :music
-    user.interests.must_equal %w(music)
+    expect(user.interests).must_equal %w(music)
     user.interests << :sports
-    user.interests.must_equal %w(music sports)
+    expect(user.interests).must_equal %w(music sports)
 
     user.interests = []
     interests = user.interests
     interests << :music
-    interests.must_equal %w(music)
+    expect(interests).must_equal %w(music)
     interests << :dancing
-    interests.must_equal %w(music dancing)
+    expect(interests).must_equal %w(music dancing)
   end
 
   it 'returns invalid multiple value for validation' do
@@ -75,19 +75,19 @@ describe Enumerize do
     user.interests << :music
     user.interests << :invalid
     values = user.read_attribute_for_validation(:interests)
-    values.must_equal %w(music invalid)
+    expect(values).must_equal %w(music invalid)
   end
 
   it 'validates multiple attributes' do
     user = ActiveModelUser.new
     user.interests << :invalid
-    user.wont_be :valid?
+    expect(user).wont_be :valid?
 
     user.interests = Object.new
-    user.wont_be :valid?
+    expect(user).wont_be :valid?
 
     user.interests = ['music', '']
-    user.must_be :valid?
+    expect(user).must_be :valid?
   end
 
   it 'validates presence with multiple attributes' do
@@ -95,17 +95,17 @@ describe Enumerize do
     user.interests = []
     user.valid?
 
-    user.errors[:interests].wont_be :empty?
+    expect(user.errors[:interests]).wont_be :empty?
 
     user.interests = ['']
     user.valid?
 
-    user.errors[:interests].wont_be :empty?
+    expect(user.errors[:interests]).wont_be :empty?
 
     user.interests = [:dancing, :programming]
     user.valid?
 
-    user.errors[:interests].must_be_empty
+    expect(user.errors[:interests]).must_be_empty
   end
 end