picasa 0.5.2 → 0.5.3

data/Gemfile

@@ -4,7 +4,7 @@ gemspec
 
 gem "thor"
 gem "rake"
-gem "minitest", :platform => :ruby_18
+gem "minitest", "3.5.0", :platform => :ruby_18
 gem "debugger", :platform => :ruby_19
 
 # xml parsers

data/README.md

@@ -45,30 +45,34 @@ client = Picasa::Client.new(user_id: "some.user@gmail.com", authorization_header
 You can install thor script for uploading all photos from given directory:
 
 ```
-thor install https://github.com/morgoth/picasa/raw/master/extra/Thorfile --as picasa_uploader --force
+thor install https://github.com/morgoth/picasa/raw/master/extra/Thorfile --as imagery --force
 ```
 
 Updating script can be done by:
 
 ```
-thor update picasa_uploader
+thor update imagery
 ```
 
 And then use it (it will create album taking title from folder name and upload all photos from that directory):
 
 ```
-GOOGLE_USER_ID=your.email@gmail.com GOOGLE_PASSWORD=secret thor picasa_uploader:upload_all path-to-folder-with-photos
+GOOGLE_USER_ID=your.email@gmail.com GOOGLE_PASSWORD=secret thor imagery:upload path-to-folder-with-photos
 # Without specifing password
-GOOGLE_USER_ID=your.email@gmail.com GOOGLE_AUTHORIZATION_HEADER="GoogleLogin auth=token" thor picasa_uploader:upload_all path-to-folder-with-photos
+GOOGLE_USER_ID=your.email@gmail.com GOOGLE_AUTHORIZATION_HEADER="GoogleLogin auth=token" thor imagery:upload path-to-folder-with-photos
 ```
 
 If your upload was somehow interrupted, you can resume it by adding `--continue` option:
 
 ```
-GOOGLE_USER_ID=your.email@gmail.com GOOGLE_PASSWORD=secret thor picasa_uploader:upload_all --continue path-to-folder-with-photos
+GOOGLE_USER_ID=your.email@gmail.com GOOGLE_PASSWORD=secret thor imagery:upload --continue path-to-folder-with-photos
 ```
 
-If you run out of quota and want to resize images to fit Picasa free storage limits, you might be interested in Thor task for [that job](https://github.com/morgoth/ripper#usage)
+If you run out of quota and want to resize images to fit Picasa free storage limits, you can install `rmagick` gem and run (this will modify files):
+
+```
+thor imagery:resize path-to-folder-with-photos
+```
 
 ## Caveats
 
@@ -77,6 +81,11 @@ Currently picasa wont work with `ox` xml parser.
 Using `rexml` parser wont return `etag` attribute properly.
 
 I recommend to use `libxml` or `nokogiri`.
+You can set it by:
+
+```ruby
+MultiXml.parser = :libxml
+```
 
 ## Continuous Integration
 [![Build Status](https://secure.travis-ci.org/morgoth/picasa.png)](http://travis-ci.org/morgoth/picasa)

data/{example → examples}/create_new_album.rb

@@ -4,9 +4,10 @@ begin
   client = Picasa::Client.new(:user_id => "your_gmail_account", :password => "password")
   # create new album.
   client.album.create(
-      :title => "New Album",
-      :summary => "This is a new album.",
-      :access => "protected")
+    :title => "New Album",
+    :summary => "This is a new album.",
+    :access => "protected"
+  )
 
 rescue Picasa::ForbiddenError
   puts "You have the wrong user_id or password."

data/examples/download_all_albums.rb

@@ -0,0 +1,41 @@
+# Download photos example
+# Matthew Epler, Sept 2012
+
+require "picasa"
+require "open-uri"
+
+username = "user@gmail.com"
+dir = "/Users/path.../"
+
+begin
+  client = Picasa::Client.new(:user_id => username)
+  albums = client.album.list.entries
+
+  albums.each do |album|
+  	Dir.chdir(dir)
+  	this_album = client.album.show(album.id).entries
+  	Dir.mkdir(album.title)
+  	Dir.chdir(album.title)
+
+		for photo in this_album
+			begin
+				get_string = photo.content.src
+				puts "processing" << photo.id
+
+			rescue Exception => e
+				puts photo.id << "  **ERROR**"
+				puts e
+			end
+
+		  open(get_string) do |f|
+ 				File.open(photo.title, "wb") do |file|
+          file.puts f.read
+ 			  end
+		  end
+		  puts "======================================"
+		end
+  end
+
+rescue Picasa::ForbiddenError
+  puts "You have the wrong user_id or password."
+end

data/examples/download_one_album.rb

@@ -0,0 +1,37 @@
+# Download photos example
+# Matthew Epler, Sept 2012
+
+require "picasa"
+require "open-uri"
+
+username = "user@gmail.com"
+dir = "/Users/path.../"
+
+begin
+  client = Picasa::Client.new(:user_id => username)
+  albums = client.album.list.entries
+
+  album = albums.find { |album| album.title == "your_album_name" }
+  photos = client.album.show(album.id).entries
+
+  photos.each do |photo|
+    begin
+  		get_string = photo.content.src
+  		puts "processing " << photo.id
+
+    rescue Exception => e
+      puts photo.id << "  **ERROR**"
+      puts e
+
+      Dir.chdir(dir)
+			open(get_string) do |f|
+        File.open(photo.title, "wb") do |file|
+    			file.puts f.read
+   		  end
+			end
+			puts "======================================"
+		end
+  end
+rescue Picasa::ForbiddenError
+  puts "You have the wrong user_id or password."
+end

data/extra/Thorfile

@@ -4,13 +4,13 @@ require "thread"
 # Temporary requirement
 MultiXml.parser = :libxml
 
-class PicasaUploader < Thor
+class Imagery < Thor
   include Thor::Actions
 
-  desc "upload_all DIR", "Uploads all photos from given directory (pass --continue to resume uploading)"
+  desc "upload [-c] [-t <number>] DIR", "Uploads all photos from given directory (pass --continue to continue uploading)"
   method_option :continue, type: :boolean, default: false, aliases: "-c", desc: "continue aborted upload"
   method_option :threads, type: :numeric, default: 8, aliases: "-t", desc: "specify threads number"
-  def upload_all(dir = File.basename(Dir.getwd))
+  def upload(dir = File.basename(Dir.getwd))
     require_credentials
 
     inside(dir, verbose: true) do
@@ -52,6 +52,33 @@ class PicasaUploader < Thor
     end
   end
 
+  desc "resize [-w <number>] [-h <number>] DIR", "Resizes photos to given dimensions if exceeded"
+  method_option :width, type: :numeric, default: 2048, aliases: "-w", desc: "max width"
+  method_option :height, type: :numeric, default: 2048, aliases: "-h", desc: "max height"
+  def resize(dir = ".")
+    # Requires imagemagick library
+    require "RMagick"
+    inside(dir, verbose: true) do
+      entries = Dir.entries(".").select { |e| e =~ /\.(jpg|jpeg|png|gif|bmp)$/i }.sort
+      processed = 0
+      entries.each do |file|
+        photo = Magick::Image.read(file).first
+        processed += 1
+        GC.start # problems with memory leaking by RMagick
+        if photo.columns > options[:width] || photo.rows > options[:height]
+          say "Resizing #{file} to fit #{options[:width]}x#{options[:height]} - #{processed}/#{entries.size}"
+
+          photo.resize_to_fit!(options[:width], options[:height])
+          photo.write(File.basename(file))
+          # Release memory
+          photo.destroy!
+        else
+          say "Skipping #{file} - #{processed}/#{entries.size}"
+        end
+      end
+    end
+  end
+
   no_tasks do
     def client
       @client ||= Picasa::Client.new(user_id: ENV["GOOGLE_USER_ID"],

data/lib/picasa.rb

@@ -9,12 +9,15 @@ require "picasa/file"
 require "picasa/template"
 
 require "picasa/api/album"
+require "picasa/api/comment"
 require "picasa/api/photo"
 require "picasa/api/tag"
 
 require "picasa/presenter/album"
 require "picasa/presenter/album_list"
 require "picasa/presenter/author"
+require "picasa/presenter/comment"
+require "picasa/presenter/comment_list"
 require "picasa/presenter/content"
 require "picasa/presenter/link"
 require "picasa/presenter/media"

data/lib/picasa/api/comment.rb

@@ -0,0 +1,70 @@
+require "picasa/api/base"
+
+module Picasa
+  module API
+    class Comment < Base
+      # Returns comment list - when album_id is not specified, list of user comments will be returned
+      #
+      # @param [Hash] options additional options included in request
+      # @option options [String] :album_id retrieve comments for given album
+      # @option options [String] :photo_id retrieve comments for given photo (album_id must be provided)
+      #
+      # @return [Presenter::CommentList]
+      def list(options = {})
+        album_id = options.delete(:album_id)
+        photo_id = options.delete(:photo_id)
+        raise(ArgumentError, "You must specify album_id when providing photo_id") if photo_id && !album_id
+
+        path = "/data/feed/api/user/#{user_id}"
+        path << "/albumid/#{album_id}" if album_id
+        path << "/photoid/#{photo_id}" if photo_id
+
+        uri = URI.parse(path)
+        response = Connection.new.get(:path => uri.path, :query => options.merge(:kind => "comment"), :headers => auth_header)
+
+        Presenter::CommentList.new(MultiXml.parse(response.body)["feed"])
+      end
+
+      # Creates a comment for a photo.
+      #
+      # @param [Hash]
+      # @option options [String] :album_id id of album
+      # @option options [String] :photo_id id of photo
+      # @option options [String] :content name of tag
+      #
+      # @return [Presenter::Tag]
+      def create(params = {})
+        album_id = params.delete(:album_id) || raise(ArgumentError, "You must specify album_id")
+        photo_id = params.delete(:photo_id) || raise(ArgumentError, "You must specify photo_id")
+        params[:content] || raise(ArgumentError, "You must specify content")
+
+        path = "/data/feed/api/user/#{user_id}/albumid/#{album_id}/photoid/#{photo_id}"
+
+        template = Template.new("new_comment", params)
+
+        uri = URI.parse(path)
+        response = Connection.new.post(:path => uri.path, :body => template.render, :headers => auth_header)
+
+        Presenter::Comment.new(MultiXml.parse(response.body)["entry"])
+      end
+
+      # Removes a comment from given photo.
+      #
+      # @param [String] comment_id comment id
+      # @param [Hash]
+      # @option options [String] :album_id id of album
+      # @option options [String] :photo_id id of photo
+      #
+      # @return [true]
+      def destroy(comment_id, params = {})
+        album_id = params.delete(:album_id) || raise(ArgumentError, "You must specify album_id")
+        photo_id = params.delete(:photo_id) || raise(ArgumentError, "You must specify photo_id")
+
+        uri = URI.parse("/data/entry/api/user/#{user_id}/albumid/#{album_id}/photoid/#{photo_id}/commentid/#{comment_id}")
+        Connection.new.delete(:path => uri.path, :headers => auth_header)
+        true
+      end
+      alias :delete :destroy
+    end
+  end
+end

data/lib/picasa/api/photo.rb

@@ -28,10 +28,10 @@ module Picasa
         Presenter::Photo.new(MultiXml.parse(response.body)["entry"])
       end
 
-	    # Destroys given photo
+      # Destroys given photo
       #
       # @param [String] album_id album id
-	    # @param [String] photo_id photo id
+      # @param [String] photo_id photo id
       # @param [Hash] options request parameters
       # @option options [String] :etag destroys only when ETag matches - protects before destroying other client changes
       #

data/lib/picasa/api/tag.rb

@@ -28,7 +28,7 @@ module Picasa
       # Creates a tag for a photo.
       #
       # @param [Hash]
-      # @option options [String] :album_id id pof album
+      # @option options [String] :album_id id of album
       # @option options [String] :photo_id id of photo
       # @option options [String] :title name of tag
       #
@@ -47,6 +47,24 @@ module Picasa
 
         Presenter::Tag.new(MultiXml.parse(response.body)["entry"])
       end
+
+      # Removes a tag from given photo.
+      #
+      # @param [String] tag_id tag name (title)
+      # @param [Hash]
+      # @option options [String] :album_id id pof album
+      # @option options [String] :photo_id id of photo
+      #
+      # @return [true]
+      def destroy(tag_id, params = {})
+        album_id = params.delete(:album_id) || raise(ArgumentError, "You must specify album_id")
+        photo_id = params.delete(:photo_id) || raise(ArgumentError, "You must specify photo_id")
+
+        uri = URI.parse("/data/entry/api/user/#{user_id}/albumid/#{album_id}/photoid/#{photo_id}/tag/#{tag_id}")
+        Connection.new.delete(:path => uri.path, :headers => auth_header)
+        true
+      end
+      alias :delete :destroy
     end
   end
 end

data/lib/picasa/client.rb

@@ -48,6 +48,18 @@ module Picasa
       API::Tag.new(credentials)
     end
 
+    # @return [API::Comment]
+    #
+    # @example
+    #   client = Picasa::Client.new(user_id: "my.email@google.com")
+    #   comment_list = client.comment.list(album_id: "988", photo_id: "123")
+    #   comment_list.entries.map &:content
+    #   # => "nice photo!"
+    def comment
+      authenticate if authenticates?
+      API::Comment.new(credentials)
+    end
+
     # @return [String]
     def authenticate
       response = Connection.new.post(

data/lib/picasa/connection.rb

@@ -1,44 +1,46 @@
 require "net/https"
-require "cgi"
 require "uri"
 
 module Picasa
   class Connection
-    def http(url = API_URL)
-      uri = URI.parse(url)
-      http = Net::HTTP.new(uri.host, uri.port)
-      http.use_ssl = true
-      http
-    end
-
     # @param [Hash] params request arguments
     # @option params [String] :host host of request
     # @option params [String] :path request path
-    # @option params [String] :body request body (for POST)
     # @option params [String] :query request url query
     # @option params [String] :headers request headers
     def get(params = {})
+      params[:host]    ||= API_URL
       params[:headers] ||= {}
-      params[:query] ||= {}
-      params[:host] ||= API_URL
+      params[:query]   ||= {}
 
       path = path_with_query(params[:path], params[:query])
       request = Net::HTTP::Get.new(path, headers.merge(params[:headers]))
       handle_response(http(params[:host]).request(request))
     end
 
+    # @param [Hash] params request arguments
+    # @option params [String] :host host of request
+    # @option params [String] :path request path
+    # @option params [String] :body request body (for POST)
+    # @option params [String] :query request url query
+    # @option params [String] :headers request headers
     def post(params = {})
+      params[:host]    ||= API_URL
       params[:headers] ||= {}
-      params[:host] ||= API_URL
 
       request = Net::HTTP::Post.new(params[:path], headers.merge(params[:headers]))
       request.body = params[:body]
       handle_response(http(params[:host]).request(request))
     end
 
+    # @param [Hash] params request arguments
+    # @option params [String] :host host of request
+    # @option params [String] :path request path
+    # @option params [String] :query request url query
+    # @option params [String] :headers request headers
     def delete(params = {})
+      params[:host]    ||= API_URL
       params[:headers] ||= {}
-      params[:host] ||= API_URL
 
       request = Net::HTTP::Delete.new(params[:path], headers.merge(params[:headers]))
       handle_response(http(params[:host]).request(request))
@@ -51,6 +53,13 @@ module Picasa
 
     private
 
+    def http(url = API_URL)
+      uri = URI.parse(url)
+      http = Net::HTTP.new(uri.host, uri.port)
+      http.use_ssl = true
+      http
+    end
+
     def handle_response(response)
       case response.code.to_i
       when 200...300

data/lib/picasa/presenter/comment.rb

@@ -0,0 +1,57 @@
+require "picasa/presenter/base"
+
+module Picasa
+  module Presenter
+    class Comment < Base
+      # @return [Presenter::Author]
+      def author
+        @author ||= Author.new(safe_retrieve(parsed_body, "author"))
+      end
+
+      # @return [Array<Presenter::Link>]
+      def links
+        @links ||= array_wrap(safe_retrieve(parsed_body, "link")).map { |link| Link.new(link) }
+      end
+
+      # @return [DateTime]
+      def published
+        @published ||= map_to_date(safe_retrieve(parsed_body, "published"))
+      end
+
+      # @return [DateTime]
+      def updated
+        @updated ||= map_to_date(safe_retrieve(parsed_body, "updated"))
+      end
+
+      # @return [DateTime]
+      def edited
+        @edited ||= map_to_date(safe_retrieve(parsed_body, "edited"))
+      end
+
+      # @return [String]
+      def title
+        @title ||= safe_retrieve(parsed_body, "title")
+      end
+
+      # @return [String]
+      def etag
+        @etag ||= safe_retrieve(parsed_body, "etag")
+      end
+
+      # @return [String]
+      def content
+        @content ||= safe_retrieve(parsed_body, "content", "__content__") || safe_retrieve(parsed_body, "content")
+      end
+
+      # @return [String]
+      def id
+        @id ||= array_wrap(safe_retrieve(parsed_body, "id")).last
+      end
+
+      # @return [String]
+      def photo_id
+        @photo_id ||= safe_retrieve(parsed_body, "photoid")
+      end
+    end
+  end
+end

data/lib/picasa/presenter/comment_list.rb

@@ -0,0 +1,73 @@
+require "picasa/presenter/base"
+
+module Picasa
+  module Presenter
+    class CommentList < Base
+      # @return [Presenter::Author]
+      def author
+        @author ||= Author.new(safe_retrieve(parsed_body, "author"))
+      end
+
+      # @return [Array<Presenter::Comment>]
+      def entries
+        @entries ||= array_wrap(safe_retrieve(parsed_body, "entry")).map { |entry| Comment.new(entry) }
+      end
+      alias :comments :entries
+
+      # @return [Array<Presenter::Link>]
+      def links
+        @links ||= array_wrap(safe_retrieve(parsed_body, "link")).map { |link| Link.new(link) }
+      end
+
+      # @return [String]
+      def title
+        @title ||= safe_retrieve(parsed_body, "title")
+      end
+
+      # @return [DateTime]
+      def updated
+        @updated ||= map_to_date(safe_retrieve(parsed_body, "updated"))
+      end
+
+      # @return [String]
+      def icon
+        @icon ||= safe_retrieve(parsed_body, "icon")
+      end
+
+      # @return [String]
+      def generator
+        @generator ||= safe_retrieve(parsed_body, "generator", "__content__")
+      end
+
+      # @return [Integer]
+      def total_results
+        @total_results ||= map_to_integer(safe_retrieve(parsed_body, "totalResults"))
+      end
+
+      # @return [Integer]
+      def start_index
+        @start_index ||= map_to_integer(safe_retrieve(parsed_body, "startIndex"))
+      end
+
+      # @return [Integer]
+      def items_per_page
+        @items_per_page ||= map_to_integer(safe_retrieve(parsed_body, "itemsPerPage"))
+      end
+
+      # @return [String]
+      def user
+        @user ||= safe_retrieve(parsed_body, "user")
+      end
+
+      # @return [String]
+      def nickname
+        @nickname ||= safe_retrieve(parsed_body, "nickname")
+      end
+
+      # @return [String]
+      def thumbnail
+        @thumbnail ||= safe_retrieve(parsed_body, "thumbnail")
+      end
+    end
+  end
+end

data/lib/picasa/templates/new_comment.xml.erb

@@ -0,0 +1,4 @@
+<entry xmlns="http://www.w3.org/2005/Atom">
+  <content><%= content %></content>
+  <category scheme="http://schemas.google.com/g/2005#kind" term="http://schemas.google.com/photos/2007#comment"/>
+</entry>

data/lib/picasa/utils.rb

@@ -1,4 +1,5 @@
 require "date"
+require "cgi"
 
 module Picasa
   module Utils

data/lib/picasa/version.rb

@@ -1,3 +1,3 @@
 module Picasa
-  VERSION = "0.5.2"
+  VERSION = "0.5.3"
 end

data/test/api/comment_test.rb

@@ -0,0 +1,70 @@
+# -*- encoding: utf-8 -*-
+require "helper"
+
+describe Picasa::API::Comment do
+  describe "#list" do
+    it "throws ArgumentError when photo_id provided without album_id" do
+      comment = Picasa::API::Comment.new(:user_id => "w.wnetrzak")
+
+      assert_raises Picasa::ArgumentError, /album_id/ do
+        comment.list(:photo_id => "12343")
+      end
+    end
+
+    it "gives correct parsed body fragment" do
+      stub_request(:get, "https://picasaweb.google.com/data/feed/api/user/w.wnetrzak?kind=comment").to_return(fixture("comment/comment-list.txt"))
+
+      comment_list = Picasa::API::Comment.new(:user_id => "w.wnetrzak").list
+
+      assert_equal 1, comment_list.entries.size
+    end
+  end
+
+  describe "#create" do
+    it "raises ArgumentError when no album_id" do
+      comment = Picasa::API::Comment.new(:user_id => "w.wnetrzak@gmail.com", :password => "secret")
+      assert_raises Picasa::ArgumentError, /album_id/ do
+        comment.create(:photo_id => "455", :content => "content")
+      end
+    end
+
+    it "raises ArgumentError when no photo_id" do
+      comment = Picasa::API::Comment.new(:user_id => "w.wnetrzak@gmail.com", :password => "secret")
+      assert_raises Picasa::ArgumentError, /photo_id/ do
+        comment.create(:album_id => "123", :content => "content")
+      end
+    end
+
+    it "raises ArgumentError when no content" do
+      comment = Picasa::API::Comment.new(:user_id => "w.wnetrzak@gmail.com", :password => "secret")
+      assert_raises Picasa::ArgumentError, /content/ do
+        comment.create(:album_id => "123", :photo_id => "455")
+      end
+    end
+  end
+
+  describe "#destroy" do
+    it "raises ArgumentError when no photo_id" do
+      comment = Picasa::API::Comment.new(:user_id => "w.wnetrzak@gmail.com", :password => "secret")
+      assert_raises Picasa::ArgumentError, /photo_id/ do
+        comment.destroy("wtf", :album_id => "123")
+      end
+    end
+
+    it "raises ArgumentError when no album_id" do
+      comment = Picasa::API::Comment.new(:user_id => "w.wnetrzak@gmail.com", :password => "secret")
+      assert_raises Picasa::ArgumentError, /album_id/ do
+        comment.destroy("wtf", :photo_id => "455")
+      end
+    end
+
+    it "gives true when success" do
+      stub_request(:post, "https://www.google.com/accounts/ClientLogin").to_return(fixture("auth/success.txt"))
+      stub_request(:delete, "https://picasaweb.google.com/data/entry/api/user/w.wnetrzak@gmail.com/albumid/123/photoid/456/commentid/987").to_return(:status => 200, :body => "")
+
+      result = Picasa::API::Comment.new(:user_id => "w.wnetrzak@gmail.com", :password => "secret").destroy("987", :album_id => "123", :photo_id => "456")
+
+      assert_equal true, result
+    end
+  end
+end

data/test/api/tag_test.rb

@@ -42,4 +42,29 @@ describe Picasa::API::Tag do
       end
     end
   end
+
+  describe "#destroy" do
+    it "raises ArgumentError when no photo_id" do
+      tag = Picasa::API::Tag.new(:user_id => "w.wnetrzak@gmail.com", :password => "secret")
+      assert_raises Picasa::ArgumentError, /photo_id/ do
+        tag.destroy("wtf", :album_id => "123")
+      end
+    end
+
+    it "raises ArgumentError when no album_id" do
+      tag = Picasa::API::Tag.new(:user_id => "w.wnetrzak@gmail.com", :password => "secret")
+      assert_raises Picasa::ArgumentError, /album_id/ do
+        tag.destroy("wtf", :photo_id => "455")
+      end
+    end
+
+    it "gives true when success" do
+      stub_request(:post, "https://www.google.com/accounts/ClientLogin").to_return(fixture("auth/success.txt"))
+      stub_request(:delete, "https://picasaweb.google.com/data/entry/api/user/w.wnetrzak@gmail.com/albumid/123/photoid/456/tag/wtf").to_return(:status => 200, :body => "")
+
+      result = Picasa::API::Tag.new(:user_id => "w.wnetrzak@gmail.com", :password => "secret").destroy("wtf", :album_id => "123", :photo_id => "456")
+
+      assert_equal true, result
+    end
+  end
 end

data/test/fixtures/comment/comment-list.txt

@@ -0,0 +1,65 @@
+HTTP/1.1 200 OK
+Expires: Sun, 30 Sep 2012 09:09:17 GMT
+Date: Sun, 30 Sep 2012 09:09:17 GMT
+Cache-Control: private, max-age=0, must-revalidate, no-transform
+Set-Cookie: _rtok=ZS2AJZMN4GwZ; Path=/; Secure; HttpOnly
+Set-Cookie: S=photos_html=wWH1eSR_XDZiIU9n_ezhUQ; Domain=.google.com; Path=/; Secure; HttpOnly
+Content-Type: application/atom+xml; charset=UTF-8; type=feed
+Vary: Accept, X-GData-Authorization, GData-Version, Cookie
+GData-Version: 2.0
+ETag: W/"D0ADRncyeip7ImA9WhJbGUQ."
+Last-Modified: Sun, 30 Sep 2012 09:02:57 GMT
+X-Content-Type-Options: nosniff
+X-Frame-Options: SAMEORIGIN
+X-XSS-Protection: 1; mode=block
+Server: GSE
+Transfer-Encoding: chunked
+
+<?xml version='1.0' encoding='UTF-8'?>
+<feed xmlns='http://www.w3.org/2005/Atom' xmlns:app='http://www.w3.org/2007/app' xmlns:gphoto='http://schemas.google.com/photos/2007' xmlns:openSearch='http://a9.com/-/spec/opensearch/1.1/' xmlns:gd='http://schemas.google.com/g/2005' gd:etag='W/&quot;D0ADRncyeip7ImA9WhJbGUQ.&quot;'>
+  <id>https://picasaweb.google.com/data/feed/user/106136347770555028022</id>
+  <updated>2012-09-30T09:02:57.992Z</updated>
+  <category scheme='http://schemas.google.com/g/2005#kind' term='http://schemas.google.com/photos/2007#user'/>
+  <title>106136347770555028022</title>
+  <subtitle/>
+  <icon>https://lh3.googleusercontent.com/-6ezHc54U8x0/AAAAAAAAAAI/AAAAAAAAAAA/PBuxm7Ehn6E/s64-c/106136347770555028022.jpg</icon>
+  <link rel='http://schemas.google.com/g/2005#feed' type='application/atom+xml' href='https://picasaweb.google.com/data/feed/api/user/106136347770555028022'/>
+  <link rel='alternate' type='text/html' href='https://picasaweb.google.com/106136347770555028022'/>
+  <link rel='http://schemas.google.com/photos/2007#slideshow' type='application/x-shockwave-flash' href='https://picasaweb.google.com/s/c/bin/slideshow.swf?host=picasaweb.google.com&amp;RGB=0x000000&amp;feed=https%3A%2F%2Fpicasaweb.google.com%2Fdata%2Ffeed%2Fapi%2Fuser%2F106136347770555028022%3Falt%3Drss'/>
+  <link rel='self' type='application/atom+xml' href='https://picasaweb.google.com/data/feed/api/user/106136347770555028022?start-index=1&amp;max-results=100&amp;kind=comment'/>
+  <author>
+    <name>Wojciech Wnętrzak</name>
+    <uri>https://picasaweb.google.com/106136347770555028022</uri>
+  </author>
+  <generator version='1.00' uri='http://picasaweb.google.com/'>Picasaweb</generator>
+  <openSearch:totalResults>1</openSearch:totalResults>
+  <openSearch:startIndex>1</openSearch:startIndex>
+  <openSearch:itemsPerPage>100</openSearch:itemsPerPage>
+  <gphoto:user>106136347770555028022</gphoto:user>
+  <gphoto:nickname>Wojciech Wnętrzak</gphoto:nickname>
+  <gphoto:thumbnail>https://lh3.googleusercontent.com/-6ezHc54U8x0/AAAAAAAAAAI/AAAAAAAAAAA/PBuxm7Ehn6E/s64-c/106136347770555028022.jpg</gphoto:thumbnail>
+  <gphoto:quotalimit>1073741824</gphoto:quotalimit>
+  <gphoto:quotacurrent>758213</gphoto:quotacurrent>
+  <gphoto:maxPhotosPerAlbum>1000</gphoto:maxPhotosPerAlbum>
+  <entry gd:etag='W/&quot;D0ADRn04fCp7ImA9WhJbGUQ.&quot;'>
+    <id>https://picasaweb.google.com/data/entry/user/106136347770555028022/albumid/5793892606777564353/photoid/5793892628357238194/commentid/z13stn0rtrvkvpnbm04cgjbgjkmwyr5ot4g-1348995777334000</id>
+    <published>2012-09-30T09:02:57.334Z</published>
+    <updated>2012-09-30T09:02:57.334Z</updated>
+    <app:edited>2012-09-30T09:02:57.334Z</app:edited>
+    <category scheme='http://schemas.google.com/g/2005#kind' term='http://schemas.google.com/photos/2007#comment'/>
+    <title>Wojciech Wnętrzak</title>
+    <content type='html'>testing comment</content>
+    <link rel='alternate' type='text/html' href='https://picasaweb.google.com/lh/photo/sPdyu2Pl7tE-Je04UbLSuiUdvMQllM3aC4Soztgbiog'/>
+    <link rel='self' type='application/atom+xml' href='https://picasaweb.google.com/data/entry/api/user/106136347770555028022/albumid/5793892606777564353/photoid/5793892628357238194/commentid/z13stn0rtrvkvpnbm04cgjbgjkmwyr5ot4g-1348995777334000?authkey=Gv1sRgCNmigd3KrbOHLA'/>
+    <link rel='edit' type='application/atom+xml' href='https://picasaweb.google.com/data/entry/api/user/106136347770555028022/albumid/5793892606777564353/photoid/5793892628357238194/commentid/z13stn0rtrvkvpnbm04cgjbgjkmwyr5ot4g-1348995777334000?authkey=Gv1sRgCNmigd3KrbOHLA'/>
+    <author>
+      <name>Wojciech Wnętrzak</name>
+      <uri>https://picasaweb.google.com/106136347770555028022</uri>
+      <gphoto:nickname>Wojciech Wnętrzak</gphoto:nickname>
+      <gphoto:thumbnail>https://lh3.googleusercontent.com/-6ezHc54U8x0/AAAAAAAAAAI/AAAAAAAAAAA/PBuxm7Ehn6E/s48-c/106136347770555028022.jpg</gphoto:thumbnail>
+      <gphoto:user>106136347770555028022</gphoto:user>
+    </author>
+    <gphoto:id>z13stn0rtrvkvpnbm04cgjbgjkmwyr5ot4g-1348995777334000</gphoto:id>
+    <gphoto:photoid>5793892628357238194</gphoto:photoid>
+  </entry>
+</feed>

data/test/fixtures/presenters/comment_list.xml

@@ -0,0 +1,48 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<feed xmlns='http://www.w3.org/2005/Atom' xmlns:app='http://www.w3.org/2007/app' xmlns:gphoto='http://schemas.google.com/photos/2007' xmlns:openSearch='http://a9.com/-/spec/opensearch/1.1/' xmlns:gd='http://schemas.google.com/g/2005' gd:etag='W/&quot;D0ADRncyeip7ImA9WhJbGUQ.&quot;'>
+  <id>https://picasaweb.google.com/data/feed/user/106136347770555028022</id>
+  <updated>2012-09-30T09:02:57.992Z</updated>
+  <category scheme='http://schemas.google.com/g/2005#kind' term='http://schemas.google.com/photos/2007#user'/>
+  <title>106136347770555028022</title>
+  <subtitle/>
+  <icon>https://lh3.googleusercontent.com/-6ezHc54U8x0/AAAAAAAAAAI/AAAAAAAAAAA/PBuxm7Ehn6E/s64-c/106136347770555028022.jpg</icon>
+  <link rel='http://schemas.google.com/g/2005#feed' type='application/atom+xml' href='https://picasaweb.google.com/data/feed/api/user/106136347770555028022'/>
+  <link rel='alternate' type='text/html' href='https://picasaweb.google.com/106136347770555028022'/>
+  <link rel='http://schemas.google.com/photos/2007#slideshow' type='application/x-shockwave-flash' href='https://picasaweb.google.com/s/c/bin/slideshow.swf?host=picasaweb.google.com&amp;RGB=0x000000&amp;feed=https%3A%2F%2Fpicasaweb.google.com%2Fdata%2Ffeed%2Fapi%2Fuser%2F106136347770555028022%3Falt%3Drss'/>
+  <link rel='self' type='application/atom+xml' href='https://picasaweb.google.com/data/feed/api/user/106136347770555028022?start-index=1&amp;max-results=100&amp;kind=comment'/>
+  <author>
+    <name>Wojciech Wnętrzak</name>
+    <uri>https://picasaweb.google.com/106136347770555028022</uri>
+  </author>
+  <generator version='1.00' uri='http://picasaweb.google.com/'>Picasaweb</generator>
+  <openSearch:totalResults>1</openSearch:totalResults>
+  <openSearch:startIndex>1</openSearch:startIndex>
+  <openSearch:itemsPerPage>100</openSearch:itemsPerPage>
+  <gphoto:user>106136347770555028022</gphoto:user>
+  <gphoto:nickname>Wojciech Wnętrzak</gphoto:nickname>
+  <gphoto:thumbnail>https://lh3.googleusercontent.com/-6ezHc54U8x0/AAAAAAAAAAI/AAAAAAAAAAA/PBuxm7Ehn6E/s64-c/106136347770555028022.jpg</gphoto:thumbnail>
+  <gphoto:quotalimit>1073741824</gphoto:quotalimit>
+  <gphoto:quotacurrent>758213</gphoto:quotacurrent>
+  <gphoto:maxPhotosPerAlbum>1000</gphoto:maxPhotosPerAlbum>
+  <entry gd:etag='W/&quot;D0ADRn04fCp7ImA9WhJbGUQ.&quot;'>
+    <id>https://picasaweb.google.com/data/entry/user/106136347770555028022/albumid/5793892606777564353/photoid/5793892628357238194/commentid/z13stn0rtrvkvpnbm04cgjbgjkmwyr5ot4g-1348995777334000</id>
+    <published>2012-09-30T09:02:57.334Z</published>
+    <updated>2012-09-30T09:02:57.334Z</updated>
+    <app:edited>2012-09-30T09:02:57.334Z</app:edited>
+    <category scheme='http://schemas.google.com/g/2005#kind' term='http://schemas.google.com/photos/2007#comment'/>
+    <title>Wojciech Wnętrzak</title>
+    <content type='html'>testing comment</content>
+    <link rel='alternate' type='text/html' href='https://picasaweb.google.com/lh/photo/sPdyu2Pl7tE-Je04UbLSuiUdvMQllM3aC4Soztgbiog'/>
+    <link rel='self' type='application/atom+xml' href='https://picasaweb.google.com/data/entry/api/user/106136347770555028022/albumid/5793892606777564353/photoid/5793892628357238194/commentid/z13stn0rtrvkvpnbm04cgjbgjkmwyr5ot4g-1348995777334000?authkey=Gv1sRgCNmigd3KrbOHLA'/>
+    <link rel='edit' type='application/atom+xml' href='https://picasaweb.google.com/data/entry/api/user/106136347770555028022/albumid/5793892606777564353/photoid/5793892628357238194/commentid/z13stn0rtrvkvpnbm04cgjbgjkmwyr5ot4g-1348995777334000?authkey=Gv1sRgCNmigd3KrbOHLA'/>
+    <author>
+      <name>Wojciech Wnętrzak</name>
+      <uri>https://picasaweb.google.com/106136347770555028022</uri>
+      <gphoto:nickname>Wojciech Wnętrzak</gphoto:nickname>
+      <gphoto:thumbnail>https://lh3.googleusercontent.com/-6ezHc54U8x0/AAAAAAAAAAI/AAAAAAAAAAA/PBuxm7Ehn6E/s48-c/106136347770555028022.jpg</gphoto:thumbnail>
+      <gphoto:user>106136347770555028022</gphoto:user>
+    </author>
+    <gphoto:id>z13stn0rtrvkvpnbm04cgjbgjkmwyr5ot4g-1348995777334000</gphoto:id>
+    <gphoto:photoid>5793892628357238194</gphoto:photoid>
+  </entry>
+</feed>

data/test/presenter/comment_list_test.rb

@@ -0,0 +1,67 @@
+# -*- encoding: utf-8 -*-
+require "helper"
+
+describe Picasa::Presenter::CommentList do
+  before do
+    body = MultiXml.parse(fixture("presenters/comment_list.xml"))
+    @comment_list = Picasa::Presenter::CommentList.new(body["feed"])
+  end
+
+  it "has author name" do
+    assert_equal "Wojciech Wnętrzak", @comment_list.author.name
+  end
+
+  it "has author uri" do
+    assert_equal "https://picasaweb.google.com/106136347770555028022", @comment_list.author.uri
+  end
+
+  it "has links" do
+    assert_equal 4, @comment_list.links.size
+  end
+
+  it "has title" do
+    assert_equal "106136347770555028022", @comment_list.title
+  end
+
+  it "has updated" do
+    assert_equal "2012-09-30T09:02:57+00:00", @comment_list.updated.to_s
+  end
+
+  it "has icon" do
+    expected = "https://lh3.googleusercontent.com/-6ezHc54U8x0/AAAAAAAAAAI/AAAAAAAAAAA/PBuxm7Ehn6E/s64-c/106136347770555028022.jpg"
+    assert_equal expected, @comment_list.icon
+  end
+
+  it "has generator" do
+    assert_equal "Picasaweb", @comment_list.generator
+  end
+
+  it "has total_results" do
+    assert_equal 1, @comment_list.total_results
+  end
+
+  it "has start_index" do
+    assert_equal 1, @comment_list.start_index
+  end
+
+  it "has items_per_page" do
+    assert_equal 100, @comment_list.items_per_page
+  end
+
+  it "has user" do
+    assert_equal "106136347770555028022", @comment_list.user
+  end
+
+  it "has nickname" do
+    assert_equal "Wojciech Wnętrzak", @comment_list.nickname
+  end
+
+  it "has thumbnail" do
+    expected = "https://lh3.googleusercontent.com/-6ezHc54U8x0/AAAAAAAAAAI/AAAAAAAAAAA/PBuxm7Ehn6E/s64-c/106136347770555028022.jpg"
+    assert_equal expected, @comment_list.thumbnail
+  end
+
+  it "has entries" do
+    assert_equal 1, @comment_list.entries.size
+  end
+end

data/test/presenter/comment_test.rb

@@ -0,0 +1,56 @@
+# -*- encoding: utf-8 -*-
+require "helper"
+
+describe Picasa::Presenter::Comment do
+  describe "comment from comment list" do
+    before do
+      body = MultiXml.parse(fixture("presenters/comment_list.xml"))
+      @comment = Picasa::Presenter::Comment.new(body["feed"]["entry"])
+    end
+
+    it "has author name" do
+      assert_equal "Wojciech Wnętrzak", @comment.author.name
+    end
+
+    it "has author uri" do
+      assert_equal "https://picasaweb.google.com/106136347770555028022", @comment.author.uri
+    end
+
+    it "has links" do
+      assert_equal 3, @comment.links.size
+    end
+
+    it "has published" do
+      assert_equal "2012-09-30T09:02:57+00:00", @comment.published.to_s
+    end
+
+    it "has updated" do
+      assert_equal "2012-09-30T09:02:57+00:00", @comment.updated.to_s
+    end
+
+    it "has edited" do
+      assert_equal "2012-09-30T09:02:57+00:00", @comment.edited.to_s
+    end
+
+    it "has etag" do
+      assert_equal "W/\"D0ADRn04fCp7ImA9WhJbGUQ.\"", @comment.etag
+    end
+
+    it "has title" do
+      assert_equal "Wojciech Wnętrzak", @comment.title
+    end
+
+    it "has content" do
+      assert_equal "testing comment", @comment.content
+    end
+
+    it "has id" do
+      expected = "z13stn0rtrvkvpnbm04cgjbgjkmwyr5ot4g-1348995777334000"
+      assert_equal expected, @comment.id
+    end
+
+    it "has photo_id" do
+      assert_equal "5793892628357238194", @comment.photo_id
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: picasa
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-16 00:00:00.000000000 Z
+date: 2012-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_xml
@@ -72,16 +72,19 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- example/add_tags_to_photo.rb
-- example/create_new_album.rb
-- example/delete_all_photos.rb
-- example/get_some_albums.rb
-- example/get_some_photos.rb
-- example/upload_photo.rb
+- examples/add_tags_to_photo.rb
+- examples/create_new_album.rb
+- examples/delete_all_photos.rb
+- examples/download_all_albums.rb
+- examples/download_one_album.rb
+- examples/get_some_albums.rb
+- examples/get_some_photos.rb
+- examples/upload_photo.rb
 - extra/Thorfile
 - lib/picasa.rb
 - lib/picasa/api/album.rb
 - lib/picasa/api/base.rb
+- lib/picasa/api/comment.rb
 - lib/picasa/api/photo.rb
 - lib/picasa/api/tag.rb
 - lib/picasa/client.rb
@@ -92,6 +95,8 @@ files:
 - lib/picasa/presenter/album_list.rb
 - lib/picasa/presenter/author.rb
 - lib/picasa/presenter/base.rb
+- lib/picasa/presenter/comment.rb
+- lib/picasa/presenter/comment_list.rb
 - lib/picasa/presenter/content.rb
 - lib/picasa/presenter/link.rb
 - lib/picasa/presenter/media.rb
@@ -101,12 +106,14 @@ files:
 - lib/picasa/presenter/thumbnail.rb
 - lib/picasa/template.rb
 - lib/picasa/templates/new_album.xml.erb
+- lib/picasa/templates/new_comment.xml.erb
 - lib/picasa/templates/new_photo.xml.erb
 - lib/picasa/templates/new_tag.xml.erb
 - lib/picasa/utils.rb
 - lib/picasa/version.rb
 - picasa.gemspec
 - test/api/album_test.rb
+- test/api/comment_test.rb
 - test/api/photo_test.rb
 - test/api/tag_test.rb
 - test/client_test.rb
@@ -120,6 +127,7 @@ files:
 - test/fixtures/album/album-show-with-tag-and-one-photo.txt
 - test/fixtures/album/album-show.txt
 - test/fixtures/auth/success.txt
+- test/fixtures/comment/comment-list.txt
 - test/fixtures/exceptions/forbidden.txt
 - test/fixtures/exceptions/not_found.txt
 - test/fixtures/exceptions/precondition_failed.txt
@@ -132,6 +140,7 @@ files:
 - test/fixtures/presenters/album_list.xml
 - test/fixtures/presenters/album_show.xml
 - test/fixtures/presenters/album_show_with_one_photo.xml
+- test/fixtures/presenters/comment_list.xml
 - test/fixtures/presenters/tag_list.xml
 - test/fixtures/tag/tag-list.txt
 - test/helper.rb
@@ -139,6 +148,8 @@ files:
 - test/presenter/album_test.rb
 - test/presenter/author_test.rb
 - test/presenter/base_test.rb
+- test/presenter/comment_list_test.rb
+- test/presenter/comment_test.rb
 - test/presenter/content_test.rb
 - test/presenter/link_test.rb
 - test/presenter/media_test.rb