kaminari 0.13.0 → 0.14.0

data/spec/models/mongoid/mongoid_spec.rb

@@ -0,0 +1,110 @@
+require 'spec_helper'
+
+if defined? Mongoid
+  describe Kaminari::MongoidExtension do
+    before(:each) do
+      41.times do
+        User.create!({:salary => 1})
+      end
+    end
+
+    describe '#page' do
+
+      context 'page 1' do
+        subject { User.page 1 }
+        it { should be_a Mongoid::Criteria }
+        its(:current_page) { should == 1 }
+        its(:limit_value) { should == 25 }
+        its(:total_pages) { should == 2 }
+        it { should skip(0) }
+      end
+
+      context 'page 2' do
+        subject { User.page 2 }
+        it { should be_a Mongoid::Criteria }
+        its(:current_page) { should == 2 }
+        its(:limit_value) { should == 25 }
+        its(:total_pages) { should == 2 }
+        it { should skip 25 }
+      end
+
+      context 'page "foobar"' do
+        subject { User.page 'foobar' }
+        it { should be_a Mongoid::Criteria }
+        its(:current_page) { should == 1 }
+        its(:limit_value) { should == 25 }
+        its(:total_pages) { should == 2 }
+        it { should skip 0 }
+      end
+
+      shared_examples 'complete valid pagination' do
+        if Mongoid::VERSION =~ /^3/
+          its(:selector) { should == {'salary' => 1} }
+        else
+          its(:selector) { should == {:salary => 1} }
+        end
+        its(:current_page) { should == 2 }
+        its(:limit_value) { should == 25 }
+        its(:total_pages) { should == 2 }
+        it { should skip 25 }
+      end
+
+      context 'with criteria before' do
+        subject { User.where(:salary => 1).page 2 }
+        it_should_behave_like 'complete valid pagination'
+      end
+
+      context 'with criteria after' do
+        subject { User.page(2).where(:salary => 1) }
+        it_should_behave_like 'complete valid pagination'
+      end
+    end
+
+    describe '#per' do
+      subject { User.page(2).per(10) }
+      it { should be_a Mongoid::Criteria }
+      its(:current_page) { should == 2 }
+      its(:limit_value) { should == 10 }
+      its(:total_pages) { should == 5 }
+      it { should skip 10 }
+    end
+
+    describe '#page in embedded documents' do
+      before do
+        @mongo_developer = MongoMongoidExtensionDeveloper.new
+        @mongo_developer.frameworks.new(:name => "rails", :language => "ruby")
+        @mongo_developer.frameworks.new(:name => "merb", :language => "ruby")
+        @mongo_developer.frameworks.new(:name => "sinatra", :language => "ruby")
+        @mongo_developer.frameworks.new(:name => "cakephp", :language => "php")
+        @mongo_developer.frameworks.new(:name => "tornado", :language => "python")
+      end
+
+      context 'page 1' do
+        subject { @mongo_developer.frameworks.page(1).per(1) }
+        it { should be_a Mongoid::Criteria }
+        its(:total_count) { should == 5 }
+        its(:limit_value) { should == 1 }
+        its(:current_page) { should == 1 }
+        its(:total_pages) { should == 5 }
+      end
+
+      context 'with criteria after' do
+        subject { @mongo_developer.frameworks.page(1).per(2).where(:language => "ruby") }
+        it { should be_a Mongoid::Criteria }
+        its(:total_count) { should == 3 }
+        its(:limit_value) { should == 2 }
+        its(:current_page) { should == 1 }
+        its(:total_pages) { should == 2 }
+      end
+
+      context 'with criteria before' do
+        subject { @mongo_developer.frameworks.where(:language => "ruby").page(1).per(2) }
+        it { should be_a Mongoid::Criteria }
+        its(:total_count) { should == 3 }
+        its(:limit_value) { should == 2 }
+        its(:current_page) { should == 1 }
+        its(:total_pages) { should == 2 }
+      end
+    end
+  end
+end

data/spec/requests/users_spec.rb

