fcoury-mongomapper 0.2.0 → 0.3.0

data/.gitignore

@@ -4,4 +4,3 @@ coverage
 rdoc
 pkg
 *~
-*.gem

data/History

@@ -1,8 +1,6 @@
 0.2.1(working)
 * 1 major addition
-  * Added Document#paginate which works just like find but adds pagination (dcu did basics and I pimped)
-  * Added a basic console for playing around with MongoMapper (dcu)
-  * Embedded associations can now be deeply nested (Keith Hanson)
+  * Added Document#paginate which works just like find but adds pagination
 
 0.2.0 7/7/2009
 * 2 major additions (observers, associations), several minor additions, and a few bug fixes

data/README.rdoc

@@ -2,18 +2,16 @@
 
 Awesome gem for modeling your domain and storing it in mongo.
 
-Releases are tagged on github and also released as gems on github and rubyforge. Master is pushed to whenever I add a patch or a new feature. To build from master, you can clone the code, generate the updated gemspec, build the gem and install.
+== Note on Releases
 
-* rake gemspec
-* gem build mongomapper.gemspec
-* gem install the gem that was built
+Releases are tagged on github and also released as gems on github and rubyforge. Master is pushed to whenever I add a patch or a new feature. To build from master, you can clone the code and run 'rake install' to install the gem.
 
 == Note on Patches/Pull Requests
 
 * Fork the project.
 * Make your feature addition or bug fix.
 * Add tests for it. This is important so I don't break it in a future version unintentionally.
