djsun-mongo_mapper 0.5.6.6 → 0.5.8.1

data/lib/mongo_mapper/validations.rb

@@ -4,67 +4,37 @@ module MongoMapper
       def validates_uniqueness_of(*args)
         add_validations(args, MongoMapper::Validations::ValidatesUniquenessOf)
       end
-
-      def validates_exclusion_of(*args)
-        add_validations(args, MongoMapper::Validations::ValidatesExclusionOf)
-      end
-
-      def validates_inclusion_of(*args)
-        add_validations(args, MongoMapper::Validations::ValidatesInclusionOf)
-      end
     end
     
     class ValidatesUniquenessOf < Validatable::ValidationBase
-      option :scope
-      
+      option :scope, :case_sensitive
+      default :case_sensitive => true
+
       def valid?(instance)
         value = instance[attribute]
         return true if allow_blank && value.blank?
-        doc = instance.class.first({self.attribute => value}.merge(scope_conditions(instance)))
+        base_conditions = case_sensitive ? {self.attribute => value} : {}
+        doc = instance.class.first(base_conditions.merge(scope_conditions(instance)).merge(where_conditions(instance)))
         doc.nil? || instance.id == doc.id
       end
 
       def message(instance)
         super || "has already been taken"
       end
-      
+
       def scope_conditions(instance)
         return {} unless scope
         Array(scope).inject({}) do |conditions, key|
           conditions.merge(key => instance[key])
         end
       end
-    end
-    
-    class ValidatesExclusionOf < Validatable::ValidationBase
-      required_option :within
-      
-      def valid?(instance)
-        value = instance[attribute]
-        return true if allow_nil && value.nil?
-        return true if allow_blank && value.blank?
-        
-        !within.include?(instance[attribute])
-      end
-      
-      def message(instance)
-        super || "is reserved"
-      end
-    end
 
-    class ValidatesInclusionOf < Validatable::ValidationBase
-      required_option :within
-      
-      def valid?(instance)
-        value = instance[attribute]
-        return true if allow_nil && value.nil?
-        return true if allow_blank && value.blank?
-        
-        within.include?(value)
-      end
-      
-      def message(instance)
-        super || "is not in the list"
+      def where_conditions(instance)
+        conditions = {}
+        unless case_sensitive
+          conditions.merge!({'$where' => "this.#{attribute}.toLowerCase() == '#{instance[attribute].downcase}'"})
+        end
+        conditions
       end
     end
   end

data/lib/mongo_mapper.rb

@@ -1,13 +1,19 @@
-require 'rubygems'
-gem 'activesupport', '>= 2.3'
 require 'active_support'
 require 'mongo'
 require 'validatable'
 
 module MongoMapper
-  class KeyNotFound < RuntimeError; end
-  DocumentNotFound  = Class.new(StandardError)
-  DocumentNotValid  = Class.new(StandardError) do
+  # generic MM error
+  class MongoMapperError < StandardError; end
+  
+  # raised when key expected to exist but not found
+  class KeyNotFound < MongoMapperError; end
+  
+  # raised when document expected but not found
+  class DocumentNotFound < MongoMapperError; end
+  
+  # raised when document not valid and using !
+  class DocumentNotValid < MongoMapperError
     def initialize(document)
       @document = document
       super("Validation failed: #{@document.errors.full_messages.join(", ")}")

data/test/functional/associations/test_belongs_to_polymorphic_proxy.rb

@@ -3,8 +3,8 @@ require 'models'
 
 class BelongsToPolymorphicProxyTest < Test::Unit::TestCase
   def setup
-    Status.collection.clear
-    Project.collection.clear
+    Status.collection.remove
+    Project.collection.remove
   end
   
   should "default to nil" do
@@ -14,7 +14,7 @@ class BelongsToPolymorphicProxyTest < Test::Unit::TestCase
   end
 
   should "be able to replace the association" do
-    status = Status.new
+    status = Status.new(:name => 'Foo!')
     project = Project.new(:name => "mongomapper")
     status.target = project
     status.save.should be_true
