mongoid-rspec 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 22432282a4af9711e7ff58260bd7e9ccf7279a31
-  data.tar.gz: c183931632e9cdd7594ab6314678f3ca6f76f849
+  metadata.gz: 644aca9f2b61c8979ce8eb90856a3d7db324e506
+  data.tar.gz: 8f428ac11869473c94207866056850ceb113246a
 SHA512:
-  metadata.gz: 1b3752eba793b316c4d0ccc611c4b6d9e8b766ceb43617a92185899c90839e4e9067dabe7b9b274868e85434c2c209189bb2278cbd7e644c51c8c7ecfcb83470
-  data.tar.gz: 69ac5c4fe2ddf2626021c2776e311394fc8a709713f926e16bb4ca4c3e58906d1f9880510d594c5887c4645155a285c8237e44b91082da7e2b32a4745a5321d3
+  metadata.gz: bb156c8186d891023ed5b423635aef4c673b150728372648cec95de064c72bc7fea35007ea1895d4002f880d787779dddcd9be0ce6304b68dfcdf0554a8aa8d6
+  data.tar.gz: 83b4e63454cc912622c081fc67b0ff0185bb4b612676ad9ec2e7c7240d39f066fa94fe023066a968ca3c848ac21df4dcfd84c6b29c595894ecb7e35dc716f2e6

data/README.md

@@ -10,19 +10,19 @@ mongoid-rspec provides a collection of RSpec-compatible matchers that help to te
 
 ### With Mongoid 4.x
 
-Use mongoid-rspec [2.0.0.rc1][mongo4]
+Use mongoid-rspec [2.1.0][mongoid4]
 
-    gem 'mongoid-rspec', '~> 2.0.0.rc1'
+    gem 'mongoid-rspec', '~> 2.1.0'
 
 ### With Mongoid 3.x
 
-Use mongoid-rspec [1.11.0][mongo3].
+Use mongoid-rspec [1.13.0][mongoid3].
 
-    gem 'mongoid-rspec', '~> 1.11.0'
+    gem 'mongoid-rspec', '~> 1.13.0'
 
 ### With Mongoid 2.x
 
-Use mongoid-rspec [1.4.5][mongo2]
+Use mongoid-rspec [1.4.5][mongoid2]
 
     gem 'mongoid-rspec', '1.4.5'
 
@@ -37,169 +37,177 @@ RSpec.configure do |config|
 end
 ```
 
+If you aren't using rails then you don't have to specify the type.
+If you want to know why visit [the rspec documentation](https://relishapp.com/rspec/rspec-rails/docs/directory-structure).
+
 ## Matchers
 
 ### Association Matchers
 
 ```ruby
-describe User do
-  it { should have_many(:articles).with_foreign_key(:author_id).ordered_by(:title) }
+RSpec.describe User do
+  it { is_expected.to have_many(:articles).with_foreign_key(:author_id).ordered_by(:title) }
 
-  it { should have_one(:record) }
+  it { is_expected.to have_one(:record) }
   #can verify autobuild is set to true
-  it { should have_one(:record).with_autobuild }
+  it { is_expected.to have_one(:record).with_autobuild }
 
-  it { should have_many :comments }
+  it { is_expected.to 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) }
+  it { is_expected.to have_many(:comments).with_dependent(:destroy) }
   #can verify autosave is set to true
-  it { should have_many(:comments).with_autosave }
+  it { is_expected.to have_many(:comments).with_autosave }
 
-  it { should embed_one :profile }
+  it { is_expected.to embed_one :profile }
 
-  it { should have_and_belong_to_many(:children) }
-  it { should have_and_belong_to_many(:children).of_type(User) }
+  it { is_expected.to have_and_belong_to_many(:children) }
+  it { is_expected.to have_and_belong_to_many(:children).of_type(User) }
 end
 
-describe Profile do
-  it { should be_embedded_in(:user).as_inverse_of(:profile) }
+RSpec.describe Profile do
+  it { is_expected.to be_embedded_in(:user).as_inverse_of(:profile) }
 end
 