-* Commit, do not mess with rakefile, version, or history. (if you want to have your own version, that is fine but bump version in a commit by itself in another branch so I can ignore when I pull)
+* Commit, do not mess with rakefile, version, or history. (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
 * Send me a pull request. Bonus points for topic branches.
 
 == Dependencies

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/lib/mongomapper/associations/has_many_embedded_proxy.rb

@@ -9,11 +9,11 @@ module MongoMapper
       end
 
       protected
-        def find_target
-          (@_values || []).map do |e|
-            @association.klass.new(e)
-          end
+      def find_target
+        (@_values || []).map do |e|
+          @association.klass.new(e)
         end
+      end
     end
   end
 end

data/lib/mongomapper/associations/has_many_proxy.rb

@@ -12,18 +12,17 @@ module MongoMapper
           o.save
           o
         end
-        
         reload_target
       end
 
       protected
-        def find_target
-          @association.klass.find(:all, {:conditions => {self.foreign_key => @owner.id}})
-        end
+      def find_target
+        @association.klass.find(:all, {:conditions => {self.foreign_key => @owner.id}})
+      end
 
-        def foreign_key
-          @association.options[:foreign_key] || @owner.class.name.underscore.gsub("/", "_") + "_id"
-        end
+      def foreign_key
+        @association.options[:foreign_key] || @owner.class.name.underscore.gsub("/", "_") + "_id"
+      end
     end
   end
 end

data/lib/mongomapper/associations/polymorphic_belongs_to_proxy.rb

@@ -19,13 +19,13 @@ module MongoMapper
       end
 
       protected
-        def find_target
-          ref_id = @owner.__send__(:read_attribute, "#{@association.name}_id")
-          ref_type = @owner.__send__(:read_attribute, "#{@association.name}_type")
-          if ref_id && ref_type
-            ref_type.constantize.find(ref_id)
-          end
+      def find_target
+        ref_id = @owner.__send__(:read_attribute, "#{@association.name}_id")
+        ref_type = @owner.__send__(:read_attribute, "#{@association.name}_type")
+        if ref_id && ref_type
+          ref_type.constantize.find(ref_id)
         end
+      end
     end
   end
 end

data/lib/mongomapper/associations/polymorphic_has_many_embedded_proxy.rb

@@ -0,0 +1,31 @@
+module MongoMapper
+  module Associations
+    class PolymorphicHasManyEmbeddedProxy < Proxy
+      def replace(v)
+        @_values = v.map do |e|
+          ref_type = "#{@association.name}_type"
+          if e.kind_of?(EmbeddedDocument)  
+            e.class.send(:key, ref_type, String)
+            {ref_type => e.class.name}.merge(e.attributes)
+          else
+            e
+          end
+        end
+        
+        @target = nil
+
+        reload_target
+      end
+
+      protected
+      def find_target
+        (@_values || []).map do |e|
+          ref_type = "#{@association.name}_type"
+          class_name = e[ref_type]
+          klass = class_name ? Kernel.const_get(class_name) : @association.klass
+          klass.new(e)
+        end
+      end
+    end
+  end
+end

data/lib/mongomapper/associations/proxy.rb

@@ -38,29 +38,23 @@ module MongoMapper
       end
 
       protected
-        def method_missing(method, *args)
-          if load_target
-            if block_given?
-              @target.send(method, *args)  { |*block_args| yield(*block_args) }
-            else
-              @target.send(method, *args)
-            end
+      def method_missing(method, *args)
+        if load_target
+          if block_given?
+            @target.send(method, *args)  { |*block_args| yield(*block_args) }
+          else
+            @target.send(method, *args)
           end
         end
+      end
 
-        def load_target
-          @target ||= find_target
-        end
+      def load_target
+        @target ||= find_target
+      end
 
-        def find_target
-          raise NotImplementedError
-        end
-        
-        # Array#flatten has problems with recursive arrays. Going one level
-        # deeper solves the majority of the problems.
-        def flatten_deeper(array)
-          array.collect { |element| (element.respond_to?(:flatten) && !element.is_a?(Hash)) ? element.flatten : element }.flatten
-        end
+      def find_target
+        raise NotImplementedError
+      end
     end
   end
 end

data/lib/mongomapper/document.rb

@@ -9,7 +9,7 @@ module MongoMapper
         include Observing
         include Callbacks
         include SaveWithValidation
-        include DocumentRailsCompatibility
+        include RailsCompatibility
         extend ClassMethods
 
         key :_id, String

data/lib/mongomapper/embedded_document.rb

@@ -8,11 +8,10 @@ module MongoMapper
       model.class_eval do
         extend ClassMethods
         include InstanceMethods
-      
+
         extend Associations::ClassMethods
         include Associations::InstanceMethods
 
-        include EmbeddedDocumentRailsCompatibility
         include Validatable
         include Serialization
       end
@@ -215,25 +214,14 @@ module MongoMapper
       end
       
       def embedded_association_attributes
-        embedded_attributes = HashWithIndifferentAccess.new
+        attributes = HashWithIndifferentAccess.new
         self.class.associations.each_pair do |name, association|
-          
-          if association.type == :many && association.klass.embeddable?            
-            if documents = instance_variable_get(association.ivar)
-              embedded_attributes[name] = documents.collect do |item|
-                attributes_hash = item.attributes
-                
-                item.send(:embedded_association_attributes).each_pair do |association_name, association_value|
-                  attributes_hash[association_name] = association_value
-                end
-                
-                attributes_hash
-              end
-            end
+          if association.type == :many && association.klass.embeddable?
+            vals = instance_variable_get(association.ivar)
+            attributes[name] = vals.collect { |item| item.attributes } if vals
           end
         end
-        
-        embedded_attributes
+        attributes
       end
 
       def initialize_associations(attrs={})

data/lib/mongomapper/pagination.rb

@@ -0,0 +1,52 @@
+module MongoMapper
+  module Pagination
+    class PaginationProxy < BlankSlate
+      attr_accessor :subject
+      attr_reader :total_entries, :per_page, :current_page
+      alias limit per_page
+      
+      def initialize(total_entries, current_page, per_page=nil)
+        @total_entries    = total_entries.to_i
+        self.per_page     = per_page
+        self.current_page = current_page
+      end
+      
+      def total_pages
+        (total_entries / per_page.to_f).ceil
+      end
+      
+      def out_of_bounds?
+        current_page > total_pages
+      end
+      
+      def previous_page
+        current_page > 1 ? (current_page - 1) : nil
+      end
+      
+      def next_page
+        current_page < total_pages ? (current_page + 1) : nil
+      end
+      
+      def skip
+        (current_page - 1) * per_page
+      end
+      alias offset skip
+      
+      def method_missing(name, *args, &block)
+        @subject.send(name, *args, &block)
+      end
+      
+      private
+        def per_page=(value)
+          value = 25 if value.blank?
+          @per_page = value.to_i
+        end
+        
+        def current_page=(value)
+          value = value.to_i
+          value = 1 if value < 1
+          @current_page = value
+        end
+    end
+  end
+end

data/lib/mongomapper/{embedded_document_rails_compatibility.rb → rails_compatibility.rb}

@@ -1,7 +1,8 @@
 module MongoMapper
-  module EmbeddedDocumentRailsCompatibility
+  module RailsCompatibility
     def self.included(model)
       model.class_eval do
+        alias_method :new_record?, :new?
         extend ClassMethods
       end
       class << model
@@ -16,7 +17,7 @@ module MongoMapper
     end
 
     def to_param
-      raise "Missing to_param method in #{self.class.name}. You should implement it to return the unique identifier of this document within a collection."
+      id
     end
   end
 end

data/lib/mongomapper.rb

@@ -24,8 +24,7 @@ require dir + 'finder_options'
 require dir + 'key'
 require dir + 'observing'
 require dir + 'pagination'
-require dir + 'document_rails_compatibility'
-require dir + 'embedded_document_rails_compatibility'
+require dir + 'rails_compatibility'
 require dir + 'save_with_validation'
 require dir + 'serialization'
 require dir + 'validations'

data/mongomapper.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongomapper}
-  s.version = "0.2.0"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["John Nunemaker"]
-  s.date = %q{2009-07-07}
+  s.date = %q{2009-07-19}
   s.email = %q{nunemaker@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -27,6 +27,7 @@ Gem::Specification.new do |s|
      "lib/mongomapper/associations/has_many_embedded_proxy.rb",
      "lib/mongomapper/associations/has_many_proxy.rb",
      "lib/mongomapper/associations/polymorphic_belongs_to_proxy.rb",
+     "lib/mongomapper/associations/polymorphic_has_many_embedded_proxy.rb",
      "lib/mongomapper/associations/proxy.rb",
      "lib/mongomapper/callbacks.rb",
      "lib/mongomapper/document.rb",
@@ -34,8 +35,8 @@ Gem::Specification.new do |s|
      "lib/mongomapper/finder_options.rb",
      "lib/mongomapper/key.rb",
      "lib/mongomapper/observing.rb",
-     "lib/mongomapper/document_rails_compatibility.rb",
-     "lib/mongomapper/embedded_document_rails_compatibility.rb",
+     "lib/mongomapper/pagination.rb",
+     "lib/mongomapper/rails_compatibility.rb",
      "lib/mongomapper/save_with_validation.rb",
      "lib/mongomapper/serialization.rb",
      "lib/mongomapper/serializers/json_serializer.rb",
@@ -51,16 +52,16 @@ Gem::Specification.new do |s|
      "test/test_key.rb",
      "test/test_mongomapper.rb",
      "test/test_observing.rb",
+     "test/test_pagination.rb",
      "test/test_rails_compatibility.rb",
      "test/test_serializations.rb",
      "test/test_validations.rb"
   ]
