mongoid-rspec 1.5.1 → 1.5.3

data/README.md

@@ -46,6 +46,19 @@ Association Matchers
       it { should belong_to(:user).as_inverse_of(:record) }
     end
 
+Mass Assignment Matcher
+-
+    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
+
 Validation Matchers
 -
     describe Site do
@@ -54,19 +67,20 @@ Validation Matchers
     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) }
-		# The on matcher can take var args or an array. Validations do not fail if on is not specified.
-	    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(: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]) }
 	  end
 
     describe Article do
@@ -87,6 +101,18 @@ Validation Matchers
        # should redefine the kind method to return :custom, i.e. "def self.kind() :custom end"
       it { should custom_validate(:ssn).with_validator(SsnValidator) }
     end
+
+Index Matcher
+-
+    describe Article do
+      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: 1, last_name: 1) }
+    end
+
 Others
 -
     describe User do
@@ -94,9 +120,6 @@ Others
       it { should have_field(:active).of_type(Boolean).with_default_value_of(false) }
       it { should have_fields(:birthdate, :registered_at).of_type(DateTime) }
 
-      it { should have_index_for(:last_name) }
-      it { should have_index_for(:email).with_options(:unique => true) }
-
       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) }

data/lib/matchers/validations/inclusion_of.rb

@@ -13,9 +13,16 @@ module Mongoid
         
         def matches?(actual)
           return false unless result = super(actual)
-          
+
           if @allowed_values
-            not_allowed_values = @allowed_values - @validator.options[:in].to_a
+            raw_validator_allowed_values = @validator.options[:in]
+
+            validator_allowed_values = case raw_validator_allowed_values 
+            when Range then raw_validator_allowed_values.to_a
+            when Proc then raw_validator_allowed_values.call(actual)
+            else raw_validator_allowed_values end
+
+            not_allowed_values = @allowed_values - validator_allowed_values
             if not_allowed_values.empty?
               @positive_result_message = @positive_result_message << " allowing all values mentioned"
             else

data/lib/mongoid-rspec/version.rb

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

data/spec/models/user.rb

@@ -8,6 +8,7 @@ class User
   field :age, type: Integer
   field :password, type: String
   field :provider_uid
+  field :locale
 
   belongs_to :site, :inverse_of => :users
   has_many :articles, :foreign_key => :author_id
@@ -24,6 +25,7 @@ class User
   validates :age, :presence => true, :numericality => true, :inclusion => { :in => 23..42 }, :on => [:create, :update]
   validates :password, :presence => true, :on => [:create, :update]
   validates :provider_uid, presence: true
+  validates :locale, :inclusion => {:in => lambda { |user| [:en, :ru] } }
 
   attr_accessible :login, :email, :age, :password
   attr_accessible :role, :as => :admin

data/spec/unit/validations_spec.rb

@@ -20,6 +20,7 @@ describe "Validations" do
     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]) }
   end
 
   describe Profile do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-rspec
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-27 00:00:00.000000000 Z
+date: 2012-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70095909068120 !ruby/object:Gem::Requirement
+  requirement: &70177756732360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70095909068120
+  version_requirements: *70177756732360
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &70095909066740 !ruby/object:Gem::Requirement
+  requirement: &70177756731080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 3.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *70095909066740
+  version_requirements: *70177756731080
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70095909065960 !ruby/object:Gem::Requirement
+  requirement: &70177756728480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '2.9'
   type: :runtime
   prerelease: false
-  version_requirements: *70095909065960
+  version_requirements: *70177756728480
 description: RSpec matches for Mongoid models, including association and validation
   matchers
 email: evansagge@gmail.com