google_plus 0.1.4 → 0.2.0

data/README.md

@@ -56,12 +56,12 @@ And once you have an activity, you can move back to its person using `#person`.
 
 ### People do Things
 
-Lastly, you can get a list of activities for a person, which is returned as a `GooglePlus::Cursor`.  You use it like:
+Lastly, you can get a list of activities for a person, which is returned as a `GooglePlus::Cursor`.  You use it like (which auto-paginates):
 
     person = GooglePlus::Person.new(123)
     cursor = person.list_activities
-    while cursor.next_page
-      cursor.items.count # a batch of activities
+		cursor.each do |item|
+		  item # an item
     end
 
 Or if you just want one page, you can have it:
@@ -74,7 +74,7 @@ You can also set the cursor size at any time using any of these variations:
     # on the cursor
     cursor = person.activities_list(:max_results => 10)
     # or on the page
-    cursor.next_page(:max_results => 5)
+    items = cursor.next_page(:max_results => 5)
 
 ### Plusoners and Resharers
 
@@ -92,8 +92,8 @@ Getting comments for an activity is done just like getting activities for a pers
 
     activity = GooglePlus::Activity.get(123)
     cursor = activity.list_comments
-    while cursor.next_page
-      cursor.items.count # a bunch of comments
+		cursor.each do |item|
+			# a comment
     end
 
 ## Searching
@@ -101,10 +101,8 @@ Getting comments for an activity is done just like getting activities for a pers
 You can search for [people](https://developers.google.com/+/api/latest/people/search) or [activities](https://developers.google.com/+/api/latest/activities/search) using the respective `search` methods, which also yield `GooglePlus::Cursor` objects.  Here's an example:
 
     search = GooglePlus::Person.search('john crepezzi')
-    while search.next_page
-      search.each do |p|
-        puts p.display_name
-      end
+    search.each do |p|
+			puts p.display_name
     end
 
 ## Setting options

data/lib/google_plus.rb

@@ -1,13 +1,18 @@
-require 'bundler/setup'
-require File.dirname(__FILE__) + '/google_plus/resource'
-require File.dirname(__FILE__) + '/google_plus/cursor'
+require 'restclient'
+require 'json'
 
 # GooglePlus is a ruby library for accessing the Google Plus API
 module GooglePlus
 
-  autoload :Activity, File.dirname(__FILE__) + '/google_plus/activity'
-  autoload :Comment, File.dirname(__FILE__) + '/google_plus/comment'
-  autoload :Person, File.dirname(__FILE__) + '/google_plus/person'
+  autoload :Activity,         'google_plus/activity'
+  autoload :Comment,          'google_plus/comment'
+  autoload :Cursor,           'google_plus/cursor'
+  autoload :Entity,           'google_plus/entity'
+  autoload :Person,           'google_plus/person'
+  autoload :Resource,         'google_plus/resource'
+
+  autoload :ConnectionError,  'google_plus/errors/connection_error'
+  autoload :RequestError,     'google_plus/errors/request_error'
 
   class << self
     attr_accessor :api_key, :access_token

data/lib/google_plus/activity.rb

@@ -1,6 +1,3 @@
-require 'json'
-require File.dirname(__FILE__) + '/entity'
-
 module GooglePlus
 
   # An Acitity in Google Plus

data/lib/google_plus/comment.rb

@@ -1,6 +1,3 @@
-require 'json'
-require File.dirname(__FILE__) + '/entity'
-
 module GooglePlus
 
   # A Comment in Google Plus

data/lib/google_plus/cursor.rb

@@ -1,5 +1,3 @@
-require 'json'
-
 module GooglePlus
 
   # A class for easily paginating through lists of Google Plus
@@ -8,6 +6,19 @@ module GooglePlus
 
     extend GooglePlus::Resource
 
+    # Go through each item
+    # @yieldparam [GooglePlus::Entity] an individual item
+    # @yieldreturn [GooglePlus::Cursor] self
+    def each
+      while items = next_page
+        break if items.empty?
+        items.each do |item|
+          yield item
+        end
+      end
+      self
+    end
+
     # Get the current page of results
     # @return [Array] the current page of results, or nil if the page is blank
     def items(params = {})
@@ -53,7 +64,8 @@ module GooglePlus
           data = JSON::parse(json)
           @next_page_token = data['nextPageToken']
           if items = data['items']
-            return data['items'].map { |d| @resource_klass.send(:new, d) }
+            return nil if items.empty?
+            return items.map { |d| @resource_klass.send(:new, d) }
           end
         end
       end

data/lib/google_plus/errors/request_error.rb

@@ -1,6 +1,3 @@
-require 'json'
-require File.dirname(__FILE__) + '/../entity'
-
 module GooglePlus
 
   # An error class for wrapping errors made during requests, and making its attributes

data/lib/google_plus/person.rb

@@ -1,6 +1,3 @@
-require 'json'
-require File.dirname(__FILE__) + '/entity'
-
 module GooglePlus
 
   # A Person in Google Plus

data/lib/google_plus/resource.rb

@@ -1,7 +1,3 @@
-require 'restclient'
-require File.dirname(__FILE__) + '/errors/request_error'
-require File.dirname(__FILE__) + '/errors/connection_error'
-
 module GooglePlus
 
   # A modular extension for classes that make requests to the

data/lib/google_plus/version.rb

@@ -1,6 +1,6 @@
 module GooglePlus
 
   # The current version of the library
-  VERSION = '0.1.4'
+  VERSION = '0.2.0'
 
 end

data/spec/spec_helper.rb

@@ -1,4 +1,5 @@
-require File.dirname(__FILE__) + '/../lib/google_plus'
+require 'bundler/setup'
+require 'google_plus'
 
 unless TEST_API_KEY = ENV['API_KEY']
   puts 'please provide an API_KEY environment variable'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: google_plus
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-12 00:00:00.000000000Z
+date: 2012-01-04 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70353324637400 !ruby/object:Gem::Requirement
+  requirement: &70322067896220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70353324637400
+  version_requirements: *70322067896220
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70353324636220 !ruby/object:Gem::Requirement
+  requirement: &70322067895680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.6.1
   type: :runtime
   prerelease: false
-  version_requirements: *70353324636220
+  version_requirements: *70322067895680
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70353324635840 !ruby/object:Gem::Requirement
+  requirement: &70322067895300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70353324635840
+  version_requirements: *70322067895300
 description: Google+ Ruby Gem
 email: john.crepezzi@gmail.com
 executables: []
@@ -74,12 +74,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -526203007372864254
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -526203007372864254
 requirements: []
 rubyforge_project: google_plus
 rubygems_version: 1.8.10