mongomodel 0.2.15 → 0.2.16

data/Gemfile

@@ -1,4 +1,4 @@
 source "http://rubygems.org"
 
 gemspec
-gem "bson_ext", '= 1.1.2'
+gem "bson_ext", '~> 1.1.5'

data/lib/mongomodel/concerns/attribute_methods/dirty.rb

@@ -12,7 +12,7 @@ module MongoModel
       
       # Returns the attributes as they were before any changes were made to the document.
       def original_attributes
-        {}.merge(attributes).merge(changed_attributes)
+        {}.with_indifferent_access.merge(attributes).merge(changed_attributes)
       end
     
     protected

data/lib/mongomodel/document.rb

@@ -1,3 +1,4 @@
+require 'active_support/core_ext/class/attribute_accessors'
 require 'active_support/core_ext/hash/reverse_merge'
 require 'active_support/core_ext/hash/deep_merge'
 require 'active_support/core_ext/string/inflections'
@@ -15,5 +16,8 @@ module MongoModel
     include DocumentExtensions::Callbacks
     
     self.abstract_class = true
+    
+    cattr_accessor :per_page
+    self.per_page = 20
   end
 end

data/lib/mongomodel/document/scopes.rb

@@ -13,7 +13,7 @@ module MongoModel
       module ClassMethods
         delegate :find, :first, :last, :all, :exists?, :count, :to => :scoped
         delegate :update, :update_all, :delete, :delete_all, :destroy, :destroy_all, :to => :scoped
-        delegate :select, :order, :where, :limit, :offset, :from, :to => :scoped
+        delegate :select, :order, :where, :limit, :offset, :from, :paginate, :to => :scoped
         
         def unscoped
           @unscoped ||= MongoModel::Scope.new(self)

data/lib/mongomodel/support/scope.rb

@@ -9,10 +9,11 @@ module MongoModel
     autoload :QueryMethods,   'mongomodel/support/scope/query_methods'
     autoload :FinderMethods,  'mongomodel/support/scope/finder_methods'
     autoload :DynamicFinders, 'mongomodel/support/scope/dynamic_finders'
+    autoload :Pagination,     'mongomodel/support/scope/pagination'
     
-    include DynamicFinders, FinderMethods, QueryMethods, SpawnMethods
+    include Pagination, DynamicFinders, FinderMethods, QueryMethods, SpawnMethods
     
-    delegate :inspect, :to => :to_a
+    delegate :inspect, :as_json, :to => :to_a
     
     attr_reader :klass
     

data/lib/mongomodel/support/scope/pagination.rb

@@ -0,0 +1,17 @@
+require 'will_paginate/collection'
+
+module MongoModel
+  class Scope
+    module Pagination
+      def paginate(options={})
+        page     = options[:page] || 1
+        per_page = options[:per_page] || klass.per_page
+        
+        WillPaginate::Collection.create(page, per_page) do |pager|
+          pager.replace offset(pager.offset).limit(pager.per_page)
+          pager.total_entries ||= count
+        end
+      end
+    end
+  end
+end

data/lib/mongomodel/version.rb

@@ -1,3 +1,3 @@
 module MongoModel
-  VERSION = "0.2.15"
+  VERSION = "0.2.16"
 end

data/mongomodel.gemspec

@@ -17,6 +17,7 @@ Gem::Specification.new do |s|
   s.add_dependency "activesupport", "~> 3.0.3"
   s.add_dependency "activemodel",   "~> 3.0.3"
   s.add_dependency "mongo",         "~> 1.1.2"
+  s.add_dependency "will_paginate", "~> 2.3.15"
 
   s.add_development_dependency "bundler", ">= 1.0.0"
   s.add_development_dependency "rspec",   "= 1.3.0"

data/spec/mongomodel/concerns/attribute_methods/dirty_spec.rb

@@ -142,7 +142,7 @@ module MongoModel
       
       context "without changes" do
         it "should return the attributes hash" do
-          subject.original_attributes.should == subject.attributes
+          subject.original_attributes.symbolize_keys.should == subject.attributes
         end
       end
     end

