mongoid-minitest 0.1.1 → 0.1.2

data/CHANGELOG.md

@@ -1,6 +1,18 @@
-## 0.1.1 - unreleased
+## 0.1.2 - August 13, 2012
 
-+ Remove required ruby version from the gemspec. Fixes [#9](https://github.com/frodsan/mongoid-minitest/pull/9).
++ Allow passing in a Regex to the validate_format_of matcher.
+  Pull Request [#12](https://github.com/frodsan/mongoid-minitest/pull/12) - *Godfrey Chan*.
++ Allow non-array values for inclusion/exclusion matchers.
+  Pull Request [#11](https://github.com/frodsan/mongoid-minitest/pull/11) - *Godfrey Chan*.
++ Added as_inverse_of for association matchers.
+  Pull Request [#10](https://frodsan/mongoid-minitest/pull/10) - *Godfrey Chan*.
++ Use [minitest-matchers](https://github.com/zenspider/minitest-matchers) gem
+  instead of our matchers implementation - *Francesco Rodriguez*.
++ Bump mongoid version to 3.0.4 - *Francesco Rodriguez*.
+
+## 0.1.1 - August 09, 2012
+
++ Remove required ruby version from the gemspec. Fixes [#9](https://github.com/frodsan/mongoid-minitest/pull/9). *Francesco Rodriguez*
 
 ## 0.1.0 - August 09, 2012
 

data/README.md

@@ -1,15 +1,19 @@
-# 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)
+# mongoid-minitest
 
 MiniTest matchers for Mongoid.
 
+[![Build Status](https://secure.travis-ci.org/frodsan/mongoid-minitest.png?branch=master&.png)](http://travis-ci.org/frodsan/mongoid-minitest)
+
 ## Support
 
 This gem supports:
 
 * Ruby 1.9.3
-* Mongoid ~>3.0.2
+* Mongoid ~>3.0.4
 * MiniTest ~>3.3.0
 
+If you're using Mongoid 2.4.x, you should use [0.0.3.1 version](https://github.com/frodsan/mongoid-minitest/tree/274976e8814cc9bfb3f1c83eba1bed21fa3cf26b).
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -175,6 +179,11 @@ See the following examples:
 
 To run unit tests, run `bundle exec rake`.
 
+## Maintainers
+
+* Francesco Rodriguez (<https://github.com/frodsan/>).
+* Sascha Wessel (<https://github.com/gr4y>).
+
 ## License
 
 MIT License. Copyright 2012 Francesco Rodriguez. See [LICENSE](https://github.com/frodsan/lego/blob/master/LICENSE)

data/lib/matchers/associations/associations.rb

@@ -9,9 +9,7 @@ module Mongoid
       EMBEDS_MANY = Mongoid::Relations::Embedded::Many
       EMBEDDED_IN = Mongoid::Relations::Embedded::In
 
-      class HaveAssociationMatcher
-        include Helpers
-
+      class HaveAssociationMatcher < Matcher
         def initialize(name, type)
           @association = {}
           @association[:name] = name.to_s
@@ -25,6 +23,12 @@ module Mongoid
           self
         end
 
+        def as_inverse_of(inverse_of)
+          @association[:inverse_of] = inverse_of
+          @description << " as the inverse of #{@association[:inverse_of].inspect}"
+          self
+        end
+
         def matches?(subject)
           @klass    = class_of(subject)
           @metadata = @klass.relations[@association[:name]]
@@ -33,6 +37,7 @@ module Mongoid
           check_association_name
           check_association_type
           check_association_class if @association[:class]
+          check_association_inverse_of if @association[:inverse_of]
 
           @result
         end
@@ -82,6 +87,15 @@ module Mongoid
           end
         end
 
+        def check_association_inverse_of
+          if @association[:inverse_of] != @metadata.inverse_of
+            @negative_message = "..."
+            @result = false
+          else
+            @positive_message << " as inverse of #{@metadata.inverse_of}" if @association[:inverse_of]
+          end
+        end
+
         def type_description(type = nil, passive = true)
           type ||= @association[:type]
           case type.name

data/lib/matchers/document/be_stored_in.rb

@@ -1,8 +1,6 @@
 module Mongoid
   module Matchers
-    class BeStoredInMatcher
-      include Helpers
-
+    class BeStoredInMatcher < Matcher
       def initialize(collection_name)
         @collection_name = collection_name.to_s
       end

data/lib/matchers/document/document.rb

@@ -6,15 +6,13 @@ module Mongoid
       VERSIONING = Mongoid::Versioning
       TIMESTAMPS = Mongoid::Timestamps
 
-      class DocumentModuleMatcher
-        include Helpers
-
-        def initialize(mod)
+      class DocumentMatcher < Matcher
+        def initialize mod
           @mod = mod
         end
 
-        def matches?(subject)
-          class_of(subject).included_modules.include?(@mod)
+        def matches? subject
+          class_of(subject).included_modules.include? @mod
         end
 
         def description
@@ -31,19 +29,19 @@ module Mongoid
       end
 
       def be_document
-        DocumentModuleMatcher.new(DOCUMENT)
+        DocumentMatcher.new DOCUMENT
       end
 
       def be_paranoid
-        DocumentModuleMatcher.new(PARANOIA)
+        DocumentMatcher.new PARANOIA
       end
 
       def be_versioned
-        DocumentModuleMatcher.new(VERSIONING)
+        DocumentMatcher.new VERSIONING
       end
 
       def be_timestamped
-        DocumentModuleMatcher.new(TIMESTAMPS)
+        DocumentMatcher.new TIMESTAMPS
       end
     end
   end

data/lib/matchers/document/have_field.rb

@@ -1,9 +1,7 @@
 module Mongoid
   module Matchers
     module Document
-      class HaveFieldMatcher
-        include Helpers
-
+      class HaveFieldMatcher < Matcher
         def initialize(*fields)
           @fields = fields.collect(&:to_s)
         end
@@ -26,7 +24,7 @@ module Mongoid
             if @klass.fields.include?(field)
               error = ""
               result_field = @klass.fields[field]
-              
+
               if check_type_with(result_field.type)
                 error << " of type #{result_field.type.inspect}"
               end
@@ -62,11 +60,11 @@ module Mongoid
         end
 
         private
-        
+
         def check_type_with(type)
           @type && type != @type
         end
-        
+
         def check_default_with(default)
           !@default.nil? && !default.nil? && default != @default
         end

data/lib/matchers/document/have_index.rb

@@ -1,8 +1,6 @@
 module Mongoid
   module Matchers
-    class HaveIndexMatcher
-      include Helpers
-
+    class HaveIndexMatcher < Matcher
       def initialize(field)
         @field = field.to_s
       end

data/lib/matchers/helpers.rb

@@ -1,11 +1,11 @@
 module Mongoid
   module Matchers
     module Helpers
-      def to_sentence(ary)
+      def to_sentence ary
         ary.collect(&:inspect).to_sentence
       end
 
-      def class_of(subject)
+      def class_of subject
         subject.is_a?(Class) ? subject : subject.class
       end
     end

data/lib/matchers/matcher.rb

@@ -0,0 +1,17 @@
+require_relative 'helpers'
+
+module Mongoid
+  module Matchers
+    class Matcher
+      include Helpers
+
+      def failure_message
+        "Expected #{inspect} to #{description}".squeeze ' '
+      end
+
+      def negative_failure_message
+        "Expected not to #{description}".squeeze ' '
+      end
+    end
+  end
+end

data/lib/matchers/validations/exclusion.rb

@@ -7,14 +7,14 @@ module Mongoid
         end
 
         def to_not_allow(*values)
-          @not_allowed_values = values.flatten
+          @not_allowed_values = (values.length > 1) ? values.flatten : values[0]
           self
         end
 
         def matches?(subject)
           return false unless result = super(subject)
 
-          if @not_allowed_values
+          if Array === @not_allowed_values
             allowed_values = @not_allowed_values - @validator.options[:in].to_a
             if allowed_values.empty?
               @positive_message << ' not allowing all values mentioned'
@@ -23,14 +23,23 @@ module Mongoid
               @negative_message << " #{to_sentence(allowed_values)}"
               result = false
             end
+          elsif @not_allowed_values
+            if @not_allowed_values == @validator.options[:in]
+              @positive_message << " not allowing values in #{@not_allowed_values.inspect}"
+            else
+              @negative_message << " not allowing values in #{@validator.options[:in].inspect}"
+              result = false
+            end
           end
 
           result
         end
 
         def description
-          if @not_allowed_values
+          if Array === @not_allowed_values
             super << " not allowing the values: #{to_sentence(@not_allowed_values)}"
+          elsif @not_allowed_values
+            super << " not allowing the values in #{@not_allowed_values.inspect}"
           end
         end
       end

data/lib/matchers/validations/format.rb

@@ -2,21 +2,21 @@ module Mongoid
   module Matchers
     module Validations
       class ValidateFormatMatcher < HaveValidationMatcher
-        def initialize(field)
-          super(field, :format)
+        def initialize field
+          super field, :format
         end
 
-        def to_allow(valid_value)
+        def to_allow valid_value
           @valid = valid_value
           self
         end
 
-        def to_not_allow(invalid_value)
+        def to_not_allow invalid_value
           @invalid = invalid_value
           self
         end
 
-        def matches?(subject)
+        def matches? subject
           return false unless @result = super(subject)
 
           check_valid_value   if @valid
@@ -35,7 +35,7 @@ module Mongoid
         private
 
         def check_valid_value
-          if format =~ @valid
+          if format == @valid || format =~ @valid
             @positive_message << " with #{@valid.inspect} as a valid value"
           else
             @negative_message << " with #{@valid.inspect} as an invalid value"
@@ -44,7 +44,7 @@ module Mongoid
         end
 
         def check_invalid_value
-          if !(format =~ @invalid)
+          if format !~ @invalid
             @positive_message << " with #{@invalid.inspect} as a invalid value"
           else
             @negative_message << " with #{@invalid.inspect} as a valid value"
@@ -57,8 +57,8 @@ module Mongoid
         end
       end
 
-      def validate_format_of(field)
-        ValidateFormatMatcher.new(field)
+      def validate_format_of field
+        ValidateFormatMatcher.new field
       end
     end
   end

data/lib/matchers/validations/inclusion.rb

@@ -7,30 +7,39 @@ module Mongoid
         end
 
         def to_allow(*values)
-          @allowed_values = values.flatten
+          @allowed_values = (values.length > 1) ? values.flatten : values[0]
           self
         end
 
         def matches?(subject)
           return false unless result = super(subject)
 
-          if @allowed_values
+          if Array === @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 allowing the following the values:'
               @negative_message << " #{not_allowed_values.inspect}"
               result = false
             end
+          elsif @allowed_values
+            if @allowed_values == @validator.options[:in]
+              @positive_message << " allowing values in #{@allowed_values.inspect}"
+            else
+              @negative_message << " allowing values in #{@validator.options[:in].inspect}"
+              result = false
+            end
           end
 
           result
         end
 
         def description
-          if @allowed_values
+          if Array === @allowed_values
             super << " allowing the values: #{to_sentence(@allowed_values)}"
+          elsif @allowed_values
+            super << " allowing the values in #{@allowed_values.inspect}"
           end
         end
       end

data/lib/matchers/validations/validations.rb

@@ -1,9 +1,7 @@
 module Mongoid
   module Matchers
     module Validations
-      class HaveValidationMatcher
-        include Mongoid::Matchers::Helpers
-
+      class HaveValidationMatcher < Matcher
         def initialize(field, validation_type)
           @field = field.to_s
           @type = validation_type.to_s

data/lib/mongoid-minitest.rb

@@ -1,9 +1,9 @@
 gem 'minitest'
 require 'mongoid'
 require 'minitest/spec'
-
 require 'minitest/matchers'
-require 'matchers/helpers'
+
+require 'matchers/matcher'
 require 'matchers/document/document'
 require 'matchers/document/have_field'
 require 'matchers/document/be_stored_in'

data/lib/mongoid-minitest/version.rb

@@ -1,5 +1,5 @@
 module Mongoid
   module MiniTest
-    VERSION = '0.1.1'
+    VERSION = '0.1.2'
   end
 end

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-minitest
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
 - Francesco Rodriguez
+- Sascha Wessel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-09 00:00:00.000000000 Z
+date: 2012-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -27,6 +28,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 3.3.0
+- !ruby/object:Gem::Dependency
+  name: minitest-matchers
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
@@ -34,7 +51,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.2
+        version: 3.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +59,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.2
+        version: 3.0.4
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -72,6 +89,7 @@ files:
 - lib/matchers/document/have_field.rb
 - lib/matchers/document/have_index.rb
 - lib/matchers/helpers.rb
+- lib/matchers/matcher.rb
 - lib/matchers/validations/acceptance.rb
 - lib/matchers/validations/associated.rb
 - lib/matchers/validations/confirmation.rb
@@ -82,7 +100,6 @@ files:
 - lib/matchers/validations/presence.rb
 - lib/matchers/validations/uniqueness.rb
 - lib/matchers/validations/validations.rb
-- lib/minitest/matchers.rb
 - lib/mongoid-minitest/version.rb
 - lib/mongoid-minitest.rb
 - LICENSE

data/lib/minitest/matchers.rb

@@ -1,42 +0,0 @@
-module MiniTest
-  module Assertions
-    def assert_must(subject, matcher, msg = nil)
-      msg = message(msg) do
-        if matcher.respond_to? :failure_message
-          "Expected #{matcher.failure_message}".squeeze(" ")
-        else
-          "Expected #{subject.inspect} to #{matcher.description}".squeeze(" ")
-        end
-      end
-
-      assert matcher.matches?(subject), msg
-    end
-
-    def assert_wont(subject, matcher, msg = nil)
-      msg = message(msg) do
-        if matcher.respond_to? :negative_failure_message
-          "Expected #{matcher.negative_failure_message}".squeeze(" ")
-        else
-          "Expected not to #{matcher.description}".squeeze(" ")
-        end
-      end
-
-      refute matcher.matches?(subject), msg
-    end
-  end
-
-  module Expectations
-    infect_an_assertion :assert_must, :must, :reverse
-    infect_an_assertion :assert_wont, :wont, :reverse
-  end
-end
-
-class MiniTest::Spec
-  def must(*args, &block)
-    subject.must(*args, &block)
-  end
-
-  def wont(*args, &block)
-    subject.wont(*args, &block)
-  end
-end