kaminari 0.10.4 → 0.11.0

data/CHANGELOG

@@ -1,3 +1,34 @@
+== 0.11.0
+
+This release contains several backward incompatibilities on template API.
+You probably need to update your existing templates if you're already using
+your own custom theme.
+
+* Merge _current_page, _first_page_link, _last_page_link and _page_link into
+one _page partial #28 [GarthSnyder]
+
+* Add real first/last page links, and use them by default instead of outer
+window #30 [GarthSnyder]
+
+* The disabled items should simply not be emitted, even as an empty span #30
+[GarthSnyder]
+
+* Skip :order in #count_all so complex groups with generated columns don't
+blow up in SQL-land #61 [keeran, Empact]
+
+* Ignore :include in #count_all to make it work better with polymorphic eager
+loading #80 [njakobsen]
+
+* Quick fix on #count to return the actual number of records on AR 3.0 #45 #50
+
+* Removed "TERRIBLE HORRIBLE NO GOOD VERY BAD HACK" #82 [janx, flop, pda]
+
+* Allow for Multiple Themes #64 [tmilewski]
+
+* Themes can contain the whole application directory structure now
+
+* Use gemspec method in Gemfile [p_elliott]
+
 == 0.10.4
 
 * Do not break ActiveRecord::Base.descendants, by making sure to call super

data/Gemfile

@@ -1,30 +1 @@
-source 'http://rubygems.org'
-# Add dependencies required to use your gem here.
-# Example:
-#   gem "activesupport", ">= 2.3.5"
-
-# Add dependencies to develop your gem here.
-# Include everything needed to run rake, tests, features, etc.
-group :development do
-  gem 'rspec', '>= 2.5.0'
-  gem 'rr', '>= 1.0.2'
-  gem 'steak', '>= 1.1.0'
-  gem 'capybara', '>= 0.4.1.1'
-  gem 'bundler', '>= 1.0.0'
-  gem 'jeweler', '>= 1.5.2'
-  gem 'rcov', '>= 0'
-  gem 'rails', :git => 'git://github.com/rails/rails.git'
-#   gem 'rails', '>= 3.0.3'
-  gem 'rack', :git => 'git://github.com/rack/rack.git'
-  gem 'arel', :git => 'git://github.com/rails/arel.git'
-  gem 'rspec-rails', '>= 2.5.0'
-  gem 'sqlite3', '>= 1.3.3'
-  gem 'mongoid', '2.0.0.rc.7'
-  gem 'bson_ext', '~> 1.2'
-#   platforms :mri_18 do
-#     gem 'ruby-debug'
-#   end
-#   platforms :mri_19 do
-#     gem 'ruby-debug19'
-#   end
-end
+gemspec

data/Gemfile.lock

@@ -1,69 +1,41 @@
-GIT
-  remote: git://github.com/rack/rack.git
-  revision: e3ffeac0dc04bb8d5994b7923bf12e55d549a279
+PATH
+  remote: .
   specs:
-    rack (1.2.1)
+    kaminari (0.11.0)
+      kaminari
 
-GIT
-  remote: git://github.com/rails/arel.git
-  revision: dbc86c0f2c2fc3c8bacf35c67fb8e0967b0a8980
-  specs:
-    arel (2.0.7.beta.20110121165657)
-
-GIT
-  remote: git://github.com/rails/rails.git
-  revision: 289cc15f1a89a179116f67e5f666f4ff6d645f03
+GEM
   specs:
-    actionmailer (3.1.0.beta)
-      actionpack (= 3.1.0.beta)
+    abstract (1.0.0)
+    actionmailer (3.0.7)
+      actionpack (= 3.0.7)
       mail (~> 2.2.15)
-    actionpack (3.1.0.beta)
-      activemodel (= 3.1.0.beta)
-      activesupport (= 3.1.0.beta)
-      builder (~> 3.0.0)
+    actionpack (3.0.7)
+      activemodel (= 3.0.7)
+      activesupport (= 3.0.7)
+      builder (~> 2.1.2)
       erubis (~> 2.6.6)
       i18n (~> 0.5.0)
       rack (~> 1.2.1)
-      rack-cache (~> 1.0.0)
-      rack-mount (~> 0.6.13)
+      rack-mount (~> 0.6.14)
       rack-test (~> 0.5.7)
       tzinfo (~> 0.3.23)
