googlereader 0.0.3 → 0.0.4

data/History.txt

@@ -1,3 +1,5 @@
+* 0.0.4
+	- got search working by using a raw post instead of a fancy set_form_data
 * 0.0.3
 	- updated manifest to include all files, 0.0.2 release was not up to date
 * 0.0.2

data/config/hoe.rb

@@ -59,7 +59,7 @@ hoe = Hoe.new(GEM_NAME, VERS) do |p|
   
   # == Optional
   p.changes        = p.paragraphs_of("History.txt", 0..1).join("\n\n")
-  p.extra_deps    = [['googlebase', '>= 0.1.1'], ['atom', '>= 0.3'], ['json', '>= 1.1.1']]     # An array of rubygem dependencies [name, version], e.g. [ ['active_support', '>= 1.3.1'] ]
+  p.extra_deps    = [['googlebase', '>= 0.1.3'], ['atom', '>= 0.3'], ['json', '>= 1.1.1']]     # An array of rubygem dependencies [name, version], e.g. [ ['active_support', '>= 1.3.1'] ]
   
   #p.spec_extras   = {}    # A hash of extra values to set in the gemspec.
   

data/examples/labels.rb

@@ -1,10 +1,9 @@
 $:.unshift File.join(File.dirname(__FILE__), '/../lib')
 require 'google/reader'
-
 require 'pp'
 require 'yaml'
-config = YAML::load(open("#{ENV['HOME']}/.google"))
 
+config = YAML::load(open("#{ENV['HOME']}/.google"))
 Google::Base.establish_connection(config[:email], config[:password])
 # Google::Base.set_connection(Google::Base.new(config[:email], config[:password]))
 
@@ -12,8 +11,8 @@ puts '', '=Labels='
 labels = Google::Reader::Label.all
 pp labels
 
-# puts '', '==Links=='
-# unread = Google::Reader::Label.new('links').entries(:unread, :n => 5)
+# puts '', '==Ruby on Rails=='
+# unread = Google::Reader::Label.new('ruby-on-rails').entries(:unread, :n => 5)
 # pp unread.first
 # 
 # puts '', '===Using Continuation==='

data/examples/search.rb

@@ -1,11 +1,13 @@
 $:.unshift File.join(File.dirname(__FILE__), '/../lib')
 require 'google/reader'
-require 'pp'
 require 'yaml'
+require 'pp'
 
 config = YAML::load(open("#{ENV['HOME']}/.google"))
 Google::Base.establish_connection(config[:email], config[:password])
 
-search = Google::Reader::Search.new('test')
-search.execute
-pp search.results
+search = Google::Reader::Search.new('john nunemaker')
+results = search.results(:start => 0)
+puts results.total
+results.each { |r| puts r.title }
+search.results(:start => 20).each { |r| puts r.title }

data/lib/google/reader.rb

@@ -5,7 +5,7 @@ require 'rubygems'
 
 gem 'atom', '>= 0.3'
 gem 'json', '>= 1.1.1'
-gem 'googlebase', '>= 0.1.1'
+gem 'googlebase', '>= 0.1.3'
 
 require 'atom'
 require 'json'

data/lib/google/reader/label.rb

@@ -59,8 +59,8 @@ module Google
       def entries(which=nil, o={})
         options = {:n => 15,}.merge(o)
         query_str = valid_keys_to_query_string(o)
-        url = case which
-        when :unread
+        url = case which.to_s
+        when 'unread'
           sprintf(LABEL_URL, @name) + "?xt=#{State::READ}&#{query_str}"
         else
           sprintf(LABEL_URL, @name)

data/lib/google/reader/search.rb

@@ -1,6 +1,7 @@
 # This is getting the ids fine but I haven't figured out how 
 # to post multiple elements of the same name yet in ruby so 
 # don't use it unless you want to fix it.
+require 'ostruct'
 module Google #:nodoc:
   module Reader #:nodoc:
     class Search < Base #:nodoc:
@@ -22,22 +23,37 @@ module Google #:nodoc:
       end
       
       def results(o={})
+        execute unless @executed
         options = {
           :token => nil,
           :start => 0,
           :num   => 20,
         }.merge(o)
-        
         options[:token] ||= self.class.get_token
         
         if ids.size > 0
-          i_str = ids[options[:start]] + '&'
-          i_str += ids[(options[:start]+1)..options[:num]].collect { |id| ["i=#{id}&"] unless id.nil? }.join('')
-          
-          self.class.post(SEARCH_CONTENTS_URL, :form_data => {
-            :T => options[:token],
-            :i => i_str,
-          })
+          raw_data  = ids[(options[:start]), options[:num]].collect { |id| "i=#{id}" unless id.nil? }.join('&')
+          raw_data += "&T=#{options[:token]}"
+          json_results = self.class.parse_json(self.class.post(SEARCH_CONTENTS_URL, :raw_data => raw_data))
+          results = json_results['items'].inject([]) do |acc, r|
+            result = OpenStruct.new(:google_id => r['id'], :title => r['title'], 
+                                    :published => Time.at(r['published']), :author => r['author'], 
+                                    :categories => r['categories'])
+            if r['alternate'].size > 0
+              result.alternate_href = r['alternate'].first['href']
+              result.alternate_type = r['alternate'].first['type']
+            end
+            result.origin_title     = r['origin']['title']
+            result.origin_url       = r['origin']['htmlUrl']
+            result.origin_stream_id = r['origin']['streamId']
+            result.content = r['content'] ? r['content']['content'] : ''
+            acc << result
+          end
+          results.class.class_eval "attr_accessor :total"
+          results.total = ids.size
+          results
+        else
+          []
         end
       end
     end

data/lib/google/reader/version.rb

@@ -3,7 +3,7 @@ module Google #:nodoc:
     module VERSION #:nodoc:
       MAJOR = 0
       MINOR = 0
-      TINY  = 3
+      TINY  = 4
 
       STRING = [MAJOR, MINOR, TINY].join('.')
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: googlereader
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 platform: ""
 authors: 
 - John Nunemaker
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2007-11-25 00:00:00 -05:00
+date: 2007-12-26 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -19,7 +19,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.1.1
+        version: 0.1.3
     version: 
 - !ruby/object:Gem::Dependency 
   name: atom