Skip to content

Added support for Kaminari pagination plus fix for double per_page params #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Added support for Kaminari pagination plus fix for double per_page params #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b728fbd
Remove :per_page fatal error
Phobos98 Jan 28, 2013
abe9554
Try to support kaminari
Phobos98 Jan 28, 2013
c4b028b
Remove undefined method error
Phobos98 Jan 28, 2013
d1c64fc
Heroku debug
Phobos98 Jan 28, 2013
aea2ab8
Debug failed :)
Phobos98 Jan 28, 2013
3c79330
Heroku fix
Phobos98 Jan 29, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/rsolr-ext/response.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ def header
end

def rows
params[:rows].to_i
params[:rows].try(:first).to_i
end

def params
Expand Down Expand Up @@ -58,4 +58,4 @@ def start

end

end
end
6 changes: 5 additions & 1 deletion lib/rsolr-ext/response/docs.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ def current_page
@current_page ||= (start / per_page_normalized).ceil + 1
end

def limit_value
per_page
end

# Calcuates the total pages from 'numFound' and 'rows'
# WillPaginate hook
def total_pages
Expand Down Expand Up @@ -56,4 +60,4 @@ def docs
end
end

end
end
9 changes: 5 additions & 4 deletions rsolr-ext.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
# -*- encoding: utf-8 -*-
$:.push File.expand_path("../lib", __FILE__)

require 'rsolr-ext'
#require 'rsolr-ext'

Gem::Specification.new do |s|
s.name = %q{rsolr-ext}
s.version = RSolr::Ext.version

s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
s.authors = ["Matt Mitchell", "James Davidson", "Chris Beer", "Jason Ronallo", "Eric Lindvall", "Andreas Kemkes"]
s.authors = ["Matt Mitchell", "James Davidson", "Chris Beer", "Jason Ronallo", "Eric Lindvall", "Andreas Kemkes", "Ivan Kourza"]
s.date = %q{2011-06-08}
s.description = %q{A query/response extension lib for RSolr}
s.email = %q{[email protected]}
Expand All @@ -18,6 +17,9 @@ Gem::Specification.new do |s|
s.test_files = `git ls-files -- {spec}/*`.split("\n")
s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
s.require_paths = ["lib"]
s.autorequire = 'rsolr-ext'

s.version = "1.1.0"


s.add_dependency 'rsolr', ">= 1.0.1"
Expand All @@ -26,4 +28,3 @@ Gem::Specification.new do |s|
s.add_development_dependency 'rspec', '~> 2.6.0'
s.add_development_dependency 'rcov'
end