-describe Article do
-  it { should belong_to(:author).of_type(User).as_inverse_of(:articles) }
-  it { should belong_to(:author).of_type(User).as_inverse_of(:articles).with_index }
-  it { should embed_many(:comments) }
+RSpec.describe Article do
+  it { is_expected.to belong_to(:author).of_type(User).as_inverse_of(:articles) }
+  it { is_expected.to belong_to(:author).of_type(User).as_inverse_of(:articles).with_index }
+  it { is_expected.to embed_many(:comments) }
 end
 
-describe Comment do
-  it { should be_embedded_in(:article).as_inverse_of(:comments) }
-  it { should belong_to(:user).as_inverse_of(:comments) }
+RSpec.describe Comment do
+  it { is_expected.to be_embedded_in(:article).as_inverse_of(:comments) }
+  it { is_expected.to belong_to(:user).as_inverse_of(:comments) }
 end
 
-describe Record do
-  it { should belong_to(:user).as_inverse_of(:record) }
+RSpec.describe Record do
+  it { is_expected.to belong_to(:user).as_inverse_of(:record) }
 end
 
-describe Site do
-  it { should have_many(:users).as_inverse_of(:site).ordered_by(:email.asc) }
+RSpec.describe Site do
+  it { is_expected.to have_many(:users).as_inverse_of(:site).ordered_by(:email.asc).with_counter_cache }
 end
 ```
 
 ### Mass Assignment Matcher
 
 ```ruby
-describe User do
-  it { should allow_mass_assignment_of(:login) }
-  it { should allow_mass_assignment_of(:email) }
-  it { should allow_mass_assignment_of(:age) }
-  it { should allow_mass_assignment_of(:password) }
-  it { should allow_mass_assignment_of(:password) }
-  it { should allow_mass_assignment_of(:role).as(:admin) }
+RSpec.describe User do
+  it { is_expected.to allow_mass_assignment_of(:login) }
+  it { is_expected.to allow_mass_assignment_of(:email) }
+  it { is_expected.to allow_mass_assignment_of(:age) }
+  it { is_expected.to allow_mass_assignment_of(:password) }
+  it { is_expected.to allow_mass_assignment_of(:password) }
+  it { is_expected.to allow_mass_assignment_of(:role).as(:admin) }
 
-  it { should_not allow_mass_assignment_of(:role) }
+  it { is_expected.not_to allow_mass_assignment_of(:role) }
 end
 ```
 
 ### Validation Matchers
 
 ```ruby
-describe Site do
-  it { should validate_presence_of(:name) }
-  it { should validate_uniqueness_of(:name) }
+RSpec.describe Site do
+  it { is_expected.to validate_presence_of(:name) }
+  it { is_expected.to validate_uniqueness_of(:name) }
 end
 
-describe User do
-  it { should validate_presence_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_exclusion_of(:login).to_not_allow("super", "index", "edit") }
-  it { should validate_inclusion_of(:role).to_allow("admin", "member") }
-  it { should validate_confirmation_of(:email) }
-  it { should validate_presence_of(:age).on(:create, :update) }
-  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) }
-  it { should validate_inclusion_of(:locale).to_allow([:en, :ru]) }
+RSpec.describe User do
+  it { is_expected.to validate_presence_of(:login) }
+  it { is_expected.to validate_uniqueness_of(:login).scoped_to(:site) }
+  it { is_expected.to validate_uniqueness_of(:email).case_insensitive.with_message("is already taken") }
+  it { is_expected.to validate_format_of(:login).to_allow("valid_login").not_to_allow("invalid login") }
+  it { is_expected.to validate_associated(:profile) }
+  it { is_expected.to validate_exclusion_of(:login).to_not_allow("super", "index", "edit") }
+  it { is_expected.to validate_inclusion_of(:role).to_allow("admin", "member") }
+  it { is_expected.to validate_confirmation_of(:email) }
+  it { is_expected.to validate_presence_of(:age).on(:create, :update) }
+  it { is_expected.to validate_numericality_of(:age).on(:create, :update) }
+  it { is_expected.to validate_inclusion_of(:age).to_allow(23..42).on([:create, :update]) }
+  it { is_expected.to validate_presence_of(:password).on(:create) }
+  it { is_expected.to validate_presence_of(:provider_uid).on(:create) }
+  it { is_expected.to validate_inclusion_of(:locale).to_allow([:en, :ru]) }
 end
 