@@ -3,7 +3,6 @@ require 'spec_helper'
 
 feature 'Users' do
   background do
-    User.delete_all
     1.upto(100) {|i| User.create! :name => "user#{'%03d' % i}" }
   end
   scenario 'navigating by pagination links' do

data/spec/spec_helper.rb

@@ -1,30 +1,32 @@
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'rails'
-require 'mongoid'
-require 'dm-core'
-require 'kaminari'
+
+begin
+  require 'rails'
+rescue LoadError
+end
+
+require 'bundler/setup'
+Bundler.require
+
 require 'database_cleaner'
-# Ensure we use 'syck' instead of 'psych' in 1.9.2
-# RubyGems >= 1.5.0 uses 'psych' on 1.9.2, but
-# Psych does not yet support YAML 1.1 merge keys.
-# Merge keys is often used in mongoid.yml
-# See: http://redmine.ruby-lang.org/issues/show/4300
-if RUBY_VERSION >= '1.9.2'
-  YAML::ENGINE.yamler = 'syck'
+
+# Simulate a gem providing a subclass of ActiveRecord::Base before the Railtie is loaded.
+require 'fake_gem' if defined? ActiveRecord
+
+if defined? Rails
+  require 'fake_app/rails_app'
+
+  require 'rspec/rails'
+end
+if defined? Sinatra
+  require 'spec_helper_for_sinatra'
 end
-require 'fake_gem'
-require 'fake_app'
 
-require 'rspec/rails'
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
 RSpec.configure do |config|
   config.mock_with :rr
-  config.before :all do
-#     ActiveRecord::Base.connection.execute 'CREATE TABLE "users" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255))' unless ActiveRecord::Base.connection.table_exists? 'users'
-    CreateAllTables.up unless ActiveRecord::Base.connection.table_exists? 'users'
-  end
 end

data/spec/spec_helper_for_sinatra.rb

@@ -1,10 +1,32 @@
 require 'kaminari/sinatra'
 require 'rack/test'
 require 'sinatra/test_helpers'
+require 'capybara/dsl'
+require 'capybara/rspec'
+
+require 'fake_app/sinatra_app'
+
+Capybara.app = SinatraApp
+
+module HelperMethodForHelperSpec
+  module FakeEnv
+    def env
+      {'PATH_INFO' => '/'}
+    end
+  end
+
+  def helper
+    # OMG terrible object...
+    Kaminari::Helpers::SinatraHelpers::ActionViewTemplateProxy.new(:current_params => {}, :current_path => '/', :param_name => Kaminari.config.param_name).extend(Padrino::Helpers, Kaminari::ActionViewExtension, Kaminari::Helpers::SinatraHelpers::HelperMethods, FakeEnv)
+  end
+end
 
 RSpec.configure do |config|
   config.include Rack::Test::Methods
   config.include Sinatra::TestHelpers
+  config.include Capybara::DSL
+  config.include HelperMethodForHelperSpec
+#   config.include HelperMethodForHelperSpec, :type => :helper
 end
 
 require 'nokogiri'

data/spec/support/database_cleaner.rb

@@ -1,4 +1,7 @@
-DatabaseCleaner.strategy = :transaction
+DatabaseCleaner[:active_record].strategy = :transaction if defined? ActiveRecord
+DatabaseCleaner[:data_mapper].strategy = :transaction if defined? DataMapper
+DatabaseCleaner[:mongoid].strategy = :truncation if defined? Mongoid
+DatabaseCleaner[:mongo_mapper].strategy = :truncation if defined? MongoMapper
 
 RSpec.configure do |config|
   config.before :suite do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kaminari
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.14.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-22 00:00:00.000000000 Z
+date: 2012-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70223286119560 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,21 +21,15 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70223286119560
-- !ruby/object:Gem::Dependency
-  name: actionpack
-  requirement: &70223286119040 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: *70223286119040
 - !ruby/object:Gem::Dependency
