make_restful 0.1.11 → 0.1.13

Sign up to get free protection for your applications and to get access to all the features.
@@ -15,7 +15,7 @@ module MakeRestful::Rendering
15
15
 
16
16
  options[:status] ||= @status
17
17
 
18
- load_template = options.delete(:load_template) == true
18
+ load_template = options.delete(:load_template) != false
19
19
 
20
20
  super(*args, options, &block) and return if ( template_present && load_template ) || options.except(:status).present?
21
21
 
@@ -48,7 +48,7 @@ module MakeRestful::Rendering
48
48
  if @collection.respond_to? :current_page
49
49
 
50
50
  pagination = {}
51
- pagination[:current_page] = @collection.current_page if @collection.respond_to? :current_page
51
+ pagination[:page] = @collection.current_page if @collection.respond_to? :current_page
52
52
  pagination[:per_page] = @collection.current_page if @collection.respond_to? :per_page
53
53
  pagination[:total_entries] = @collection.total_entries if @collection.respond_to? :total_entries
54
54
  pagination[:total_pages] = @collection.total_pages if @collection.respond_to? :total_pages
@@ -1,3 +1,3 @@
1
1
  module MakeRestful
2
- VERSION = "0.1.11"
2
+ VERSION = "0.1.13"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: make_restful
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.11
4
+ version: 0.1.13
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-11-22 00:00:00.000000000 Z
12
+ date: 2012-11-26 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: activesupport