@@ -27,7 +27,7 @@ class BelongsToPolymorphicProxyTest < Test::Unit::TestCase
   end
 
   should "unset the association" do
-    status = Status.new
+    status = Status.new(:name => 'Foo!')
     project = Project.new(:name => "mongomapper")
     status.target = project
     status.save.should be_true
@@ -41,7 +41,7 @@ class BelongsToPolymorphicProxyTest < Test::Unit::TestCase
   
   context "association id set but document not found" do
     setup do
-      @status = Status.new
+      @status = Status.new(:name => 'Foo!')
       project = Project.new(:name => "mongomapper")
       @status.target = project
       @status.save.should be_true

data/test/functional/associations/test_belongs_to_proxy.rb

@@ -2,48 +2,46 @@ require 'test_helper'
 require 'models'
 
 class BelongsToProxyTest < Test::Unit::TestCase
-  def setup
-    Status.collection.clear
-    Project.collection.clear
+  def setup    
+    @post_class = Class.new do
+      include MongoMapper::Document
+    end
+    
+    @comment_class = Class.new do
+      include MongoMapper::Document
+      key :post_id, String
+    end
+    @comment_class.belongs_to :post, :class => @post_class
+    
+    @post_class.collection.remove
+    @comment_class.collection.remove
   end
   
   should "default to nil" do
-    status = Status.new
-    status.project.nil?.should == true
-    status.project.inspect.should == 'nil'
+    @comment_class.new.post.nil?.should be_true
   end
   
   should "be able to replace the association" do
-    status = Status.new
-    project = Project.new(:name => "mongomapper")
-    status.project = project
-    status.save.should be_true
+    post = @post_class.new(:name => 'mongomapper')
+    comment = @comment_class.new(:name => 'Foo!', :post => post)
+    comment.save.should be_true
     
-    from_db = Status.find(status.id)
-    from_db.project.nil?.should be_false
-    from_db.project.name.should == "mongomapper"
+    comment = comment.reload
+    comment.post.should == post
+    comment.post.nil?.should be_false
   end
   
   should "unset the association" do
-    status = Status.new
-    project = Project.new(:name => "mongomapper")
-    status.project = project
-    status.save.should be_true
+    post = @post_class.new(:name => 'mongomapper')
+    comment = @comment_class.new(:name => 'Foo!', :post => post)
+    comment.save.should be_true
     
-    from_db = Status.find(status.id)
-    from_db.project = nil
-    from_db.project.nil?.should be_true
-    from_db.project.inspect.should == 'nil'
+    comment = comment.reload
+    comment.post = nil
+    comment.post.nil?.should be_true
   end
   
-  context "association id set but document not found" do
-    setup do
-      @status = Status.new(:name => 'Foo', :project_id => '1234')
-    end
-
-    should "return nil instead of raising error" do
-      @status.project.nil?.should be_true
-      @status.project.inspect.should == 'nil'
-    end
+  should "return nil if id set but document not found" do
+    @comment_class.new(:name => 'Foo', :post_id => '1234').post.nil?.should be_true
   end
-end
+end

data/test/functional/associations/test_many_documents_as_proxy.rb

@@ -3,8 +3,8 @@ require 'models'
 
 class ManyDocumentsAsProxyTest < Test::Unit::TestCase
   def setup
-    Post.collection.clear
-    PostComment.collection.clear
+    Post.collection.remove
+    PostComment.collection.remove
   end
 
   should "default reader to empty array" do
@@ -171,20 +171,20 @@ class ManyDocumentsAsProxyTest < Test::Unit::TestCase
 
       should "not work for id not in association" do
         lambda {
-          @post.comments.find(@comment5.id)
+          @post.comments.find!(@comment5.id)
         }.should raise_error(MongoMapper::DocumentNotFound)
       end
     end
 
     context "with multiple ids" do
       should "work for ids in association" do
