mongoid-minitest 0.0.1 → 0.0.2

data/.travis.yml

@@ -0,0 +1,5 @@
+language: ruby
+rvm:
+  - 1.9.2
+  - 1.9.3
+  - ruby-head

data/CHANGELOG.md

@@ -1,30 +1,43 @@
-### 0.0.1
+### 0.0.2 - 04/13/2012
 
-+ Added `of_type` matcher to `HaveAssociationMatcher`.
-+ Added `have_many` association matcher.
++ Added `have_one(association_name)` association matcher.
++ Added `in(range)` alias to `within` matcher.
++ Added `within(range)` chain matcher to `validate_length_of`.
++ Added `scoped_to(*scope)` chain matcher to `validate_uniqueness_of`
++ Added `with_message(custom_message)` chain matcher for validation matchers to test custom messages.
++ Added `DocumentModuleMatcher` class to simplify document matchers.
++ Added `be_stored_in(collection_name)` document matcher.
++ Added `to_allow(values)` chain matcher to `validate_inclusion_of`.
++ Added `validate_inclusion_of(field)` validation matcher.
++ Added `belong_to(association_name)` association matcher.
+
+### 0.0.1 - 04/11/2012
+
++ Added `of_type(type)` chain matcher to association matcher.
++ Added `have_many(association_name)` association matcher.
 + Added `Mongoid::Matchers::Associations` module.
-+ Added `to_not_allow` matcher to `ValidateExclusionMatcher`.
-+ Added `validate_exclusion_of` matcher.
-+ Added `to_not_allow` matcher to `ValidateFormatMatcher`.
-+ Added `to_allow` matcher to `ValidateFormatMatcher`.
-+ Added `validate_format_of` matcher.
-+ Added `with_max` alias to `with_maximum` matcher.
-+ Added `with_maximum` matcher to `ValidateLengthMatcher`
-+ Added `with_min` alias to `with_minimum` matcher.
-+ Added `with_minimum` matcher to `ValidateLengthMatcher`.
-+ Added `validate_length_of` matcher.
-+ Added `case_sensitive` matcher to `ValidateUniquenessMatcher`.
-+ Added `validate_uniqueness_of` matcher.
-+ Added `validate_presence_of` matcher.
-+ Added `have_fields` matcher.
++ Added `to_not_allow(*values)` chain matcher to `validate_exclusion_of`.
++ Added `validate_exclusion_of(field)` validation matcher.
++ Added `to_not_allow(*values)` matcher to `validate_format_of`.
++ Added `to_allow(*values)` matcher to `validate_format_of`.
++ Added `validate_format_of(field)` validation matcher.
++ Added `with_max(value)` alias to `with_maximum` matcher.
++ Added `with_maximum(value)` chain matcher to `validate_length_of`
++ Added `with_min(value)` alias to `with_minimum` matcher.
++ Added `with_minimum(value)` matcher to `validate_length_of`.
++ Added `validate_length_of(field)` validation matcher.
++ Added `case_sensitive` chain matcher to `validate_uniqueness_of`.
++ Added `validate_uniqueness_of(field)` validation matcher.
++ Added `validate_presence_of(field)` validation matcher.
++ Added `have_fields(*fields)` document matcher.
 + Added `be_timestamped` document matcher.
 + Added `be_versioned` document matcher.
 + Added `be_paranoid` document matcher.
-+ Added default failure messages based on description matcher.
 + Added `be_document` document matcher.
-+ Added `with_default_value` matcher to `HaveFieldMatcher`.
-+ Added `of_type` matcher to `HaveFieldMatcher`.
++ Added `with_default_value(default)` chain matcher to `have_field`.
++ Added `of_type(type)` chain matcher to `have_field`.
 + Added `must` and `wont` methods to `MiniTest::Spec`.
-+ Added `have_field` matcher.
++ Added `have_field(field)` document matcher.
++ Added default failure messages based on description matcher.
 + Added `must` and `wont` expectations.
 + Added `assert_must` and `assert_wont` to `MiniTest::Assertions`.

data/Guardfile

@@ -1,7 +1,12 @@
 guard 'minitest' do
   watch(%r|^test/(.*)_test\.rb|)