-    activemodel (3.1.0.beta)
-      activesupport (= 3.1.0.beta)
-      bcrypt-ruby (~> 2.1.4)
-      builder (~> 3.0.0)
+    activemodel (3.0.7)
+      activesupport (= 3.0.7)
+      builder (~> 2.1.2)
       i18n (~> 0.5.0)
-    activerecord (3.1.0.beta)
-      activemodel (= 3.1.0.beta)
-      activesupport (= 3.1.0.beta)
+    activerecord (3.0.7)
+      activemodel (= 3.0.7)
+      activesupport (= 3.0.7)
       arel (~> 2.0.2)
       tzinfo (~> 0.3.23)
-    activeresource (3.1.0.beta)
-      activemodel (= 3.1.0.beta)
-      activesupport (= 3.1.0.beta)
-    activesupport (3.1.0.beta)
-    rails (3.1.0.beta)
-      actionmailer (= 3.1.0.beta)
-      actionpack (= 3.1.0.beta)
-      activerecord (= 3.1.0.beta)
-      activeresource (= 3.1.0.beta)
-      activesupport (= 3.1.0.beta)
-      bundler (~> 1.0)
-      railties (= 3.1.0.beta)
-    railties (3.1.0.beta)
-      actionpack (= 3.1.0.beta)
-      activesupport (= 3.1.0.beta)
-      rake (>= 0.8.7)
-      thor (~> 0.14.4)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    abstract (1.0.0)
-    bcrypt-ruby (2.1.4)
-    bson (1.2.2)
-    bson_ext (1.2.2)
-    builder (3.0.0)
+    activeresource (3.0.7)
+      activemodel (= 3.0.7)
+      activesupport (= 3.0.7)
+    activesupport (3.0.7)
+    arel (2.0.9)
+    bson (1.3.0)
+    builder (2.1.2)
     capybara (0.4.1.2)
       celerity (>= 0.7.9)
       culerity (>= 0.2.4)
@@ -73,14 +45,15 @@ GEM
       rack-test (>= 0.5.4)
       selenium-webdriver (>= 0.0.27)
       xpath (~> 0.1.3)
-    celerity (0.8.8)
-    childprocess (0.1.7)
-      ffi (~> 0.6.3)
+    celerity (0.8.9)
+    childprocess (0.1.8)
+      ffi (~> 1.0.6)
     culerity (0.2.15)
+    database_cleaner (0.6.6)
     diff-lcs (1.1.2)
     erubis (2.6.6)
       abstract (>= 1.0.0)
-    ffi (0.6.3)
+    ffi (1.0.7)
       rake (>= 0.8.7)
     git (1.2.5)
     i18n (0.5.0)
@@ -89,27 +62,39 @@ GEM
       git (>= 1.2.5)
       rake
     json_pure (1.5.1)
-    mail (2.2.15)
+    mail (2.2.17)
       activesupport (>= 2.3.6)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.16)
-    mongo (1.2.2)
-      bson (>= 1.2.2)
-    mongoid (2.0.0.rc.7)
+    mongo (1.3.0)
+      bson (>= 1.3.0)
+    mongoid (2.0.1)
       activemodel (~> 3.0)
-      mongo (~> 1.2)
+      mongo (~> 1.3)
       tzinfo (~> 0.3.22)
       will_paginate (~> 3.0.pre)
     nokogiri (1.4.4)
     polyglot (0.3.1)
-    rack-cache (1.0)
-      rack (>= 0.4)
-    rack-mount (0.6.13)
+    rack (1.2.2)
+    rack-mount (0.6.14)
       rack (>= 1.0.0)
     rack-test (0.5.7)
       rack (>= 1.0)
+    rails (3.0.7)
+      actionmailer (= 3.0.7)
+      actionpack (= 3.0.7)
+      activerecord (= 3.0.7)
+      activeresource (= 3.0.7)
+      activesupport (= 3.0.7)
+      bundler (~> 1.0)
+      railties (= 3.0.7)
+    railties (3.0.7)
+      actionpack (= 3.0.7)
+      activesupport (= 3.0.7)
+      rake (>= 0.8.7)
+      thor (~> 0.14.4)
     rake (0.8.7)
     rcov (0.9.9)
     rr (1.0.2)
