mongoid-rspec 1.5.0 → 1.5.1

data/README.md

@@ -1,25 +1,29 @@
 mongoid-rspec
 =
 
-RSpec matchers for Mongoid.
+http://rubygems.org/gems/mongoid-rspec
+
+RSpec matchers for Mongoid 3.x.
+
+For Mongoid 2.x, use [mongoid-rspec 1.4.5](http://rubygems.org/gems/mongoid-rspec/versions/1.4.5)
 
 Association Matchers
 -
     describe User do
       it { should have_many(:articles).with_foreign_key(:author_id) }
-  
-      it { should have_one(:record) }    
-  
+
+      it { should have_one(:record) }
+
       it { should have_many :comments }
-      
+
       #can also specify with_dependent to test if :dependent => :destroy/:destroy_all/:delete is set
       it { should have_many(:comments).with_dependent(:destroy) }
       #can verify autosave is set to true
       it { should have_many(:comments).with_autosave }
-  
+
       it { should embed_one :profile }
 
-      it { should have_and_belong_to_many(:children) }  
+      it { should have_and_belong_to_many(:children) }
       it { should have_and_belong_to_many(:children).of_type(User) }
     end
 
@@ -68,14 +72,14 @@ Validation Matchers
     describe Article do
       it { should validate_length_of(:title).within(8..16) }
     end
-    
+
     describe Profile do
       it { should validate_numericality_of(:age).greater_than(0) }
-    end    
+    end
 
     describe MovieArticle do
       it { should validate_numericality_of(:rating).to_allow(:greater_than => 0).less_than_or_equal_to(5) }
-      it { should validate_numericality_of(:classification).to_allow(:even => true, :only_integer => true, :nil => false) }    
+      it { should validate_numericality_of(:classification).to_allow(:even => true, :only_integer => true, :nil => false) }
     end
 
     describe Person do
@@ -93,33 +97,34 @@ Others
       it { should have_index_for(:last_name) }
       it { should have_index_for(:email).with_options(:unique => true) }
 
-      # useful if you use factory_girl and have Factory(:user) defined for User
-      it { should save }
-      
-      it { should be_timestamped_document } # if you're declaring `include Mongoid::Timestamps`
+      it { should be_timestamped_document } # if you're declaring `include
+      Mongoid::Timestamps` or any of `include Mongoid::Timestamps::Created` and `Mongoid::Timestamps::Updated`
+      it { should be_timestamped_document.with(:created) }
+      it { should_not be_timestamped_document.with(:updated) }
+
       it { should be_versioned_document } # if you're declaring `include Mongoid::Versioning`
       it { should be_paranoid_document } # if you're declaring `include Mongoid::Paranoia`
       it { should be_multiparameted_document } # if you're declaring `include Mongoid::MultiParameterAttributes`
     end
-    
+
     describe Log do
       it { should be_stored_in :logs }
-    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
-    
+
 Acknowledgement
 -
-Thanks to [Durran Jordan](https://github.com/durran) for providing the changes necessary to make 
-this compatible with mongoid 2.0.0.rc, and for other [contributors](https://github.com/evansagge/mongoid-rspec/contributors) 
+Thanks to [Durran Jordan](https://github.com/durran) for providing the changes necessary to make
+this compatible with mongoid 2.0.0.rc, and for other [contributors](https://github.com/evansagge/mongoid-rspec/contributors)
 to this project.

data/lib/matchers/document.rb

@@ -92,11 +92,24 @@ end
 
 RSpec::Matchers.define :be_timestamped_document do
   match do |doc|
-    doc.class.included_modules.include?(Mongoid::Timestamps)
+    if [*@timestamped_module].any?
+      modules = [*@timestamped_module].map{|m| "Mongoid::Timestamps::#{m.to_s.classify}".constantize }
+      (modules - doc.class.included_modules).empty?
+    else
+      doc.class.included_modules.include?(Mongoid::Timestamps) or
+      doc.class.included_modules.include?(Mongoid::Timestamps::Created) or
+      doc.class.included_modules.include?(Mongoid::Timestamps::Updated)
+    end
+  end
+
+  chain :with do |timestamped_module|
+    @timestamped_module = timestamped_module
   end
 
   description do
-    "be a timestamped Mongoid document"
+    desc = "be a timestamped Mongoid document"
+    desc << " with #{@timestamped_module}" if @timestamped_module
+    desc
   end
 end
 

data/lib/matchers/validations.rb

@@ -1,20 +1,20 @@
 module Mongoid
   module Matchers
-    module Validations  
-      
+    module Validations
+
       class HaveValidationMatcher
-      
+
         def initialize(field, validation_type)
           @field = field.to_s
           @type = validation_type.to_s
           @options = {}
         end
-                
+
         def matches?(actual)
           @klass = actual.is_a?(Class) ? actual : actual.class
-          
+
           @validator = @klass.validators_on(@field).detect{|v| v.kind.to_s == @type}
-          
+
           if @validator
             @negative_result_message = "#{@type.inspect} validator on #{@field.inspect}"
             @positive_result_message = "#{@type.inspect} validator on #{@field.inspect}"
@@ -23,37 +23,44 @@ module Mongoid
             return false
           end
           @result = true
-          check_on if @options[:on]          
+          check_on if @options[:on]
           @result
         end
-        
-        def failure_message_for_should  
-          "Expected #{@klass.inspect} to #{description}; instead got #{@negative_result_message}"  
+
+        def failure_message_for_should
+          "Expected #{@klass.inspect} to #{description}; instead got #{@negative_result_message}"
         end
-      
-        def failure_message_for_should_not  
-          "Expected #{@klass.inspect} to not #{description}; instead got #{@positive_result_message}"  
+
+        def failure_message_for_should_not
+          "Expected #{@klass.inspect} to not #{description}; instead got #{@positive_result_message}"
         end
-        
+
         def description
-          "validate #{@type} of #{@field.inspect}"
+          desc = "validate #{@type} of #{@field.inspect}"
+          desc << " on #{@options[:on]}" if @options[:on]
+          desc
         end
-        
+
         def on(*on_method)
           @options[:on] = on_method.flatten
           self
-        end  
-        
+        end
+
         def check_on
-          message = " on methods: #{@validator.options[:on]}"
-          if [@validator.options[:on]].flatten == @options[:on]
-            @positive_result_message << message
-          else
-            @negative_result_message << message
-            @result = false
+          validator_on_methods = [@validator.options[:on]].flatten
+
+          if validator_on_methods.any?
+            message = " on methods: #{validator_on_methods}"
+
+            if (@options[:on] - validator_on_methods).empty?
+              @positive_result_message << message
+            else
+              @negative_result_message << message
+              @result = false
+            end
           end
         end
-      end     
+      end
     end
   end
 end

data/lib/mongoid-rspec/version.rb

@@ -1,5 +1,5 @@
 module Mongoid
   module Rspec
-    VERSION = "1.5.0"
+    VERSION = "1.5.1"
   end
 end

data/spec/models/user.rb

@@ -1,11 +1,13 @@
 class User
   include Mongoid::Document
+  include Mongoid::Timestamps::Created
 
   field :login
   field :email
   field :role
   field :age, type: Integer
   field :password, type: String
+  field :provider_uid
 
   belongs_to :site, :inverse_of => :users
   has_many :articles, :foreign_key => :author_id
@@ -20,7 +22,8 @@ class User
   validates :role, :presence => true, :inclusion => { :in => ["admin", "moderator", "member"]}
   validates :profile, :presence => true, :associated => true
   validates :age, :presence => true, :numericality => true, :inclusion => { :in => 23..42 }, :on => [:create, :update]
-  validates :password, :presence => true, :on => :create
+  validates :password, :presence => true, :on => [:create, :update]
+  validates :provider_uid, presence: true
 
   attr_accessible :login, :email, :age, :password
   attr_accessible :role, :as => :admin

data/spec/unit/document_spec.rb

@@ -3,15 +3,15 @@ require 'spec_helper'
 describe "Document" do
   describe User do
     it { should have_fields(:email, :login) }
+    it { should be_timestamped_document }
+    it { should be_timestamped_document.with(:created) }
+    it { should_not be_timestamped_document.with(:updated) }
   end
-  
+
   describe Article do
     it { should have_field(:published).of_type(Boolean).with_default_value_of(false) }
-    it { should have_field(:allow_comments).of_type(Boolean).with_default_value_of(true) }    
+    it { should have_field(:allow_comments).of_type(Boolean).with_default_value_of(true) }
     it { should_not have_field(:allow_comments).of_type(Boolean).with_default_value_of(false) }
-  end
-
-  describe Article do
     it { should be_mongoid_document }
     it { should be_versioned_document }
     it { should be_timestamped_document }

data/spec/unit/validations_spec.rb

@@ -19,6 +19,7 @@ describe "Validations" do
     it { should validate_numericality_of(:age).on(:create, :update) }
     it { should validate_inclusion_of(:age).to_allow(23..42).on([:create, :update]) }
     it { should validate_presence_of(:password).on(:create) }
+    it { should validate_presence_of(:provider_uid).on(:create) }
   end
 
   describe Profile do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-rspec
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70123218181600 !ruby/object:Gem::Requirement
+  requirement: &70095909068120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70123218181600
+  version_requirements: *70095909068120
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &70123218180220 !ruby/object:Gem::Requirement
+  requirement: &70095909066740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 3.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *70123218180220
+  version_requirements: *70095909066740
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70123218179440 !ruby/object:Gem::Requirement
+  requirement: &70095909065960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '2.9'
   type: :runtime
   prerelease: false
-  version_requirements: *70123218179440
+  version_requirements: *70095909065960
 description: RSpec matches for Mongoid models, including association and validation
   matchers
 email: evansagge@gmail.com