-  name: railties
-  requirement: &70223286118440 !ruby/object:Gem::Requirement
+  name: actionpack
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,131 +37,95 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70223286118440
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: &70223286117960 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :development
-  prerelease: false
-  version_requirements: *70223286117960
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: &70223286117460 !ruby/object:Gem::Requirement
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70223286117460
-- !ruby/object:Gem::Dependency
-  name: activerecord
-  requirement: &70223286116800 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.0.0
-  type: :development
-  prerelease: false
-  version_requirements: *70223286116800
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
-  name: activemodel
-  requirement: &70223286132700 !ruby/object:Gem::Requirement
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70223286132700
-- !ruby/object:Gem::Dependency
-  name: sinatra
-  requirement: &70223286132120 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
-  prerelease: false
-  version_requirements: *70223286132120
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: mongoid
-  requirement: &70223286131640 !ruby/object:Gem::Requirement
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70223286131640
-- !ruby/object:Gem::Dependency
-  name: mongo_mapper
-  requirement: &70223286131080 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.9'
-  type: :development
-  prerelease: false
-  version_requirements: *70223286131080
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: dm-core
-  requirement: &70223286130520 !ruby/object:Gem::Requirement
+  name: tzinfo
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70223286130520
-- !ruby/object:Gem::Dependency
-  name: dm-migrations
-  requirement: &70223286130040 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.1.0
-  type: :development
-  prerelease: false
-  version_requirements: *70223286130040
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: dm-aggregates
-  requirement: &70223286129460 !ruby/object:Gem::Requirement
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70223286129460
-- !ruby/object:Gem::Dependency
-  name: dm-sqlite-adapter
-  requirement: &70223286128980 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.1.0
-  type: :development
-  prerelease: false
-  version_requirements: *70223286128980
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: &70223286128420 !ruby/object:Gem::Requirement
+  name: rr
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -175,43 +133,31 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70223286128420
-- !ruby/object:Gem::Dependency
-  name: rspec-rails
-  requirement: &70223286127860 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *70223286127860
 - !ruby/object:Gem::Dependency
-  name: rr
-  requirement: &70223286127320 !ruby/object:Gem::Requirement
+  name: capybara
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70223286127320
-- !ruby/object:Gem::Dependency
-  name: capybara
-  requirement: &70223286126800 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: *70223286126800
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &70223286126260 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -219,51 +165,28 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70223286126260
-- !ruby/object:Gem::Dependency
-  name: padrino-helpers
-  requirement: &70223286125740 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.10'
-  type: :development
-  prerelease: false
-  version_requirements: *70223286125740
-- !ruby/object:Gem::Dependency
-  name: rack-test
-  requirement: &70223286125200 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *70223286125200
 - !ruby/object:Gem::Dependency
-  name: sinatra-contrib
-  requirement: &70223286141060 !ruby/object:Gem::Requirement
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70223286141060
-- !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: &70223286140580 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *70223286140580
 description: Kaminari is a Scope & Engine based, clean, powerful, agnostic, customizable
   and sophisticated paginator for Rails 3
 email:
@@ -305,6 +228,14 @@ files:
 - app/views/kaminari/_prev_page.html.haml
 - app/views/kaminari/_prev_page.html.slim
 - config/locales/kaminari.yml
+- gemfiles/active_record_30.gemfile
+- gemfiles/active_record_31.gemfile
+- gemfiles/active_record_32.gemfile
+- gemfiles/data_mapper_12.gemfile
+- gemfiles/mongo_mapper.gemfile
+- gemfiles/mongoid_24.gemfile
+- gemfiles/mongoid_30.gemfile
+- gemfiles/sinatra.gemfile
 - kaminari.gemspec
 - lib/generators/kaminari/config_generator.rb
 - lib/generators/kaminari/templates/kaminari_config.rb
@@ -312,6 +243,7 @@ files:
 - lib/kaminari.rb
 - lib/kaminari/config.rb
 - lib/kaminari/engine.rb