-describe Article do
-  it { should validate_length_of(:title).within(8..16) }
+RSpec.describe Article do
+  it { is_expected.to validate_length_of(:title).within(8..16) }
 end
 
-describe Profile do
-  it { should validate_numericality_of(:age).greater_than(0) }
+RSpec.describe Profile do
+  it { is_expected.to validate_numericality_of(:age).greater_than(0) }
 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) }
+RSpec.describe MovieArticle do
+  it { is_expected.to validate_numericality_of(:rating).to_allow(:greater_than => 0).less_than_or_equal_to(5) }
+  it { is_expected.to validate_numericality_of(:classification).to_allow(:even => true, :only_integer => true, :nil => false) }
 end
 
-describe Person do
+RSpec.describe Person do
    # in order to be able to use the custom_validate matcher, the custom validator class (in this case SsnValidator)
    # should redefine the kind method to return :custom, i.e. "def self.kind() :custom end"
-  it { should custom_validate(:ssn).with_validator(SsnValidator) }
+  it { is_expected.to custom_validate(:ssn).with_validator(SsnValidator) }
 end
 ```
 
 ### Accepts Nested Attributes Matcher
 
 ```ruby
-describe User do
-  it { should accept_nested_attributes_for(:articles) }
-  it { should accept_nested_attributes_for(:comments) }
+RSpec.describe User do
+  it { is_expected.to accept_nested_attributes_for(:articles) }
+  it { is_expected.to accept_nested_attributes_for(:comments) }
 end
 
-describe Article do
-  it { should accept_nested_attributes_for(:permalink) }
+RSpec.describe Article do
+  it { is_expected.to accept_nested_attributes_for(:permalink) }
 end
 ```
 
 ### Index Matcher
 
 ```ruby
-describe Article do
-  it { should have_index_for(published: 1) }
-  it { should have_index_for(title: 1).with_options(unique: true, background: true) }
+RSpec.describe Article do
+  it { is_expected.to have_index_for(published: 1) }
+  it { is_expected.to have_index_for(title: 1).with_options(unique: true, background: true) }
+end
+
+RSpec.describe Profile do
+  it { is_expected.to have_index_for(first_name: 1, last_name: 1) }
 end
 
-describe Profile do
-  it { should have_index_for(first_name: 1, last_name: 1) }
+Rspec.describe Log do
+  it { is_expected.to have_index_for(created_at: 1).with_options(bucket_size: 100, expire_after_seconds: 3600) }
 end
 ```
 
 ### Others
 
 ```ruby
-describe User do
-  it { should have_fields(:email, :login) }
-  it { should have_field(:s).with_alias(:status) }
-  it { should have_fields(:birthdate, :registered_at).of_type(DateTime) }
+RSpec.describe User do
+  it { is_expected.to have_fields(:email, :login) }
+  it { is_expected.to have_field(:s).with_alias(:status) }
+  it { is_expected.to have_fields(:birthdate, :registered_at).of_type(DateTime) }
 
   # if you're declaring 'include Mongoid::Timestamps'
   # or any of 'include Mongoid::Timestamps::Created' and 'Mongoid::Timestamps::Updated'
