markauskas-googlereader 0.1.1 → 0.1.2

data/Rakefile

@@ -9,9 +9,10 @@ begin
     gemspec.email = "info@tamole.net"
     gemspec.homepage = "http://github.com/markauskas/googlereader"
     gemspec.authors = ["Tomas Markauskas", "John Nunemaker"]
+    gemspec.add_dependency('activesupport') # For JSON && deep_merge
     gemspec.add_dependency('atom', '>= 0.3')
     gemspec.add_dependency('json', '>= 1.2.0')
-    gemspec.add_dependency('markauskas-googlebase', '>= 0.3.0')
+    gemspec.add_dependency('markauskas-googlebase', '>= 0.3.2')
   end
 
   Jeweler::GemcutterTasks.new
@@ -26,3 +27,12 @@ Rake::TestTask.new(:test) do |test|
 end
 
 task :default => :test
+
+task :a do
+  require 'yaml'
+  require File.dirname(__FILE__) + '/lib/google/reader'
+
+  GOOGLE_CONFIG = YAML::load(open(File.dirname(__FILE__) + '/test/.credentials.yml'))
+  Google::Base.establish_connection(GOOGLE_CONFIG['username'], GOOGLE_CONFIG['password'])
+  puts Google::Reader::Subscription.all.inspect
+end

data/lib/google/reader/base.rb

@@ -12,7 +12,8 @@ module Google
         end
         
         def parse_json(json_str)
-          JSON.parse(json_str)
+          # JSON.parse(json_str)
+          ActiveSupport::JSON.decode(json_str)
         end
         
         def get_entries(url, o={})

data/lib/google/reader/item.rb

@@ -0,0 +1,28 @@
+module Google
+  module Reader
+    class Item < Base
+      # a = add state
+      # r = remove state
+      # s = feed/stream
+      # i = item
+      # T = token
+      def self.add_label(feed, item, label)
+        token = get_token
+        puts token
+        options = { :form_data => { :s => feed, :a => label, :i => item, :T => token } }
+        result = post(EDIT_LABEL_URL, options)
+        puts result
+        !!result =~ "OK"
+      end
+      
+      def self.remove_label(feed, item, label)
+        token = get_token
+        puts token
+        options = { :form_data => { :s => feed, :r => label, :i => item, :T => token } }
+        result = post(EDIT_LABEL_URL, options)
+        puts result
+        !!result =~ "OK"
+      end
+    end
+  end
+end

data/lib/google/reader/stream.rb

@@ -1,17 +1,29 @@
 module Google
   module Reader
     class Stream < Base
-      def self.fetch(feed_url, count = 20, o = {})
-        feed_url = normalize_feed_url(feed_url)
-        url = sprintf(JSON_FEED_URL, CGI.escape(feed_url))
+      # Params:
+      # xt - exclude target, e.g. xt=user/-/state/com.google/read
+      # r - order (n - newest first, o - oldest first)
+      # ot - if r=o, only items posted after ot are returned (unix timestamp)
+      # ck - current timestamp?
+      # c - continuation
+      # n - count
+      # client - ?
+      def self.fetch(feed_url, options = {})
+        url = sprintf(STREAM_URL, feed_url)
         options = {
           :query_hash => {
             :ck => Time.now.to_i,
-            :n  => count
+            :n  => 20
           }
-        }.merge(o)
+        }.deep_merge(options)
         json = get(url, options)
-        data = JSON.parse(json)
+        data = parse_json(json)
+      end
+      
+      def self.fetch_feed(feed_url, options = {})
+        feed_url = 'feed/' + CGI.escape(normalize_feed_url(feed_url))
+        fetch feed_url, options
       end
     end
   end

data/lib/google/reader/subscription.rb

@@ -1,15 +1,11 @@
-require 'ostruct'
 module Google
   module Reader
     class Subscription < Base      
       class << self
         def all
-          parse_json(get(SUBSCRIPTION_LIST_URL))['subscriptions'].inject([]) do |subs, s|
-            subs << OpenStruct.new( :firstitemmsec => s['firstitemmsec'], 
-                                    :title         => s['title'], 
-                                    :google_id     => s['id'],
-                                    :categories    => s['categories'].inject([]) { |cats, c| cats << OpenStruct.new(:google_id => c['id'], :name => c['label']) })
-          end
+          json_str = get(SUBSCRIPTION_LIST_URL)
+          json = parse_json json_str
+          json['subscriptions']
         end
       end
     end