-        posts = @post.comments.find(@comment1.id, @comment2.id)
+        posts = @post.comments.find!(@comment1.id, @comment2.id)
         posts.should == [@comment1, @comment2]
       end
 
       should "not work for ids not in association" do
         lambda {
-          @post.comments.find(@comment1.id, @comment2.id, @comment4.id)
+          @post.comments.find!(@comment1.id, @comment2.id, @comment4.id)
         }.should raise_error(MongoMapper::DocumentNotFound)
       end
     end

data/test/functional/associations/test_many_embedded_polymorphic_proxy.rb

@@ -3,8 +3,8 @@ require 'models'
 
 class ManyEmbeddedPolymorphicProxyTest < Test::Unit::TestCase
   def setup
-    Catalog.collection.clear
-    TrModels::Fleet.collection.clear
+    Catalog.collection.remove
+    TrModels::Fleet.collection.remove
   end
   
   should "default reader to empty array" do
@@ -129,4 +129,28 @@ class ManyEmbeddedPolymorphicProxyTest < Test::Unit::TestCase
       from_db.transports[2].icu.should == true
     end
   end
-end
+
+  context "extending the association" do
+    should "work using a block passed to many" do
+      catalog = Catalog.new
+      medias = catalog.medias = [
+        Video.new("file" => "video.mpg", "length" => 3600, :visible => true),
+        Music.new("file" => "music.mp3", "bitrate" => "128kbps", :visible => true),
+        Image.new("file" => "image.png", "width" => 800, "height" => 600, :visible => false)
+      ]
+      catalog.save
+      catalog.medias.visible.should == [medias[0], medias[1]]
+    end
+  
+    should "work using many's :extend option" do
+      fleet = TrModels::Fleet.new
+      transports = fleet.transports = [
+        TrModels::Car.new("license_plate" => "ABC1223", "model" => "Honda Civic", "year" => 2003, :purchased_on => 2.years.ago.to_date),
+        TrModels::Bus.new("license_plate" => "XYZ9090", "max_passengers" => 51, :purchased_on => 3.years.ago.to_date),
+        TrModels::Ambulance.new("license_plate" => "HDD3030", "icu" => true, :purchased_on => 1.year.ago.to_date)
+      ]
+      fleet.save
+      fleet.transports.to_be_replaced.should == [transports[1]]
+    end
+  end
+end

data/test/functional/associations/test_many_embedded_proxy.rb

@@ -3,8 +3,8 @@ require 'models'
 
 class ManyEmbeddedProxyTest < Test::Unit::TestCase
   def setup
-    Project.collection.clear
-    RealPerson.collection.clear
+    Project.collection.remove
+    RealPerson.collection.remove
   end
     
   should "default reader to empty array" do
@@ -17,13 +17,6 @@ class ManyEmbeddedProxyTest < Test::Unit::TestCase
     project.addresses.push Address.new
     project.addresses.size.should == 2
   end
-  
-  should "allow finding :all embedded documents" do
-    project = Project.new
-    project.addresses << Address.new
-    project.addresses << Address.new
-    project.save
-  end
 
   should "be embedded in document on save" do
     sb = Address.new(:city => 'South Bend', :state => 'IN')
@@ -45,7 +38,7 @@ class ManyEmbeddedProxyTest < Test::Unit::TestCase
       set_collection_name 'test'
       key :person, Person
     end
-    @document.collection.clear
+    @document.collection.remove
     
     meg = Person.new(:name => "Meg")
     meg.child = Person.new(:name => "Steve")
@@ -92,7 +85,7 @@ class ManyEmbeddedProxyTest < Test::Unit::TestCase
         set_collection_name 'test'
         many :people
       end
-      @document.collection.clear
+      @document.collection.remove
     end
 
     should "persist all embedded documents" do
@@ -130,45 +123,72 @@ class ManyEmbeddedProxyTest < Test::Unit::TestCase
       doc.people.first.pets.first._root_document.should == doc
     end
 
