mongoid-data_table 1.0.3 → 1.0.4

data/Gemfile.lock

@@ -2,8 +2,8 @@ PATH
   remote: .
   specs:
     mongoid-data_table (1.0.3)
-      rails (~> 3.0.0)
-      will_paginate (~> 3.0.pre2)
+      kaminari (~> 0.12.4)
+      rails (>= 3.0.0)
 
 GEM
   remote: http://rubygems.org/
@@ -43,6 +43,8 @@ GEM
     erubis (2.6.6)
       abstract (>= 1.0.0)
     i18n (0.5.0)
+    kaminari (0.12.4)
+      rails (>= 3.0.0)
     mail (2.2.19)
       activesupport (>= 2.3.6)
       i18n (>= 0.4.0)
@@ -52,13 +54,12 @@ GEM
     mocha (0.9.12)
     mongo (1.3.1)
       bson (>= 1.3.1)
-    mongoid (2.0.1)
+    mongoid (2.0.2)
       activemodel (~> 3.0)
       mongo (~> 1.3)
       tzinfo (~> 0.3.22)
-      will_paginate (~> 3.0.pre)
     polyglot (0.3.1)
-    rack (1.2.2)
+    rack (1.2.3)
     rack-mount (0.6.14)
       rack (>= 1.0.0)
     rack-test (0.5.7)
@@ -76,7 +77,7 @@ GEM
       activesupport (= 3.0.7)
       rake (>= 0.8.7)
       thor (~> 0.14.4)
-    rake (0.8.7)
+    rake (0.9.0)
     rspec (2.6.0)
       rspec-core (~> 2.6.0)
       rspec-expectations (~> 2.6.0)
@@ -91,15 +92,14 @@ GEM
       polyglot (>= 0.3.1)
     tzinfo (0.3.27)
     watchr (0.7)
