markauskas-googlereader 0.1.0 → 0.1.1

data/.gitignore

@@ -0,0 +1 @@
+pkg/

data/Rakefile

@@ -9,6 +9,8 @@ begin
     gemspec.email = "info@tamole.net"
     gemspec.homepage = "http://github.com/markauskas/googlereader"
     gemspec.authors = ["Tomas Markauskas", "John Nunemaker"]
+    gemspec.add_dependency('atom', '>= 0.3')
+    gemspec.add_dependency('json', '>= 1.2.0')
     gemspec.add_dependency('markauskas-googlebase', '>= 0.3.0')
   end
 
@@ -16,3 +18,11 @@ begin
 rescue LoadError
   puts "Jeweler not available. Install it with: gem install jeweler"
 end
+
+require 'rake'
+require 'rake/testtask'
+Rake::TestTask.new(:test) do |test|
+  test.pattern = 'test/**/*_test.rb'
+end
+
+task :default => :test

data/init.rb

@@ -0,0 +1 @@
+require 'google/reader'

data/lib/google/reader/base.rb

@@ -1,7 +1,12 @@
 module Google
-  module Reader    
+  module Reader
     class Base < Base
-      class << self        
+      class << self
+        def normalize_feed_url(feed_url)
+          feed_url[0,5] = "" if feed_url[0,5] == "feed/"
+          feed_url
+        end
+        
         def parse(atom_feed)
           Atom::Feed.new(atom_feed)
         end

data/lib/google/reader/stream.rb

@@ -0,0 +1,18 @@
+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))
+        options = {
+          :query_hash => {
+            :ck => Time.now.to_i,
+            :n  => count
+          }
+        }.merge(o)
+        json = get(url, options)
+        data = JSON.parse(json)
+      end
+    end
+  end
+end

data/lib/google/reader/version.rb

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

data/lib/google/reader.rb

@@ -4,8 +4,8 @@ require 'net/http'
 require 'rubygems'
 
 gem 'atom', '>= 0.3'
-gem 'json', '>= 1.1.1'
-gem 'googlebase', '>= 0.1.3'
+gem 'json', '>= 1.2.0'
+gem 'markauskas-googlebase', '>= 0.3.0'
 
 require 'atom'
 require 'json'
@@ -15,6 +15,7 @@ require 'google/reader/count'
 require 'google/reader/label'
 require 'google/reader/preference'
 require 'google/reader/search'
+require 'google/reader/stream'
 require 'google/reader/subscription'
 
 module Google
@@ -25,7 +26,8 @@ module Google
     SEARCH_CONTENTS_URL   = READER_URL + "/api/0/stream/items/contents"
     SUBSCRIPTION_LIST_URL = READER_URL + '/api/0/subscription/list?output=json'
     SUBSCRIPTION_EDIT_URL = READER_URL + '/api/0/subscription/edit'
-    FEED_URL              = READER_URL + '/atom/feed/%s'
+    ATOM_FEED_URL         = READER_URL + '/atom/feed/%s'
+    JSON_FEED_URL         = READER_URL + '/api/0/stream/contents/feed/%s'
     LABELS_URL            = READER_URL + '/api/0/tag/list?output=json'
     LABEL_URL             = READER_URL + '/atom/user/-/label/%s'
     PREFERENCE_URL        = READER_URL + '/api/0/preference/list?output=json'

data/lib/googlereader.rb

@@ -0,0 +1 @@
+require 'google/reader'

data/markauskas-googlereader.gemspec

@@ -5,37 +5,34 @@
 
 Gem::Specification.new do |s|
   s.name = %q{markauskas-googlereader}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   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-01-12}