-  watch(%r|^test/test_helper\.rb|) { "test" }
-  watch(%r|^test/models/(.*)\.rb|) { "test" }
-  watch(%r|^lib/mongoid-minitest\.rb|) { "test" }
-  watch(%r|^lib/matchers/(.*)\.rb|) { "test" }
+  watch(%r|^test/test_helper\.rb|)      { "test" }
+  watch(%r|^test/models/(.*)\.rb|)      { "test" }
+  watch(%r|^lib/minitest/matchers\.rb|) { "test" }
+  watch(%r|^lib/mongoid-minitest\.rb|)  { "test" }
+
+  watch(%r|^lib/matchers/helpers\.rb|)     { "test" }
+  watch(%r|^lib/matchers/document/(.*)\.rb|)     { "test/matchers/document_test.rb" }
+  watch(%r|^lib/matchers/validations/(.*)\.rb|)  { "test/matchers/validations_test.rb" }
+  watch(%r|^lib/matchers/associations/(.*)\.rb|) { "test/matchers/associations_test.rb" }
 end

data/README.md

@@ -1,8 +1,9 @@
-# mongoid-minitest
+# mongoid-minitest [![Build Status](https://secure.travis-ci.org/frodsan/mongoid-minitest.png?branch=master&.png)](http://travis-ci.org/frodsan/mongoid-minitest) [![Dependency Status](https://gemnasium.com/frodsan/mongoid-minitest.png)](https://gemnasium.com/frodsan/mongoid-minitest)
 
 MiniTest matchers for Mongoid.  
 
-Requires Ruby 1.9.
+* Compatible with Ruby >=1.9.2.
+* Tested on MiniTest 2.x
 
 ## Installation
 
@@ -76,10 +77,12 @@ See the following examples:
     describe Mongoid::Matchers::Document do
       subject { Person }
 
-      it { must be_document }
-      it { must be_paranoid }
-      it { must be_versioned }
-      it { must be_timestamped }
+      it { must be_document }    # if model includes Mongoid::Document
+      it { must be_paranoid }    # if model includes Mongoid::Paranoia
+      it { must be_versioned }   # if model includes Mongoid::Versioning
+      it { must be_timestamped } # if model includes Mongoid::Timestamps
+
+      it { must be_stored_in(:people) } # checks the collection for model's document
 
       it { must have_field(:name) }
       it { must have_field(:name).of_type(String) }
@@ -92,7 +95,7 @@ See the following examples:
       it { must have_fields(:name, :login).of_type(String).with_default_value("me") }
     end
 
-### Validations Matchers
+### Validation Matchers
 
     describe Mongoid::Matchers::Validations do
       subject { Person }
@@ -100,6 +103,10 @@ See the following examples:
       it { must validate_presence_of(:name) }
 
       it { must validate_uniqueness_of(:login).case_insensitive }
+      it { must validate_uniqueness_of(:login).scoped_to(:site) }
+
+      it { must validate_length_of(:login).in(5..12) }
+      it { must validate_length_of(:login).within(5..12) }
 
       it { must validate_length_of(:password).with_min(8) }
       it { must validate_length_of(:password).with_minimum(8) }
@@ -109,15 +116,35 @@ See the following examples:
       it { must validate_format_of(:email).to_allow("foo@bar.com") }
       it { must validate_format_of(:email).to_not_allow("foo_bar_com") }
 
+      it { must validate_inclusion_of(:role).to_allow("user", "admin") }
       it { must validate_exclusion_of(:email).to_not_allow("foo@bar.com", "fizz@buzz.com") }
+
+      # Testing validators custom messages
+      it { must validate_presence_of(:role).with_message("no role") }
+      it { must validate_length_of(:password).with_min(8).with_message("len >= 8") }
     end
 
 ### Association Matchers
 
     describe Mongoid::Matchers::Associations do
-      subject { Person }
+      describe Person do
+        subject { Person }
+
+        it { must have_one(:account).of_type(Account) }
+        it { must have_many(:pets).of_type(Pet) }
+      end
 
-      it { must have_many(:pets).of_type(Pet) }
+      describe Pet do
+        subject { Pet }
+
+        it { must belong_to(:person).of_type(Person) }
+      end
+
+      describe Account do
+        subject { Account }
+
+        it { must belong_to(:person).of_type(Person) }
+      end
     end
 
 ## Contributing

data/lib/matchers/associations/associations.rb

@@ -1,44 +1,44 @@
 module Mongoid
   module Matchers
     module Associations
-      HAS_MANY = Mongoid::Relations::Referenced::Many
+      HAS_ONE    = Mongoid::Relations::Referenced::One
+      HAS_MANY   = Mongoid::Relations::Referenced::Many
+      BELONGS_TO = Mongoid::Relations::Referenced::In
 
       class HaveAssociationMatcher