+- lib/kaminari/grape.rb
 - lib/kaminari/helpers/action_view_extension.rb
 - lib/kaminari/helpers/paginator.rb
 - lib/kaminari/helpers/sinatra_helpers.rb
@@ -333,19 +265,29 @@ files:
 - lib/kaminari/sinatra.rb
 - lib/kaminari/version.rb
 - spec/config/config_spec.rb
-- spec/fake_app.rb
+- spec/fake_app/active_record/config.rb
+- spec/fake_app/active_record/models.rb
+- spec/fake_app/data_mapper/config.rb
+- spec/fake_app/data_mapper/models.rb
+- spec/fake_app/mongo_mapper/config.rb
+- spec/fake_app/mongo_mapper/models.rb
+- spec/fake_app/mongoid/config.rb
+- spec/fake_app/mongoid/models.rb
+- spec/fake_app/rails_app.rb
+- spec/fake_app/sinatra_app.rb
 - spec/fake_gem.rb
 - spec/helpers/action_view_extension_spec.rb
 - spec/helpers/helpers_spec.rb
 - spec/helpers/sinatra_helpers_spec.rb
 - spec/helpers/tags_spec.rb
-- spec/models/active_record_relation_methods_spec.rb
+- spec/models/active_record/active_record_relation_methods_spec.rb
+- spec/models/active_record/default_per_page_spec.rb
+- spec/models/active_record/max_per_page_spec.rb
+- spec/models/active_record/scopes_spec.rb
 - spec/models/array_spec.rb
-- spec/models/data_mapper_spec.rb
-- spec/models/default_per_page_spec.rb
-- spec/models/mongo_mapper_spec.rb
-- spec/models/mongoid_spec.rb
-- spec/models/scopes_spec.rb
+- spec/models/data_mapper/data_mapper_spec.rb
+- spec/models/mongo_mapper/mongo_mapper_spec.rb
+- spec/models/mongoid/mongoid_spec.rb
 - spec/requests/users_spec.rb
 - spec/spec_helper.rb
 - spec/spec_helper_for_sinatra.rb
@@ -366,7 +308,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1990752312542125094
+      hash: 3342355439431297487
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -375,28 +317,38 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1990752312542125094
+      hash: 3342355439431297487
 requirements: []
 rubyforge_project: kaminari
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A pagination engine plugin for Rails 3 or other modern frameworks
 test_files:
 - spec/config/config_spec.rb
-- spec/fake_app.rb
+- spec/fake_app/active_record/config.rb
+- spec/fake_app/active_record/models.rb
+- spec/fake_app/data_mapper/config.rb
+- spec/fake_app/data_mapper/models.rb
+- spec/fake_app/mongo_mapper/config.rb
+- spec/fake_app/mongo_mapper/models.rb
+- spec/fake_app/mongoid/config.rb
+- spec/fake_app/mongoid/models.rb
+- spec/fake_app/rails_app.rb
+- spec/fake_app/sinatra_app.rb
 - spec/fake_gem.rb
 - spec/helpers/action_view_extension_spec.rb
 - spec/helpers/helpers_spec.rb
 - spec/helpers/sinatra_helpers_spec.rb
 - spec/helpers/tags_spec.rb
-- spec/models/active_record_relation_methods_spec.rb
+- spec/models/active_record/active_record_relation_methods_spec.rb
+- spec/models/active_record/default_per_page_spec.rb
+- spec/models/active_record/max_per_page_spec.rb
+- spec/models/active_record/scopes_spec.rb
 - spec/models/array_spec.rb
-- spec/models/data_mapper_spec.rb
-- spec/models/default_per_page_spec.rb
-- spec/models/mongo_mapper_spec.rb
-- spec/models/mongoid_spec.rb
-- spec/models/scopes_spec.rb
+- spec/models/data_mapper/data_mapper_spec.rb
+- spec/models/mongo_mapper/mongo_mapper_spec.rb
+- spec/models/mongoid/mongoid_spec.rb
 - spec/requests/users_spec.rb
 - spec/spec_helper.rb
 - spec/spec_helper_for_sinatra.rb