+  s.date = %q{2010-02-01}
   s.email = %q{info@tamole.net}
   s.extra_rdoc_files = [
     "README.txt"
   ]
   s.files = [
-    "History.txt",
+    ".gitignore",
      "License.txt",
      "README.txt",
      "Rakefile",
-     "Todo.txt",
-     "examples/base.rb",
-     "examples/counts.rb",
-     "examples/labels.rb",
-     "examples/preferences.rb",
-     "examples/search.rb",
-     "examples/subscriptions.rb",
+     "init.rb",
      "lib/google/reader.rb",
      "lib/google/reader/base.rb",
      "lib/google/reader/count.rb",
      "lib/google/reader/label.rb",
      "lib/google/reader/preference.rb",
      "lib/google/reader/search.rb",
+     "lib/google/reader/stream.rb",
      "lib/google/reader/subscription.rb",
      "lib/google/reader/version.rb",
+     "lib/googlereader.rb",
      "markauskas-googlereader.gemspec",
-     "test/test_googlereader.rb",
+     "test/.credentials.sample.yml",
+     "test/googlereader_test.rb",
      "test/test_helper.rb"
   ]
   s.homepage = %q{http://github.com/markauskas/googlereader}
@@ -44,14 +41,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.5}
   s.summary = %q{Ruby wrapper for Google Reader}
   s.test_files = [
-    "test/test_googlereader.rb",
-     "test/test_helper.rb",
-     "examples/base.rb",
-     "examples/counts.rb",
-     "examples/labels.rb",
-     "examples/preferences.rb",
-     "examples/search.rb",
-     "examples/subscriptions.rb"
+    "test/googlereader_test.rb",
+     "test/test_helper.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -59,11 +50,17 @@ 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<atom>, [">= 0.3"])
+      s.add_runtime_dependency(%q<json>, [">= 1.2.0"])
       s.add_runtime_dependency(%q<markauskas-googlebase>, [">= 0.3.0"])
     else
+      s.add_dependency(%q<atom>, [">= 0.3"])
+      s.add_dependency(%q<json>, [">= 1.2.0"])
       s.add_dependency(%q<markauskas-googlebase>, [">= 0.3.0"])
     end
   else
+    s.add_dependency(%q<atom>, [">= 0.3"])
+    s.add_dependency(%q<json>, [">= 1.2.0"])
     s.add_dependency(%q<markauskas-googlebase>, [">= 0.3.0"])
   end
 end

data/test/.credentials.sample.yml

@@ -0,0 +1,3 @@
+# Copy this file to .credentials.yml and fill in your details
+username: username@gmail.com
+password: password123

data/test/googlereader_test.rb

@@ -0,0 +1,58 @@
+require File.dirname(__FILE__) + '/test_helper.rb'
+require 'cgi'
+
+class GooglereaderTest < Test::Unit::TestCase
+  def setup
+  end
+  
+  def test_should_get_google_reader_data
+    response = Google::Base.get('http://www.google.com/reader/api/0/user-info')
+    assert response =~ /userEmail/
+    assert response =~ Regexp.new(Regexp.escape(GOOGLE_CONFIG['username']))
+    assert response =~ /userProfileId/
+    assert response =~ /userId/
+  end
+
+  def test_some_urls
+    feeds = [
+      "feed/http://feeds.feedburner.com/blogspot/MKuf",
+      "feed/http://feeds.feedburner.com/blogspot/MKuf?format=xml",
+      "feed/http://pukomuko.esu.lt/?item=rss"
+    ]
+    base_url = 'http://www.google.com/reader/api/0/stream/contents/'
+    
+    feeds.each do |feed_url|
+      # 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
+      url = base_url + CGI.escape(feed_url)
+      options = { :query_hash => { :r => :n, :n => 1 }, :qsi => '?'}
+      response = Google::Base.get(url, options)
+      assert response =~ /feed\/http:\/\//
+      assert response =~ /id/
+      assert response =~ /title/
+      assert response =~ /description/
+    end
+  end
+  
+  def test_some_feeds
+    feeds = [
+      "feed/http://feeds.feedburner.com/blogspot/MKuf",
+      "feed/http://feeds.feedburner.com/blogspot/MKuf?format=xml",
+      "feed/http://pukomuko.esu.lt/?item=rss"
+    ]
+    feeds.each do |feed_url|
+      # 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)
+      assert_not_nil response
+      assert_not_nil response['items']
+      assert_not_nil response['title']
+      assert_not_nil response['description']
+      assert_not_nil response['updated']
+      assert response.is_a?Hash
+      assert response['items'].is_a?Array
+    end
+  end
+end

data/test/test_helper.rb

@@ -1,2 +1,6 @@
 require 'test/unit'
-require File.dirname(__FILE__) + '/../lib/googlereader'
+require 'yaml'
+require File.dirname(__FILE__) + '/../lib/google/reader'
+
+GOOGLE_CONFIG = YAML::load(open(File.dirname(__FILE__) + '/.credentials.yml'))
+Google::Base.establish_connection(GOOGLE_CONFIG['username'], GOOGLE_CONFIG['password'])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: markauskas-googlereader
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Tomas Markauskas
@@ -10,9 +10,29 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-12 00:00:00 +01:00
+date: 2010-02-01 00:00:00 +01:00
 default_executable: 
 dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: atom
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0.3"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: json
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.2.0
+    version: 
 - !ruby/object:Gem::Dependency 
   name: markauskas-googlebase
   type: :runtime
@@ -32,27 +52,24 @@ extensions: []
 extra_rdoc_files: 
 - README.txt
 files: 
-- History.txt
+- .gitignore
 - License.txt
 - README.txt
 - Rakefile
-- Todo.txt
-- examples/base.rb
-- examples/counts.rb
-- examples/labels.rb
-- examples/preferences.rb
-- examples/search.rb
-- examples/subscriptions.rb
+- init.rb
 - lib/google/reader.rb
 - lib/google/reader/base.rb
 - lib/google/reader/count.rb
 - lib/google/reader/label.rb
 - lib/google/reader/preference.rb
 - lib/google/reader/search.rb
+- lib/google/reader/stream.rb
 - lib/google/reader/subscription.rb
 - lib/google/reader/version.rb
+- lib/googlereader.rb
 - markauskas-googlereader.gemspec
-- test/test_googlereader.rb
+- test/.credentials.sample.yml
+- test/googlereader_test.rb
 - test/test_helper.rb
 has_rdoc: true
 homepage: http://github.com/markauskas/googlereader
@@ -83,11 +100,5 @@ signing_key:
 specification_version: 3
 summary: Ruby wrapper for Google Reader
 test_files: 
-- test/test_googlereader.rb
+- test/googlereader_test.rb
 - test/test_helper.rb
-- examples/base.rb
-- examples/counts.rb
-- examples/labels.rb
-- examples/preferences.rb
-- examples/search.rb
-- examples/subscriptions.rb

data/History.txt

@@ -1,10 +0,0 @@
-* 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
-	- added wrapper for subscriptions
-	- added wrapper for preferences
-	- added Base#get_token for retrieving tokens from google
-* 0.0.1
-	- labels and counts are working

data/Todo.txt

@@ -1,7 +0,0 @@
-* 0.0.5 Feed (ie: Feed.new('http://feeds.feedburner.com/johnnunemaker'))
-* 0.0.6 State (ie: State.new('read').entries)
-
-== Edit API
-** 0.0.8 Subscription-Edit (add and remove subscriptions)
-** 0.1.0 Edit-Tag (mark items as read, starred, shared, etc.)
-** Disable-Tag (no idea what this is)

data/examples/base.rb

@@ -1,10 +0,0 @@
-$:.unshift File.join(File.dirname(__FILE__), '/../lib')
-require 'google/reader'
-require 'pp'
-require 'yaml'
-
-config = YAML::load(open("#{ENV['HOME']}/.google"))
-Google::Base.establish_connection(config[:email], config[:password])
-
-pp Google::Reader::Base.get_token
-pp Google::Reader::Base.user_info

data/examples/counts.rb

@@ -1,12 +0,0 @@
-$:.unshift File.join(File.dirname(__FILE__), '/../lib')
-require 'google/reader'
-
-require 'pp'
-require 'yaml'
-config = YAML::load(open("#{ENV['HOME']}/.google"))
-
-Google::Base.establish_connection(config[:email], config[:password])
-
-# pp Google::Reader::Count.all
-pp Google::Reader::Count.labels
-# pp Google::Reader::Count.feeds

data/examples/labels.rb

@@ -1,20 +0,0 @@
-$:.unshift File.join(File.dirname(__FILE__), '/../lib')
-require 'google/reader'
-require 'pp'
-require 'yaml'
-
-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]))
-
-puts '', '=Labels='
-labels = Google::Reader::Label.all
-pp labels
-
-# puts '', '==Ruby on Rails=='
-# unread = Google::Reader::Label.new('ruby-on-rails').entries(:unread, :n => 5)
-# pp unread.first
-# 
-# puts '', '===Using Continuation==='
-# more_unread = Google::Reader::Label.new('links').entries(:unread, :n => 5, :c => unread.continuation)
-# more_unread.each { |p| puts p.title }