+        include Helpers
+
         def initialize(name, type)
           @association = {}
           @association[:name] = name.to_s
           @association[:type] = type
-          @expectation_message = "#{type_description} #{@association[:name].inspect}"
+          @description = "#{type_description} #{@association[:name].inspect}"
         end
 
         def of_type(klass)
           @association[:class] = klass
-          @expectation_message << " of type #{@association[:class].inspect}"
+          @description << " of type #{@association[:class].inspect}"
           self
         end
 
-        def matches?(klass)
-          @klass    = klass.is_a?(Class) ? klass : klass.class
+        def matches?(subject)
+          @klass    = class_of(subject)
           @metadata = @klass.relations[@association[:name]] 
           @result   = true
 
           check_association_name
-          check_association_type  if @result
-          check_association_class if @result
+          check_association_type
+          check_association_class if @association[:class]
 
           @result
         end
 
         def failure_message
-          "Expected #{@klass} to #{@expectation_message}, got #{@negative_message}"
+          "#{@klass} to #{@description}, got #{@negative_message}"
         end
 
         def negative_failure_message
-          "Expected #{@klass} to not #{@expectation_message}, got #{@positive_message}"
-        end
-
-        def description
-          @expectation_message
+          "#{@klass} to not #{@description}, got #{@positive_message}"
         end
 
         private
@@ -71,7 +71,7 @@ module Mongoid
         end
 
         def check_association_class
-          if !@association[:class].nil? and @association[:class] != @metadata.klass
+          if @association[:class] != @metadata.klass
             @negative_message = "#{@positive_message} of type #{@metadata.klass}"
             @result = false
           else
@@ -82,17 +82,29 @@ module Mongoid
         def type_description(type = nil, passive = true)
           type ||= @association[:type]
           case type.name
+          when HAS_ONE.name
+            (passive ? "reference" : "references") << " one"
           when HAS_MANY.name
             (passive ? "reference" : "references") << " many"
+          when BELONGS_TO.name
+            (passive ? "be referenced" : "referenced") << " in"
           else
-            raise "Unknown association type '%s'" % type
+            raise "Unknown association type #{type}"
           end
         end
       end
 
+      def have_one(association_name)
+        HaveAssociationMatcher.new(association_name, HAS_ONE)
+      end
+
       def have_many(association_name)
         HaveAssociationMatcher.new(association_name, HAS_MANY)
       end
+
+      def belong_to(association_name)
+        HaveAssociationMatcher.new(association_name, BELONGS_TO)
+      end
     end
   end
 end

data/lib/matchers/document/be_stored_in.rb

@@ -0,0 +1,23 @@
+module Mongoid
+  module Matchers
+    class BeStoredInMatcher
+      include Helpers
+
+      def initialize(collection_name)
+        @collection_name = collection_name.to_s
+      end
+
+      def matches?(subject)
+        class_of(subject).collection_name == @collection_name
+      end
+
+      def description
+        "be stored in #{@collection_name.inspect}"
+      end
+    end
+
+    def be_stored_in(collection_name)
+      BeStoredInMatcher.new(collection_name)
+    end
+  end
+end

data/lib/matchers/document/document.rb

@@ -0,0 +1,50 @@
+module Mongoid
+  module Matchers
+    module Document
+      DOCUMENT   = Mongoid::Document
+      PARANOIA   = Mongoid::Paranoia
+      VERSIONING = Mongoid::Versioning
+      TIMESTAMPS = Mongoid::Timestamps
+
+      class DocumentModuleMatcher
+        include Helpers
+
+        def initialize(mod)
+          @mod = mod
+        end
+        
+        def matches?(subject)
+          class_of(subject).included_modules.include?(@mod)
+        end
+
+        def description
+          msg = case
+                when @mod == DOCUMENT   then ""
+                when @mod == PARANOIA   then "paranoid "
+                when @mod == VERSIONING then "versioned "
+                when @mod == TIMESTAMPS then "timestamped "
+                else raise "Unknow Mongoid module #{@mod}"
+                end
+
+          "be a #{msg}Mongoid document"
+        end
+      end
+
+      def be_document
+        DocumentModuleMatcher.new(DOCUMENT)
+      end
+
+      def be_paranoid
+        DocumentModuleMatcher.new(PARANOIA)
+      end
+
+      def be_versioned
+        DocumentModuleMatcher.new(VERSIONING)
+      end
+
+      def be_timestamped
+        DocumentModuleMatcher.new(TIMESTAMPS)
+      end
+    end
+  end
+end

