mongoid-minitest 0.0.2 → 0.0.3

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+### 0.0.3 - 04/14/2012
+
++ Added `have_index_for(indexed_field)` document matcher.
++ Added `embedded_in(association_name)` association matcher.
++ Added `embed_many(association_name)` association matcher.
++ Fixed issue check `association_type` if metadata is not nil.
++ Added `embed_one(association_name)` association matcher.
++ Added `have_and_belong_to_many(association_name)` association matcher.
++ Added `validate_associated(association_name)` validation matcher.
++ Added `accept_with(value)` chain matcher to `validate_acceptance_of`.
++ Added `validate_acceptance_of(field)` validation matcher.
++ Added `validate_confirmation_of(field)` validation matcher.
+
 ### 0.0.2 - 04/13/2012
 
 + Added `have_one(association_name)` association matcher.
@@ -11,7 +24,7 @@
 + Added `validate_inclusion_of(field)` validation matcher.
 + Added `belong_to(association_name)` association matcher.
 
-### 0.0.1 - 04/11/2012
+### 0.0.1 - 04/12/2012
 
 + Added `of_type(type)` chain matcher to association matcher.
 + Added `have_many(association_name)` association matcher.

data/README.md

@@ -2,14 +2,16 @@
 
 MiniTest matchers for Mongoid.  
 
-* Compatible with Ruby >=1.9.2.
-* Tested on MiniTest 2.x
+## Requirements
+
+* Ruby 1.9.x
+* Mongoid 2.x
 
 ## Installation
 
 Add this line to your application's Gemfile:
 
-    gem 'mongoid-minitest'
+    gem "mongoid-minitest"
 
 And then execute:
 
@@ -93,6 +95,8 @@ See the following examples:
       it { must have_fields(:name, :login).of_type(String) }
       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_index_for(:name) }
     end
 
 ### Validation Matchers
@@ -101,7 +105,7 @@ See the following examples:
       subject { Person }
 
       it { must validate_presence_of(:name) }
-
+      
       it { must validate_uniqueness_of(:login).case_insensitive }
       it { must validate_uniqueness_of(:login).scoped_to(:site) }
 
@@ -119,6 +123,11 @@ See the following examples:
       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") }
 
+      it { must validate_confirmation_of(:password) }
+      it { must validate_acceptance_of(:terms_of_use).accept_with("1") }
+
+      it { must validate_associated(:pets) }
+
       # 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") }
@@ -130,20 +139,24 @@ See the following examples:
       describe Person do
         subject { Person }
 
-        it { must have_one(:account).of_type(Account) }
+        it { must have_one(:account) }
         it { must have_many(:pets).of_type(Pet) }
+        it { must have_and_belong_to_many(:friends) }
+
+        it { must embed_one(:profile) }
+        it { must embed_many(:sites) }
       end
 
       describe Pet do
         subject { Pet }
 
-        it { must belong_to(:person).of_type(Person) }
+        it { must belong_to(:person) }
       end
 
-      describe Account do
-        subject { Account }
+      describe Site do
+        subject { Site }
 
-        it { must belong_to(:person).of_type(Person) }
+        it { must embedded_in(:person) }
       end
     end
 
@@ -159,31 +172,6 @@ See the following examples:
 
 To run unit tests, run `bundle exec rake` or `bundle exec guard` to run in auto mode.
 