-    should "create properly-named reference to parent document when building off association proxy" do
-      person = RealPerson.new
-      pet = person.pets.build
-      person.should == pet.real_person
-    end
-
-
     should "create a reference to the root document for all embedded documents" do
-      meg = Person.new(:name => "Meg")
       sparky = Pet.new(:name => "Sparky", :species => "Dog")
-
+      meg = Person.new(:name => "Meg", :pets => [sparky])
       doc = @document.new
-
-      meg.pets << sparky
-
       doc.people << meg
       doc.save
 
-      from_db = @document.find(doc.id)
-      from_db.people.first._root_document.should == doc
-      from_db.people.first.pets.first._root_document.should == doc
+      doc = doc.reload
+      doc.people.first._root_document.should == doc
+      doc.people.first.pets.first._root_document.should == doc
     end
   end
   
-  should "allow retrieval via find(:all)" do
-    meg = Person.new(:name => "Meg")
+  should "allow finding by id" do
     sparky = Pet.new(:name => "Sparky", :species => "Dog")
-
-    meg.pets << sparky
-    
-    meg.pets.find(:all).should include(sparky)
+    meg = Person.new(:name => "Meg", :pets => [sparky])
+    meg.pets.find(sparky.id).should == sparky
   end
   
-  should "allow retrieval via find(id)" do
-    meg = Person.new(:name => "Meg")
-    sparky = Pet.new(:name => "Sparky", :species => "Dog")
-
-    meg.pets << sparky
+  context "extending the association" do
+    setup do
+      @address_class = Class.new do
+        include MongoMapper::EmbeddedDocument
+        key :address, String
+        key :city, String
+        key :state, String
+        key :zip, Integer
+      end
+      
+      @project_class = Class.new do
+        include MongoMapper::Document
+        key :name, String
+      end
+      
+      @project_class.collection.remove
+    end
     
-    meg.pets.find(sparky.id).should == sparky
+    should "work using a block passed to many" do
+      @project_class.many :addresses, :class => @address_class do
+        def find_all_by_state(state)
+          find_all { |a| a.state == state }
+        end
+      end
+      
+      addr1 = @address_class.new(:address => "Gate-3 Lankershim Blvd.", :city => "Universal City", :state => "CA", :zip => "91608")
+      addr2 = @address_class.new(:address => "3000 W. Alameda Ave.", :city => "Burbank", :state => "CA", :zip => "91523")
+      addr3 = @address_class.new(:address => "111 Some Ln", :city => "Nashville", :state => "TN", :zip => "37211")
+      project = @project_class.create(:name => "Some Project", :addresses => [addr1, addr2, addr3])
+      
+      project.addresses.find_all_by_state("CA").should == [addr1, addr2]
+    end
+  
+    should "work using many's :extend option" do
+      module FindByCity
+        def find_by_city(city)
+          find_all { |a| a.city == city }
+        end
+      end
+      @project_class.many :addresses, :class => @address_class, :extend => FindByCity
+      
+      addr1 = @address_class.new(:address => "Gate-3 Lankershim Blvd.", :city => "Universal City", :state => "CA", :zip => "91608")
+      addr2 = @address_class.new(:address => "3000 W. Alameda Ave.", :city => "Burbank", :state => "CA", :zip => "91523")
+      addr3 = @address_class.new(:address => "111 Some Ln", :city => "Nashville", :state => "TN", :zip => "37211")
+      project = @project_class.create(:name => "Some Project", :addresses => [addr1, addr2, addr3])
+      
+      project.addresses.find_by_city('Burbank').should == [addr2]
+    end
   end
 end

data/test/functional/associations/test_many_polymorphic_proxy.rb

@@ -3,7 +3,8 @@ require 'models'
 
 class ManyPolymorphicProxyTest < Test::Unit::TestCase
   def setup
-    Room.collection.clear
+    Room.collection.remove
+    Message.collection.remove
   end
   
   should "default reader to empty array" do