data/lib/matchers/document/have_field.rb

@@ -2,7 +2,7 @@ module Mongoid
   module Matchers
     module Document
       class HaveFieldMatcher
-        include Mongoid::Matchers::Helpers
+        include Helpers
 
         def initialize(*fields)
           @fields = fields.collect(&:to_s)
@@ -18,8 +18,8 @@ module Mongoid
           self
         end
 
-        def matches?(klass)
-          @klass  = klass.is_a?(Class) ? klass : klass.class
+        def matches?(subject)
+          @klass  = class_of(subject)
           @errors = []
 
           @fields.each do |field|
@@ -27,11 +27,11 @@ module Mongoid
               error = ""
               result_field = @klass.fields[field]
               
-              if @type && result_field.type != @type
+              if check_type_with(result_field.type)
                 error << " of type #{result_field.type.inspect}"
               end
 
-              if !@default.nil? && !result_field.default.nil? && result_field.default != @default
+              if check_default_with(result_field.default)
                 error << " with default value of #{result_field.default.inspect}"
               end
 
@@ -45,21 +45,31 @@ module Mongoid
         end
 
         def failure_message
-          "Expected #{@klass.inspect} to #{description}, got #{@errors.to_sentence}"
+          "#{@klass} to #{description}, got #{@errors.to_sentence}"
         end
 
         def negative_failure_message
-          msg =  "Expected #{@klass.inspect} to not #{description}, "
+          msg = "#{@klass.inspect} to not #{description}, "
           msg << "got #{@klass.inspect} to #{description}"
         end
 
         def description
-          desc =  "have #{@fields.size > 1 ? 'fields' : 'field'} named"
+          desc = "have #{@fields.size > 1 ? 'fields' : 'field'} named"
           desc << " #{to_sentence(@fields)}"
           desc << " of type #{@type.inspect}" if @type
           desc << " with default value of #{@default.inspect}" if !@default.nil?
           desc
         end
+
+        private
+        
+        def check_type_with(type)
+          @type && type != @type
+        end
+        
+        def check_default_with(default)
+          !@default.nil? && !default.nil? && default != @default
+        end
       end
 
       def have_field(*fields)

data/lib/matchers/helpers.rb

@@ -4,6 +4,10 @@ module Mongoid
       def to_sentence(ary)
         ary.collect(&:inspect).to_sentence
       end
+
+      def class_of(subject)
+        subject.is_a?(Class) ? subject : subject.class
+      end
     end
   end
 end

data/lib/matchers/validations/exclusion_of.rb

@@ -11,11 +11,11 @@ module Mongoid
           self
         end
 
-        def matches?(actual)
-          return false unless result = super(actual)
+        def matches?(subject)
+          return false unless result = super(subject)
 
           if @not_allowed_values
-            allowed_values = @not_allowed_values - @validator.options[:in]
+            allowed_values = @not_allowed_values - @validator.options[:in].to_a
             if allowed_values.empty?
               @positive_message << " not allowing all values mentioned"
             else

data/lib/matchers/validations/format_of.rb

@@ -16,8 +16,8 @@ module Mongoid
           self
         end
 
-        def matches?(klass)
-          return false unless @result = super(klass)
+        def matches?(subject)
+          return false unless @result = super(subject)
 
           check_valid_value   if @valid
           check_invalid_value if @invalid

data/lib/matchers/validations/inclusion_of.rb

@@ -0,0 +1,43 @@
+module Mongoid
+  module Matchers
+    module Validations
+      class ValidateInclusionMatcher < HaveValidationMatcher
+        def initialize(field)
+          super(field, :inclusion)
+        end
+
+        def to_allow(*values)
+          @allowed_values = values.flatten
+          self
+        end
+
+        def matches?(subject)
+          return false unless result = super(subject)
+
+          if @allowed_values
+            not_allowed_values = @allowed_values - @validator.options[:in].to_a
+            if not_allowed_values.empty?
+              @positive_message << " allowing all values mentioned"
+            else
+              @negative_message << " not allowing the following the  values:"
+              @negative_message << " #{not_allowed_values.inspect}"
+              result = false
+            end
+          end
+          
+          result 
+        end
+
+        def description
+          if @allowed_values
+            super << " allowing the values: #{to_sentence(@allowed_values)}"
+          end
+        end
+      end
+
+      def validate_inclusion_of(field)
+        ValidateInclusionMatcher.new(field)
+      end
+    end
+  end
+end

