mongoid-rspec 1.4.5 → 1.4.6

data/.travis.yml

@@ -1,8 +1,5 @@
+language: ruby
 rvm:
-  - 1.8.7 # (current default)
   - 1.9.2
-  - rbx
-  - rbx-2.0
-  - ree
-  - jruby
+  - 1.9.3
   - ruby-head

data/README.md

@@ -78,6 +78,11 @@ Validation Matchers
       it { should validate_numericality_of(:classification).to_allow(:even => true, :only_integer => true, :nil => false) }    
     end
 
+    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) }
+    end
 Others
 -
     describe User do

data/lib/matchers/allow_mass_assignment.rb

@@ -0,0 +1,101 @@
+# this code is totally extracted from shoulda-matchers gem.
+module Mongoid
+  module Matchers
+    class AllowMassAssignmentOfMatcher # :nodoc:
+      attr_reader :failure_message, :negative_failure_message
+
+      def initialize(attribute)
+        @attribute = attribute.to_s
+        @options = {}
+      end
+
+      def as(role)
+        if active_model_less_than_3_1?
+          raise "You can specify role only in Rails 3.1 or greater"
+        end
+        @options[:role] = role
+        self
+      end
+
+      def matches?(klass)
+        @klass = klass
+        if attr_mass_assignable?
+          if whitelisting?
+            @negative_failure_message = "#{@attribute} was made accessible"
+          else
+            if protected_attributes.empty?
+              @negative_failure_message = "no attributes were protected"
+            else
+              @negative_failure_message = "#{class_name} is protecting " <<
+                "#{protected_attributes.to_a.to_sentence}, " <<
+                "but not #{@attribute}."
+            end
+          end
+          true
+        else
+          if whitelisting?
+            @failure_message = "Expected #{@attribute} to be accessible"
+          else
+            @failure_message = "Did not expect #{@attribute} to be protected"
+          end
+          false
+        end
+      end
+
+      def description
+        "allow mass assignment of #{@attribute}"
+      end
+
+      private
+
+      def role
+        @options[:role] || :default
+      end
+
+      def protected_attributes
+        @protected_attributes ||= (@klass.class.protected_attributes || [])
+      end
+
+      def accessible_attributes
+        @accessible_attributes ||= (@klass.class.accessible_attributes || [])
+      end
+
+      def whitelisting?
+        authorizer.kind_of?(::ActiveModel::MassAssignmentSecurity::WhiteList)
+      end
+
+      def attr_mass_assignable?
+        !authorizer.deny?(@attribute)
+      end
+
+      def authorizer
+        if active_model_less_than_3_1?
+          @klass.class.active_authorizer
+        else
+          @klass.class.active_authorizer[role]
+        end
+      end
+
+      def class_name
+        @klass.class.name
+      end
+
+      def active_model_less_than_3_1?
+        ::ActiveModel::VERSION::STRING.to_f < 3.1
+      end
+    end
+
+    # Ensures that the attribute can be set on mass update.
+    #
+    #   it { should_not allow_mass_assignment_of(:password) }
+    #   it { should allow_mass_assignment_of(:first_name) }
+    #
+    # In Rails 3.1 you can check role as well:
+    #
+    #   it { should allow_mass_assignment_of(:first_name).as(:admin) }
+    #
+    def allow_mass_assignment_of(value)
+      AllowMassAssignmentOfMatcher.new(value)
+    end
+  end
+end

data/lib/matchers/collections.rb

@@ -1,6 +1,6 @@
 RSpec::Matchers.define :be_stored_in do |collection_name|
   match do |doc|
-    doc.collection_name == collection_name.to_s
+    doc.class.collection_name == collection_name
   end
 
   description do

data/lib/matchers/validations/custom_validation_of.rb

@@ -0,0 +1,64 @@
+module Mongoid
+  module Matchers
+    module Validations
+      class ValidateWithCustomValidatorMatcher < HaveValidationMatcher
+        def initialize(field)
+          super(field, :custom)
+        end
+
+        def with_validator(custom_validator)
+          @custom_validator = custom_validator
+          self
+        end
+
+        def with_message(message)
+          @expected_message = message
+          self
+        end
+
+        def matches?(actual)
+          return false unless (@result = super(actual))
+          check_custom_validator if @custom_validator
+          check_expected_message if @expected_message
+
+          @result
+        end
+
+        def description
+          options_desc = []
+          options_desc << " with custom validator #{@custom_validator.name}" if @validator
+          options_desc << " with message '#{@expected_message}'" if @expected_message
+          "validate field #{@field.inspect}" << options_desc.to_sentence
+        end
+
+        private
+
+        def check_custom_validator
+          if @validator.kind_of? @custom_validator
+            @positive_result_message << " with custom validator of type #{@custom_validator.name}"
+          else
+            @negative_result_message << " with custom validator not of type #{@custom_validator.name}"
+            @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 custom_validate(field)
+        ValidateWithCustomValidatorMatcher.new(field)
+      end
+    end
+  end
+end

data/lib/matchers/validations/uniqueness_of.rb

@@ -43,7 +43,7 @@ module Mongoid
           options_desc << " scoped to #{@scope.inspect}" if @scope
           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
+          options_desc << " with message '#{@expected_message}'" if @expected_message
           super << options_desc.to_sentence
         end
         

data/lib/mongoid-rspec.rb

@@ -2,10 +2,12 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 
 require 'mongoid'
 require 'rspec'
+require "active_model"
 require 'matchers/document'
 require 'matchers/associations'
 require 'matchers/collections'
 require 'matchers/indexes'
+require 'matchers/allow_mass_assignment'
 require 'matchers/validations'
 require 'matchers/validations/associated'
 require 'matchers/validations/confirmation_of'
@@ -17,6 +19,7 @@ require 'matchers/validations/numericality_of'
 require 'matchers/validations/presence_of'
 require 'matchers/validations/uniqueness_of'
 require 'matchers/validations/acceptance_of'
+require 'matchers/validations/custom_validation_of'
 
 module Mongoid
   module Matchers

data/lib/mongoid-rspec/version.rb

@@ -1,5 +1,5 @@
 module Mongoid
   module Rspec
-    VERSION = "1.4.5"
+    VERSION = "1.4.6"
   end
 end

data/mongoid-rspec.gemspec

@@ -20,6 +20,6 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency 'rake'
-  s.add_dependency 'mongoid', '>= 2.4.6'
+  s.add_dependency 'mongoid', '>= 3.0.0.rc'
   s.add_dependency 'rspec', '>= 2.9'
 end

data/spec/models/article.rb

@@ -18,6 +18,6 @@ class Article
 
   validates_length_of :title, :minimum => 8, :maximum => 16
 
-  index :title, :unique => true, :background => true
-  index :published
+  index({ title: 1 }, { unique: true, background: true })
+  index({ published: 1 })
 end

data/spec/models/log.rb

@@ -1,4 +1,4 @@
 class Log
   include Mongoid::Document
-  store_in :logs
+  store_in collection: "logs"
 end

data/spec/models/person.rb

@@ -0,0 +1,13 @@
+require 'ssn_validator.rb'
+
+class Person
+
+  include Mongoid::Document
+
+  field :name
+  field :ssn
+
+  validates :ssn, ssn: true
+
+
+end

data/spec/models/profile.rb

@@ -10,10 +10,5 @@ class Profile
   validates_numericality_of :age, :greater_than => 0
   validates_acceptance_of :terms_of_service
 
-  index(
-      [
-        [ :first_name, Mongo::ASCENDING ],
-        [ :last_name, Mongo::ASCENDING ]
-      ]
-  )
+  index({first_name: 1, last_name: 1 })
 end

data/spec/models/user.rb

@@ -22,6 +22,9 @@ class User
   validates :age, :presence => true, :numericality => true, :inclusion => { :in => 23..42 }, :on => [:create, :update]
   validates :password, :presence => true, :on => :create
 
+  attr_accessible :login, :email, :age, :password
+  attr_accessible :role, :as => :admin
+
   def admin?
     false
   end

data/spec/spec_helper.rb

@@ -2,20 +2,20 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "lib"))
 MODELS = File.join(File.dirname(__FILE__), "models")
 $LOAD_PATH.unshift(MODELS)
+VALIDATORS = File.join(File.dirname(__FILE__), "validators")
+$LOAD_PATH.unshift(VALIDATORS)
 
 require "rubygems"
 require "bundler"
 Bundler.setup
 
+require 'mongoid'
 require 'rspec'
 require 'rspec/core'
 require 'rspec/expectations'
-require 'mongoid'
 
 Mongoid.configure do |config|
-  name = "mongoid-rspec-test"
-  host = "localhost"
-  config.master = Mongo::Connection.new.db(name)
+  config.connect_to("mongoid-rspec-test")
 end
 
 Dir[ File.join(MODELS, "*.rb") ].sort.each { |file| require File.basename(file) }
@@ -27,6 +27,6 @@ RSpec.configure do |config|
   config.include Mongoid::Matchers
   config.mock_with :rspec
   config.after :all do
-    Mongoid.master.collections.each(&:drop)
+    Mongoid::Config.purge!
   end
 end

data/spec/unit/allow_mass_assignment_spec.rb

@@ -0,0 +1,14 @@
+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

data/spec/unit/indexes_spec.rb

@@ -2,11 +2,11 @@ require 'spec_helper'
 
 describe "Indexes" do
   describe Article do
-    it { should have_index_for(:published) }
-    it { should have_index_for(:title).with_options(:unique => true, :background => true) }
+    it { should have_index_for(published: 1) }
+    it { should have_index_for(title: 1).with_options(unique: true, background: true) }
   end
   
   describe Profile do
-    it { should have_index_for([ [ :first_name, Mongo::ASCENDING ], [ :last_name, Mongo::ASCENDING ] ]) }
+    it { should have_index_for(first_name: 1, last_name: 1) }
   end
 end

data/spec/unit/validations_spec.rb

@@ -35,4 +35,9 @@ describe "Validations" 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) }
   end
+
+  describe Person do
+    it { should custom_validate(:ssn).with_validator(SsnValidator) }
+    it { should_not custom_validate(:name) }
+  end
 end

data/spec/validators/ssn_validator.rb

@@ -0,0 +1,14 @@
+class SsnValidator <  ActiveModel::EachValidator
+
+  def validate_each(record, attribute, value)
+    record.errors[attribute] << "#{value} is not a valid Social Security Number" unless valid_ssn?(record, attribute, value)
+  end
+
+  def self.kind() :custom end
+
+  def valid_ssn?(record, attribute, value)
+    # irrelevant here how validation is done
+    true
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-rspec
 version: !ruby/object:Gem::Version
-  version: 1.4.5
+  version: 1.4.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-23 00:00:00.000000000 Z
+date: 2012-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70235030173460 !ruby/object:Gem::Requirement
+  requirement: &70121800719080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,21 +21,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70235030173460
+  version_requirements: *70121800719080
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &70235030172800 !ruby/object:Gem::Requirement
+  requirement: &70121800717200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.4.6
+        version: 3.0.0.rc
   type: :runtime
   prerelease: false
-  version_requirements: *70235030172800
+  version_requirements: *70121800717200
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70235030172220 !ruby/object:Gem::Requirement
+  requirement: &70121800716000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '2.9'
   type: :runtime
   prerelease: false
-  version_requirements: *70235030172220
+  version_requirements: *70121800716000
 description: RSpec matches for Mongoid models, including association and validation
   matchers
 email: evansagge@gmail.com
@@ -60,6 +60,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- lib/matchers/allow_mass_assignment.rb
 - lib/matchers/associations.rb
 - lib/matchers/collections.rb
 - lib/matchers/document.rb
@@ -68,6 +69,7 @@ files:
 - lib/matchers/validations/acceptance_of.rb
 - lib/matchers/validations/associated.rb
 - lib/matchers/validations/confirmation_of.rb
+- lib/matchers/validations/custom_validation_of.rb
 - lib/matchers/validations/exclusion_of.rb
 - lib/matchers/validations/format_of.rb
 - lib/matchers/validations/inclusion_of.rb
@@ -83,16 +85,19 @@ files:
 - spec/models/log.rb
 - spec/models/movie_article.rb
 - spec/models/permalink.rb
+- spec/models/person.rb
 - spec/models/profile.rb
 - spec/models/record.rb
 - spec/models/site.rb
 - spec/models/user.rb
 - spec/spec_helper.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
 licenses: []
 post_install_message: 
@@ -123,13 +128,16 @@ test_files:
 - spec/models/log.rb
 - spec/models/movie_article.rb
 - spec/models/permalink.rb
+- spec/models/person.rb
 - spec/models/profile.rb
 - spec/models/record.rb
 - spec/models/site.rb
 - spec/models/user.rb
 - spec/spec_helper.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