grapi 0.4.1 → 0.5.0

data/README.textile

@@ -29,8 +29,8 @@ Public API:
 
 * initialize(verbose= false)
 * login(USERNAME, PASSWORD)
-* reading_list(:continuation => nil, :dump_data => false, :output => "atom/json")
-* subscribe(feed_url, label=test)
+* reading_list(:continuation => nil, :dump_data => false, :output => "atom/json", :items => 1000, :lable => nil)
+* subscribe(feed_url, label = test)
 * unsubscribe(feed_url)
 * mark_as_read( entry_google_ids ) # can pass an entry id or an array of entries id
 
@@ -48,5 +48,5 @@ h3. Links
 
 * "Friends of the Unofficial Google Reader API":http://groups.google.com/group/fougrapi
 * "pyrfeed":http://code.google.com/p/pyrfeed/wiki/GoogleReaderAPI
-* "Using the Google Reader API – Part 2":http://blog.martindoms.com/2009/10/16/using-the-google-reader-api-part-2/
+* "Using the Google Reader API - Part 2":http://blog.martindoms.com/2009/10/16/using-the-google-reader-api-part-2/
 

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.5.0

data/grapi.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# DO NOT EDIT THIS FILE
+# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{grapi}
-  s.version = "0.4.1"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Aurelian Oancea"]
-  s.date = %q{2010-01-04}
+  s.date = %q{2010-01-22}
   s.description = %q{Ruby client for unofficial Google Reader API}
   s.email = %q{oancea@gmail.com}
   s.extra_rdoc_files = [
@@ -51,4 +51,3 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<curb>, [">= 0.6.1.0"])
   end
 end
-

data/lib/grapi/reader.rb

@@ -29,8 +29,12 @@ module Grapi
         "service" => "reader",
         "accountType" => "HOSTED_OR_GOOGLE"
       }
-      @client.body_str.uncompress =~ /^SID=(.*)\n/
-      @client.headers['Cookie']= "SID=#{$1}"
+      if @client.body_str.uncompress =~ /^SID=(.*)\n/
+        @client.headers['Cookie']= "SID=#{$1}"
+      else
+        # TODO: can we handle Error=CaptchaRequired?
+        raise Error.new("Authentication failed with: #{@client.body_str.uncompress}")
+      end
       self
     end
 
@@ -56,12 +60,21 @@ module Grapi
     #   :continuation (default: nil) -> continuation string
     #   :dump_data (default: false) -> whether to write the response to a file in /tmp or not
     #   :output (default: atom) -> desired output (atom|json)
+    #   :items (default: 1000) -> amount of items to fetch
+    #   :label (default: nil) -> get only the items in label, by default fetch all items
     def reading_list(options={})
-      options= {:continuation => nil, :output => "atom", :dump_data => false}.update(options)
+      options= {:continuation => nil, :output => "atom", :dump_data => false, :items => 1000, :label => nil}.update(options)
+
+      base= if options[:label].nil?
+              "user/-/state/com.google/reading-list"
+            else
+              "user/-/label/#{options[:label]}"
+            end
+
       if options[:output] == "atom"
-        get "http://www.google.com/reader/atom/user/-/state/com.google/reading-list?xt=user/-/state/com.google/read&ck=#{Time.now.to_i*1000}&n=1000&c=#{options[:continuation]}"
+        get "http://www.google.com/reader/atom/#{base}?xt=user/-/state/com.google/read&ck=#{Time.now.to_i*1000}&n=#{options[:items]}&c=#{options[:continuation]}"
       else
-        get "http://www.google.com/reader/api/0/stream/contents/user/-/state/com.google/reading-list?output=#{options[:output]}&xt=user/-/state/com.google/read&ck=#{Time.now.to_i*1000}&n=1000&c=#{options[:continuation]}"
+        get "http://www.google.com/reader/api/0/stream/contents/#{base}?output=#{options[:output]}&xt=user/-/state/com.google/read&ck=#{Time.now.to_i*1000}&n=#{options[:items]}&c=#{options[:continuation]}"
       end
       response= @client.body_str.uncompress
       File.open("/tmp/#{Time.now.to_i}-reading_list.#{options[:output]}", "w"){|f|f<<response} if options[:dump_data]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: grapi
 version: !ruby/object:Gem::Version 
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors: 
 - Aurelian Oancea
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-04 00:00:00 +01:00
+date: 2010-01-22 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency