mongoid-rspec 1.8.0 → 1.8.1

data/lib/matchers/validations/custom_validation_of.rb

@@ -2,6 +2,7 @@ module Mongoid
   module Matchers
     module Validations
       class ValidateWithCustomValidatorMatcher < HaveValidationMatcher
+        include WithMessage
         def initialize(field)
           super(field, :custom)
         end
@@ -11,11 +12,6 @@ module Mongoid
           self
         end
 
-        def with_message(message)
-          @expected_message = message
-          self
-        end
-
         def matches?(actual)
           return false unless (@result = super(actual))
           check_custom_validator if @custom_validator
@@ -41,19 +37,6 @@ module Mongoid
             @result = false
           end
         end
-
-        def check_expected_message
-          actual_message = @validator.options[:message]
-          if actual_message.nil?
-            @negative_result_message << " with no custom message"
-            @result = false
-          elsif actual_message == @expected_message
-            @positive_result_message << " with custom message '#{@expected_message}'"
-          else
-            @negative_result_message << " got message '#{actual_message}'"
-            @result = false
-          end
-        end
       end
 
       def custom_validate(field)
@@ -61,4 +44,4 @@ module Mongoid
       end
     end
   end
-end
+end

data/lib/matchers/validations/length_of.rb

@@ -2,6 +2,8 @@ module Mongoid
   module Matchers
     module Validations
       class ValidateLengthOfMatcher < HaveValidationMatcher
+        include WithMessage
+
         def initialize(name)
           super(name, :length)
         end
@@ -30,6 +32,11 @@ module Mongoid
         end
         alias :is :as_exactly
 
+        def with_message(message)
+          @expected_message = message
+          self
+        end
+
         def matches?(actual)
           return false unless @result = super(actual)
 
@@ -37,6 +44,7 @@ module Mongoid
           check_minimum if @minimum
           check_range if @within
           check_exact if @is
+          check_expected_message if @expected_message
 
           @result
         end
@@ -47,6 +55,7 @@ module Mongoid
           options_desc << "with maximum of #{@maximum}" if @maximum
           options_desc << "within the range of #{@within}" if @within
           options_desc << "as exactly #{@is}" if @is
+          options_desc << "with message '#{@expected_message}'" if @expected_message
           super << " #{options_desc.to_sentence}"
         end
 
@@ -104,6 +113,19 @@ module Mongoid
           end
         end
 
+        def check_expected_message
+          actual_message = @validator.options[:message]
+          if actual_message.nil?
+            @negative_result_message << " with no custom message"
+            @result = false
+          elsif actual_message == @expected_message
+            @positive_result_message << " with custom message '#{@expected_message}'"
+          else
+            @negative_result_message << " got message '#{actual_message}'"
+            @result = false
+          end
+        end
+
         def actual_is
           actual_is = @validator.options[:is]
         end

data/lib/matchers/validations/uniqueness_of.rb

@@ -2,6 +2,7 @@ module Mongoid
   module Matchers
     module Validations  
       class ValidateUniquenessOfMatcher < HaveValidationMatcher
+        include WithMessage
         def initialize(field)
           super(field, :uniqueness)
         end
@@ -22,11 +23,6 @@ module Mongoid
           self
         end
 
-        def with_message(message)
-          @expected_message = message
-          self
-        end
-
         def matches?(actual)
           return false unless @result = super(actual)
           
@@ -76,19 +72,6 @@ module Mongoid
             @result = false
           end
         end
-
-        def check_expected_message
-          actual_message = @validator.options[:message]
-          if actual_message.nil?
-            @negative_result_message << " with no custom message"
-            @result = false
-          elsif actual_message == @expected_message
-            @positive_result_message << " with custom message '#{@expected_message}'"
-          else
-            @negative_result_message << " got message '#{actual_message}'"
-            @result = false
-          end
-        end
       end
       
       def validate_uniqueness_of(field)
@@ -96,4 +79,4 @@ module Mongoid
       end       
     end
   end
-end  
+end  

data/lib/matchers/validations/with_message.rb

@@ -0,0 +1,27 @@
+module Mongoid
+  module Matchers
+    module Validations
+      module WithMessage
+        def with_message(message)
+          @expected_message = message
+          self
+        end
+
+        private
+
+        def check_expected_message
+          actual_message = @validator.options[:message]
+          if actual_message.nil?
+            @negative_result_message << " with no custom message"
+            @result = false
+          elsif actual_message == @expected_message
+            @positive_result_message << " with custom message '#{@expected_message}'"
+          else
+            @negative_result_message << " got message '#{actual_message}'"
+            @result = false
+          end
+        end
+      end
+    end
+  end
+end

data/lib/mongoid-rspec.rb

@@ -10,6 +10,7 @@ require 'matchers/indexes'
 require 'matchers/allow_mass_assignment'
 require 'matchers/accept_nested_attributes'
 require 'matchers/validations'
+require 'matchers/validations/with_message'
 require 'matchers/validations/associated'
 require 'matchers/validations/confirmation_of'
 require 'matchers/validations/exclusion_of'

data/lib/mongoid-rspec/version.rb

@@ -1,5 +1,5 @@
 module Mongoid
   module Rspec
-    VERSION = "1.8.0"
+    VERSION = "1.8.1"
   end
 end

data/spec/models/profile.rb

@@ -4,11 +4,13 @@ class Profile
   field :first_name
   field :last_name
   field :age
-  
+  field :hobbies, type: Array, default: []
+
   embedded_in :user, :inverse_of => :profile
   
   validates_numericality_of :age, :greater_than => 0
   validates_acceptance_of :terms_of_service
+  validates_length_of :hobbies, minimum: 1, message: "requires at least one hobby"
 
   index({first_name: 1, last_name: 1 })
 end

data/spec/unit/validations_spec.rb

@@ -26,6 +26,7 @@ describe "Validations" do
   describe Profile do
     it { should validate_numericality_of(:age).greater_than(0) }
     it { should validate_acceptance_of(:terms_of_service) }
+    it { should validate_length_of(:hobbies).with_minimum(1).with_message("requires at least one hobby") }
   end
 
   describe Article do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-rspec
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.8.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-21 00:00:00.000000000 Z
+date: 2013-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -93,6 +93,7 @@ files:
 - lib/matchers/validations/numericality_of.rb
 - lib/matchers/validations/presence_of.rb
 - lib/matchers/validations/uniqueness_of.rb
+- lib/matchers/validations/with_message.rb
 - lib/mongoid-rspec.rb
 - lib/mongoid-rspec/version.rb
 - mongoid-rspec.gemspec
@@ -129,7 +130,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4081406614009892373
+      hash: 3977837244165332206
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -138,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4081406614009892373
+      hash: 3977837244165332206
 requirements: []
 rubyforge_project: mongoid-rspec
 rubygems_version: 1.8.25