Moving from WP to MM's default pagination.

steveklabnik · steveklabnik · commit c891922a648e · 2011-04-21T18:29:57.000-04:00
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 *.swp
 *~
 .bundle
+tmp/
diff --git a/Gemfile b/Gemfile
@@ -18,7 +18,6 @@ gem "pony", "~>1.0.1"
 gem "sinatra-content-for"
 gem "exceptional"
 gem "newrelic_rpm"
-gem "will_paginate"
 
 group :development do
   gem "rocco"
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -89,7 +89,6 @@ GEM
       nokogiri (>= 1.2.0)
       rack (>= 1.0)
       rack-test (>= 0.5.3)
-    will_paginate (2.3.15)
 
 PLATFORMS
   ruby
@@ -115,4 +114,3 @@ DEPENDENCIES
   sinatra-content-for
   steak (~> 1.0.0)
   webrat (~> 0.7.1)
-  will_paginate
diff --git a/hackety.rb b/hackety.rb
@@ -100,13 +100,6 @@
 # [a Sinatra version](https://github.com/foca/sinatra-content-for).
 require 'sinatra/content_for'
 
-# will_paginate can work with Sinatra 
-# https://gist.github.com/553473
-require 'will_paginate'
-require 'will_paginate/collection'
-require 'will_paginate/view_helpers'
-
-
 # We moved lots of helpers into a separate file. These are all things that are
 # useful throughout the rest of the application. This file
 require_relative 'helpers'
@@ -217,14 +210,15 @@
 # the content that others have posted. So we grab it all, and sort it in the
 # opposite order that it's been updated. Wouldn't want to see old stuff!
 get '/stream' do
-  limit = 20
   page = params[:page] || 1
-  page = page.to_i
-  page -= 1
-  offset = limit * page
-  content_list = Content.sort(:updated_at.desc).all( :limit => limit, :offset => offset)
+  @content_list = Content.paginate( :page => params[:page], :per_page => params[:per_page] || 20, :order => :updated_at.desc)
+  if @content_list.next_page
+    @next_page = "?#{Rack::Utils.build_query :page => @content_list.next_page}"
+  end
 
-  @content_list = WillPaginate::Collection.create(page + 1, limit, Content.count) {|p| p.replace content_list }
+  if @content_list.previous_page
+    @prev_page = "?#{Rack::Utils.build_query :page => @content_list.previous_page}"
+  end
   haml :stream
 end
 
diff --git a/helpers.rb b/helpers.rb
@@ -74,9 +74,6 @@ def gravatar_url_for email
     "http://www.gravatar.com/avatar/#{Digest::MD5.hexdigest(email.downcase)}"
   end
 
-  # Will_paginate helpers
-  include WillPaginate::ViewHelpers
-
 end
 
 # This handy helper method lets us require an entire directory of `rb` files.
diff --git a/models/stream_renderer.rb b/models/stream_renderer.rb
diff --git a/views/stream.haml b/views/stream.haml
@@ -53,8 +53,13 @@
           shared a
           %a{:href => "/content/#{content.id}"}= content.type
           \: "#{content.body[0,50]}..." (#{content.comments.length} comments)
-  != will_paginate @content_list
+  - unless @prev_page.nil?
+    %a.button{:href => @prev_page, :id => "prev_button"}
+      &laquo; Previous
 
+  - unless @next_page.nil?
+    %a.button{:href => @next_page, :id => "next_button"}
+      Next &raquo;
 
 - content_for :head do
   :javascript

-Original file line number
+Diff line change
@@ @@ -1,3 +1,4 @@ @@
 *.swp
 *~
 .bundle
 +tmp/