data/lib/google/reader/version.rb

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

data/lib/google/reader.rb

@@ -1,3 +1,4 @@
+require 'cgi'
 require 'uri'
 require 'net/https'
 require 'net/http'
@@ -5,18 +6,22 @@ require 'rubygems'
 
 gem 'atom', '>= 0.3'
 gem 'json', '>= 1.2.0'
-gem 'markauskas-googlebase', '>= 0.3.0'
+gem 'markauskas-googlebase', '>= 0.3.2'
+gem 'activesupport'
 
 require 'atom'
 require 'json'
+require 'active_support'
 require 'google/base'
-require 'google/reader/base'
-require 'google/reader/count'
-require 'google/reader/label'
-require 'google/reader/preference'
-require 'google/reader/search'
-require 'google/reader/stream'
-require 'google/reader/subscription'
+
+require File.dirname(__FILE__) + '/reader/base'
+require File.dirname(__FILE__) + '/reader/count'
+require File.dirname(__FILE__) + '/reader/label'
+require File.dirname(__FILE__) + '/reader/preference'
+require File.dirname(__FILE__) + '/reader/search'
+require File.dirname(__FILE__) + '/reader/stream'
+require File.dirname(__FILE__) + '/reader/subscription'
+require File.dirname(__FILE__) + '/reader/item'
 
 module Google
   module Reader
@@ -27,9 +32,10 @@ module Google
     SUBSCRIPTION_LIST_URL = READER_URL + '/api/0/subscription/list?output=json'
     SUBSCRIPTION_EDIT_URL = READER_URL + '/api/0/subscription/edit'
     ATOM_FEED_URL         = READER_URL + '/atom/feed/%s'
-    JSON_FEED_URL         = READER_URL + '/api/0/stream/contents/feed/%s'
+    STREAM_URL            = READER_URL + '/api/0/stream/contents/%s'
     LABELS_URL            = READER_URL + '/api/0/tag/list?output=json'
     LABEL_URL             = READER_URL + '/atom/user/-/label/%s'
+    EDIT_LABEL_URL        = READER_URL + '/api/0/edit-tag'
     PREFERENCE_URL        = READER_URL + '/api/0/preference/list?output=json'
     PREFERENCE_STREAM_URL = READER_URL + '/api/0/preference/stream/list?output=json'
     UNREAD_COUNT_URL      = READER_URL + '/api/0/unread-count?all=true&output=json'
@@ -37,12 +43,14 @@ module Google
     PACKAGE               = "user/-/state/com.google"
     
     module State
-      READ                    = "#{PACKAGE}/read"
-      KEPT_UNREAD             = "#{PACKAGE}/kept-unread"
-      FRESH                   = "#{PACKAGE}/fresh"
-      STARRED                 = "#{PACKAGE}/starred"
-      BROADCAST               = "#{PACKAGE}/broadcast"
-      READING_LIST            = "#{PACKAGE}/reading-list"
+      READ                    = "#{PACKAGE}/read"                       # Read items
+      KEPT_UNREAD             = "#{PACKAGE}/kept-unread"                # Items marked as unread
+      FRESH                   = "#{PACKAGE}/fresh"                      # Unread items
+      STARRED                 = "#{PACKAGE}/starred"                    # Starred items
+      SELF                    = "#{PACKAGE}/self"                       # Shared + Notes?
+      BROADCAST               = "#{PACKAGE}/broadcast"                  # Shared items from me
+      BROADCAST_FRIENDS       = "#{PACKAGE}/broadcast-friends"          # Shared items from friends
+      READING_LIST            = "#{PACKAGE}/reading-list"               # All items
       TRACKING_BODY_LINK_USED = "#{PACKAGE}/tracking-body-link-used"
       TRACKING_EMAILED        = "#{PACKAGE}/tracking-emailed"
       TRACKING_ITEM_LINK_USED = "#{PACKAGE}/tracking-item-link-used"

