mongoid-rspec 1.13.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a4c1a2239f0fe2d5fa2e91f8c33d3e481700810
-  data.tar.gz: 8c6e6f83f5a1d01d5ee9820fb56e76913f568dbd
+  metadata.gz: 22432282a4af9711e7ff58260bd7e9ccf7279a31
+  data.tar.gz: c183931632e9cdd7594ab6314678f3ca6f76f849
 SHA512:
-  metadata.gz: 51b893ad1bf9837b1c7e5183cd4033be0397953b90169852cdad26a26388b60e193d834bc035eb274ef4c6434a02c4f2c75e8eee72534fb88cc53b035465edc2
-  data.tar.gz: 8d35fbfdb8b35e44050330f06fa00e98cb3670a1fe444159d12e182f1f50efdc11616de71d0685dc49d6a128104964ed9c08d08d8e71a2a0653c641e1ded6c97
+  metadata.gz: 1b3752eba793b316c4d0ccc611c4b6d9e8b766ceb43617a92185899c90839e4e9067dabe7b9b274868e85434c2c209189bb2278cbd7e644c51c8c7ecfcb83470
+  data.tar.gz: 69ac5c4fe2ddf2626021c2776e311394fc8a709713f926e16bb4ca4c3e58906d1f9880510d594c5887c4645155a285c8237e44b91082da7e2b32a4745a5321d3

data/.ruby-version

@@ -1 +1 @@
-ruby-2.1.0
+2.2.0

data/.travis.yml

@@ -2,11 +2,9 @@ services: mongodb
 language: ruby
 rvm:
   - 1.9.3
-  - 2.0.0
-  - 2.1.0
-  - 2.1.2
   - 2.1.3
   - 2.2.0
   - jruby-19mode
+
 gemfile:
   - Gemfile

data/README.md

@@ -1,19 +1,35 @@
-mongoid-rspec
-=
+# mongoid-rspec
 
 [![Build Status][travis_badge]][travis]
+[![Gem Version][rubygems_badge]][rubygems]
+[![Code Climate][codeclimate_badge]][codeclimate]
 
-RSpec matchers for Mongoid 3.x.
+mongoid-rspec provides a collection of RSpec-compatible matchers that help to test mongoid documents.
 
-For Mongoid 2.x, use [mongoid-rspec 1.4.5](http://rubygems.org/gems/mongoid-rspec/versions/1.4.5)
+## Installation
 
-Installation
--
-Add to your Gemfile
+### With Mongoid 4.x
 
-    gem 'mongoid-rspec'
+Use mongoid-rspec [2.0.0.rc1][mongo4]
 
-Drop in existing or dedicated support file in spec/support (spec/support/mongoid.rb)
+    gem 'mongoid-rspec', '~> 2.0.0.rc1'
+
+### With Mongoid 3.x
+
+Use mongoid-rspec [1.11.0][mongo3].
+
+    gem 'mongoid-rspec', '~> 1.11.0'
+
+### With Mongoid 2.x
+
+Use mongoid-rspec [1.4.5][mongo2]
+
+    gem 'mongoid-rspec', '1.4.5'
+
+### Configuring
+
+Drop in existing or dedicated support file in spec/support.
+i.e: `spec/support/mongoid.rb`
 
 ```ruby
 RSpec.configure do |config|
@@ -21,8 +37,9 @@ RSpec.configure do |config|
 end
 ```
 
-Association Matchers
--
+## Matchers
+
+### Association Matchers
 
 ```ruby
 describe User do
@@ -69,8 +86,7 @@ describe Site do
 end
 ```
 
-Mass Assignment Matcher
--
+### Mass Assignment Matcher
 
 ```ruby
 describe User do
@@ -85,8 +101,7 @@ describe User do
 end
 ```
 
-Validation Matchers
--
+### Validation Matchers
 
 ```ruby
 describe Site do
@@ -131,8 +146,7 @@ describe Person do
 end
 ```
 
-Accepts Nested Attributes Matcher
--
+### Accepts Nested Attributes Matcher
 
 ```ruby
 describe User do
@@ -145,8 +159,7 @@ describe Article do
 end
 ```
 
-Index Matcher
--
+### Index Matcher
 
 ```ruby
 describe Article do
@@ -159,8 +172,7 @@ describe Profile do
 end
 ```
 
-Others
--
+### Others
 
 ```ruby
 describe User do
@@ -191,17 +203,26 @@ describe Article do
 end
 ```
 
-Known issues
--
+## Known issues
 
-accept_nested_attributes_for matcher must test options [issue 91](https://github.com/evansagge/mongoid-rspec/issues/91).
+accept_nested_attributes_for matcher must test options [issue 91](https://github.com/mongoid-rspec/mongoid-rspec/issues/91).
 
-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)
+## Acknowledgement
+
+Thanks to [Durran Jordan][durran] for providing the changes necessary to make
+this compatible with mongoid 2.0.0.rc, and for other [contributors](https://github.com/mongoid-rspec/mongoid-rspec/contributors)
 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
 
-[travis_badge]: https://travis-ci.org/mongoid-rspec/mongoid-rspec.svg?branch=mongoid-3-1
+[travis_badge]: http://img.shields.io/travis/mongoid-rspec/mongoid-rspec.svg?style=flat
 [travis]: https://travis-ci.org/mongoid-rspec/mongoid-rspec
+
+[rubygems_badge]: http://img.shields.io/gem/v/mongoid-rspec.svg?style=flat
+[rubygems]: http://rubygems.org/gems/mongoid-rspec
+
+[codeclimate_badge]: http://img.shields.io/codeclimate/github/mongoid-rspec/mongoid-rspec.svg?style=flat
+[codeclimate]: https://codeclimate.com/github/mongoid-rspec/mongoid-rspec

data/lib/matchers/indexes.rb

@@ -13,13 +13,31 @@ module Mongoid
       def matches?(klass)
         @klass  = klass.is_a?(Class) ? klass : klass.class
         @errors = []
-        unless @klass.index_options[@index_fields]
-          @errors.push "no index for #{@index_fields}"
+
+        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
+              end
+            end
+          end
         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}"
+          # 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

data/lib/matchers/validations/inclusion_of.rb

@@ -7,7 +7,7 @@ module Mongoid
         end
 
         def to_allow(*values)
-          @allowed_values = values.map(&:to_a).flatten
+          @allowed_values = values.map { |v| v.respond_to?(:to_a) ? v.to_a : v }.flatten
           self
         end
 

data/lib/mongoid-rspec/version.rb

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

data/mongoid-rspec.gemspec

@@ -6,9 +6,9 @@ Gem::Specification.new do |s|
   s.name        = "mongoid-rspec"
   s.version     = Mongoid::Rspec::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Evan Sagge"]
-  s.email       = %q{evansagge@gmail.com}
-  s.homepage    = %q{http://github.com/evansagge/mongoid-rspec}
+  s.authors     = ["Evan Sagge", "Rodrigo Pinto"]
+  s.email       = %q{evansagge@gmail.com contato@rodrigopinto.me}
+  s.homepage    = %q{http://github.com/mongoid-rspec/mongoid-rspec}
   s.summary     = %q{RSpec matchers for Mongoid}
   s.description = %q{RSpec matches for Mongoid models, including association and validation matchers}
 
@@ -20,6 +20,6 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency 'rake'
-  s.add_dependency 'mongoid', '~> 3.1'
+  s.add_dependency 'mongoid', '~> 4.0.0'
   s.add_dependency 'rspec',   '~> 3.1'
 end

data/spec/models/article.rb

@@ -1,9 +1,6 @@
 class Article
   include Mongoid::Document
   include Mongoid::Timestamps
-  include Mongoid::Paranoia
-  include Mongoid::Versioning
-  include Mongoid::MultiParameterAttributes
 
   field :title, localize: true
   field :content

data/spec/models/user.rb

@@ -18,7 +18,7 @@ class User
 
   embeds_one :profile
 
-  validates :login, presence: true, uniqueness: { scope: :site }, format: { with: /^[\w\-]+$/ }, exclusion: { in: ["super", "index", "edit"] }
+  validates :login, presence: true, uniqueness: { scope: :site }, format: { with: /\A[\w\-]+\z/ }, exclusion: { in: ["super", "index", "edit"] }
   validates :email, uniqueness: { case_sensitive: false, scope: :site, message: "is already taken" }, confirmation: true
   validates :role, presence: true, inclusion: { in: ["admin", "moderator", "member"] }
   validates :profile, presence: true, associated: true
@@ -28,9 +28,6 @@ class User
   validates :provider_uid, presence: true
   validates :locale, inclusion: { in: ->(user) { [:en, :ru] } }
 
-  attr_accessible :login, :email, :age, :password
-  attr_accessible :role, as: :admin
-
   accepts_nested_attributes_for :articles, :comments
 
   def admin?

data/spec/unit/document_spec.rb

@@ -9,16 +9,13 @@ describe "Document" do
   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(: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(Boolean).with_default_value_of(false) }
+    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_versioned_document }
     it { should be_timestamped_document }
-    it { should be_paranoid_document }
-    it { should be_multiparameted_document }
   end
 end

data/spec/unit/indexes_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 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, drop_dups: true) }
+    it { should have_index_for(title: 1).with_options(unique: true, background: true, dropDups: true) }
     it { should have_index_for('permalink._id' => 1) }
   end
 

data/spec/unit/validations_spec.rb

@@ -15,6 +15,7 @@ describe "Validations" do
     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) }

metadata

@@ -1,10 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-rspec
 version: !ruby/object:Gem::Version
-  version: 1.13.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Evan Sagge
+- Rodrigo Pinto
 autorequire: 
 bindir: bin
 cert_chain: []
@@ -30,14 +31,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -54,7 +55,7 @@ dependencies:
         version: '3.1'
 description: RSpec matches for Mongoid models, including association and validation
   matchers
-email: evansagge@gmail.com
+email: evansagge@gmail.com contato@rodrigopinto.me
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -103,14 +104,13 @@ files:
 - spec/models/user.rb
 - spec/spec_helper.rb
 - spec/unit/accept_nested_attributes_spec.rb
-- spec/unit/allow_mass_assignment_spec.rb
 - spec/unit/associations_spec.rb
 - spec/unit/collections_spec.rb
 - spec/unit/document_spec.rb
 - spec/unit/indexes_spec.rb
 - spec/unit/validations_spec.rb
 - spec/validators/ssn_validator.rb
-homepage: http://github.com/evansagge/mongoid-rspec
+homepage: http://github.com/mongoid-rspec/mongoid-rspec
 licenses: []
 metadata: {}
 post_install_message: 
@@ -146,7 +146,6 @@ test_files:
 - spec/models/user.rb
 - spec/spec_helper.rb
 - spec/unit/accept_nested_attributes_spec.rb
-- spec/unit/allow_mass_assignment_spec.rb
 - spec/unit/associations_spec.rb
 - spec/unit/collections_spec.rb
 - spec/unit/document_spec.rb

data/spec/unit/allow_mass_assignment_spec.rb

@@ -1,14 +0,0 @@
-require 'spec_helper'
-
-describe "AllowMassAssignment" do
-  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) }
-
-    it { should_not allow_mass_assignment_of(:role) }
-  end
-end