data/lib/matchers/validations/length_of.rb

@@ -18,11 +18,18 @@ module Mongoid
         end
         alias :with_max :with_maximum
 
-        def matches?(klass)
-          return false unless @result = super(klass)
+        def within(value)
+          @within = value
+          self
+        end
+        alias :in :within
+
+        def matches?(subject)
+          return false unless @result = super(subject)
 
           check_minimum if @minimum
           check_maximum if @maximum
+          check_range   if @within
 
           @result
         end
@@ -31,6 +38,7 @@ module Mongoid
           desc = []
           desc << " with minimum #{@minimum}" if @minimum
           desc << " with maximum #{@maximum}" if @maximum
+          desc << " within range #{@within}"  if @within
           super << desc.to_sentence
         end
 
@@ -39,7 +47,7 @@ module Mongoid
         def check_minimum
           actual = @validator.options[:minimum]
           if actual == @minimum
-            @positive_message << " with minimum of #{@minimum}"
+            @positive_message << " with minimum of #{actual}"
           else
             @negative_message << " with minimum of #{actual}"
             @result = false
@@ -49,12 +57,25 @@ module Mongoid
         def check_maximum
           actual = @validator.options[:maximum]
           if actual == @maximum
-            @positive_message << " with maximum of #{@maximum}"
+            @positive_message << " with maximum of #{actual}"
           else
             @negative_message << " with maximum of #{actual}"
             @result = false
           end
         end
+
+        def check_range
+          min, max = [@within.min, @within.max]
+          actual_min = @validator.options[:minimum]
+          actual_max = @validator.options[:maximum]
+
+          if actual_min == min && actual_max == max
+            @positive_message << " with range #{@within}"
+          else
+            @negative_message << " with range #{actual_min..actual_max}"
+            @result = false
+          end
+        end
       end
 
       def validate_length_of(field)

data/lib/matchers/validations/uniqueness_of.rb

@@ -11,14 +11,41 @@ module Mongoid
           self
         end
 
-        def matches?(klass)
-          return false unless @result = super(klass)
+        def scoped_to(*scope)
+          @scope = [scope].flatten.map(&:to_s)
+          self
+        end
+
+        def matches?(subject)
+          return false unless @result = super(subject)
 
+          check_scope if @scope
           check_case_sensivity if @case_insensitive
 
           @result
         end
 
+        def description
+          desc = []
+          desc << " scoped to #{to_sentence(@scope)}" if @scope
+          desc << " allowing case insensitive values" if @case_insensitive
+          super << desc.to_sentence
+        end
+
+        private
+
+        def check_scope
+          actual_scope = [@validator.options[:scope]].flatten.map(&:to_s)
+          message = " scoped to #{to_sentence(actual_scope)}"
+
+          if actual_scope == @scope
+            @positive_message << message
+          else
+            @negative_message << message
+            @result = false
+          end
+        end
+
         def check_case_sensivity
           if @validator.options[:case_sensitive] == false
             @positive_message << " with case insensitive values"
@@ -27,12 +54,6 @@ module Mongoid
             @result = false
           end
         end
-
-        def description
-          desc =  []
-          desc << " allowing case insensitive values" if @case_insensitive
-          super << desc.to_sentence
-        end
       end
 
       def validate_uniqueness_of(field)

data/lib/matchers/validations/validations.rb

@@ -9,31 +9,61 @@ module Mongoid
           @type = validation_type.to_s
         end
 
-        def matches?(actual)
-          @klass = actual.is_a?(Class) ? actual : actual.class
-          @validator = @klass.validators_on(@field).detect { |v| v.kind.to_s == @type }
+        def with_message(expected_message)
+          @expected_message = expected_message
+          self
+        end
 
-          if @validator
-            @negative_message = "#{@type.inspect} validator on #{@field.inspect}"
-            @positive_message = "#{@type.inspect} validator on #{@field.inspect}"
-          else
-            @negative_message = "no #{@type.inspect} validator on #{@field.inspect}"
-            return false
-          end
+        def matches?(subject)
+          @klass     = class_of(subject)
+          @validator = detect_validator
+          @result    = true
+
+          check_validator
+          check_message if @expected_message
 
-          true
+          @result
         end
 
         def failure_message
