mongoid-rspec 1.2.1 → 1.3.2

data/Gemfile

@@ -1,9 +1 @@
-# A sample Gemfile
-source :gemcutter
-
-gem "mongoid", '>= 2.0.0.beta.15'
-gem 'bson_ext', '>= 1.0.4'
-
-gem 'redgreen'
-
-gem 'rspec', ">= 2.0.0.beta.19"
+gemspec

data/Gemfile.lock

@@ -1,41 +1,43 @@
+PATH
+  remote: .
+  specs:
+    mongoid-rspec (1.3.0)
+      mongoid (~> 2.0.0)
+      rspec (~> 2)
+
 GEM
-  remote: http://rubygems.org/
   specs:
-    activemodel (3.0.0.rc)
-      activesupport (= 3.0.0.rc)
+    activemodel (3.0.1)
+      activesupport (= 3.0.1)
       builder (~> 2.1.2)
       i18n (~> 0.4.1)
-    activesupport (3.0.0.rc)
-    bson (1.0.4)
-    bson_ext (1.0.4)
+    activesupport (3.0.1)
+    bson (1.1.2)
     builder (2.1.2)
     diff-lcs (1.1.2)
-    i18n (0.4.1)
-    mongo (1.0.7)
-      bson (>= 1.0.4)
-    mongoid (2.0.0.beta.16)
-      activemodel (= 3.0.0.rc)
-      bson (= 1.0.4)
-      mongo (= 1.0.7)
-      tzinfo (= 0.3.22)
+    i18n (0.4.2)
+    mongo (1.1.2)
+      bson (>= 1.1.1)
+    mongoid (2.0.0.beta.20)
+      activemodel (~> 3.0)
+      mongo (~> 1.1)
+      tzinfo (~> 0.3.22)
       will_paginate (~> 3.0.pre)