-  it { should be_timestamped_document }
-  it { should be_timestamped_document.with(:created) }
-  it { should_not be_timestamped_document.with(:updated) }
+  it { is_expected.to be_timestamped_document }
+  it { is_expected.to be_timestamped_document.with(:created) }
+  it { is_expected.not_to 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`
+  it { is_expected.to be_versioned_document } # if you're declaring `include Mongoid::Versioning`
+  it { is_expected.to be_paranoid_document } # if you're declaring `include Mongoid::Paranoia`
+  it { is_expected.to be_multiparameted_document } # if you're declaring `include Mongoid::MultiParameterAttributes`
 end
 
-describe Log do
-  it { should be_stored_in :logs }
+RSpec.describe Log do
+  it { is_expected.to be_stored_in :logs }
+  it { is_expected.to be_dynamic_document }
 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_not have_field(:allow_comments).of_type(Boolean).with_default_value_of(false) }
-  it { should_not have_field(:number_of_comments).of_type(Integer).with_default_value_of(1) }
+RSpec.describe Article do
+  it { is_expected.to have_field(:published).of_type(Boolean).with_default_value_of(false) }
+  it { is_expected.to have_field(:allow_comments).of_type(Boolean).with_default_value_of(true) }
+  it { is_expected.not_to have_field(:allow_comments).of_type(Boolean).with_default_value_of(false) }
+  it { is_expected.not_to have_field(:number_of_comments).of_type(Integer).with_default_value_of(1) }
 end
 ```
 
@@ -214,9 +222,9 @@ this compatible with mongoid 2.0.0.rc, and for other [contributors](https://gith
 to this project.
 
 [durran]: https://github.com/durran
-[mongo2]: http://rubygems.org/gems/mongoid-rspec/versions/1.4.5
-[mongo3]: http://rubygems.org/gems/mongoid-rspec/versions/1.11.0
-[mongo4]: http://rubygems.org/gems/mongoid-rspec/versions/2.0.0.rc1
+[mongoid2]: http://rubygems.org/gems/mongoid-rspec/versions/1.4.5
+[mongoid3]: http://rubygems.org/gems/mongoid-rspec/versions/1.13.0
+[mongoid4]: http://rubygems.org/gems/mongoid-rspec/versions/2.0.0
 
 [travis_badge]: http://img.shields.io/travis/mongoid-rspec/mongoid-rspec.svg?style=flat
 [travis]: https://travis-ci.org/mongoid-rspec/mongoid-rspec

data/lib/matchers/associations.rb

@@ -101,6 +101,12 @@ module Mongoid
           self
         end
 
+        def with_counter_cache
+          @association[:counter_cache] = true
+          @expectation_message << " which specifies counter_cache as #{@association[:counter_cache].to_s}"
+          self
+        end
+
         def matches?(actual)
           @actual = actual.is_a?(Class) ? actual : actual.class
           metadata = @actual.relations[@association[:name]]
@@ -235,6 +241,15 @@ module Mongoid
             end
           end
 
+          if @association[:counter_cache]
+            if metadata.counter_cached? != true
+              @negative_result_message = "#{@positive_result_message} which did not set counter_cache"
+              return false
+            else
+              @positive_result_message = "#{@positive_result_message} which set counter_cache"
+            end
+          end
+
           return true
         end
 

data/lib/matchers/document.rb

@@ -161,3 +161,13 @@ RSpec::Matchers.define :be_multiparameted_document do
     "be a multiparameted Mongoid document"
   end
 end
+
+RSpec::Matchers.define :be_dynamic_document do |_|
+  match do |doc|
+    doc.class.included_modules.include?(Mongoid::Attributes::Dynamic)
+  end
+
+  description do
+    'be a Mongoid document with dynamic attributes'
+  end
+end

data/lib/matchers/indexes.rb

@@ -14,33 +14,18 @@ module Mongoid
         @klass  = klass.is_a?(Class) ? klass : klass.class
         @errors = []
 
-        if @klass.respond_to?(:index_options)
-          # Mongoid 3
-          unless @klass.index_options[@index_fields]
-            @errors.push "no index for #{@index_fields}"
-          else
-            if !@options.nil? && !@options.empty?
-              @options.each do |option, option_value|
-                if denormalising_options(@klass.index_options[@index_fields])[option] != option_value
-                  @errors.push "index for #{@index_fields.inspect} with options of #{@klass.index_options[@index_fields].inspect}"
-                end
+        index_specifications = @klass.index_specifications.find { |is| is.key == @index_fields }
+        if index_specifications
+          if !@options.nil? && !@options.empty?
+            index_options = normalize_options(index_specifications.options)
+            @options.each do |option, option_value|
+              if index_options[option] != option_value
+                @errors.push "index for #{@index_fields.inspect} with options of #{index_options.inspect}"
               end
             end
           end
         else
-          # Mongoid 4
-          unless @klass.index_specifications.map(&:key).include?(@index_fields)
-            @errors.push "no index for #{@index_fields}"
-          else
-            if !@options.nil? && !@options.empty?
-              index_options = @klass.index_specifications.select { |is| is.key == @index_fields }.first.options
-              @options.each do |option, option_value|
-                if index_options[option] != option_value
-                  @errors.push "index for #{@index_fields.inspect} with options of #{index_options.inspect}"
-                end
-              end
-            end
-          end
+          @errors.push "no index for #{@index_fields}"
         end
 
         @errors.empty?
@@ -65,15 +50,15 @@ module Mongoid
 
       private
         MAPPINGS = {
-          dropDups: :drop_dups
+          dropDups: :drop_dups,
+          expireAfterSeconds: :expire_after_seconds,
+          bucketSize: :bucket_size
         }
 
-        def denormalising_options(opts)
-          options = {}
-          opts.each_pair do |option, value|
-            options[MAPPINGS[option] || option] = value
+        def normalize_options(options)
+          options.transform_keys do |key|
+            MAPPINGS[key] || key
           end
-          options
         end
     end
 

data/lib/mongoid-rspec/version.rb

@@ -1,5 +1,5 @@
 module Mongoid
   module Rspec
-    VERSION = "2.0.0"
+    VERSION = "2.1.0"
   end
 end

data/spec/models/log.rb

@@ -1,4 +1,9 @@
 class Log
   include Mongoid::Document
+  include Mongoid::Timestamps
+  include Mongoid::Attributes::Dynamic
+
   store_in collection: "logs"
-end
+
+  index({ created_at: 1 }, { bucket_size: 100, expire_after_seconds: 3600 } )
+end

data/spec/models/site.rb

@@ -3,7 +3,7 @@ class Site
 
   field :name
 
-  has_many :users, inverse_of: :site, order: :email.desc
+  has_many :users, inverse_of: :site, order: :email.desc, counter_cache: true
 
   validates :name, presence: true, uniqueness: true
-end
+end

data/spec/spec_helper.rb

@@ -29,4 +29,5 @@ RSpec.configure do |config|
   config.after :all do
     Mongoid::Config.purge!
   end
+  config.disable_monkey_patching!
 end

data/spec/unit/accept_nested_attributes_spec.rb

@@ -1,12 +1,12 @@
 require 'spec_helper'
 
-describe "AcceptsNestedAttributes" do
+RSpec.describe "AcceptsNestedAttributes" do
   describe User do
-    it { should accept_nested_attributes_for(:articles) }
-    it { should accept_nested_attributes_for(:comments) }
+    it { is_expected.to accept_nested_attributes_for(:articles) }
+    it { is_expected.to accept_nested_attributes_for(:comments) }
   end
 
   describe Article do
-    it { should accept_nested_attributes_for(:permalink) }
+    it { is_expected.to accept_nested_attributes_for(:permalink) }
   end
-end
+end

data/spec/unit/associations_spec.rb

@@ -1,42 +1,42 @@
 require 'spec_helper'
 
-describe "Associations" do
+RSpec.describe "Associations" do
   describe User do
-    it { should have_many(:articles).with_foreign_key(:author_id).ordered_by(:title) }
+    it { is_expected.to have_many(:articles).with_foreign_key(:author_id).ordered_by(:title) }
 
-    it { should have_one(:record).with_autobuild }
+    it { is_expected.to have_one(:record).with_autobuild }
 
-    it { should have_many(:comments).with_dependent(:destroy).with_autosave }
+    it { is_expected.to have_many(:comments).with_dependent(:destroy).with_autosave }
 
-    it { should embed_one(:profile) }
+    it { is_expected.to embed_one(:profile) }
 
-    it { should have_and_belong_to_many(:children).of_type(User) }
+    it { is_expected.to have_and_belong_to_many(:children).of_type(User) }
   end
 
   describe Profile do
-    it { should be_embedded_in(:user).as_inverse_of(:profile) }
+    it { is_expected.to be_embedded_in(:user).as_inverse_of(:profile) }
   end
 
   describe Article do
-    it { should belong_to(:author).of_type(User).as_inverse_of(:articles).with_index }
-    it { should embed_many(:comments).with_cascading_callbacks }
-    it { should embed_one(:permalink) }
+    it { is_expected.to belong_to(:author).of_type(User).as_inverse_of(:articles).with_index }
+    it { is_expected.to embed_many(:comments).with_cascading_callbacks }
+    it { is_expected.to embed_one(:permalink) }
   end
 
   describe Comment do
-    it { should be_embedded_in(:article).as_inverse_of(:comments).with_polymorphism }
-    it { should belong_to(:user).as_inverse_of(:comments) }
+    it { is_expected.to be_embedded_in(:article).as_inverse_of(:comments).with_polymorphism }
+    it { is_expected.to belong_to(:user).as_inverse_of(:comments) }
   end
 
   describe Record do
-    it { should belong_to(:user).as_inverse_of(:record) }
+    it { is_expected.to belong_to(:user).as_inverse_of(:record) }
   end
 
   describe Permalink do
-    it { should be_embedded_in(:linkable).as_inverse_of(:link) }
+    it { is_expected.to be_embedded_in(:linkable).as_inverse_of(:link) }
   end
 
   describe Site do
-    it { should have_many(:users).as_inverse_of(:site).ordered_by(:email.desc) }
+    it { is_expected.to have_many(:users).as_inverse_of(:site).ordered_by(:email.desc).with_counter_cache }
   end
 end

data/spec/unit/collections_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
-describe "Collections" do
+RSpec.describe "Collections" do
   describe Log do
-    it { should be_stored_in :logs }
+    it { is_expected.to be_stored_in :logs }
   end
-end
+end

data/spec/unit/document_spec.rb

@@ -1,21 +1,26 @@
 require 'spec_helper'
 
-describe "Document" do
+RSpec.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) }
+    it { is_expected.to have_fields(:email, :login) }
+    it { is_expected.to be_timestamped_document }
+    it { is_expected.to be_timestamped_document.with(:created) }
+    it { is_expected.not_to be_timestamped_document.with(:updated) }
   end
 
   describe Article do
