remarkable_mongoid 0.5.2 → 0.6.0

data/HISTORY.txt

@@ -1,3 +1,5 @@
+## 0.6.0
+  * Allow arrays as scopes for validates_uniqueness_of (benedikt & negonicrac)
 ## 0.5.2
   * Updated README
 

data/README.markdown

@@ -36,7 +36,7 @@ Validations
     describe Book do
       it { should reference_one :author }
     end
-    
+
 ## Copyright
 
 Copyright (c) 2010 - 2011 Brian Cardarella. See LICENSE for details.

data/lib/remarkable/mongoid.rb

@@ -18,3 +18,4 @@ elsif defined?(Spec) # RSpec 1.x
     config.include(Remarkable::Mongoid::Matchers)
   end
 end
+

data/lib/remarkable/mongoid/fields.rb

@@ -49,3 +49,4 @@ module Remarkable::Mongoid
     end
   end
 end
+

data/lib/remarkable/mongoid/relations.rb

@@ -12,7 +12,7 @@ module Remarkable::Mongoid
     def reference_one(attr)
       RelationMatcher.new(attr, ::Mongoid::Relations::Referenced::One)
     end
-    
+
     # Specify the document references many documents
     #
     # examples:
@@ -36,7 +36,7 @@ module Remarkable::Mongoid
     def reference_many_and_be_referenced_in(attr)
       RelationMatcher.new(attr, ::Mongoid::Relations::Referenced::ManyToMany)
     end
-    
+
     # Specify the document is referenced in another document
     #
     # examples:
@@ -60,7 +60,7 @@ module Remarkable::Mongoid
     def embed_one(attr)
       RelationMatcher.new(attr, ::Mongoid::Relations::Embedded::One)
     end
-    
+
     # Specify the document embeds many documents
     #
     # examples:
@@ -72,7 +72,7 @@ module Remarkable::Mongoid
     def embed_many(attr)
       RelationMatcher.new(attr, ::Mongoid::Relations::Embedded::Many)
     end
-    
+
     # Specify the document is embedded in another document
     #
     # examples:
@@ -84,7 +84,7 @@ module Remarkable::Mongoid
     def be_embedded_in(attr)
       RelationMatcher.new(attr, ::Mongoid::Relations::Embedded::In)
     end
-    
+
     class RelationMatcher
       attr_accessor :attr, :relation_type
 
@@ -102,16 +102,17 @@ module Remarkable::Mongoid
       def description
         "has #{humanized_relation} relation :#{attr}"
       end
-      
+
       def failure_message_for_should
         "\n#{humanized_relation} relation failure\nExpected: '#{attr}'"
       end
-      
+
       private
-      
+
       def humanized_relation
         relation_type.to_s.split('::').last
       end
     end
   end
 end
+

data/lib/remarkable/mongoid/validate_association.rb

@@ -12,14 +12,14 @@ module Remarkable::Mongoid
     def validate_association(attr)
       ValidateAssociationMatcher.new(attr)
     end
-    
+
     class ValidateAssociationMatcher
       attr_accessor :attr
 
       def initialize(attr)
         self.attr = attr.to_sym
       end
-      
+
       def matches?(subject)
         @subject    = subject
         validations = @subject._validators[attr]
@@ -33,8 +33,9 @@ module Remarkable::Mongoid
       def failure_message_for_should
         "\nAssociation validation failure\nExpected: #{@subject.class} to validate the '#{attr}' association"
       end
-      
+
     end
-    
+
   end
 end
+

data/lib/remarkable/mongoid/validate_uniqueness_of.rb

@@ -12,21 +12,21 @@ module Remarkable::Mongoid
     def validate_uniqueness_of(attr)
       ValidateUniquenessOfMatcher.new(attr)
     end
-    
+
     class ValidateUniquenessOfMatcher
       attr_accessor :attr, :validation_type, :message, :scope
 
       def initialize(attr)
         self.attr = attr.to_sym
       end
-      
+
       def with_message(message)
         self.message = message
         self
       end
-      
+
       def scoped_to(scope)
-        self.scope = scope.to_sym
+        self.scope = scope.is_a?(Array) ? scope.map(&:to_sym) : scope.to_sym
         self
       end
 
@@ -48,9 +48,9 @@ module Remarkable::Mongoid
       def failure_message_for_should
         "\nUniqueness validation failure\nExpected: '#{attr}' to be unique"
       end
-      
+
       private
-      
+
       def check_option(validation, option)
         if self.send(option)
           validation.options[option] == self.send(option)
@@ -59,6 +59,7 @@ module Remarkable::Mongoid
         end
       end
     end
-    
+
   end
 end
+

data/lib/remarkable/mongoid/version.rb

@@ -1,5 +1,6 @@
 module Remarkable
   module Mongoid
-    VERSION = '0.5.2'
+    VERSION = '0.6.0'
   end
 end
+

data/remarkable_mongoid.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency 'bson_ext'
   s.add_development_dependency 'activesupport', '~> 3.0.0'
-  s.add_development_dependency 'mongoid', '~> 2.0.0.rc.6'
+  s.add_development_dependency 'mongoid', '~> 2.0.0.rc.7'
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'bourne'
 

data/spec/fields_spec.rb

@@ -30,7 +30,7 @@ describe 'Mongoid Fields' do
         matcher.matches?(SingleBook.new).should be_false
       end
     end
-    
+
     context 'with given type' do
       it 'should be true for a book with field published_on of type Date' do
         matcher = @should.have_field :published_on, :type => Date
@@ -74,3 +74,4 @@ describe 'Mongoid Fields' do
     end
   end
 end
+

data/spec/relations_spec.rb

@@ -8,7 +8,7 @@ describe 'Mongoid Relations' do
 
     @should = Should.new
   end
-  
+
   context 'embedding' do
     before :all do
       class SingleBook
@@ -17,7 +17,7 @@ describe 'Mongoid Relations' do
         embeds_many :pages,  :class_name => "SinglePage"
         embeds_one  :author, :class_name => "SingleAuthor"
       end
-      
+
       class SinglePage
         include Mongoid::Document
 
@@ -30,38 +30,38 @@ describe 'Mongoid Relations' do
         matcher = @should.embed_one :author
         matcher.matches?(SingleBook.new).should be_true
       end
-      
+
       it 'should be false for a book embedding one publisher' do
         matcher = @should.embed_one :publisher
         matcher.matches?(SingleBook.new).should be_false
       end
     end
-    
+
     describe 'embed_many' do
       it 'should be true for a book embedding many pages' do
         matcher = @should.embed_many :pages
         matcher.matches?(SingleBook.new).should be_true
       end
-      
+
       it 'should be false for a book embedding many words' do
         matcher = @should.embed_many :words
         matcher.matches?(SingleBook.new).should be_false
       end
     end
-    
+
     describe 'embedded_in' do
       it 'should be true for a page embedded in a book' do
         matcher = @should.be_embedded_in :book
         matcher.matches?(SinglePage.new).should be_true
       end
-      
+
       it 'should be false for a page embedded in a newspaper' do
         matcher = @should.be_embedded_in :newspaper
         matcher.matches?(SinglePage.new).should be_false
       end
     end
   end
-  
+
   context 'referencing' do
     before :all do
       class SingleOwner
@@ -71,7 +71,7 @@ describe 'Mongoid Relations' do
         references_one                    :friend,  :class_name => "SingleFriend"
         references_and_referenced_in_many :turtles, :class_name => "SingleTurtle"
       end
-      
+
       class SingleDog
         include Mongoid::Document
 
@@ -88,19 +88,19 @@ describe 'Mongoid Relations' do
         matcher = @should.reference_one :friend
         matcher.matches?(SingleOwner.new).should be_true
       end
-      
+
       it 'should be false for an owner having one boss' do
         matcher = @should.reference_one :boss
         matcher.matches?(SingleOwner.new).should be_false
       end
     end
-    
+
     describe 'reference_many' do
       it 'should be true for an owner having many dogs' do
         matcher = @should.reference_many :dogs
         matcher.matches?(SingleOwner.new).should be_true
       end
-      
+
       it 'should be false for an owner having many cats' do
         matcher = @should.reference_many :cats
         matcher.matches?(SingleOwner.new).should be_false
@@ -121,33 +121,34 @@ describe 'Mongoid Relations' do
         matcher.matches?(SingleOwner.new).should be_false
       end
     end
-    
+
     describe 'be_referenced_in' do
       it 'should be true for a dog belonging to an owner' do
         matcher = @should.be_referenced_in :owner
         matcher.matches?(SingleDog.new).should be_true
       end
-      
+
       it 'should be false for a dog belonging to a cat' do
         matcher = @should.be_referenced_in :stranger
         matcher.matches?(SingleDog.new).should be_false
       end
     end
   end
-  
+
   context 'messages' do
     before do
       @relation_matcher = Remarkable::Mongoid::Matchers::RelationMatcher.new(:test, "Some::Test")
     end
-    
+
     describe 'description' do
       subject { @relation_matcher.description }
       it { should == "has Test relation :test" }
     end
-    
+
     describe 'failure_message_for_should' do
       subject { @relation_matcher.failure_message_for_should }
       it { should == "\nTest relation failure\nExpected: 'test'"}
     end
   end
 end
+

data/spec/remarkable-mongoid_spec.rb

@@ -10,4 +10,5 @@ describe 'Remarkable::ActiveModel' do
   it 'should include the Remarkable ActiveModel validation matchers' do
     defined?(Remarkable::ActiveModel).should be_true
   end
-end
+end
+

data/spec/spec_helper.rb

@@ -14,3 +14,4 @@ require 'rspec/autorun'
 RSpec.configure do |config|
   config.mock_with :mocha
 end
+

data/spec/validate_associated_spec.rb

@@ -5,10 +5,10 @@ describe 'Validates Associated' do
     class Should
       include Remarkable::Mongoid::Matchers
     end
-    
+
     @should = Should.new
   end
-  
+
   describe 'validate_association' do
     before do
       class SingleBook
@@ -16,22 +16,22 @@ describe 'Validates Associated' do
         validates_associated :pages
       end
     end
-    
+
     after do
       Object.send(:remove_const, :SingleBook)
     end
-    
+
     it 'should be true for a book validating the association :pages' do
       matcher = @should.validate_association :pages
       matcher.matches?(SingleBook.new).should be_true
     end
-  
+
     it 'should be false for a book validating the association :author' do
       matcher = @should.validate_association :author
       matcher.matches?(SingleBook.new).should be_false
     end
   end
-  
+
   context 'messages' do
     before do
       matcher_subject = mock('SingleBook')
@@ -39,16 +39,17 @@ describe 'Validates Associated' do
       @association_matcher = Remarkable::Mongoid::Matchers::ValidateAssociationMatcher.new(:test)
       @association_matcher.instance_variable_set('@subject', matcher_subject)
     end
-    
+
     describe 'description' do
       subject { @association_matcher.description }
       it { should == "validates the :test association" }
     end
-    
+
     describe 'failure_message_for_should' do
       subject { @association_matcher.failure_message_for_should }
       it { should == "\nAssociation validation failure\nExpected: SingleBook to validate the 'test' association" }
     end
   end
-  
+
 end
+

data/spec/validate_uniqueness_of_spec.rb

@@ -5,18 +5,19 @@ describe 'Validates Uniqueness Of' do
     class Should
       include Remarkable::Mongoid::Matchers
     end
-    
+
     @should = Should.new
   end
-  
+
   describe 'validate_uniqueness_of' do
     before do
       class SingleBook
         include Mongoid::Validations
         validates_uniqueness_of :title, :message => 'Test message', :scope => :author_id
+        validates_uniqueness_of :price, :scope => [:store_id, :shelf_id]
       end
     end
-    
+
     after do
       Object.send(:remove_const, :SingleBook)
     end
@@ -25,12 +26,12 @@ describe 'Validates Uniqueness Of' do
       matcher = @should.validate_uniqueness_of :title
       matcher.matches?(SingleBook.new).should be_true
     end
-    
+
     it 'should be false for a book validating the uniqueness of author' do
       matcher = @should.validate_uniqueness_of :author
       matcher.matches?(SingleBook.new).should be_false
     end
-    
+
     context 'with message' do
       it 'should be true for a book validating the uniqueness of title' do
         matcher = @should.validate_uniqueness_of(:title).with_message('Test message')
@@ -42,17 +43,22 @@ describe 'Validates Uniqueness Of' do
         matcher.matches?(SingleBook.new).should be_false
       end
     end
-    
+
     context 'with scope' do
       it 'should be true for a book validating the uniqueness scoped_to author_id' do
         matcher = @should.validate_uniqueness_of(:title).scoped_to(:author_id)
         matcher.matches?(SingleBook.new).should be_true
       end
-      
+
       it 'should be false for a book validating the uniqueness scoped_to reader_id' do
         matcher = @should.validate_uniqueness_of(:title).scoped_to(:reader_id)
         matcher.matches?(SingleBook.new).should be_false
       end
+
+      it 'should be true for a book validating the uniqueness scoped_to [:store_id, :shelf_id]' do
+        matcher = @should.validate_uniqueness_of(:price).scoped_to([:store_id, :shelf_id])
+        matcher.matches?(SingleBook.new).should be_true
+      end
     end
 
     context 'with scope and message' do
@@ -60,7 +66,7 @@ describe 'Validates Uniqueness Of' do
         matcher = @should.validate_uniqueness_of(:title).scoped_to(:author_id).with_message('Test message')
         matcher.matches?(SingleBook.new).should be_true
       end
-      
+
       it 'should be false for a book validating the uniqueness with good scope and bad message' do
         matcher = @should.validate_uniqueness_of(:title).scoped_to(:author_id).with_message('Bad message')
         matcher.matches?(SingleBook.new).should be_false
@@ -78,21 +84,22 @@ describe 'Validates Uniqueness Of' do
     end
 
   end
-  
+
   context 'messages' do
     before do
       @association_matcher = Remarkable::Mongoid::Matchers::ValidateUniquenessOfMatcher.new(:test)
     end
-    
+
     describe 'description' do
       subject { @association_matcher.description }
       it { should == "validates that :test is unique" }
     end
-    
+
     describe 'failure_message_for_should' do
       subject { @association_matcher.failure_message_for_should }
       it { should == "\nUniqueness validation failure\nExpected: 'test' to be unique" }
     end
   end
-  
-end
+
+end
+

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: remarkable_mongoid
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 5
-  - 2
-  version: 0.5.2
+  prerelease: 
+  version: 0.6.0
 platform: ruby
 authors: 
 - Brian Cardarella
@@ -14,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-29 00:00:00 -05:00
+date: 2011-03-18 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,11 +21,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 4
-        - 0
-        - 0
-        - alpha4
         version: 4.0.0.alpha4
   type: :runtime
   version_requirements: *id001
@@ -41,8 +32,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id002
@@ -54,10 +43,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        - 0
         version: 3.0.0
   type: :development
   version_requirements: *id003
@@ -69,13 +54,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 0
-        - 0
-        - rc
-        - 6
-        version: 2.0.0.rc.6
+        version: 2.0.0.rc.7
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -86,8 +65,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id005
@@ -99,8 +76,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id006
@@ -112,8 +87,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id007
@@ -162,21 +135,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.3
 signing_key: 
 specification_version: 3
 summary: RSpec Matchers for Mongoid