data/examples/preferences.rb

@@ -1,14 +0,0 @@
-$:.unshift File.join(File.dirname(__FILE__), '/../lib')
-require 'google/reader'
-require 'pp'
-require 'yaml'
-
-config = YAML::load(open("#{ENV['HOME']}/.google"))
-Google::Base.establish_connection(config[:email], config[:password])
-
-pp Google::Reader::Preference.available
-pp Google::Reader::Preference[:design]
-pp Google::Reader::Preference[:mobile_use_transcoder]
-pp Google::Reader::Preference[:mobile_num_entries]
-
-pp Google::Reader::Preference.stream

data/examples/search.rb

@@ -1,13 +0,0 @@
-$:.unshift File.join(File.dirname(__FILE__), '/../lib')
-require 'google/reader'
-require 'yaml'
-require 'pp'
-
-config = YAML::load(open("#{ENV['HOME']}/.google"))
-Google::Base.establish_connection(config[:email], config[:password])
-
-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/examples/subscriptions.rb

@@ -1,9 +0,0 @@
-$:.unshift File.join(File.dirname(__FILE__), '/../lib')
-require 'google/reader'
-require 'pp'
-require 'yaml'
-
-config = YAML::load(open("#{ENV['HOME']}/.google"))
-Google::Base.establish_connection(config[:email], config[:password])
-
-pp Google::Reader::Subscription.all.detect { |s| s.categories.size > 1 }

data/test/test_googlereader.rb

@@ -1,11 +0,0 @@
-# require File.dirname(__FILE__) + '/test_helper.rb'
-# 
-# class TestGooglereader < Test::Unit::TestCase
-# 
-#   def setup
-#   end
-#   
-#   def test_truth
-#     assert true
-#   end
-# end