-          "Expected #{@klass.inspect} to #{description}; instead got #{@negative_message}"
+          "#{@klass} to #{description}; instead got #{@negative_message}"
         end
 
         def negative_failure_message
-          "Expected #{@klass.inspect} to not #{description}; instead got #{@positive_message}"
+          "#{@klass} to not #{description}; instead got #{@positive_message}"
         end
 
         def description
-          "validate #{@type.inspect} of #{@field.inspect}"
+          desc = "validate #{@type.inspect} of #{@field.inspect}"
+          desc << " with message: #{@expected_message.inspect}" if @expected_message
+
+          desc
+        end
+
+        private
+
+        def check_validator
+          if @validator
+            @negative_message = "#{@type.inspect} validator on #{@field.inspect}"
+            @positive_message = "#{@type.inspect} validator on #{@field.inspect}"
+          else
+            @negative_message = "no #{@type.inspect} validator on #{@field.inspect}"
+            @result = false
+          end
+        end
+
+        def check_message
+          error_message = @validator.options[:message]
+          if @expected_message == error_message
+            @positive_message << " with message: #{error_message.inspect}"
+          else
+            @negative_message << " with message: #{error_message.inspect}"
+            @result = false
+          end
+        end
+
+        def detect_validator
+          @klass.validators_on(@field).detect { |v| v.kind.to_s == @type }
         end
       end
     end

data/lib/minitest/matchers.rb

@@ -3,9 +3,9 @@ module MiniTest
     def assert_must(subject, matcher, msg = nil)
       msg = message(msg) do
         if matcher.respond_to? :failure_message
-          matcher.failure_message
+          "Expected #{matcher.failure_message}".squeeze(" ")
         else
-          "Expected #{subject.inspect} to #{matcher.description}"
+          "Expected #{subject.inspect} to #{matcher.description}".squeeze(" ")
         end
       end
 
@@ -15,9 +15,9 @@ module MiniTest
     def assert_wont(subject, matcher, msg = nil)
       msg = message(msg) do
         if matcher.respond_to? :negative_failure_message
-          matcher.negative_failure_message
+          "Expected #{matcher.negative_failure_message}".squeeze(" ")
         else
-          "Expected not to #{matcher.description}"
+          "Expected not to #{matcher.description}".squeeze(" ")
         end
       end
 

data/lib/mongoid-minitest.rb

@@ -4,16 +4,15 @@ require "minitest/spec"
 
 require "minitest/matchers"
 require "matchers/helpers"
+require "matchers/document/document"
 require "matchers/document/have_field"
-require "matchers/document/be_document"
-require "matchers/document/be_paranoid"
-require "matchers/document/be_versioned"
-require "matchers/document/be_timestamped"
+require "matchers/document/be_stored_in"
 require "matchers/validations/validations"
 require "matchers/validations/presence_of"
 require "matchers/validations/uniqueness_of"
 require "matchers/validations/length_of"
 require "matchers/validations/format_of"
+require "matchers/validations/inclusion_of"
 require "matchers/validations/exclusion_of"
 require "matchers/associations/associations"
 

data/lib/mongoid-minitest/version.rb

@@ -1,5 +1,5 @@
 module Mongoid
   module MiniTest
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

data/test/matchers/associations_test.rb

@@ -1,15 +1,24 @@
 require 'test_helper'
 
-describe Mongoid::Matchers::Associations do
+describe "Associations" do
 
-  describe "have_many" do
+  describe Person do
     subject { Person }
 
-    it { must have_many(:pets) }
-    it { wont have_many(:accounts) }
-
     it { must have_many(:pets).of_type(Pet) }
-    it { wont have_many(:pets).of_type(Person) }
+    it { must have_one(:account).of_type(Account) }
+  end
+
+  describe Pet do
+    subject { Pet }
+
+    it { must belong_to(:person).of_type(Person) }
+  end
+
+  describe Account do
+    subject { Account }
+
+    it { must belong_to(:person).of_type(Person) }
   end
 
 end

data/test/matchers/document_test.rb

@@ -1,28 +1,17 @@
 require "test_helper"
 
-describe Mongoid::Matchers::Document do
-  subject { Person }
+describe "Document" do
+  describe Person do
+    subject { Person }
 
-  it { must be_document }
-  it { must be_paranoid }
-  it { must be_versioned }
-  it { must be_timestamped }
+    it { must be_document }
+    it { must be_paranoid }
+    it { must be_versioned }
+    it { must be_timestamped }
 
