Skip to content

Commit 2cfac05

Browse files
committed
Convert to 1.8 Hash syntax
Signed-off-by: David Celis <[email protected]>
1 parent c72e940 commit 2cfac05

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

lib/grape/pagination.rb

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ def paginate(collection)
2323

2424
base.class_eval do
2525
def self.paginate(options = {})
26-
options.reverse_merge!(per_page: 10)
26+
options.reverse_merge!(:per_page => 10)
2727
params do
28-
optional :page, type: Integer, default: 1,
29-
desc: 'Page offset to fetch.'
30-
optional :per_page, type: Integer, default: options[:per_page],
31-
desc: 'Number of results to return per page.'
28+
optional :page, :type => Integer, :default => 1,
29+
:desc => 'Page of results to fetch.'
30+
optional :per_page, :type => Integer, :default => options[:per_page],
31+
:desc => 'Number of results to return per page.'
3232
end
3333
end
3434
end

spec/support/numbers_controller.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ module Rails
55
def self.application
66
@application ||= begin
77
routes = ActionDispatch::Routing::RouteSet.new
8-
OpenStruct.new(routes: routes, env_config: {})
8+
OpenStruct.new(:routes => routes, :env_config => {})
99
end
1010
end
1111
end
@@ -39,13 +39,13 @@ def teardown(*methods)
3939
end
4040

4141
Rails.application.routes.draw do
42-
resources :numbers, only: [:index]
42+
resources :numbers, :only => [:index]
4343
end
4444

4545
class NumbersController < ActionController::Base
4646
include Rails.application.routes.url_helpers
4747

48-
after_filter only: [:index] { paginate(:numbers) }
48+
after_filter :only => [:index] { paginate(:numbers) }
4949

5050
def index
5151
page = params.fetch(:page, 1).to_i
@@ -58,6 +58,6 @@ def index
5858
end
5959

6060
@numbers = PaginatedSet.new(page, 25, total)
61-
render json: @numbers
61+
render :json => @numbers
6262
end
6363
end

0 commit comments

Comments
 (0)