-    redgreen (1.2.2)
-    rspec (2.0.0.beta.19)
-      rspec-core (= 2.0.0.beta.19)
-      rspec-expectations (= 2.0.0.beta.19)
-      rspec-mocks (= 2.0.0.beta.19)
-    rspec-core (2.0.0.beta.19)
-    rspec-expectations (2.0.0.beta.19)
-      diff-lcs (>= 1.1.2)
-    rspec-mocks (2.0.0.beta.19)
-    tzinfo (0.3.22)
+    rspec (2.1.0)
+      rspec-core (~> 2.1.0)
+      rspec-expectations (~> 2.1.0)
+      rspec-mocks (~> 2.1.0)
+    rspec-core (2.1.0)
+    rspec-expectations (2.1.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.1.0)
+    tzinfo (0.3.23)
     will_paginate (3.0.pre2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bson_ext (>= 1.0.4)
-  mongoid (>= 2.0.0.beta.15)
-  redgreen
-  rspec (>= 2.0.0.beta.19)
+  mongoid (~> 2.0.0)
+  mongoid-rspec!
+  rspec (~> 2)

data/README.markdown

@@ -37,6 +37,10 @@ Validation Matchers
       it { should validate_inclusion_of(:role).to_allow("admin", "member") }
       it { should validate_numericality_of(:age) }
     end
+    
+    describe Article do
+      it { should validate_length_of(:title) }
+    end
 
 Others
 -
@@ -47,4 +51,16 @@ Others
 
       # useful if you use factory_girl and have Factory(:user) defined for User
       it { should save }
-    end
+    end
+
+Use
+-
+add in Gemfile
+
+    gem 'mongoid-rspec'
+    
+drop in existing or dedicated support file in spec/support (spec/support/mongoid.rb)
+
+    RSpec.configure do |configuration|
+      configuration.include Mongoid::Matchers
+    end

data/Rakefile

@@ -10,10 +10,8 @@ begin
     gem.email = "evansagge@gmail.com"
     gem.homepage = "http://github.com/evansagge/mongoid-rspec"
     gem.authors = ["Evan Sagge"]
-    gem.add_dependency "mongoid", ">= 2.0.0.beta.15"
-    gem.add_dependency "bson_ext", ">= 1.0.4"
-    gem.add_dependency "rspec", ">= 2.0.0.beta.19"
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
+    gem.add_dependency "mongoid", "~> 2.0.0"
+    gem.add_dependency "rspec", "~> 2"
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError
@@ -25,11 +23,11 @@ require 'rspec/core/rake_task'
 
 task :default => :spec
 
-Rspec::Core::RakeTask.new(:spec) do |spec|
+RSpec::Core::RakeTask.new(:spec) do |spec|
   spec.pattern = "./spec/**/*_spec.rb"
 end
 
-Rspec::Core::RakeTask.new(:rcov) do |spec|
+RSpec::Core::RakeTask.new(:rcov) do |spec|
   spec.pattern = "./spec/**/*_spec.rb"
   spec.rcov = true
 end

data/VERSION

@@ -1 +1 @@
-1.2.1
+1.3.2

data/lib/matchers/document.rb

@@ -100,3 +100,27 @@ RSpec::Matchers.define :have_instance_method do |name|
     "have instance method #{name.to_s}"
   end
 end
+
+RSpec::Matchers.define :be_mongoid_document do
+  match do |doc|
+    doc.class.included_modules.should include(Mongoid::Document)
+  end
+end
+
+RSpec::Matchers.define :be_versioned_document do
+  match do |doc|
+    doc.class.included_modules.should include(Mongoid::Versioning)
+  end
+end
+
+RSpec::Matchers.define :be_timestamped_document do
+  match do |doc|
+    doc.class.included_modules.should include(Mongoid::Timestamps)
+  end
+end
+
+RSpec::Matchers.define :be_paranoid_document do
+  match do |doc|
+    doc.class.included_modules.should include(Mongoid::Paranoia)
+  end
+end

data/lib/matchers/validations/length_of.rb

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

data/lib/matchers/validations/uniqueness_of.rb

@@ -12,36 +12,83 @@ module Mongoid
         end        
         alias_method :scoped_on, :scoped_to
         
+        def case_insensitive
+          @case_insensitive = true
+          self
+        end
+        
         def allow_blank?(allow_blank)
           @allow_blank = allow_blank
+          self
         end
-              
+
+        def with_message(message)
+          @expected_message = message
+          self
+        end
+
         def matches?(actual)
-          return false unless result = super(actual)
-          
-          if [@validator.options[:scope]].flatten == @scope
-            @positive_result_message = @positive_result_message << "scope to #{@validator.options[:scope]}"
-          else
-            @negative_result_message = @negative_result_message << "scope to #{@validator.options[:scope]}"
-            result = false
-          end if @scope
+          return false unless @result = super(actual)
           
-          if @validator.options[:allow_blank] == @allow_blank
-            @positive_result_message = @positive_result_message << " with blank values allowed"
-          else
-            @negative_result_message = @negative_result_message << " with no blank values allowed"
-            result = false
-          end if @allow_blank          
+          check_scope if @scope
+          check_allow_blank if @allow_blank
+          check_case_sensitivity if @case_insensitive
+          check_expected_message if @expected_message
           
-          result
-        end        
-        
+          @result
+        end
+
         def description
           options_desc = []
           options_desc << " scoped to #{@scope.inspect}" if @scope
-          options_desc << " allowing blank values" if @allow_blank          
+          options_desc << " allowing blank values" if @allow_blank
+          options_desc << " allowing case insensitive values" if @case_insensitive
+          options_desc << " with message '#{@expected_message}'" if @case_insensitive
           super << options_desc.to_sentence
-        end        
+        end
+        
+        private
+
+        def check_allow_blank
+          if @validator.options[:allow_blank] == @allow_blank
+            @positive_result_message << " with blank values allowed"
+          else
+            @negative_result_message << " with no blank values allowed"
+            @result = false
+          end
+        end
+
+        def check_scope
+          message = "scope to #{@validator.options[:scope]}"
+          if [@validator.options[:scope]].flatten == @scope
+            @positive_result_message << message
+          else
+            @negative_result_message << message
+            @result = false
+          end
+        end
+        
+        def check_case_sensitivity
+          if @validator.options[:case_sensitive] == false
+            @positive_result_message << " with case insensitive values"
+          else
+            @negative_result_message << " without case insensitive values"
+            @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)

data/lib/mongoid-rspec.rb

@@ -8,6 +8,7 @@ require 'matchers/validations'
 require 'matchers/validations/associated'
 require 'matchers/validations/format_of'
 require 'matchers/validations/inclusion_of'
+require 'matchers/validations/length_of'
 require 'matchers/validations/numericality_of'
 require 'matchers/validations/presence_of'
 require 'matchers/validations/uniqueness_of'

data/mongoid-rspec.gemspec