-  it { must have_field(:name) }
-  it { wont have_field(:noexist) }
+    it { must be_stored_in(:people) }
 
-  it { must have_field(:name).of_type(String) }
-  it { wont have_field(:name).of_type(Integer) }
-
-  it { must have_field(:name).with_default_value("me") }
-  it { wont have_field(:name).with_default_value("nodefault") }
-  it { must have_field(:name).of_type(String).with_default_value("me") }
-  it { wont have_field(:name).of_type(String).with_default_value("nodefault") }
-
-  it { must have_fields(:name, :login) }
-  it { wont have_fields(:noexist, :noexistagain) }
-  it { must have_fields(:name, :login).of_type(String) }
-  it { wont have_fields(:name, :login).of_type(Integer) }
-  it { must have_fields(:name, :login).with_default_value("me") }
-  it { must have_fields(:name, :login).of_type(String).with_default_value("me") }
+    it { must have_field(:name).of_type(String).with_default_value("me") }
+    it { must have_fields(:name, :login).of_type(String).with_default_value("me") }
+  end
 end

data/test/matchers/validations_test.rb

@@ -1,29 +1,28 @@
 require "test_helper"
 
-describe Mongoid::Matchers::Validations do
-  subject { Person }
-
-  it { must validate_presence_of(:name) }
-  it { wont validate_presence_of(:age) }
-
-  it { must validate_uniqueness_of(:login).case_insensitive }
-  it { wont validate_uniqueness_of(:email).case_insensitive }
-
-  it { must validate_length_of(:password).with_min(8) }
-  it { wont validate_length_of(:password).with_min(0) }
-  it { must validate_length_of(:password).with_minimum(8) }
-  it { wont validate_length_of(:password).with_minimum(0) }
-  it { must validate_length_of(:password).with_max(16) }
-  it { wont validate_length_of(:password).with_max(8) }
-  it { must validate_length_of(:password).with_maximum(16) }
-  it { wont validate_length_of(:password).with_maximum(8) }
-
-  it { must validate_format_of(:email).to_allow("foo@bar.com") }
-  it { wont validate_format_of(:email).to_allow("foo_bar_com") }
-  it { must validate_format_of(:email).to_not_allow("foo_bar_com") }
-  it { wont validate_format_of(:email).to_not_allow("foo@bar.com") }
-
-  it { must validate_exclusion_of(:email).to_not_allow("foo@bar.com") }
-  it { must validate_exclusion_of(:email).to_not_allow("foo@bar.com", "fizz@buzz.com") }
-  it { wont validate_exclusion_of(:email).to_not_allow("foo_bar.com") }
+describe "Validations" do
+  describe Person do
+    subject { Person }
+
+    it { must validate_presence_of(:name) }
+    it { must validate_presence_of(:role).with_message("no role") }
+
+    it { must validate_uniqueness_of(:login).case_insensitive }
+    it { must validate_uniqueness_of(:login).scoped_to(:site) }
+
+    it { must validate_length_of(:login).in(5..12) }
+    it { must validate_length_of(:login).within(5..12) }
+
+    it { must validate_length_of(:password).with_min(8) }
+    it { must validate_length_of(:password).with_minimum(8) }
+
+    it { must validate_length_of(:password).with_max(16) }
+    it { must validate_length_of(:password).with_maximum(16) }
+
+    it { must validate_format_of(:email).to_allow("foo@bar.com") }
+    it { must validate_format_of(:email).to_not_allow("foo_bar_com") }
+
+    it { must validate_inclusion_of(:role).to_allow("user", "admin") }
+    it { must validate_exclusion_of(:email).to_not_allow("foo@bar.com", "fizz@buzz.com") }
+  end
 end

data/test/models/models.rb

@@ -9,17 +9,31 @@ class Person
   field :name,     type: String,  default: "me"
   field :age,      type: Integer
   field :email,    type: String
+  field :role,     type: String
+  field :site,     type: String
 
   has_many :pets
+  has_one :account
 
   validates_presence_of(:name)
+  validates_presence_of(:role, message: "no role")
   validates_uniqueness_of(:email)
-  validates_uniqueness_of(:login, case_sensitive: false)
+  validates_uniqueness_of(:login, scope: :site, case_sensitive: false)
   validates_length_of(:password, minimum: 8, maximum: 16)
+  validates_length_of(:login, in: 5..12)
   validates_format_of(:email, with: /^([^\s]+)((?:[-a-z0-9]\.)[a-z]{2,})$/i)