-## License
-
-Copyright (c) 2012 Francesco Rodriguez
-
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
 ## Last words
 
 At [EpicLabs](https://github.com/epiclabs/), We're migrating all the tests from `rspec` to `minitest`. I've been using

data/lib/matchers/associations/associations.rb

@@ -1,9 +1,13 @@
 module Mongoid
   module Matchers
     module Associations
-      HAS_ONE    = Mongoid::Relations::Referenced::One
-      HAS_MANY   = Mongoid::Relations::Referenced::Many
+      HAS_ONE = Mongoid::Relations::Referenced::One
+      HAS_MANY = Mongoid::Relations::Referenced::Many
+      HAS_AND_BELONGS_TO_MANY = Mongoid::Relations::Referenced::ManyToMany
       BELONGS_TO = Mongoid::Relations::Referenced::In
+      EMBEDS_ONE = Mongoid::Relations::Embedded::One
+      EMBEDS_MANY = Mongoid::Relations::Embedded::Many
+      EMBEDDED_IN = Mongoid::Relations::Embedded::In
 
       class HaveAssociationMatcher
         include Helpers
@@ -45,16 +49,15 @@ module Mongoid
 
         def check_association_name
           if @metadata.nil?
-            @negative_message = "no association named #{@association[:name]}"
+            @negative_message = "no association named #{@association[:name].inspect}"
             @result = false
           else
-            @positive_message = "association named #{@association[:name]}"
+            @positive_message = "association named #{@association[:name].inspect}"
           end
         end
 
         def check_association_type
-          @relation = @metadata.relation
-          if @relation != @association[:type]
+          if !@metadata.nil? && @metadata.relation != @association[:type]
             @negative_message = association_type_failure_message
             @result = false
           else
@@ -64,7 +67,7 @@ module Mongoid
 
         def association_type_failure_message
           msg = "#{@klass.inspect}"
-          msg << " #{type_description(@relation, false)}"
+          msg << " #{type_description(@association[:type], false)}"
           msg << " #{@association[:name].inspect}"
 
           msg
@@ -86,8 +89,16 @@ module Mongoid
             (passive ? "reference" : "references") << " one"
           when HAS_MANY.name
             (passive ? "reference" : "references") << " many"
+          when HAS_AND_BELONGS_TO_MANY.name
+            (passive ? "reference" : "references") << " and referenced in many"
           when BELONGS_TO.name
             (passive ? "be referenced" : "referenced") << " in"
+          when EMBEDS_ONE.name
+            (passive ? "embed" : "embeds") << " one"
+          when EMBEDS_MANY.name
+            (passive ? "embed" : "embeds") << " many"
+          when EMBEDDED_IN.name
+            (passive ? "be" : "is") << " embedded in"
           else
             raise "Unknown association type #{type}"
           end
@@ -102,9 +113,25 @@ module Mongoid
         HaveAssociationMatcher.new(association_name, HAS_MANY)
       end
 
+      def have_and_belong_to_many(association_name)
+        HaveAssociationMatcher.new(association_name, HAS_AND_BELONGS_TO_MANY)
+      end
+
       def belong_to(association_name)
         HaveAssociationMatcher.new(association_name, BELONGS_TO)
       end
+
+      def embed_one(association_name)
+        HaveAssociationMatcher.new(association_name, EMBEDS_ONE)
+      end
+
+      def embed_many(association_name)
+        HaveAssociationMatcher.new(association_name, EMBEDS_MANY)
+      end
+
+      def embedded_in(association_name)
+        HaveAssociationMatcher.new(association_name, EMBEDDED_IN)
+      end
     end
   end
 end

data/lib/matchers/document/have_index.rb

@@ -0,0 +1,39 @@
+module Mongoid
+  module Matchers
+    class HaveIndexMatcher
+      include Helpers
+
+      def initialize(field)
+        @field = field.to_s
+      end
+
+      def matches?(subject)
+        @klass = class_of(subject)
+
+        if !@klass.index_options[@field.to_sym]
+          @error = "no index for #{@field.inspect}"
+
+          return false
+        end
+
+        true
+      end
+
+      def failure_message
+        "#{@klass} to #{description}, got #{@error}"
+      end
+
+      def negative_failure_message
+        "#{@klass} to not #{description}, got #{@klass} to #{description}"
+      end
+
+      def description
+        "have an index for #{@field.inspect}"
+      end
+    end
+
+    def have_index_for(field)
+      HaveIndexMatcher.new(field)
+    end
+  end
+end

data/lib/matchers/validations/acceptance.rb

@@ -0,0 +1,47 @@
+module Mongoid
+  module Matchers
+    module Validations
+      class ValidateAcceptanceMatcher < HaveValidationMatcher
+        def initialize(field)
+          super(field, :acceptance)
+        end
+
+        def accept_with(value)
+          @accepted = value
+          self
+        end
+
+        def matches?(subject)
+          return false unless @result = super(subject)
+          
+          check_accepted_value if @accepted
+
+          @result
+        end
+
+        def description
+          desc = []
+          desc << " accept with #{@accepted.inspect}" if @accepted
+          super << desc.to_sentence
+        end
+
+        private
+
+        def check_accepted_value
+          actual = @validator.options[:accept]
+
+          if actual == @accepted
+            @positive_message << " accept with #{actual.inspect}"
+          else
+            @negative_message << " accept with #{actual.inspect}"
+            @result = false
+          end
+        end
+      end
+
+      def validate_acceptance_of(field)
+        ValidateAcceptanceMatcher.new(field)
+      end
+    end
+  end
+end

data/lib/matchers/validations/associated.rb

@@ -0,0 +1,19 @@
+module Mongoid
+  module Matchers
+    module Validations
+      class ValidateAssociated < HaveValidationMatcher
+        def initialize(association_name)
+          super(association_name, :associated)
+        end
+
+        def description
+          "validate associated #{@field.inspect}"
+        end
+      end
+
+      def validate_associated(association_name)
+        ValidateAssociated.new(association_name)
+      end
+    end
+  end
+end

data/lib/matchers/validations/confirmation.rb

@@ -0,0 +1,9 @@
+module Mongoid
+  module Matchers
+    module Validations
+      def validate_confirmation_of(field)
+        HaveValidationMatcher.new(field, :confirmation)
+      end
+    end
+  end
+end

data/lib/mongoid-minitest/version.rb

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

data/lib/mongoid-minitest.rb

@@ -7,13 +7,17 @@ require "matchers/helpers"
 require "matchers/document/document"
 require "matchers/document/have_field"
 require "matchers/document/be_stored_in"
+require "matchers/document/have_index"
 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/validations/presence"
+require "matchers/validations/uniqueness"
+require "matchers/validations/length"
+require "matchers/validations/format"
+require "matchers/validations/inclusion"
+require "matchers/validations/exclusion"
+require "matchers/validations/confirmation"
+require "matchers/validations/acceptance"
+require "matchers/validations/associated"
 require "matchers/associations/associations"
 
 module Mongoid

data/test/matchers/associations_test.rb

@@ -7,6 +7,10 @@ describe "Associations" do
 
     it { must have_many(:pets).of_type(Pet) }
     it { must have_one(:account).of_type(Account) }
+    it { must have_and_belong_to_many(:friends).of_type(Person) }
+
+    it { must embed_one(:profile) }
+    it { must embed_many(:sites) }
   end
 
   describe Pet do
@@ -21,4 +25,10 @@ describe "Associations" do
     it { must belong_to(:person).of_type(Person) }
   end
 
+  describe Site do
+    subject { Site }
+
+    it { must embedded_in(:person) }
+  end
+
 end

data/test/matchers/document_test.rb

@@ -13,5 +13,7 @@ describe "Document" do
 
     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") }
+
+    it { must have_index_for(:name) }
   end
 end

data/test/matchers/validations_test.rb

@@ -24,5 +24,10 @@ describe "Validations" do
 
     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") }
+
+    it { must validate_confirmation_of(:password) }
+    it { must validate_acceptance_of(:terms_of_use).accept_with("1") }
+
+    it { must validate_associated(:pets) }
   end
 end

data/test/models/models.rb

@@ -12,16 +12,29 @@ class Person
   field :role,     type: String
   field :site,     type: String
 
-  has_many :pets
+  index :name
+
   has_one :account
+  has_many :pets
+  has_and_belongs_to_many :friends, class_name: "Person"
+
+  embeds_one :profile
+  embeds_many :sites
 
   validates_presence_of(:name)
   validates_presence_of(:role, message: "no role")
+
+  validates_confirmation_of(:password)
+  validates_acceptance_of(:terms_of_use)
+
   validates_uniqueness_of(:email)
   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
@@ -37,3 +50,13 @@ class Account
 
   belongs_to :person
 end
+
+class Profile
+  include Mongoid::Document
+end
+
+class Site
+  include Mongoid::Document
+
+  embedded_in :person
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-minitest
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-13 00:00:00.000000000 Z
+date: 2012-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70256836430000 !ruby/object:Gem::Requirement
+  requirement: &70194736091660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 2.12.0
   type: :runtime
   prerelease: false
-  version_requirements: *70256836430000
+  version_requirements: *70194736091660
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &70256836423540 !ruby/object:Gem::Requirement
+  requirement: &70194736084360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 2.4.7
   type: :runtime
   prerelease: false
-  version_requirements: *70256836423540
+  version_requirements: *70194736084360
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &70256836425720 !ruby/object:Gem::Requirement
+  requirement: &70194736087380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.6.1
   type: :development
   prerelease: false
-  version_requirements: *70256836425720
+  version_requirements: *70194736087380
 - !ruby/object:Gem::Dependency
   name: guard-minitest
-  requirement: &70256836427820 !ruby/object:Gem::Requirement
+  requirement: &70194736089500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70256836427820
+  version_requirements: *70194736089500
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70256836328980 !ruby/object:Gem::Requirement
+  requirement: &70194752344020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *70256836328980
+  version_requirements: *70194752344020
 description: Minitest matchers for Mongoid
 email:
 - lrodriguezsanc@gmail.com
@@ -86,13 +86,17 @@ files:
 - lib/matchers/document/be_stored_in.rb
 - lib/matchers/document/document.rb
 - lib/matchers/document/have_field.rb
+- lib/matchers/document/have_index.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
+- lib/matchers/validations/acceptance.rb
+- lib/matchers/validations/associated.rb
+- lib/matchers/validations/confirmation.rb
+- lib/matchers/validations/exclusion.rb
+- lib/matchers/validations/format.rb
+- lib/matchers/validations/inclusion.rb
+- lib/matchers/validations/length.rb
+- lib/matchers/validations/presence.rb
+- lib/matchers/validations/uniqueness.rb
 - lib/matchers/validations/validations.rb
 - lib/minitest/matchers.rb
 - lib/mongoid-minitest.rb