@@ -127,9 +112,9 @@ GEM
       railties (~> 3.0)
       rspec (~> 2.5.0)
     rubyzip (0.9.4)
-    selenium-webdriver (0.1.3)
-      childprocess (~> 0.1.5)
-      ffi (~> 0.6.3)
+    selenium-webdriver (0.1.4)
+      childprocess (>= 0.1.7)
+      ffi (>= 1.0.7)
       json_pure
       rubyzip
     sqlite3 (1.3.3)
@@ -138,7 +123,7 @@ GEM
     thor (0.14.6)
     treetop (1.4.9)
       polyglot (>= 0.3.1)
-    tzinfo (0.3.24)
+    tzinfo (0.3.26)
     will_paginate (3.0.pre2)
     xpath (0.1.3)
       nokogiri (~> 1.3)
@@ -147,17 +132,16 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  arel!
-  bson_ext (~> 1.2)
   bundler (>= 1.0.0)
-  capybara (>= 0.4.1.1)
-  jeweler (>= 1.5.2)
-  mongoid (= 2.0.0.rc.7)
-  rack!
-  rails!
+  capybara
+  database_cleaner
+  jeweler
+  kaminari!
+  mongoid (>= 2)
+  rails (>= 3.0.0)
   rcov
-  rr (>= 1.0.2)
-  rspec (>= 2.5.0)
-  rspec-rails (>= 2.5.0)
-  sqlite3 (>= 1.3.3)
-  steak (>= 1.1.0)
+  rr
+  rspec
+  rspec-rails
+  sqlite3
+  steak

data/README.rdoc

@@ -156,6 +156,22 @@ Kaminari includes a handy template generator.
   or just hit the generator without specifying +THEME+ argument.
     % rails g kaminari:views
 
+* multiple themes
+
+  To utilize multiple themes from within a single application, create a directory within the app/views/kaminari/ and move your custom template files into that directory.
+    rails g kaminari:views default (skip if you have existing kaminari views)
+    cd app/views/kaminari
+    mkdir my_custom_theme
+    cp _*.html.* my_custom_theme/
+	
+  Next reference that directory when calling the paginate method:
+
+    % paginate @users, :theme => 'my_custom_theme'
+
+  Customize away!
+
+  Note: if the theme isn't present or none is specified, kaminari will default back to the views included within the gem.
+
 
 == For more information
 

data/Rakefile

@@ -23,8 +23,18 @@ Jeweler::Tasks.new do |gem|
   gem.authors = ["Akira Matsuda"]
   # Include your dependencies below. Runtime dependencies are required when using your gem,
   # and development dependencies are only needed for development (ie running rake tasks, tests, etc)
-   gem.add_runtime_dependency 'rails', '>= 3.0.0'
-  #  gem.add_development_dependency 'rspec', '> 1.2.3'
+   gem.add_development_dependency 'rails', '>= 3.0.0'
+   gem.add_development_dependency 'bundler', '>= 1.0.0'
+   gem.add_development_dependency 'sqlite3'
+   gem.add_development_dependency 'mongoid', '>= 2'
+   gem.add_development_dependency 'rspec'
+   gem.add_development_dependency 'rspec-rails'
+   gem.add_development_dependency 'rr'
+   gem.add_development_dependency 'steak'
+   gem.add_development_dependency 'capybara'
+   gem.add_development_dependency 'database_cleaner'
+   gem.add_development_dependency 'rcov'
+   gem.add_development_dependency 'jeweler'
 end
 Jeweler::RubygemsDotOrgTasks.new
 

data/VERSION

@@ -1 +1 @@
-0.10.4
+0.11.0

data/app/views/kaminari/_first_page.html.erb

@@ -0,0 +1,11 @@
+<%# Link to the "First" page
+  - available local variables
+    url:           url to the first page
+    current_page:  a page object for the currently displayed page
+    num_pages:     total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+-%>
+<span class="first">
+  <%= link_to_unless current_page.first?, raw(t 'views.pagination.first'), url, :remote => remote %>
+</span>

data/app/views/kaminari/_first_page.html.haml

@@ -0,0 +1,9 @@
+-#  Link to the "First" page
+  - available local variables
+    url:           url to the first page
+    current_page:  a page object for the currently displayed page
+    num_pages:     total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+%span.first
+  = link_to_unless current_page.first?, raw(t 'views.pagination.first'), url, :remote => remote

data/app/views/kaminari/{_truncated_span.html.erb → _gap.html.erb}

@@ -1,8 +1,8 @@
 <%# Non-link tag that stands for skipped pages...
   - available local variables
-    current_page:  the page number of currently displayed page
+    current_page:  a page object for the currently displayed page
     num_pages:     total number of pages
     per_page:      number of items to fetch per page
     remote:        data-remote
 -%>
-<span class="page"><%= raw(t 'views.pagination.truncate') %></span>
+<span class="page gap"><%= raw(t 'views.pagination.truncate') %></span>

data/app/views/kaminari/{_truncated_span.html.haml → _gap.html.haml}

@@ -1,8 +1,8 @@
 -#  Non-link tag that stands for skipped pages...
   - available local variables
-    current_page:  the page number of currently displayed page
+    current_page:  a page object for the currently displayed page
     num_pages:     total number of pages
     per_page:      number of items to fetch per page
     remote:        data-remote
-%span.page
+%span.page.gap
   = raw(t 'views.pagination.truncate')

data/app/views/kaminari/_last_page.html.erb

@@ -0,0 +1,11 @@
+<%# Link to the "Last" page
+  - available local variables
+    url:           url to the last page
+    current_page:  a page object for the currently displayed page
+    num_pages:     total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+-%>
+<span class="last">
+  <%= link_to_unless current_page.last?, raw(t 'views.pagination.last'), url, {:remote => remote} %>
+</span>

data/app/views/kaminari/_last_page.html.haml

@@ -0,0 +1,9 @@
+-#  Link to the "Last" page
+  - available local variables
+    url:           url to the last page
+    current_page:  a page object for the currently displayed page
+    num_pages:     total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+%span.last
+  = link_to_unless current_page.last?, raw(t 'views.pagination.last'), url, {:remote => remote}

data/app/views/kaminari/{_next_link.html.erb → _next_page.html.erb}

@@ -1,11 +1,11 @@
-<%# "Next" with link
+<%# Link to the "Next" page
   - available local variables
     url:           url to the next page
-    current_page:  the page number of currently displayed page
+    current_page:  a page object for the currently displayed page
     num_pages:     total number of pages
     per_page:      number of items to fetch per page
     remote:        data-remote
 -%>
 <span class="next">
-  <%= link_to raw(t 'views.pagination.next'), url, :class => 'next', :rel => 'next', :remote => remote %>
+  <%= link_to_unless current_page.last?, raw(t 'views.pagination.next'), url, :rel => 'next', :remote => remote %>
 </span>

data/app/views/kaminari/{_next_link.html.haml → _next_page.html.haml}

@@ -1,9 +1,9 @@
--#  "Next" with link
+-#  Link to the "Next" page
   - available local variables
     url:           url to the next page
-    current_page:  the page number of currently displayed page
+    current_page:  a page object for the currently displayed page
     num_pages:     total number of pages
     per_page:      number of items to fetch per page
     remote:        data-remote
 %span.next
-  = link_to raw(t 'views.pagination.next'), url, :class => 'next', :rel => 'next', :remote => remote
+  = link_to_unless current_page.last?, raw(t 'views.pagination.next'), url, :rel => 'next', :remote => remote

data/app/views/kaminari/_page.html.erb

@@ -0,0 +1,12 @@
+<%# Link showing page number
+  - available local variables
+    page:          a page object for "this" page
+    url:           url to this page
+    current_page:  a page object for the currently displayed page
+    num_pages:     total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+-%>
+<span class="page<%= ' current' if page.current? %>">
+  <%= link_to_unless page.current?, page, url, opts = {:remote => remote, :rel => page.next? ? 'next' : page.prev? ? 'prev' : nil} %>
+</span>

data/app/views/kaminari/_page.html.haml

@@ -0,0 +1,10 @@
+-#  Link showing page number
+  - available local variables
+    page:          a page object for "this" page
+    url:           url to this page
+    current_page:  a page object for the currently displayed page
+    num_pages:     total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+%span{:class => "page#{' current' if page.current?}"}
+  = link_to_unless page.current?, page, url, {:remote => remote, :rel => page.next? ? 'next' : page.prev? ? 'prev' : nil}