@@ -5,62 +5,63 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongoid-rspec}
-  s.version = "1.2.1"
+  s.version = "1.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Evan Sagge"]
-  s.date = %q{2010-08-25}
+  s.date = %q{2010-11-11}
   s.description = %q{RSpec matches for Mongoid models, including association and validation matchers}
   s.email = %q{evansagge@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.markdown"
+    "README.markdown"
   ]
   s.files = [
     ".bundle/config",
-     ".document",
-     ".gitignore",
-     ".rvmrc",
-     "Gemfile",
-     "Gemfile.lock",
-     "LICENSE",
-     "README.markdown",
-     "Rakefile",
-     "VERSION",
-     "lib/matchers/associations.rb",
-     "lib/matchers/document.rb",
-     "lib/matchers/validations.rb",
-     "lib/matchers/validations/associated.rb",
-     "lib/matchers/validations/format_of.rb",
-     "lib/matchers/validations/inclusion_of.rb",
-     "lib/matchers/validations/numericality_of.rb",
-     "lib/matchers/validations/presence_of.rb",
-     "lib/matchers/validations/uniqueness_of.rb",
-     "lib/mongoid-rspec.rb",
-     "mongoid-rspec.gemspec",
-     "spec/models/article.rb",
-     "spec/models/comment.rb",
-     "spec/models/profile.rb",
-     "spec/models/user.rb",
-     "spec/spec_helper.rb",
-     "spec/unit/associations_spec.rb",
-     "spec/unit/document_spec.rb",
-     "spec/unit/validations_spec.rb"
+    ".document",
+    ".rvmrc",
+    "Gemfile",
+    "Gemfile.lock",
+    "LICENSE",
+    "README.markdown",
+    "Rakefile",
+    "VERSION",
+    "lib/matchers/associations.rb",
+    "lib/matchers/document.rb",
+    "lib/matchers/validations.rb",
+    "lib/matchers/validations/associated.rb",
+    "lib/matchers/validations/format_of.rb",
+    "lib/matchers/validations/inclusion_of.rb",
+    "lib/matchers/validations/length_of.rb",
+    "lib/matchers/validations/numericality_of.rb",
+    "lib/matchers/validations/presence_of.rb",
+    "lib/matchers/validations/uniqueness_of.rb",
+    "lib/mongoid-rspec.rb",
+    "mongoid-rspec.gemspec",
+    "spec/models/article.rb",
+    "spec/models/comment.rb",
+    "spec/models/profile.rb",
+    "spec/models/site.rb",
+    "spec/models/user.rb",
+    "spec/spec_helper.rb",
+    "spec/unit/associations_spec.rb",
+    "spec/unit/document_spec.rb",
+    "spec/unit/validations_spec.rb"
   ]
   s.homepage = %q{http://github.com/evansagge/mongoid-rspec}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{RSpec matchers for Mongoid}
   s.test_files = [
     "spec/models/article.rb",
-     "spec/models/comment.rb",
-     "spec/models/profile.rb",
-     "spec/models/user.rb",
-     "spec/spec_helper.rb",
-     "spec/unit/associations_spec.rb",
-     "spec/unit/document_spec.rb",
-     "spec/unit/validations_spec.rb"
+    "spec/models/comment.rb",
+    "spec/models/profile.rb",
+    "spec/models/site.rb",
+    "spec/models/user.rb",
+    "spec/spec_helper.rb",
+    "spec/unit/associations_spec.rb",
+    "spec/unit/document_spec.rb",
+    "spec/unit/validations_spec.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -68,18 +69,15 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<mongoid>, [">= 2.0.0.beta.15"])
-      s.add_runtime_dependency(%q<bson_ext>, [">= 1.0.4"])
-      s.add_runtime_dependency(%q<rspec>, [">= 2.0.0.beta.19"])
+      s.add_runtime_dependency(%q<mongoid>, ["~> 2.0.0"])
+      s.add_runtime_dependency(%q<rspec>, ["~> 2"])
     else
-      s.add_dependency(%q<mongoid>, [">= 2.0.0.beta.15"])
-      s.add_dependency(%q<bson_ext>, [">= 1.0.4"])
-      s.add_dependency(%q<rspec>, [">= 2.0.0.beta.19"])
+      s.add_dependency(%q<mongoid>, ["~> 2.0.0"])
+      s.add_dependency(%q<rspec>, ["~> 2"])
     end
   else
-    s.add_dependency(%q<mongoid>, [">= 2.0.0.beta.15"])
-    s.add_dependency(%q<bson_ext>, [">= 1.0.4"])
-    s.add_dependency(%q<rspec>, [">= 2.0.0.beta.19"])
+    s.add_dependency(%q<mongoid>, ["~> 2.0.0"])
+    s.add_dependency(%q<rspec>, ["~> 2"])
   end
 end
 

data/spec/models/article.rb

@@ -9,5 +9,7 @@ class Article
   referenced_in :user, :inverse_of => :articles
   
   validates :title, :presence => true
+  
+  validates_length_of :title, :minimum => 8, :maximum => 16
 end
   

data/spec/models/site.rb

@@ -0,0 +1,10 @@
+class Site
+  include Mongoid::Document
+  
+  field :name
+  
+  references_many :users, :inverse_of => :site
+  
+  validates :name, :presence => true, :uniqueness => true
+  
+end

data/spec/models/user.rb

@@ -5,14 +5,15 @@ class User
   field :email
   field :role
   
+  referenced_in :site, :inverse_of => :users
   references_many :articles
   references_many :comments
   references_many :children, :stored_as => :array, :class_name => "User"
   
   embeds_one :profile
   
-  validates :login, :presence => true, :uniqueness => true, :format => { :with => /^[\w\-]+$/ }
-  validates :email, :presence => true, :uniqueness => true
+  validates :login, :presence => true, :uniqueness => { :scope => :site }, :format => { :with => /^[\w\-]+$/ }
+  validates :email, :uniqueness => { :case_sensitive => false, :scope => :site, :message => "is already taken" }
   validates :role, :presence => true, :inclusion => { :in => ["admin", "moderator", "member"]}  
   validates :profile, :presence => true, :associated => true
   

data/spec/unit/validations_spec.rb

@@ -1,9 +1,15 @@
 require 'spec_helper'
 
 describe "Validations" do
+  describe Site do
+    it { should validate_presence_of(:name) }
+    it { should validate_uniqueness_of(:name) }
+  end
+  
   describe User do
     it { should validate_presence_of(:login) }
-    it { should validate_uniqueness_of(:login) }    
+    it { should validate_uniqueness_of(:login).scoped_to(:site) }
+    it { should validate_uniqueness_of(:email).case_insensitive.with_message("is already taken") }
     it { should validate_format_of(:login).to_allow("valid_login").not_to_allow("invalid login") }
     it { should validate_associated(:profile) }
     it { should validate_inclusion_of(:role).to_allow("admin", "member") }
@@ -12,4 +18,8 @@ describe "Validations" do
   describe Profile do
     it { should validate_numericality_of(:age) }
   end
+  
+  describe Article do
+    it { should validate_length_of(:title) }
+  end
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
+  - 3
   - 2
-  - 1
-  version: 1.2.1
+  version: 1.3.2
 platform: ruby
 authors: 
 - Evan Sagge
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-25 00:00:00 +08:00
+date: 2010-11-11 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -23,49 +23,28 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
         - 2
         - 0
         - 0
-        - beta
-        - 15
-        version: 2.0.0.beta.15
+        version: 2.0.0
   type: :runtime
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: bson_ext
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 4
-        version: 1.0.4
-  type: :runtime
-  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
         - 2
-        - 0
-        - 0
-        - beta
-        - 19
-        version: 2.0.0.beta.19
+        version: "2"
   type: :runtime
-  version_requirements: *id003
+  version_requirements: *id002
 description: RSpec matches for Mongoid models, including association and validation matchers
 email: evansagge@gmail.com
 executables: []
@@ -78,7 +57,6 @@ extra_rdoc_files:
 files: 
 - .bundle/config
 - .document
-- .gitignore
 - .rvmrc
 - Gemfile
 - Gemfile.lock
@@ -92,6 +70,7 @@ files:
 - lib/matchers/validations/associated.rb
 - lib/matchers/validations/format_of.rb
 - lib/matchers/validations/inclusion_of.rb
+- lib/matchers/validations/length_of.rb
 - lib/matchers/validations/numericality_of.rb
 - lib/matchers/validations/presence_of.rb
 - lib/matchers/validations/uniqueness_of.rb
@@ -100,6 +79,7 @@ files:
 - spec/models/article.rb
 - spec/models/comment.rb
 - spec/models/profile.rb
+- spec/models/site.rb
 - spec/models/user.rb
 - spec/spec_helper.rb
 - spec/unit/associations_spec.rb
@@ -110,8 +90,8 @@ homepage: http://github.com/evansagge/mongoid-rspec
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -141,6 +121,7 @@ test_files:
 - spec/models/article.rb
 - spec/models/comment.rb
 - spec/models/profile.rb
+- spec/models/site.rb
 - spec/models/user.rb
 - spec/spec_helper.rb
 - spec/unit/associations_spec.rb

data/.gitignore

@@ -1,21 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC