google_plus 0.0.2 → 0.0.3

Sign up to get free protection for your applications and to get access to all the features.
@@ -11,15 +11,16 @@ module GooglePlus
11
11
  # TODO raise error if params are passed here, since they're meaningless
12
12
  @items
13
13
  else
14
- @items = load_page(true, params)
14
+ @items = load_page(params)
15
15
  end
16
16
  end
17
17
 
18
18
  def next_page(params = {})
19
- @items = load_page(false, params)
19
+ @items = load_page(params)
20
20
  end
21
21
 
22
22
  def initialize(klass, method, resource, params)
23
+ @first_page_loaded = false
23
24
  @resource_klass = klass
24
25
  @method = method
25
26
  @resource = resource
@@ -29,8 +30,9 @@ module GooglePlus
29
30
  private
30
31
 
31
32
  # Load the next page
32
- def load_page(force = false, params)
33
- if @next_page_token || force
33
+ def load_page(params)
34
+ if @next_page_token || !@first_page_loaded
35
+ @first_page_loaded = true
34
36
  ap = params.merge(@base_params)
35
37
  ap[:maxResults] = ap.delete(:max_results) if ap.has_key?(:max_results)
36
38
  ap[:fields] = ap.delete(:fields) if ap.has_key?(:fields)
@@ -12,7 +12,7 @@ module GooglePlus
12
12
  # Make a request to an external resource
13
13
  def make_request(method, resource, params = {})
14
14
  params[:key] = GooglePlus.api_key unless GooglePlus.api_key.nil?
15
- params[:userIp] = params.delete(:user_ip) if params.has_key?(:user_id)
15
+ params[:userIp] = params.delete(:user_ip) if params.has_key?(:user_ip)
16
16
  params[:pp] = '0' # google documentation is incorrect, it says 'prettyPrint'
17
17
  begin
18
18
  RestClient.get "#{BASE_URI}#{resource}", :params => params
@@ -1,5 +1,5 @@
1
1
  module GooglePlus
2
2
 
3
- VERSION = '0.0.2'
3
+ VERSION = '0.0.3'
4
4
 
5
5
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: google_plus
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.2
4
+ version: 0.0.3
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,11 +9,11 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2011-09-16 00:00:00.000000000Z
12
+ date: 2011-09-19 00:00:00.000000000Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rspec
16
- requirement: &70195096445960 !ruby/object:Gem::Requirement
16
+ requirement: &70185441073180 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ~>
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: 2.6.0
22
22
  type: :development
23
23
  prerelease: false
24
- version_requirements: *70195096445960
24
+ version_requirements: *70185441073180
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: rest-client
27
- requirement: &70195096441660 !ruby/object:Gem::Requirement
27
+ requirement: &70185441072400 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ~>
@@ -32,7 +32,7 @@ dependencies:
32
32
  version: 1.6.1
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *70195096441660
35
+ version_requirements: *70185441072400
36
36
  description: Google+ Ruby Gem
37
37
  email: john.crepezzi@gmail.com
38
38
  executables: []