data/markauskas-googlereader.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{markauskas-googlereader}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tomas Markauskas", "John Nunemaker"]
-  s.date = %q{2010-02-01}
+  s.date = %q{2010-02-12}
   s.email = %q{info@tamole.net}
   s.extra_rdoc_files = [
     "README.txt"
@@ -23,6 +23,7 @@ Gem::Specification.new do |s|
      "lib/google/reader.rb",
      "lib/google/reader/base.rb",
      "lib/google/reader/count.rb",
+     "lib/google/reader/item.rb",
      "lib/google/reader/label.rb",
      "lib/google/reader/preference.rb",
      "lib/google/reader/search.rb",
@@ -33,6 +34,8 @@ Gem::Specification.new do |s|
      "markauskas-googlereader.gemspec",
      "test/.credentials.sample.yml",
      "test/googlereader_test.rb",
+     "test/stream_test.rb",
+     "test/subscription_test.rb",
      "test/test_helper.rb"
   ]
   s.homepage = %q{http://github.com/markauskas/googlereader}
@@ -42,6 +45,8 @@ Gem::Specification.new do |s|
   s.summary = %q{Ruby wrapper for Google Reader}
   s.test_files = [
     "test/googlereader_test.rb",
+     "test/stream_test.rb",
+     "test/subscription_test.rb",
      "test/test_helper.rb"
   ]
 
@@ -50,18 +55,21 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<activesupport>, [">= 0"])
       s.add_runtime_dependency(%q<atom>, [">= 0.3"])
       s.add_runtime_dependency(%q<json>, [">= 1.2.0"])
-      s.add_runtime_dependency(%q<markauskas-googlebase>, [">= 0.3.0"])
+      s.add_runtime_dependency(%q<markauskas-googlebase>, [">= 0.3.2"])
     else
+      s.add_dependency(%q<activesupport>, [">= 0"])
       s.add_dependency(%q<atom>, [">= 0.3"])
       s.add_dependency(%q<json>, [">= 1.2.0"])
-      s.add_dependency(%q<markauskas-googlebase>, [">= 0.3.0"])
+      s.add_dependency(%q<markauskas-googlebase>, [">= 0.3.2"])
     end
   else
+    s.add_dependency(%q<activesupport>, [">= 0"])
     s.add_dependency(%q<atom>, [">= 0.3"])
     s.add_dependency(%q<json>, [">= 1.2.0"])
-    s.add_dependency(%q<markauskas-googlebase>, [">= 0.3.0"])
+    s.add_dependency(%q<markauskas-googlebase>, [">= 0.3.2"])
   end
 end
 

data/test/googlereader_test.rb

@@ -1,5 +1,4 @@
 require File.dirname(__FILE__) + '/test_helper.rb'
-require 'cgi'
 
 class GooglereaderTest < Test::Unit::TestCase
   def setup
@@ -45,7 +44,7 @@ class GooglereaderTest < Test::Unit::TestCase
       # if feed_url contains a question mark (`?') it has to be escaped since
       # otherwise it would be interpreted as a part of the google reader url
       # and not the feed_url
-      response = Google::Reader::Stream.fetch(feed_url, 1)
+      response = Google::Reader::Stream.fetch_feed(feed_url)
       assert_not_nil response
       assert_not_nil response['items']
       assert_not_nil response['title']

data/test/stream_test.rb