+  validates_inclusion_of(:role, in: ["admin", "user"])
   validates_exclusion_of(:email, in: ["foo@bar.com", "fizz@buzz.com"])
 end
 
 class Pet
   include Mongoid::Document
+
+  belongs_to :person
+end
+
+class Account
+  include Mongoid::Document
+
+  belongs_to :person
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-minitest
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-12 00:00:00.000000000 Z
+date: 2012-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70195620634560 !ruby/object:Gem::Requirement
+  requirement: &70256836430000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 2.12.0
   type: :runtime
   prerelease: false
-  version_requirements: *70195620634560
+  version_requirements: *70256836430000
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &70195620634020 !ruby/object:Gem::Requirement
+  requirement: &70256836423540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 2.4.7
   type: :runtime
   prerelease: false
-  version_requirements: *70195620634020
+  version_requirements: *70256836423540
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &70195620633540 !ruby/object:Gem::Requirement
+  requirement: &70256836425720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.6.1
   type: :development
   prerelease: false
-  version_requirements: *70195620633540
+  version_requirements: *70256836425720
 - !ruby/object:Gem::Dependency
   name: guard-minitest
-  requirement: &70195620633040 !ruby/object:Gem::Requirement
+  requirement: &70256836427820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70195620633040
+  version_requirements: *70256836427820
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70195620632340 !ruby/object:Gem::Requirement
+  requirement: &70256836328980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *70195620632340
+  version_requirements: *70256836328980
 description: Minitest matchers for Mongoid
 email:
 - lrodriguezsanc@gmail.com
@@ -75,6 +75,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rbenv-version
+- .travis.yml
 - CHANGELOG.md
 - Gemfile
 - Guardfile
@@ -82,14 +83,13 @@ files:
 - README.md
 - Rakefile
 - lib/matchers/associations/associations.rb
-- lib/matchers/document/be_document.rb
-- lib/matchers/document/be_paranoid.rb
-- lib/matchers/document/be_timestamped.rb
-- lib/matchers/document/be_versioned.rb
+- lib/matchers/document/be_stored_in.rb
+- lib/matchers/document/document.rb
 - lib/matchers/document/have_field.rb
 - lib/matchers/helpers.rb
 - lib/matchers/validations/exclusion_of.rb
 - lib/matchers/validations/format_of.rb
+- lib/matchers/validations/inclusion_of.rb
 - lib/matchers/validations/length_of.rb
 - lib/matchers/validations/presence_of.rb
 - lib/matchers/validations/uniqueness_of.rb

data/lib/matchers/document/be_document.rb

@@ -1,20 +0,0 @@
-module Mongoid
-  module Matchers
-    module Document
-      class BeDocumentMatcher
-        def matches?(klass)
-          @klass = klass
-          @klass.included_modules.include?(Mongoid::Document)
-        end
-
-        def description
-          "be a Mongoid document"
-        end
-      end
-
-      def be_document
-        BeDocumentMatcher.new
-      end
-    end
-  end
-end

data/lib/matchers/document/be_paranoid.rb

@@ -1,20 +0,0 @@
-module Mongoid
-  module Matchers
-    module Document
-      class BeParanoidMatcher
-        def matches?(klass)
-          @klass = klass
-          @klass.included_modules.include?(Mongoid::Paranoia)
-        end
-
-        def description
-          "be a paranoid Mongoid document"
-        end
-      end
-
-      def be_paranoid
-        BeParanoidMatcher.new
-      end
-    end
-  end
-end

data/lib/matchers/document/be_timestamped.rb

@@ -1,20 +0,0 @@
-module Mongoid
-  module Matchers
-    module Document
-      class BeTimestamped
-        def matches?(klass)
-          @klass = klass
-          @klass.included_modules.include?(Mongoid::Timestamps)
-        end
-
-        def description
-          "be timestamped Mongoid document"
-        end
-      end
-
-      def be_timestamped
-        BeTimestamped.new
-      end
-    end
-  end
-end

data/lib/matchers/document/be_versioned.rb

@@ -1,20 +0,0 @@
-module Mongoid
-  module Matchers
-    module Document
-      class BeVersionedMatcher
-        def matches?(klass)
-          @klass = klass
-          @klass.included_modules.include?(Mongoid::Versioning)
-        end
-
-        def description
-          "be a versioned Mongoid document"
-        end
-      end
-
-      def be_versioned
-        BeVersionedMatcher.new
-      end
-    end
-  end
-end