github-migration/engine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replaced will_paginate with kaminari

Browse Source
This commit is contained in:
Mario Visic 2011-11-05 16:45:43 +11:00
parent 9f8906d840
commit 06ab49ecec
6 changed files with 7 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@ -13,7 +13,7 @@ gem 'devise_bushido_authenticatable', '1.0.0.alpha10', :require => 'devise_cas_a
gem 'mongoid', '~> 2.0.2' gem 'mongoid', '~> 2.0.2'
gem 'bson_ext', '~> 1.4.0' gem 'bson_ext', '~> 1.4.0'
gem 'locomotive_mongoid_acts_as_tree', '0.1.5.7', :require => 'mongoid_acts_as_tree' gem 'locomotive_mongoid_acts_as_tree', '0.1.5.7', :require => 'mongoid_acts_as_tree'
gem 'will_paginate', '~> 3.0.0' gem 'kaminari'
gem 'haml', '3.1.2' gem 'haml', '3.1.2'
gem 'sass', '3.1.2' gem 'sass', '3.1.2'

5
Gemfile.lock
View File

@ -145,6 +145,8 @@ GEM
yui-compressor (>= 0.9.3) yui-compressor (>= 0.9.3)
json (1.6.1) json (1.6.1)
json_pure (1.6.1) json_pure (1.6.1)
kaminari (0.12.4)
rails (>= 3.0.0)
kgio (2.6.0) kgio (2.6.0)
launchy (0.3.7) launchy (0.3.7)
configuration (>= 0.0.5) configuration (>= 0.0.5)
@ -270,7 +272,6 @@ GEM
raindrops (~> 0.6) raindrops (~> 0.6)
warden (1.0.5) warden (1.0.5)
rack (>= 1.0) rack (>= 1.0)
will_paginate (3.0.2)
xpath (0.1.4) xpath (0.1.4)
nokogiri (~> 1.3) nokogiri (~> 1.3)
yui-compressor (0.9.6) yui-compressor (0.9.6)
@ -309,6 +310,7 @@ DEPENDENCIES
highline highline
httparty (= 0.7.8) httparty (= 0.7.8)
inherited_resources (~> 1.1.2) inherited_resources (~> 1.1.2)
kaminari
launchy launchy
linecache (= 0.43) linecache (= 0.43)
locomotive_jammit-s3 locomotive_jammit-s3
@ -332,5 +334,4 @@ DEPENDENCIES
spork (~> 0.9.0.rc) spork (~> 0.9.0.rc)
unicorn unicorn
warden warden
will_paginate (~> 3.0.0)
xpath (~> 0.1.4) xpath (~> 0.1.4)

2
config/initializers/will_paginate.rb
View File

@ -1,2 +0,0 @@
require 'will_paginate/array'
require 'locomotive/liquid/drops/will_paginate_extension'

13
lib/locomotive/liquid/drops/will_paginate_extension.rb
View File

@ -1,13 +0,0 @@
class WillPaginate::Collection
def to_liquid
{
:collection => self.to_a,
:current_page => current_page,
:previous_page => previous_page,
:next_page => next_page,
:total_entries => total_entries,
:total_pages => total_pages,
:per_page => per_page
}
end
end

2
locomotive_cms.gemspec
View File

@ -24,7 +24,7 @@ Gem::Specification.new do |s|
s.add_dependency 'mongoid', '~> 2.0.2' s.add_dependency 'mongoid', '~> 2.0.2'
s.add_dependency 'bson_ext', '~> 1.4.0' s.add_dependency 'bson_ext', '~> 1.4.0'
s.add_dependency 'locomotive_mongoid_acts_as_tree', '0.1.5.7' s.add_dependency 'locomotive_mongoid_acts_as_tree', '0.1.5.7'
s.add_dependency 'will_paginate', '~> 3.0.0' s.add_dependency 'kaminari'
s.add_dependency 'haml', '3.1.2' s.add_dependency 'haml', '3.1.2'
s.add_dependency 'sass', '3.1.2' s.add_dependency 'sass', '3.1.2'

3
spec/lib/locomotive/liquid/tags/paginate_spec.rb
View File

@ -52,7 +52,8 @@ describe Locomotive::Liquid::Tags::Paginate do
{}, {},
{ {
'projects' => options.has_key?(:collection) ? options[:collection] : PaginatedCollection.new(['Ruby on Rails', 'jQuery', 'mongodb', 'Liquid', 'sqlite3']), 'projects' => options.has_key?(:collection) ? options[:collection] : PaginatedCollection.new(['Ruby on Rails', 'jQuery', 'mongodb', 'Liquid', 'sqlite3']),
'current_page' => options[:page] || 1 'current_page' => options[:page] || 1,
'path' => '/'
}, { }, {
:page => FactoryGirl.build(:page) :page => FactoryGirl.build(:page)
}, true) }, true)