@@ -0,0 +1,88 @@
+require File.dirname(__FILE__) + '/test_helper.rb'
+
+class StreamTest < Test::Unit::TestCase
+  def test_reading_list
+    list = Google::Reader::Stream.fetch(Google::Reader::State::READING_LIST, {:query_hash => {:n => 300}})
+    assert_not_nil list
+    assert_not_nil list['items']
+    assert list['items'].is_a?Array
+    list['items'].each do |item|
+      assert_not_nil item['id']
+      
+      text = (item['content'] || item['summary'])
+      assert text
+      assert text.is_a?Hash
+      assert text.keys.sort == ['content', 'direction'].sort
+      
+      assert_not_nil item['likingUsers']
+      assert item['likingUsers'].is_a?Array
+      item['likingUsers'].each do |liking_user|
+        assert liking_user.is_a?Hash
+        assert liking_user.keys == ["userId"]
+      end
+      
+      assert_not_nil item['comments']
+      assert item['comments'].is_a?Array
+      
+      assert_not_nil item['author']
+      assert item['author'].is_a?String
+      
+      assert_not_nil item['title']
+      
+      assert_not_nil item['annotations']
+      assert item['annotations'].is_a?Array
+      
+      assert_not_nil item['alternate']
+      assert item['alternate'].is_a?Array
+      assert item['alternate'].length > 0
+      item['alternate'].each do |alt|
+        assert alt.is_a?Hash
+        assert alt.keys.sort == ["href", "type"].sort
+      end
+      
+      assert_not_nil item['origin']
+      assert item['origin'].is_a?Hash
+      assert item['origin'].keys.sort == ["title", "htmlUrl", "streamId"].sort
+      
+      assert_not_nil item['categories']
+      assert item['categories'].is_a?Array
+      item['categories'].each do |category|
+        assert category.is_a?String
+      end
+      
+      assert_not_nil item['crawlTimeMsec']
+      
+      assert_not_nil item['published']
+      
+      assert_not_nil item['updated']
+    end
+  end
+  
+  def test_reading_list_without_read_items
+    list = Google::Reader::Stream.fetch(Google::Reader::State::READING_LIST, {:query_hash => {:n => 100, :xt => Google::Reader::State::READ}})
+    assert_not_nil list
+    list['items'].each do |item|
+      item['categories'].each do |category|
+        assert !(category =~ /\Auser\/[0-9]+\/state\/com.google\/read\Z/)
+      end
+    end
+  end
+  
+  def test_reading_list_order_by_newest
+    list = Google::Reader::Stream.fetch(Google::Reader::State::READING_LIST, {:query_hash => {:n => 30, :r => :n}})
+    previous = 0
+    list['items'].reverse.each do |item|
+      assert item['crawlTimeMsec'].to_i >= previous
+      previous = item['crawlTimeMsec'].to_i
+    end
+  end
+  
+  def test_reading_list_order_by_oldest
+    list = Google::Reader::Stream.fetch(Google::Reader::State::READING_LIST, {:query_hash => {:n => 30, :r => :o}})
+    previous = 0
+    list['items'].each do |item|
+      assert item['crawlTimeMsec'].to_i >= previous
+      previous = item['crawlTimeMsec'].to_i
+    end
+  end
+end

data/test/subscription_test.rb

@@ -0,0 +1,13 @@
+require File.dirname(__FILE__) + '/test_helper.rb'
+
+class SubscriptionTest < Test::Unit::TestCase
+  def test_subscription_list
+    subs = Google::Reader::Subscription.all
+    assert_not_nil subs
+    assert subs.is_a?Array
+    subs.each do |sub|
+      assert sub.is_a?Hash
+      assert_equal sub.keys.sort, ["firstitemmsec", "title", "sortid", "id", "categories"].sort
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: markauskas-googlereader
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Tomas Markauskas
@@ -10,9 +10,19 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-01 00:00:00 +01:00
+date: 2010-02-12 00:00:00 +01:00
 default_executable: 
 dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: activesupport
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 - !ruby/object:Gem::Dependency 
   name: atom
   type: :runtime
@@ -41,7 +51,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.3.0
+        version: 0.3.2
     version: 
 description: 
 email: info@tamole.net
@@ -60,6 +70,7 @@ files:
 - lib/google/reader.rb
 - lib/google/reader/base.rb
 - lib/google/reader/count.rb
+- lib/google/reader/item.rb
 - lib/google/reader/label.rb
 - lib/google/reader/preference.rb
 - lib/google/reader/search.rb
@@ -70,6 +81,8 @@ files:
 - markauskas-googlereader.gemspec
 - test/.credentials.sample.yml
 - test/googlereader_test.rb
+- test/stream_test.rb
+- test/subscription_test.rb
 - test/test_helper.rb
 has_rdoc: true
 homepage: http://github.com/markauskas/googlereader
@@ -101,4 +114,6 @@ specification_version: 3
 summary: Ruby wrapper for Google Reader
 test_files: 
 - test/googlereader_test.rb
+- test/stream_test.rb
+- test/subscription_test.rb
 - test/test_helper.rb