@@ -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===' examples/labels.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 \ No newline at end of file +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 } \ No newline at end of file examples/search.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) lib/google/reader/label.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 lib/google/reader/search.rb b75922bac192453144b21e604fd42d1ef09fd1f8 jnunemaker jnunemaker@fe7eae16-9a24-0410-a59d-9e59979e88be http://github.com/jnunemaker/googlereader/commit/e159492438b2774ef80848d26dcc2c0ba29192b4 e159492438b2774ef80848d26dcc2c0ba29192b4 2007-12-26T12:30:45-08:00 2007-12-26T12:30:45-08:00 search seems to be working pretty well git-svn-id: http://svn.addictedtonew.com/public/gems/googlereader@149 fe7eae16-9a24-0410-a59d-9e59979e88be 811720650e2c556e0c595e2c8bdd69c489e1cd55 jnunemaker jnunemaker@fe7eae16-9a24-0410-a59d-9e59979e88be