@@ -258,11 +259,25 @@ class ManyPolymorphicProxyTest < Test::Unit::TestCase
       
       should "not work for id not in association" do
         lambda {
-          @lounge.messages.find(@hm2.id)
+          @lounge.messages.find!(@hm2.id)
         }.should raise_error(MongoMapper::DocumentNotFound)
       end
     end
     
+    context "with query options/criteria" do
+      should "work with order on association" do
+        @lounge.messages.should == [@lm1, @lm2]
+      end
+      
+      should "allow overriding the order provided to the association" do
+        @lounge.messages.all(:order => 'position desc').should == [@lm2, @lm1]
+      end
+      
+      should "allow using conditions on association" do
+        @hall.latest_messages.should == [@hm3, @hm2]
+      end
+    end
+    
     context "with multiple ids" do
       should "work for ids in association" do
         messages = @lounge.messages.find(@lm1.id, @lm2.id)
@@ -271,7 +286,7 @@ class ManyPolymorphicProxyTest < Test::Unit::TestCase
       
       should "not work for ids not in association" do
         lambda {
-          @lounge.messages.find(@lm1.id, @lm2.id, @hm2.id)
+          @lounge.messages.find!(@lm1.id, @lm2.id, @hm2.id)
         }.should raise_error(MongoMapper::DocumentNotFound)
       end
     end
@@ -294,4 +309,31 @@ class ManyPolymorphicProxyTest < Test::Unit::TestCase
       end
     end
   end
+  
+  context "extending the association" do
+    should "work using a block passed to many" do
+      room = Room.new(:name => "Amazing Room")
+      messages = room.messages = [
+        Enter.new(:body => 'John entered room',  :position => 3),
+        Chat.new(:body => 'Heyyyoooo!',          :position => 4),
+        Exit.new(:body => 'John exited room',    :position => 5),
+        Enter.new(:body => 'Steve entered room', :position => 6),
+        Chat.new(:body => 'Anyone there?',       :position => 7),
+        Exit.new(:body => 'Steve exited room',   :position => 8)
+      ]
+      room.save
+      room.messages.older.should == messages[3..5]
+    end
+  
+    should "work using many's :extend option" do
+      room = Room.new(:name => "Amazing Room")
+      accounts = room.accounts = [
+        Bot.new(:last_logged_in => 3.weeks.ago),
+        User.new(:last_logged_in => nil),
+        Bot.new(:last_logged_in => 1.week.ago)
+      ]
+      room.save
+      room.accounts.inactive.should == [accounts[1]]
+    end
+  end
 end

data/test/functional/associations/test_many_proxy.rb

@@ -3,8 +3,8 @@ require 'models'
 
 class ManyProxyTest < Test::Unit::TestCase
   def setup
-    Project.collection.clear
-    Status.collection.clear
+    Project.collection.remove
+    Status.collection.remove
   end
   
   should "default reader to empty array" do
@@ -14,9 +14,9 @@ class ManyProxyTest < Test::Unit::TestCase
 
   should "allow adding to association like it was an array" do
     project = Project.new
-    project.statuses <<     Status.new
-    project.statuses.push   Status.new
-    project.statuses.concat Status.new
+    project.statuses <<     Status.new(:name => 'Foo1!')
+    project.statuses.push   Status.new(:name => 'Foo2!')
+    project.statuses.concat Status.new(:name => 'Foo3!')
     project.statuses.size.should == 3
   end
 
@@ -59,14 +59,14 @@ class ManyProxyTest < Test::Unit::TestCase
   context "create" do
     should "assign foreign key" do
       project = Project.create
-      status = project.statuses.create
+      status = project.statuses.create(:name => 'Foo!')
       status.project_id.should == project.id
     end
     
     should "save record" do
       project = Project.create
       lambda {
-        project.statuses.create
+        project.statuses.create(:name => 'Foo!')
       }.should change { Status.count }
     end
     
@@ -77,13 +77,42 @@ class ManyProxyTest < Test::Unit::TestCase
     end
   end
   
+  context "create!" do
+    should "assign foreign key" do
+      project = Project.create
+      status = project.statuses.create!(:name => 'Foo!')
+      status.project_id.should == project.id
+    end
+    
+    should "save record" do
+      project = Project.create
+      lambda {
+        project.statuses.create!(:name => 'Foo!')
+      }.should change { Status.count }
+    end
+    
+    should "allow passing attributes" do
+      project = Project.create
+      status = project.statuses.create!(:name => 'Foo!')
+      status.name.should == 'Foo!'
+    end
+    
+    should "raise exception if not valid" do
+      project = Project.create
+      lambda {
+        project.statuses.create!(:name => nil)
+      }.should raise_error(MongoMapper::DocumentNotValid)
+    end
+  end
+  
+  
   context "count" do
     should "work scoped to association" do
       project = Project.create
-      3.times { project.statuses.create }
+      3.times { project.statuses.create(:name => 'Foo!') }
       
       other_project = Project.create
-      2.times { other_project.statuses.create }
+      2.times { other_project.statuses.create(:name => 'Foo!') }
       
       project.statuses.count.should == 3
       other_project.statuses.count.should == 2
@@ -292,7 +321,7 @@ class ManyProxyTest < Test::Unit::TestCase
       
       should "not work for id not in association" do
         lambda {
-          @project1.statuses.find(@archived.id)
+          @project1.statuses.find!(@archived.id)
         }.should raise_error(MongoMapper::DocumentNotFound)
       end
     end
@@ -305,7 +334,7 @@ class ManyProxyTest < Test::Unit::TestCase
       
       should "not work for ids not in association" do
         lambda {
-          @project1.statuses.find(@brand_new.id, @complete.id, @archived.id)
+          @project1.statuses.find!(@brand_new.id, @complete.id, @archived.id)
         }.should raise_error(MongoMapper::DocumentNotFound)
       end
     end
@@ -328,4 +357,25 @@ class ManyProxyTest < Test::Unit::TestCase
       end
     end
   end
+
+  context "extending the association" do
+    should "work using a block passed to many" do
+      project = Project.new(:name => "Some Project")
+      status1 = Status.new(:name => "New")
+      status2 = Status.new(:name => "Assigned")
+      status3 = Status.new(:name => "Closed")
+      project.statuses = [status1, status2, status3]
+      project.save
+      project.statuses.open.should == [status1, status2]
+    end
+  
+    should "work using many's :extend option" do
+      project = Project.new(:name => "Some Project")
+      collaborator1 = Collaborator.new(:name => "zing")
+      collaborator2 = Collaborator.new(:name => "zang")
+      project.collaborators = [collaborator1, collaborator2]
+      project.save
+      project.collaborators.top.should == collaborator1
+    end
+  end
 end

data/test/functional/test_associations.rb

@@ -8,7 +8,7 @@ class AssociationsTest < Test::Unit::TestCase
       
       many :posts, :class_name => 'AssociationsTest::AwesomePost', :foreign_key => :creator_id
     end
-    AwesomeUser.collection.clear
+    AwesomeUser.collection.remove
     
     class AwesomeTag
       include MongoMapper::EmbeddedDocument
@@ -28,8 +28,8 @@ class AssociationsTest < Test::Unit::TestCase
       many :tags, :class_name => 'AssociationsTest::AwesomeTag', :foreign_key => :post_id
     end
     
-    AwesomeUser.collection.clear
-    AwesomePost.collection.clear
+    AwesomeUser.collection.remove
+    AwesomePost.collection.remove
     
     user = AwesomeUser.create
     tag1 = AwesomeTag.new(:name => 'awesome')

data/test/functional/test_binary.rb

@@ -7,7 +7,7 @@ class BinaryTest < Test::Unit::TestCase
       set_collection_name 'test'
       key :contents, Binary
     end
-    klass.collection.clear
+    klass.collection.remove
     
     doc = klass.new(:contents => '010101')
     doc.save