-  s.has_rdoc = true
   s.homepage = %q{http://github.com/jnunemaker/mongomapper}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{mongomapper}
-  s.rubygems_version = %q{1.3.1}
+  s.rubygems_version = %q{1.3.3}
   s.summary = %q{Awesome gem for modeling your domain and storing it in mongo}
   s.test_files = [
     "test/serializers/test_json_serializer.rb",
@@ -73,6 +74,7 @@ Gem::Specification.new do |s|
      "test/test_key.rb",
      "test/test_mongomapper.rb",
      "test/test_observing.rb",
+     "test/test_pagination.rb",
      "test/test_rails_compatibility.rb",
      "test/test_serializations.rb",
      "test/test_validations.rb"
@@ -80,7 +82,7 @@ Gem::Specification.new do |s|
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 2
+    s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activesupport>, [">= 0"])

data/test/test_associations.rb

@@ -27,34 +27,10 @@ class Status
   key :name, String
 end
 
-class RealPerson
-  include MongoMapper::Document
-  many :pets
-  
-  key :name, String
-  
-  def pets_attributes=(pets_attributes)
-    self.pets = []
-    pets_attributes.each do |attributes|
-      self.pets << Pet.new(attributes)
-    end
-  end
-end
-
 class Person
   include MongoMapper::EmbeddedDocument
   key :name, String
   key :child, Person
-  
-  many :pets
-
-end
-
-class Pet
-  include MongoMapper::EmbeddedDocument
-  
-  key :name, String
-  key :species, String
 end
 
 class Media
@@ -81,154 +57,35 @@ class Catalog
   many :medias, :polymorphic => true
 end
 
-module TrModels
-  class Transport
-    include MongoMapper::EmbeddedDocument
-    key :license_plate, String
-  end
-  
-  class Car < TrModels::Transport
-    include MongoMapper::EmbeddedDocument
-    key :model, String
-    key :year, Integer
-  end
-  
-  class Bus < TrModels::Transport
-    include MongoMapper::EmbeddedDocument
-    key :max_passengers, Integer
-  end
-  
-  class Ambulance < TrModels::Transport
-    include MongoMapper::EmbeddedDocument
-    key :icu, Boolean
-  end
-  
-  class Fleet
-    include MongoMapper::Document
-    many :transports, :polymorphic => true, :class_name => "TrModels::Transport"
-    key :name, String
-    
-    def transport_attributes=(transport_attributes)
-      self.transports = []
-      transport_attributes.each do |attributes|
-        self.transports << attributes["_type"].constantize.new(attributes)
-      end
-    end
-  end
-end
-
 class AssociationsTest < Test::Unit::TestCase
   def setup
     Project.collection.clear
     Status.collection.clear
-    Catalog.collection.clear
-    TrModels::Fleet.collection.clear
   end
   
-  context "Nested Polymorphic Many" do
-    should "set associations correctly" do
-      fleet_attributes = { 
-        "name" => "My Fleet", 
-        "transport_attributes" => [
-          {"_type" => "TrModels::Ambulance", "license_plate" => "GGG123", "icu" => true},
-          {"_type" => "TrModels::Car", "license_plate" => "ABC123", "model" => "VW Golf", "year" => 2001}, 
-          {"_type" => "TrModels::Car", "license_plate" => "DEF123", "model" => "Honda Accord", "year" => 2008},
-        ] 
-      }
-      
-      fleet = TrModels::Fleet.new(fleet_attributes)
-      fleet.transports.size.should == 3
-      fleet.transports[0].class.should == TrModels::Ambulance
-      fleet.transports[0].license_plate.should == "GGG123"
-      fleet.transports[0].icu.should be_true
-      fleet.transports[1].class.should == TrModels::Car
-      fleet.transports[1].license_plate.should == "ABC123"
-      fleet.transports[1].model.should == "VW Golf"
-      fleet.transports[1].year.should == 2001
-      fleet.transports[2].class.should == TrModels::Car
-      fleet.transports[2].license_plate.should == "DEF123"
-      fleet.transports[2].model.should == "Honda Accord"
-      fleet.transports[2].year.should == 2008      
-      fleet.save.should be_true
-
-      from_db = TrModels::Fleet.find(fleet.id)
-      from_db.transports.size.should == 3
-      from_db.transports[0].license_plate.should == "GGG123"
-      from_db.transports[0].icu.should be_true
-      from_db.transports[1].license_plate.should == "ABC123"
-      from_db.transports[1].model.should == "VW Golf"
-      from_db.transports[1].year.should == 2001
-      from_db.transports[2].license_plate.should == "DEF123"
-      from_db.transports[2].model.should == "Honda Accord"
-      from_db.transports[2].year.should == 2008      
-    end
-    
-    should "default reader to empty array" do
-      fleet = TrModels::Fleet.new
-      fleet.transports.should == []
-    end
-    
-    should "allow adding to association like it was an array" do
-      fleet = TrModels::Fleet.new
-      fleet.transports << TrModels::Car.new
-      fleet.transports.push TrModels::Bus.new
-      fleet.transports.size.should == 2
-    end
-    
-    should "store the association" do
-      fleet = TrModels::Fleet.new
-      fleet.transports = [TrModels::Car.new("license_plate" => "DCU2013", "model" => "Honda Civic")]
-      fleet.save.should be_true
-    
-      from_db = TrModels::Fleet.find(fleet.id)
-      from_db.transports.size.should == 1
-      from_db.transports[0].license_plate.should == "DCU2013"
-    end
-    
-    should "store different associations" do
-      fleet = TrModels::Fleet.new
-      fleet.transports = [
-        TrModels::Car.new("license_plate" => "ABC1223", "model" => "Honda Civic", "year" => 2003),
-        TrModels::Bus.new("license_plate" => "XYZ9090", "max_passengers" => 51),
-        TrModels::Ambulance.new("license_plate" => "HDD3030", "icu" => true)
-      ]
-      fleet.save.should be_true
-    
-      from_db = TrModels::Fleet.find(fleet.id)
-      from_db.transports.size.should == 3
-      from_db.transports[0].license_plate.should == "ABC1223"
-      from_db.transports[0].model.should == "Honda Civic"
-      from_db.transports[0].year.should == 2003
-      from_db.transports[1].license_plate.should == "XYZ9090"
-      from_db.transports[1].max_passengers.should == 51
-      from_db.transports[2].license_plate.should == "HDD3030"
-      from_db.transports[2].icu.should == true
-    end
-  end
-
   context "Polymorphic Many" do
     should "default reader to empty array" do
       catalog = Catalog.new
       catalog.medias.should == []
     end
-  
+
     should "allow adding to association like it was an array" do
       catalog = Catalog.new
       catalog.medias << Video.new
       catalog.medias.push Video.new
       catalog.medias.size.should == 2
     end
-  
+
     should "store the association" do
       catalog = Catalog.new
       catalog.medias = [Video.new("file" => "video.mpg", "length" => 3600)]
       catalog.save.should be_true
-  
+
       from_db = Catalog.find(catalog.id)
       from_db.medias.size.should == 1
       from_db.medias[0].file.should == "video.mpg"
     end
-  
+
     should "store different associations" do
       catalog = Catalog.new
       catalog.medias = [
@@ -237,7 +94,7 @@ class AssociationsTest < Test::Unit::TestCase
         Image.new("file" => "image.png", "width" => 800, "height" => 600)
       ]
       catalog.save.should be_true
-  
+
       from_db = Catalog.find(catalog.id)
       from_db.medias.size.should == 3
       from_db.medias[0].file.should == "video.mpg"
@@ -249,32 +106,79 @@ class AssociationsTest < Test::Unit::TestCase
       from_db.medias[2].height.should == 600
     end
   end
-  
+
+  context "Many embedded documents" do
+    should "default reader to empty array" do
+      project = Project.new
+      project.addresses.should == []
+    end
+
+    should "allow adding to association like it was an array" do
+      project = Project.new
+      project.addresses << Address.new
+      project.addresses.push Address.new
+      project.addresses.size.should == 2
+    end
+
+    should "be embedded in document on save" do
+      sb = Address.new(:city => 'South Bend', :state => 'IN')
+      chi = Address.new(:city => 'Chicago', :state => 'IL')
+      project = Project.new
+      project.addresses << sb
+      project.addresses << chi
+      project.save
+
+      from_db = Project.find(project.id)
+      from_db.addresses.size.should == 2
+      from_db.addresses[0].should == sb
+      from_db.addresses[1].should == chi
+    end
+
+    should "allow embedding arbitrarily deep" do
+      @document = Class.new do
+        include MongoMapper::Document
+        key :person, Person
+      end
+
+      meg = Person.new(:name => "Meg")
+      meg.child = Person.new(:name => "Steve")
+      meg.child.child = Person.new(:name => "Linda")
+
+      doc = @document.new(:person => meg)
+      doc.save
+
+      from_db = @document.find(doc.id)
+      from_db.person.name.should == 'Meg'
+      from_db.person.child.name.should == 'Steve'
+      from_db.person.child.child.name.should == 'Linda'
+    end
+  end
+
   context "Polymorphic Belongs To" do
     should "default to nil" do
       status = Status.new
       status.target.should be_nil
     end
-  
+
     should "store the association" do
       status = Status.new
       project = Project.new(:name => "mongomapper")
       status.target = project
       status.save.should be_true
-  
+
       from_db = Status.find(status.id)
       from_db.target.should_not be_nil
       from_db.target_id.should == project.id
       from_db.target_type.should == "Project"
       from_db.target.name.should == "mongomapper"
     end
-  
+
     should "unset the association" do
       status = Status.new
       project = Project.new(:name => "mongomapper")
       status.target = project
       status.save.should be_true
-  
+
       from_db = Status.find(status.id)
       from_db.target = nil
       from_db.target_type.should be_nil
@@ -282,79 +186,73 @@ class AssociationsTest < Test::Unit::TestCase
       from_db.target.should be_nil
     end
   end
-  
+
   context "Belongs To" do
     should "default to nil" do
       status = Status.new
       status.project.should be_nil
     end
-  
+
     should "store the association" do
       status = Status.new
       project = Project.new(:name => "mongomapper")
       status.project = project
       status.save.should be_true
-  
+
       from_db = Status.find(status.id)
       from_db.project.should_not be_nil
       from_db.project.name.should == "mongomapper"
     end
-  
+
     should "unset the association" do
       status = Status.new
       project = Project.new(:name => "mongomapper")
       status.project = project
       status.save.should be_true
-  
+
       from_db = Status.find(status.id)
       from_db.project = nil
       from_db.project.should be_nil
     end
   end
-  
+
   context "Many documents" do
-    should "set children documents" do
-      fleet_attributes = { 
-        "name" => "My Project", 
-        "statuses_attributes" => [
-          {"status" => "Ready", "license_plate" => "GGG123", "icu" => true},
-          {"_type" => "ACar", "license_plate" => "ABC123", "model" => "VW Golf", "year" => 2001}, 
-          {"_type" => "TrModels::Car", "license_plate" => "DEF123", "model" => "Honda Accord", "year" => 2008},
-        ] 
-      }
-    end
-    
     should "default reader to empty array" do
       project = Project.new
       project.statuses.should == []
     end
-  
+
     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.size.should == 2
     end
-  
+
     should "store the association" do
       project = Project.new
       project.statuses = [Status.new("name" => "ready")]
       project.save.should be_true
-  
+
       from_db = Project.find(project.id)
       from_db.statuses.size.should == 1
       from_db.statuses[0].name.should == "ready"
     end
   end
-  
+
   context "Many embedded documents" do
+    should "default reader to empty array" do
+      project = Project.new
+      project.addresses.should == []
+    end
+
     should "allow adding to association like it was an array" do
       project = Project.new
       project.addresses << Address.new
       project.addresses.push Address.new
       project.addresses.size.should == 2
     end
-  
+
     should "be embedded in document on save" do
       sb = Address.new(:city => 'South Bend', :state => 'IN')
       chi = Address.new(:city => 'Chicago', :state => 'IL')
@@ -362,7 +260,7 @@ class AssociationsTest < Test::Unit::TestCase
       project.addresses << sb
       project.addresses << chi
       project.save
-  
+
       from_db = Project.find(project.id)
       from_db.addresses.size.should == 2
       from_db.addresses[0].should == sb
@@ -387,58 +285,5 @@ class AssociationsTest < Test::Unit::TestCase
       from_db.person.child.name.should == 'Steve'
       from_db.person.child.child.name.should == 'Linda'
     end
-    
-    should "allow assignment of 'many' embedded documents using a hash" do
-      person_attributes = { 
-        "name" => "Mr. Pet Lover", 
-        "pets_attributes" => [
-          {"name" => "Jimmy", "species" => "Cocker Spainel"},
-          {"name" => "Sasha", "species" => "Siberian Husky"}, 
-        ] 
-      }
-      
-      pet_lover = RealPerson.new(person_attributes)
-      pet_lover.name.should == "Mr. Pet Lover"
-      pet_lover.pets[0].name.should == "Jimmy"
-      pet_lover.pets[0].species.should == "Cocker Spainel"
-      pet_lover.pets[1].name.should == "Sasha"
-      pet_lover.pets[1].species.should == "Siberian Husky"
-      pet_lover.save.should be_true
-      
-      from_db = RealPerson.find(pet_lover.id)
-      from_db.name.should == "Mr. Pet Lover"
-      from_db.pets[0].name.should == "Jimmy"
-      from_db.pets[0].species.should == "Cocker Spainel"
-      from_db.pets[1].name.should == "Sasha"
-      from_db.pets[1].species.should == "Siberian Husky"
-    end
-    
-    should "allow saving embedded documents in 'many' embedded documents" do
-      @document = Class.new do
-        include MongoMapper::Document
-        
-        many :people
-      end
-      
-      meg = Person.new(:name => "Meg")
-      sparky = Pet.new(:name => "Sparky", :species => "Dog")
-      koda = Pet.new(:name => "Koda", :species => "Dog")
-      
-      doc = @document.new
-      
-      meg.pets << sparky
-      meg.pets << koda
-      
-      doc.people << meg
-      doc.save
-      
-      from_db = @document.find(doc.id)
-      from_db.people.first.name.should == "Meg"
-      from_db.people.first.pets.should_not == []
-      from_db.people.first.pets.first.name.should == "Sparky"
-      from_db.people.first.pets.first.species.should == "Dog"
-      from_db.people.first.pets[1].name.should == "Koda"
-      from_db.people.first.pets[1].species.should == "Dog"
-    end
   end
 end

data/test/test_document.rb

@@ -55,13 +55,6 @@ class DocumentTest < Test::Unit::TestCase
       @document.keys['age'].name.should == 'age'
       @document.keys['age'].type.should == Integer
     end
-    
-    should "allow redefining a key" do
-      @document.key(:foo, String)
-      @document.keys['foo'].type.should == String
-      @document.key(:foo, Integer)
-      @document.keys['foo'].type.should == Integer
-    end
 
     should "use default database by default" do
       @document.database.should == MongoMapper.database

data/test/test_pagination.rb

@@ -0,0 +1,113 @@
+require 'test_helper'
+
+class PaginationTest < Test::Unit::TestCase
+  include MongoMapper::Pagination
+  
+  context "Pagination proxy" do
+    should "should have accessors for subject" do
+      subject = [1,2,3,4,5]
+      collection = PaginationProxy.new(25, 2)
+      collection.subject = subject
+      collection.subject.should == subject
+    end
+    
+    should "delegate any methods not defined to the subject" do
+      subject = [1,2,3,4,5]
+      collection = PaginationProxy.new(25, 2, 10)
+      collection.subject = subject
+      collection.size.should == 5
+      collection.each_with_index do |value, i|
+        value.should == subject[i]
+      end
+      collection[0..2].should == [1,2,3]
+      collection.class.should == Array
+    end
+    
+    should "return correct value for total_entries" do
+      PaginationProxy.new(25, 2, 10).total_entries.should == 25
+      PaginationProxy.new('25', 2, 10).total_entries.should == 25
+    end
+    
+    should "return correct value for per_page" do
+      PaginationProxy.new(25, 2, 10).per_page.should == 10
+      PaginationProxy.new(25, 2, '10').per_page.should == 10
+    end
+    
+    should "alias limit to per_page" do
+      PaginationProxy.new(100, 1, 300).limit.should == 300
+    end
+    
+    should "set per_page to 25 if nil or blank" do
+      PaginationProxy.new(25, 2).per_page.should == 25
+      PaginationProxy.new(25, 2, '').per_page.should == 25
+    end
+    
+    should "return correct value for current_page" do
+      PaginationProxy.new(25, 2, 10).current_page.should == 2
+      PaginationProxy.new(25, '2', 10).current_page.should == 2
+    end
+    
+    should "not allow value less than 1 for current page" do
+      PaginationProxy.new(25, -1).current_page.should == 1
+    end
+    
+    should "automatically calculate total_pages from total_entries and per page" do
+      PaginationProxy.new(25, 2, 10).total_pages.should == 3
+    end
+    
+    should "know how many records to skip" do
+      PaginationProxy.new(25, 2, 10).skip.should == 10
+    end
+    
+    should "alias offset to skip" do
+      PaginationProxy.new(25, 2, 10).offset.should == 10
+    end
+    
+    context "previous_page" do
+      should "be nil if current page 1" do
+        PaginationProxy.new(25, 1, 10).previous_page.should be_nil
+      end
+      
+      should "be one less than current page if current is > 1" do
+        PaginationProxy.new(25, 2, 10).previous_page.should == 1
+      end
+    end
+    
+    context "next_page" do
+      should "be nil if current page is last page" do
+        PaginationProxy.new(25, 3, 10).next_page.should be_nil
+      end
+      
+      should "work for any page that is not last" do
+        PaginationProxy.new(25, 1, 10).next_page.should == 2
+        PaginationProxy.new(25, 2, 10).next_page.should == 3
+      end
+    end
+    
+    context "previous_page" do
+      should "be nil if current page is first page" do
+        PaginationProxy.new(25, 1, 10).previous_page.should be_nil
+      end
+      
+      should "work for any page other than first" do
+        PaginationProxy.new(25, 2, 10).previous_page.should == 1
+        PaginationProxy.new(25, 3, 10).previous_page.should == 2
+      end
+    end
+    
+    context "out_of_bounds?" do
+      should "be true if current_page is greater than total_pages" do
+        PaginationProxy.new(25, 10, 4).out_of_bounds?.should be_true
+      end
+      
+      should "be false if current_page is less than total_pages" do
+        PaginationProxy.new(25, 10, 1).out_of_bounds?.should be_false
+        PaginationProxy.new(25, 2, 10).out_of_bounds?.should be_false
+      end
+      
+      should "be false if current_page is equal to total_pages" do
+        PaginationProxy.new(25, 3, 10).out_of_bounds?.should be_false
+      end
+    end
+  end # end of pagination proxy
+end # end of test case

data/test/test_rails_compatibility.rb

@@ -1,73 +1,29 @@
 require 'test_helper'
 
-class Item
-  include MongoMapper::EmbeddedDocument
-  key :for_all, String
-end
-
-class FirstItem < Item  
-  key :first_only, String
-end
-
-class SecondItem < Item
-  key :second_only, String
-end
-
-class Order
-  include MongoMapper::Document
-  many :items, :polymorphic => true, :class_name => "Item"
-  key :order_only, String
-end
-
 class TestRailsCompatibility < Test::Unit::TestCase
   def setup
     @document = Class.new do
       include MongoMapper::Document
     end
   end
-  
-  context "EmbeddedDocument" do
-    should "have to_param that returns id" do
-      first_item = FirstItem.new
-      second_item = SecondItem.new
 
-      order = Order.create('_id' => '1234')
-      order.items = [
-        first_item,
-        second_item
-      ]
-      order.to_param.should == '1234'
-
-      lambda { first_item.to_param }.should raise_error
-      lambda { second_item.to_param }.should raise_error
-    end
-
-    should "have column names" do
-      Order.column_names.sort.should == ['_id', 'created_at', 'order_only', 'updated_at']
-      FirstItem.column_names.sort.should == ['first_only', 'for_all']
-      SecondItem.column_names.sort.should == ['for_all', 'second_only']
-    end
+  should "have to_param that returns id" do
+    instance = @document.create('_id' => '1234')
+    instance.to_param.should == '1234'
   end
 
-  context "Document" do
-    should "have to_param that returns id" do
-      instance = @document.create('_id' => '1234')
-      instance.to_param.should == '1234'
-    end
-
-    should "alias new to new_record?" do
-      instance = @document.new
-      instance.new_record?.should == instance.new?
-    end
+  should "alias new to new_record?" do
+    instance = @document.new
+    instance.new_record?.should == instance.new?
+  end
 
-    should "alias many to has_many" do
-      @document.should respond_to(:has_many)
-      @document.method(:has_many).should == @document.method(:many)
-    end
+  should "alias many to has_many" do
+    @document.should respond_to(:has_many)
+    @document.method(:has_many).should == @document.method(:many)
+  end
 
-    should "have column names" do
-      @document.key :fname, String
-      @document.column_names.sort.should == ['_id', 'created_at', 'fname', 'updated_at']
-    end
+  should "have column names" do
+    @document.key :fname, String
+    @document.column_names.sort.should == ['_id', 'created_at', 'fname', 'updated_at']
   end
 end

data/test/test_validations.rb

@@ -169,12 +169,6 @@ class ValidationsTest < Test::Unit::TestCase
       should "allow to update an object" do
         doc = @document.new("name" => "joe")
         doc.save
-
-        @document \
-          .stubs(:find) \
-          .with(:first, :conditions => {:name => 'joe'}, :limit => 1) \
-          .returns(doc)
-
         doc.name = "joe"
         doc.valid?.should be_true
         doc.should_not have_error_on(:name)
@@ -183,12 +177,7 @@ class ValidationsTest < Test::Unit::TestCase
       should "fail if object name is not unique" do
         doc = @document.new("name" => "joe")
         doc.save.should be_true
-
-        @document \
-          .stubs(:find) \
-          .with(:first, :conditions => {:name => 'joe'}, :limit => 1) \
-          .returns(doc)
-
+        sleep 0.2 # hack to avoid race condition
         doc2 = @document.new("name" => "joe")
         doc2.should have_error_on(:name)
       end
@@ -200,12 +189,7 @@ class ValidationsTest < Test::Unit::TestCase
         
         doc = @document.create(:name => 'John')
         doc.should_not have_error_on(:name)
-        
-        @document \
-          .stubs(:find) \
-          .with(:first, :conditions => {:name => 'John'}, :limit => 1) \
-          .returns(doc)
-        
+        sleep 0.2 # hack to avoid race condition
         second_john = @document.create(:name => 'John')
         second_john.should have_error_on(:name, 'has already been taken')
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fcoury-mongomapper
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - John Nunemaker
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-07 00:00:00 -07:00
+date: 2009-07-19 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -86,6 +86,7 @@ files:
 - lib/mongomapper/associations/has_many_embedded_proxy.rb
 - lib/mongomapper/associations/has_many_proxy.rb
 - lib/mongomapper/associations/polymorphic_belongs_to_proxy.rb
+- lib/mongomapper/associations/polymorphic_has_many_embedded_proxy.rb
 - lib/mongomapper/associations/proxy.rb
 - lib/mongomapper/callbacks.rb
 - lib/mongomapper/document.rb
@@ -93,8 +94,8 @@ files:
 - lib/mongomapper/finder_options.rb
 - lib/mongomapper/key.rb
 - lib/mongomapper/observing.rb
-- lib/mongomapper/document_rails_compatibility.rb
-- lib/mongomapper/embedded_document_rails_compatibility.rb
+- lib/mongomapper/pagination.rb
+- lib/mongomapper/rails_compatibility.rb
 - lib/mongomapper/save_with_validation.rb
 - lib/mongomapper/serialization.rb
 - lib/mongomapper/serializers/json_serializer.rb
@@ -110,10 +111,11 @@ files:
 - test/test_key.rb
 - test/test_mongomapper.rb
 - test/test_observing.rb
+- test/test_pagination.rb
 - test/test_rails_compatibility.rb
 - test/test_serializations.rb
 - test/test_validations.rb
-has_rdoc: true
+has_rdoc: false
 homepage: http://github.com/jnunemaker/mongomapper
 post_install_message: 
 rdoc_options: 
@@ -137,7 +139,7 @@ requirements: []
 rubyforge_project: mongomapper
 rubygems_version: 1.2.0
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Awesome gem for modeling your domain and storing it in mongo
 test_files: 
 - test/serializers/test_json_serializer.rb
@@ -150,6 +152,7 @@ test_files:
 - test/test_key.rb
 - test/test_mongomapper.rb
 - test/test_observing.rb
+- test/test_pagination.rb
 - test/test_rails_compatibility.rb
 - test/test_serializations.rb
 - test/test_validations.rb

data/lib/mongomapper/document_rails_compatibility.rb

@@ -1,13 +0,0 @@
-module MongoMapper
-  module DocumentRailsCompatibility
-    def self.included(model)
-      model.class_eval do
-        alias_method :new_record?, :new?
-      end
-    end
-
-    def to_param
-      id
-    end
-  end
-end