-    will_paginate (3.0.pre2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bson_ext (~> 1.3.0)
+  bson_ext (~> 1.3.1)
   mocha (~> 0.9.12)
-  mongoid (~> 2.0.1)
+  mongoid (~> 2.0.2)
   mongoid-data_table!
   rspec (~> 2.6.0)
   shoulda (~> 2.11.3)

data/lib/mongoid/data_table.rb

@@ -6,10 +6,8 @@ require 'active_support/core_ext/string/inflections'
 require 'active_support/core_ext/class/inheritable_attributes'
 require 'active_support/concern'
 
-require 'mongoid/criteria'
 require 'mongoid/relations/proxy'
 
-require 'mongoid/data_table/criteria'
 require 'mongoid/data_table/proxy'
 require 'mongoid/data_table/version'
 

data/lib/mongoid/data_table/proxy.rb

@@ -19,10 +19,7 @@ module Mongoid
 
       def collection(force = false)
         reload if force
-        @collection ||= conditions.paginate({
-          :page => current_page,
-          :per_page => per_page
-        })
+        @collection ||= conditions.page(current_page).per(per_page)
       end
 
       def reload

data/lib/mongoid/data_table/version.rb

@@ -1,5 +1,5 @@
 module Mongoid
   module DataTable
-    VERSION = "1.0.3"
+    VERSION = "1.0.4"
   end
 end

data/mongoid-data_table.gemspec

@@ -16,11 +16,11 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency "rails", "~>3.0.0"
-  s.add_dependency "will_paginate", "~>3.0.pre2"
+  s.add_dependency "rails", ">= 3.0.0"
+  s.add_dependency "kaminari", "~> 0.12.4"
 
-  s.add_development_dependency "bson_ext", "~>1.3.0"
-  s.add_development_dependency "mongoid", "~>2.0.1"
+  s.add_development_dependency "bson_ext", "~>1.3.1"
+  s.add_development_dependency "mongoid", "~>2.0.2"
   s.add_development_dependency "mocha", "~>0.9.12"
   s.add_development_dependency "rspec", "~>2.6.0"
   s.add_development_dependency "shoulda", "~>2.11.3"

data/spec/spec_helper.rb

@@ -12,6 +12,7 @@ require 'mongoid'
 require 'mongoid-data_table'
 require 'mocha'
 require 'rspec'
+require 'kaminari'
 
 LOGGER = ActiveSupport::BufferedLogger.new($stdout)
 
@@ -21,6 +22,12 @@ Mongoid.configure do |config|
   config.logger = nil
 end
 
+if defined? ::Mongoid
+  require 'kaminari/models/mongoid_extension'
+  ::Mongoid::Document.send :include, Kaminari::MongoidExtension::Document
+  ::Mongoid::Criteria.send :include, Kaminari::MongoidExtension::Criteria
+end
+
 Dir[ File.join(MODELS, "*.rb") ].sort.each { |file| require File.basename(file) }
 Dir[ File.join(SUPPORT, "*.rb") ].each { |file| require File.basename(file) }
 

data/spec/unit/mongoid/data_table/proxy_spec.rb

@@ -2,12 +2,22 @@ require 'spec_helper'
 
 describe Mongoid::DataTable::Proxy do
 
-  let!(:controller) do
+  before do
+    Rails.stubs(:logger).returns(LOGGER)
+  end
+
+  let(:controller) do
     Class.new(ActionController::Base).new.tap do |c|
       c.stubs(:params).returns({})
     end
   end
 
+  let(:custom_array) { %w(custom) }
+
+  let(:custom_block) do
+    lambda { |object| custom_array }
+  end
+
   describe "#new" do
 
     it "creates a new Mongoid::DataTable::Proxy object" do
@@ -34,8 +44,8 @@ describe Mongoid::DataTable::Proxy do
 
     describe "#collection" do
 
-      it "should return WillPaginate::Collection" do
-        proxy.collection.should be_a(WillPaginate::Collection)
+      it "should be paged to page 1" do
+        proxy.collection.current_page.should == proxy.current_page
       end
 
       it "should reload when passed true" do
@@ -66,4 +76,39 @@ describe Mongoid::DataTable::Proxy do
 
   end
 
+  context "with custom block" do
+
+    let(:bob) do
+      Person.find_or_create_by(:name => 'Bob')
+    end
+
+    let(:dt) do
+      bob
+      Person.criteria.to_data_table(controller, {}, &custom_block)
+    end
+
+    it "should store it as an @extension" do
+      dt.extension.should == custom_block
+    end
+
+    describe "#to_hash" do
+
+      it "should run the custom block" do
+        dt.to_hash[:aaData].first.should == custom_array
+      end
+
+      context "with inline block" do
+
+        it "should run the inline block" do
+          a = custom_array.push('inline')
+          h = dt.to_hash { |object| a }
+          h[:aaData].first.should == a
+        end
+
+      end
+
+    end
+
+  end
+
 end

metadata

@@ -2,7 +2,7 @@
 name: mongoid-data_table
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors: 
 - Jason Dew
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-19 00:00:00 Z
+date: 2011-05-23 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
@@ -19,20 +19,20 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         version: 3.0.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: will_paginate
+  name: kaminari
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 3.0.pre2
+        version: 0.12.4
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -43,7 +43,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.3.0
+        version: 1.3.1
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -54,7 +54,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 2.0.1
+        version: 2.0.2
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -122,7 +122,6 @@ files:
 - Rakefile
 - lib/mongoid-data_table.rb
 - lib/mongoid/data_table.rb
-- lib/mongoid/data_table/criteria.rb
 - lib/mongoid/data_table/proxy.rb
 - lib/mongoid/data_table/version.rb
 - mongoid-data_table.gemspec
@@ -132,7 +131,6 @@ files:
 - spec/models/user_agent.rb
 - spec/spec_helper.rb
 - spec/unit/mongoid-data_table_spec.rb
-- spec/unit/mongoid/data_table/criteria_spec.rb
 - spec/unit/mongoid/data_table/proxy_spec.rb
 - spec/unit/mongoid/data_table_spec.rb
 homepage: http://rubygems.org/gems/mongoid-data_table
@@ -158,7 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.8.3
 signing_key: 
 specification_version: 3
 summary: Simple data preparation from Mongoid to the jQuery DataTables plugin
@@ -169,7 +167,5 @@ test_files:
 - spec/models/user_agent.rb
 - spec/spec_helper.rb
 - spec/unit/mongoid-data_table_spec.rb
-- spec/unit/mongoid/data_table/criteria_spec.rb
 - spec/unit/mongoid/data_table/proxy_spec.rb
 - spec/unit/mongoid/data_table_spec.rb
-has_rdoc: 

data/lib/mongoid/data_table/criteria.rb

@@ -1,31 +0,0 @@
-module Mongoid
-  module DataTable
-    module Criteria
-      # do nothing
-    end
-  end
-
-  class Criteria
-
-    # Used for chaining +Criteria+ scopes together in the for of class methods
-    # on the +Document+ the criteria is for.
-    #
-    # Options:
-    #
-    # name: The name of the class method on the +Document+ to chain.
-    # args: The arguments passed to the method.
-    # block: Optional block to pass
-    #
-    # Returns: <tt>Criteria</tt>
-    def method_missing(name, *args, &block)
-      if @klass.respond_to?(name)
-        @klass.send(:with_scope, self) do
-          @klass.send(name, *args, &block)
-        end
-      else
-        return entries.send(name, *args)
-      end
-    end
-
-  end
-end

data/spec/unit/mongoid/data_table/criteria_spec.rb

@@ -1,56 +0,0 @@
-require 'spec_helper'
-
-describe Mongoid::DataTable::Criteria do
-
-  before do
-    Rails.stubs(:logger).returns(LOGGER)
-  end
-
-  let(:controller) do
-    Class.new(ActionController::Base).new.tap do |c|
-      c.stubs(:params).returns({})
-    end
-  end
-
-  let(:custom_array) { %w(custom) }
-
-  let(:custom_block) do
-    lambda { |object| custom_array }
-  end
-
-  context "with custom block" do
-
-    let(:bob) do
-      Person.find_or_create_by(:name => 'Bob')
-    end
-
-    let(:dt) do
-      bob
-      Person.criteria.to_data_table(controller, {}, &custom_block)
-    end
-
-    it "should store it as an @extension" do
-      dt.extension.should == custom_block
-    end
-
-    describe "#to_hash" do
-
-      it "should run the custom block" do
-        dt.to_hash[:aaData].first.should == custom_array
-      end
-
-      context "with inline block" do
-
-        it "should run the inline block" do
-          a = custom_array.push('inline')
-          h = dt.to_hash { |object| a }
-          h[:aaData].first.should == a
-        end
-
-      end
-
-    end
-
-  end
-
-end