data/spec/mongomodel/mongomodel_spec.rb

@@ -23,8 +23,8 @@ describe MongoModel do
       database = MongoModel.database
       connection = database.connection
 
-      connection.host.should == '127.0.0.1'
-      connection.port.should == 27017
+      connection.primary_pool.host.should == '127.0.0.1'
+      connection.primary_pool.port.should == 27017
       database.name.should == 'mydb'
     end
   end

data/spec/mongomodel/support/scope_spec.rb

@@ -57,6 +57,12 @@ module MongoModel
         end
       end
       
+      describe "#as_json" do
+        it "should delegate to #to_a" do
+          subject.as_json.should == subject.to_a.as_json
+        end
+      end
+      
       describe "#count" do
         it "should count documents matching conditions and return the result" do
           model.should_count(finder_options, 4) do
@@ -728,6 +734,47 @@ module MongoModel
           end
         end
       end
+      
+      describe "#paginate" do
+        it "should load the first page of results by default" do
+          model.should_find(finder_options.merge(:offset => 0, :limit => 20), posts) {
+            subject.paginate
+          }
+        end
+        
+        it "should load a specified page of results" do
+          model.should_find(finder_options.merge(:offset => 40, :limit => 20), posts) {
+            subject.paginate(:page => 3)
+          }
+        end
+        
+        it "should allow the per_page option to be set" do
+          model.should_find(finder_options.merge(:offset => 7, :limit => 7), posts) {
+            subject.paginate(:per_page => 7, :page => 2)
+          }
+        end
+        
+        it "should auto-detect total entries where possible" do
+          paginator = nil
+          
+          model.should_find(finder_options.merge(:offset => 0, :limit => 20), posts) {
+            paginator = subject.paginate
+          }
+          
+          paginator.total_entries.should == 5
+        end
+        
+        it "should load total entries using count when auto-detection not possible" do
+          paginator = nil
+          
+          subject.stub!(:count).and_return(57)
+          model.should_find(finder_options.merge(:offset => 0, :limit => 5), posts) {
+            paginator = subject.paginate(:per_page => 5)
+          }
+          
+          paginator.total_entries.should == 57
+        end
+      end
     end
     
     

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mongomodel
 version: !ruby/object:Gem::Version 
-  hash: 9
-  prerelease: false
+  hash: 55
+  prerelease: 
   segments: 
   - 0
   - 2
-  - 15
-  version: 0.2.15
+  - 16
+  version: 0.2.16
 platform: ruby
 authors: 
 - Sam Pohlenz
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-23 00:00:00 +10:30
+date: 2011-01-04 00:00:00 +10:30
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -67,9 +67,25 @@ dependencies:
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: bundler
+  name: will_paginate
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 29
+        segments: 
+        - 2
+        - 3
+        - 15
+        version: 2.3.15
+  type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: bundler
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -81,11 +97,11 @@ dependencies:
         - 0
         version: 1.0.0
   type: :development
-  version_requirements: *id004
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -97,7 +113,7 @@ dependencies:
         - 0
         version: 1.3.0
   type: :development
-  version_requirements: *id005
+  version_requirements: *id006
 description: MongoModel is a MongoDB ORM for Ruby/Rails similar to ActiveRecord and DataMapper.
 email: 
 - sam@sampohlenz.com
@@ -174,6 +190,7 @@ files:
 - lib/mongomodel/support/scope.rb
 - lib/mongomodel/support/scope/dynamic_finders.rb
 - lib/mongomodel/support/scope/finder_methods.rb
+- lib/mongomodel/support/scope/pagination.rb
 - lib/mongomodel/support/scope/query_methods.rb
 - lib/mongomodel/support/scope/spawn_methods.rb
 - lib/mongomodel/support/types.rb
@@ -281,7 +298,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: mongomodel
-rubygems_version: 1.3.7
+rubygems_version: 1.4.1
 signing_key: 
 specification_version: 3
 summary: MongoDB ORM for Ruby/Rails