-    it { should have_field(:published).of_type(Mongoid::Boolean).with_default_value_of(false) }
-    it { should have_field(:allow_comments).of_type(Mongoid::Boolean).with_default_value_of(true) }
-    it { should belong_to(:author) }
-    it { should have_field(:title).localized }
-    it { should_not have_field(:allow_comments).of_type(Mongoid::Boolean).with_default_value_of(false) }
-    it { should_not have_field(:number_of_comments).of_type(Integer).with_default_value_of(1) }
-    it { should be_mongoid_document }
-    it { should be_timestamped_document }
+    it { is_expected.to have_field(:published).of_type(Mongoid::Boolean).with_default_value_of(false) }
+    it { is_expected.to have_field(:allow_comments).of_type(Mongoid::Boolean).with_default_value_of(true) }
+    it { is_expected.to belong_to(:author) }
+    it { is_expected.to have_field(:title).localized }
+    it { is_expected.not_to have_field(:allow_comments).of_type(Mongoid::Boolean).with_default_value_of(false) }
+    it { is_expected.not_to have_field(:number_of_comments).of_type(Integer).with_default_value_of(1) }
+    it { is_expected.to be_mongoid_document }
+    it { is_expected.to be_timestamped_document }
+  end
+
+  describe Log do
+    it { is_expected.to be_mongoid_document }
+    it { is_expected.to be_dynamic_document }
   end
 end

data/spec/unit/indexes_spec.rb

@@ -1,13 +1,17 @@
 require 'spec_helper'
 
-describe "Indexes" do
+RSpec.describe "Indexes" do
   describe Article do
-    it { should have_index_for(published: 1) }
-    it { should have_index_for(title: 1).with_options(unique: true, background: true, dropDups: true) }
-    it { should have_index_for('permalink._id' => 1) }
+    it { is_expected.to have_index_for(published: 1) }
+    it { is_expected.to have_index_for(title: 1).with_options(unique: true, background: true, drop_dups: true) }
+    it { is_expected.to have_index_for('permalink._id' => 1) }
   end
 
   describe Profile do
-    it { should have_index_for(first_name: 1, last_name: 1) }
+    it { is_expected.to have_index_for(first_name: 1, last_name: 1) }
   end
-end
+
+  describe Log do
+    it { is_expected.to have_index_for(created_at: 1).with_options(bucket_size: 100, expire_after_seconds: 3600) }
+  end
+end

data/spec/unit/validations_spec.rb

@@ -1,52 +1,52 @@
 require 'spec_helper'
 
-describe "Validations" do
+RSpec.describe "Validations" do
   describe Site do
-    it { should validate_presence_of(:name) }
-    it { should validate_uniqueness_of(:name) }
+    it { is_expected.to validate_presence_of(:name) }
+    it { is_expected.to validate_uniqueness_of(:name) }
   end
 
   describe User do
-    it { should validate_presence_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_exclusion_of(:login).to_not_allow("super", "index", "edit") }
-    it { should validate_exclusion_of(:password).to_not_allow("password") }
-    it { should validate_inclusion_of(:role).to_allow("admin", "member") }
-    it { should validate_inclusion_of(:role).to_allow(["admin", "member"]) }
-    it { should validate_confirmation_of(:email) }
-    it { should validate_presence_of(:age).on(:create, :update) }
-    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) }
-    it { should validate_inclusion_of(:locale).to_allow([:en, :ru]) }
+    it { is_expected.to validate_presence_of(:login) }
+    it { is_expected.to validate_uniqueness_of(:login).scoped_to(:site) }
+    it { is_expected.to validate_uniqueness_of(:email).case_insensitive.with_message("is already taken") }
+    it { is_expected.to validate_format_of(:login).to_allow("valid_login").not_to_allow("invalid login") }
+    it { is_expected.to validate_associated(:profile) }
+    it { is_expected.to validate_exclusion_of(:login).to_not_allow("super", "index", "edit") }
+    it { is_expected.to validate_exclusion_of(:password).to_not_allow("password") }
+    it { is_expected.to validate_inclusion_of(:role).to_allow("admin", "member") }
+    it { is_expected.to validate_inclusion_of(:role).to_allow(["admin", "member"]) }
+    it { is_expected.to validate_confirmation_of(:email) }
+    it { is_expected.to validate_presence_of(:age).on(:create, :update) }
+    it { is_expected.to validate_numericality_of(:age).on(:create, :update) }
+    it { is_expected.to validate_inclusion_of(:age).to_allow(23..42).on([:create, :update]) }
+    it { is_expected.to validate_presence_of(:password).on(:create) }
+    it { is_expected.to validate_presence_of(:provider_uid).on(:create) }
+    it { is_expected.to validate_inclusion_of(:locale).to_allow([:en, :ru]) }
   end
 
   describe Profile do
-    it { should validate_numericality_of(:age).greater_than(0) }
-    it { should validate_acceptance_of(:terms_of_service) }
-    it { should validate_length_of(:hobbies).with_minimum(1).with_message("requires at least one hobby") }
+    it { is_expected.to validate_numericality_of(:age).greater_than(0) }
+    it { is_expected.to validate_acceptance_of(:terms_of_service) }
+    it { is_expected.to validate_length_of(:hobbies).with_minimum(1).with_message("requires at least one hobby") }
   end
 
   describe Article do
-    it { should validate_length_of(:title).within(8..16) }
-    it { should_not validate_length_of(:content).greater_than(200).less_than(16) }
-    it { should validate_length_of(:content).greater_than(200) }
-    it { should validate_inclusion_of(:status).to_allow([:pending]).on( :create ) }
-    it { should validate_inclusion_of(:status).to_allow([:approved, :rejected]).on( :update ) }
+    it { is_expected.to validate_length_of(:title).within(8..16) }
+    it { is_expected.not_to validate_length_of(:content).greater_than(200).less_than(16) }
+    it { is_expected.to validate_length_of(:content).greater_than(200) }
+    it { is_expected.to validate_inclusion_of(:status).to_allow([:pending]).on( :create ) }
+    it { is_expected.to validate_inclusion_of(:status).to_allow([:approved, :rejected]).on( :update ) }
   end
 
   describe MovieArticle do
-    it { should validate_numericality_of(:rating).greater_than(0) }
-    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 { is_expected.to validate_numericality_of(:rating).greater_than(0) }
+    it { is_expected.to validate_numericality_of(:rating).to_allow(:greater_than => 0).less_than_or_equal_to(5) }
+    it { is_expected.to validate_numericality_of(:classification).to_allow(:even => true, :only_integer => true, :nil => false) }
   end
 
   describe Person do
-    it { should custom_validate(:ssn).with_validator(SsnValidator) }
-    it { should_not custom_validate(:name) }
+    it { is_expected.to custom_validate(:ssn).with_validator(SsnValidator) }
+    it { is_expected.not_to custom_validate(:name) }
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-rspec
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Evan Sagge
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-05 00:00:00.000000000 Z
+date: 2015-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake