picasa 0.4.1 → 0.4.2

data/lib/picasa.rb

@@ -6,6 +6,7 @@ require "picasa/exceptions"
 require "picasa/connection"
 require "picasa/client"
 require "picasa/api/album"
+require "picasa/api/tag"
 
 require "picasa/presenter/album"
 require "picasa/presenter/album_list"
@@ -14,6 +15,8 @@ require "picasa/presenter/content"
 require "picasa/presenter/link"
 require "picasa/presenter/media"
 require "picasa/presenter/photo"
+require "picasa/presenter/tag"
+require "picasa/presenter/tag_list"
 require "picasa/presenter/thumbnail"
 
 module Picasa

data/lib/picasa/api/album.rb

@@ -34,6 +34,7 @@ module Picasa
       # @option options [String] :tag include photos with given tag only
       #
       # @return [Presenter::Album]
+      # @raise [NotFoundError] raised when album cannot be found
       def show(album_id, options = {})
         uri = URI.parse("/data/feed/api/user/#{user_id}/albumid/#{album_id}")
         parsed_body = Connection.new(credentials).get(uri.path, options)

data/lib/picasa/api/tag.rb

@@ -0,0 +1,41 @@
+module Picasa
+  module API
+    class Tag
+      attr_reader :user_id, :credentials
+
+      # @param [Hash] credentials
+      # @option credentials [String] :user_id google username/email
+      # @option credentials [String] :password password for given username/email
+      def initialize(credentials)
+        if MultiXml.parser.to_s == "MultiXml::Parsers::Ox"
+          raise StandardError, "MultiXml parser is set to :ox - picasa gem will not work with it currently, use one of: :libxml, :nokogiri, :rexml"
+        end
+        @user_id  = credentials.fetch(:user_id)
+        @credentials = credentials
+      end
+
+      # Returns tag list - when album_id is not specified, list of user tags will be returned
+      #
+      # @param [Hash] options additional options included in request
+      # @option option [String] :album_id retrieve tags for given album
+      # @option option [String] :photo_id retrieve tags for given photo (album_id must be provided)
+      #
+      # @return [Presenter::TagList]
+      def list(options = {})
+        album_id = options[:album_id]
+        photo_id = options[: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)
+
+        parsed_body = Connection.new(credentials).get(uri.path, options.merge(:kind => "tag"))
+
+        Presenter::TagList.new(parsed_body["feed"])
+      end
+    end
+  end
+end

data/lib/picasa/client.rb

@@ -20,5 +20,16 @@ module Picasa
     def album
       API::Album.new(credentials)
     end
+
+    # @return [API::Tag]
+    #
+    # @example
+    #   client = Picasa::Client.new(user_id: "my.email@google.com")
+    #   tag_list = client.tag.list(album_id: "988", photo_id: "123")
+    #   tag_list.title
+    #   # => "holidays"
+    def tag
+      API::Tag.new(credentials)
+    end
   end
 end

data/lib/picasa/connection.rb

@@ -4,7 +4,7 @@ require "uri"
 
 module Picasa
   class Connection
-    attr_reader :user_id, :password, :response
+    attr_reader :user_id, :password
 
     def initialize(credentials = {})
       @user_id  = credentials.fetch(:user_id)
@@ -23,12 +23,7 @@ module Picasa
 
       path = path_with_params(path, params)
       request = Net::HTTP::Get.new(path, headers)
-      @response = http.request(request)
-      parsed_body
-    end
-
-    def parsed_body
-      @parsed_body ||= MultiXml.parse(response.body)
+      handle_response(http.request(request))
     end
 
     def inline_params(params)
@@ -45,6 +40,17 @@ module Picasa
 
     private
 
+    def handle_response(response)
+      case response.code.to_i
+      when 200...300
+        MultiXml.parse(response.body)
+      when 404
+        raise NotFoundError.new(response.body, response)
+      else
+        raise ResponseError.new(reponse.body, response)
+      end
+    end
+
     def headers
       {"User-Agent" => "ruby-gem-v#{Picasa::VERSION}", "GData-Version" => API_VERSION}.tap do |headers|
         headers["Authorization"] = "GoogleLogin auth=#{@auth_key}" if @auth_key
@@ -62,7 +68,6 @@ module Picasa
     end
 
     def authenticate
-      return @auth_key if defined?(@auth_key)
       validate_email!
 
       data = inline_params({"accountType" => "HOSTED_OR_GOOGLE",

data/lib/picasa/exceptions.rb

@@ -14,4 +14,6 @@ module Picasa
       super(message)
     end
   end
+
+  class NotFoundError < ResponseError; end
 end

data/lib/picasa/presenter/base.rb

@@ -22,7 +22,7 @@ module Picasa
 
       def methods_to_inspect
         # Ruby 1.8.7 workaround
-        (public_methods - Object.methods).map { |m| m.to_sym } - [:parsed_body]
+        (public_methods - Object.methods).map { |m| m.to_sym } - [:parsed_body, :entries]
       end
     end
   end

data/lib/picasa/presenter/tag.rb

@@ -0,0 +1,42 @@
+require "picasa/presenter/base"
+
+module Picasa
+  module Presenter
+    class Tag < Base
+      # @return [Presenter::Author]
+      def author
+        @author ||= Author.new(safe_retrieve(parsed_body, "author"))
+      end
+
+      # @return [Array<Presenter::Link>]
+      def links
+        @links ||= safe_retrieve(parsed_body, "link").map { |link| Link.new(link) }
+      end
+
+      # @return [DateTime]
+      def updated
+        @updated ||= map_to_date(safe_retrieve(parsed_body, "updated"))
+      end
+
+      # @return [String]
+      def title
+        @title ||= safe_retrieve(parsed_body, "title")
+      end
+
+      # @return [String]
+      def summary
+        @summary ||= safe_retrieve(parsed_body, "summary")
+      end
+
+      # @return [String]
+      def id
+        @id ||= safe_retrieve(parsed_body, "id")
+      end
+
+      # @return [Integer]
+      def weight
+        @weight ||= map_to_integer(safe_retrieve(parsed_body, "weight"))
+      end
+    end
+  end
+end

data/lib/picasa/presenter/tag_list.rb

@@ -0,0 +1,73 @@
+require "picasa/presenter/base"
+
+module Picasa
+  module Presenter
+    class TagList < Base
+      # @return [Presenter::Author]
+      def author
+        @author ||= Author.new(safe_retrieve(parsed_body, "author"))
+      end
+
+      # @return [Array<Presenter::Tag>]
+      def entries
+        @entries ||= array_wrap(safe_retrieve(parsed_body, "entry")).map { |entry| Tag.new(entry) }
+      end
+      alias :tags :entries
+
+      # @return [Array<Presenter::Link>]
+      def links
+        @links ||= 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/version.rb

@@ -1,3 +1,3 @@
 module Picasa
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

data/test/api/tag_test.rb

@@ -0,0 +1,22 @@
+# -*- encoding: utf-8 -*-
+require "helper"
+
+describe Picasa::API::Tag do
+  describe "#list" do
+    it "throws ArgumentErro when photo_id provided without album_id" do
+      tag = Picasa::API::Tag.new(:user_id => "w.wnetrzak")
+
+      assert_raises Picasa::ArgumentError, /album_id/ do
+        tag.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=tag").to_return(fixture("tag/tag-list.txt"))
+
+      tag_list = Picasa::API::Tag.new(:user_id => "w.wnetrzak").list
+
+      assert_equal 2, tag_list.entries.size
+    end
+  end
+end

data/test/connection_test.rb

@@ -37,6 +37,17 @@ describe Picasa::Connection do
     end
   end
 
+  it "raises NotFound exception when 404 returned" do
+    connection = Picasa::Connection.new(:user_id => "john.doe@domain.com")
+    uri        = URI.parse("/data/feed/api/user/#{connection.user_id}/albumid/non-existing")
+
+    stub_request(:get, "https://picasaweb.google.com" + uri.path).to_return(fixture("not_found.txt"))
+
+    assert_raises Picasa::NotFoundError, "Invalid entity id: non-existing" do
+      connection.get(uri.path)
+    end
+  end
+
   describe "authentication" do
     it "successfully authenticates" do
       connection = Picasa::Connection.new(:user_id => "john.doe@domain.com", :password => "secret")

data/test/fixtures/not_found.txt

@@ -0,0 +1,14 @@
+HTTP/1.1 404 Not Found
+Expires: Fri, 24 Aug 2012 16:04:24 GMT
+Date: Fri, 24 Aug 2012 16:04:24 GMT
+Cache-Control: private, max-age=0, must-revalidate
+Set-Cookie: _rtok=3st0A7QFPEFO; Path=/; Secure; HttpOnly
+Set-Cookie: S=photos_html=o2mfdle_g_-wK1WAJoo1Lw; Domain=.google.com; Path=/; Secure; HttpOnly
+Content-Type: text/html; charset=UTF-8
+X-Content-Type-Options: nosniff
+X-Frame-Options: SAMEORIGIN
+X-XSS-Protection: 1; mode=block
+Server: GSE
+Transfer-Encoding: chunked
+
+Invalid entity id: non-existing

data/test/fixtures/presenters/tag_list.xml

@@ -0,0 +1,51 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<feed xmlns='http://www.w3.org/2005/Atom' 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;CE8GRXczfip7ImA9WhJWEUQ.&quot;'>
+  <id>https://picasaweb.google.com/data/feed/user/106136347770555028022</id>
+  <updated>2012-08-17T08:40:24.986Z</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=500&amp;kind=tag'/>
+  <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>2</openSearch:totalResults>
+  <openSearch:startIndex>1</openSearch:startIndex>
+  <openSearch:itemsPerPage>500</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>
+  <entry gd:etag='W/&quot;CE8GRXczfip7ImA9WhJWEUQ.&quot;'>
+    <id>https://picasaweb.google.com/data/entry/user/106136347770555028022/tag/nice</id>
+    <updated>2012-08-17T08:40:24.986Z</updated>
+    <category scheme='http://schemas.google.com/g/2005#kind' term='http://schemas.google.com/photos/2007#tag'/>
+    <title>nice</title>
+    <summary>nice</summary>
+    <link rel='alternate' type='text/html' href='https://picasaweb.google.com/lh/searchbrowse?q=nice&amp;psc=G&amp;uname=106136347770555028022&amp;filter=0'/>
+    <link rel='self' type='application/atom+xml' href='https://picasaweb.google.com/data/entry/api/user/106136347770555028022/tag/nice'/>
+    <author>
+      <name>Wojciech Wnętrzak</name>
+      <uri>https://picasaweb.google.com/106136347770555028022</uri>
+    </author>
+    <gphoto:weight>2</gphoto:weight>
+  </entry>
+  <entry gd:etag='W/&quot;CE8GRXczfip7ImA9WhJWEUQ.&quot;'>
+    <id>https://picasaweb.google.com/data/entry/user/106136347770555028022/tag/ziemniaki</id>
+    <updated>2012-08-17T08:40:24.986Z</updated>
+    <category scheme='http://schemas.google.com/g/2005#kind' term='http://schemas.google.com/photos/2007#tag'/>
+    <title>ziemniaki</title>
+    <summary>ziemniaki</summary>
+    <link rel='alternate' type='text/html' href='https://picasaweb.google.com/lh/searchbrowse?q=ziemniaki&amp;psc=G&amp;uname=106136347770555028022&amp;filter=0'/>
+    <link rel='self' type='application/atom+xml' href='https://picasaweb.google.com/data/entry/api/user/106136347770555028022/tag/ziemniaki'/>
+    <author>
+      <name>Wojciech Wnętrzak</name>
+      <uri>https://picasaweb.google.com/106136347770555028022</uri>
+    </author>
+  </entry>
+</feed>

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

@@ -1,24 +1,24 @@
-HTTP/1.1 200 OK
-Expires: Mon, 05 Dec 2011 20:17:24 GMT
-Date: Mon, 05 Dec 2011 20:17:24 GMT
-Cache-Control: private, max-age=0, must-revalidate, no-transform
-Set-Cookie: _rtok=seW2VfBeMWcR; Path=/; Secure; HttpOnly
-Set-Cookie: S=photos_html=p8GDlXoFVlE58t0I2YhTkA; 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/"CUUGRXc9cCp7ImA9WhRQEUw."
-Last-Modified: Mon, 05 Dec 2011 19:27:04 GMT
-X-Content-Type-Options: nosniff
-X-Frame-Options: SAMEORIGIN
-X-XSS-Protection: 1; mode=block
-Server: GSE
-Transfer-Encoding: chunked
-
+HTTP/1.1 200 OK
+Expires: Fri, 24 Aug 2012 16:49:12 GMT
+Date: Fri, 24 Aug 2012 16:49:12 GMT
+Cache-Control: private, max-age=0, must-revalidate, no-transform
+Set-Cookie: _rtok=K94BmWQbwPpS; Path=/; Secure; HttpOnly
+Set-Cookie: S=photos_html=HoT1z5c0-FHu3mvDkW-BiA; 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/"CE8GRXczfip7ImA9WhJWEUQ."
+Last-Modified: Fri, 17 Aug 2012 08:40:24 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: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;CUUGRXc9cCp7ImA9WhRQEUw.&quot;'>
+<feed xmlns='http://www.w3.org/2005/Atom' 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;CE8GRXczfip7ImA9WhJWEUQ.&quot;'>
 	<id>https://picasaweb.google.com/data/feed/user/106136347770555028022</id>
-	<updated>2011-12-05T19:27:04.968Z</updated>
+	<updated>2012-08-17T08:40:24.986Z</updated>
 	<category scheme='http://schemas.google.com/g/2005#kind' term='http://schemas.google.com/photos/2007#user'/>
 	<title>106136347770555028022</title>
 	<subtitle/>
@@ -38,22 +38,9 @@ Transfer-Encoding: chunked
 	<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>
-	<entry gd:etag='W/&quot;CUUGRXc9cCp7ImA9WhRQEUw.&quot;'>
-		<id>https://picasaweb.google.com/data/entry/user/106136347770555028022/tag/ziemniaki</id>
-		<updated>2011-12-05T19:27:04.968Z</updated>
-		<category scheme='http://schemas.google.com/g/2005#kind' term='http://schemas.google.com/photos/2007#tag'/>
-		<title>ziemniaki</title>
-		<summary>ziemniaki</summary>
-		<link rel='alternate' type='text/html' href='https://picasaweb.google.com/lh/searchbrowse?q=ziemniaki&amp;psc=G&amp;uname=106136347770555028022&amp;filter=0'/>
-		<link rel='self' type='application/atom+xml' href='https://picasaweb.google.com/data/entry/api/user/106136347770555028022/tag/ziemniaki'/>
-		<author>
-			<name>Wojciech Wnętrzak</name>
-			<uri>https://picasaweb.google.com/106136347770555028022</uri>
-		</author>
-	</entry>
-	<entry gd:etag='W/&quot;CUUGRXc9cCp7ImA9WhRQEUw.&quot;'>
+	<entry gd:etag='W/&quot;CE8GRXczfip7ImA9WhJWEUQ.&quot;'>
 		<id>https://picasaweb.google.com/data/entry/user/106136347770555028022/tag/nice</id>
-		<updated>2011-12-05T19:27:04.968Z</updated>
+		<updated>2012-08-17T08:40:24.986Z</updated>
 		<category scheme='http://schemas.google.com/g/2005#kind' term='http://schemas.google.com/photos/2007#tag'/>
 		<title>nice</title>
 		<summary>nice</summary>
@@ -65,4 +52,17 @@ Transfer-Encoding: chunked
 		</author>
 		<gphoto:weight>2</gphoto:weight>
 	</entry>
-</feed>
+	<entry gd:etag='W/&quot;CE8GRXczfip7ImA9WhJWEUQ.&quot;'>
+		<id>https://picasaweb.google.com/data/entry/user/106136347770555028022/tag/ziemniaki</id>
+		<updated>2012-08-17T08:40:24.986Z</updated>
+		<category scheme='http://schemas.google.com/g/2005#kind' term='http://schemas.google.com/photos/2007#tag'/>
+		<title>ziemniaki</title>
+		<summary>ziemniaki</summary>
+		<link rel='alternate' type='text/html' href='https://picasaweb.google.com/lh/searchbrowse?q=ziemniaki&amp;psc=G&amp;uname=106136347770555028022&amp;filter=0'/>
+		<link rel='self' type='application/atom+xml' href='https://picasaweb.google.com/data/entry/api/user/106136347770555028022/tag/ziemniaki'/>
+		<author>
+			<name>Wojciech Wnętrzak</name>
+			<uri>https://picasaweb.google.com/106136347770555028022</uri>
+		</author>
+	</entry>
+</feed>

data/test/presenter/base_test.rb

@@ -1,27 +1,50 @@
 # -*- encoding: utf-8 -*-
 require "helper"
 
-class TestPresenter < Picasa::Presenter::Base
-  def body
-    parsed_body[:body]
+class TestAttributePresenter < Picasa::Presenter::Base
+  def attribute
+    parsed_body[:attribute]
   end
+end
 
-  def nil_value
+class TestNilAttributePresenter < Picasa::Presenter::Base
+  def nil_attribute
     nil
   end
 end
 
+class TestEntriesAliasPresenter < Picasa::Presenter::Base
+  def entries
+    ["entries"]
+  end
+  alias :elements :entries
+end
+
 describe Picasa::Presenter::Base do
-  before do
-    @presenter = TestPresenter.new({:body => "presented body"})
+  it "has attribute" do
+    presenter = TestAttributePresenter.new({:attribute => "presented body"})
+
+    assert_equal presenter.parsed_body, {:attribute => "presented body"}
   end
 
-  it "has parsed_body" do
-    assert_equal @presenter.parsed_body, {:body => "presented body"}
+  it "has inspect with class name and defined attribute" do
+    presenter = TestAttributePresenter.new({:attribute => "presented body"})
+    expected = %q{#<TestAttributePresenter attribute: "presented body">}
+
+    assert_equal expected, presenter.inspect
   end
 
-  it "has inspect with class name and defined methods" do
-    expected = %q{#<TestPresenter body: "presented body", nil_value: nil>}
-    assert_equal expected, @presenter.inspect
+  it "has inspect with nil attribute" do
+    presenter = TestNilAttributePresenter.new({:attribute => "presented body"})
+    expected = %q{#<TestNilAttributePresenter nil_attribute: nil>}
+
+    assert_equal expected, presenter.inspect
+  end
+
+  it "has aliased method to entries" do
+    presenter = TestEntriesAliasPresenter.new({:attribute => "presented body"})
+    expected = %q{#<TestEntriesAliasPresenter elements: ["entries"]>}
+
+    assert_equal expected, presenter.inspect
   end
 end

data/test/presenter/tag_list_test.rb

@@ -0,0 +1,67 @@
+# -*- encoding: utf-8 -*-
+require "helper"
+
+describe Picasa::Presenter::TagList do
+  before do
+    body = MultiXml.parse(fixture("presenters/tag_list.xml"))
+    @tag_list = Picasa::Presenter::TagList.new(body["feed"])
+  end
+
+  it "has author name" do
+    assert_equal "Wojciech Wnętrzak", @tag_list.author.name
+  end
+
+  it "has author uri" do
+    assert_equal "https://picasaweb.google.com/106136347770555028022", @tag_list.author.uri
+  end
+
+  it "has links" do
+    assert_equal 4, @tag_list.links.size
+  end
+
+  it "has title" do
+    assert_equal "106136347770555028022", @tag_list.title
+  end
+
+  it "has updated" do
+    assert_equal "2012-08-17T08:40:24+00:00", @tag_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, @tag_list.icon
+  end
+
+  it "has generator" do
+    assert_equal "Picasaweb", @tag_list.generator
+  end
+
+  it "has total_results" do
+    assert_equal 2, @tag_list.total_results
+  end
+
+  it "has start_index" do
+    assert_equal 1, @tag_list.start_index
+  end
+
+  it "has items_per_page" do
+    assert_equal 500, @tag_list.items_per_page
+  end
+
+  it "has user" do
+    assert_equal "106136347770555028022", @tag_list.user
+  end
+
+  it "has nickname" do
+    assert_equal "Wojciech Wnętrzak", @tag_list.nickname
+  end
+
+  it "has thumbnail" do
+    expected = "https://lh3.googleusercontent.com/-6ezHc54U8x0/AAAAAAAAAAI/AAAAAAAAAAA/PBuxm7Ehn6E/s64-c/106136347770555028022.jpg"
+    assert_equal expected, @tag_list.thumbnail
+  end
+
+  it "has entries" do
+    assert_equal 2, @tag_list.entries.size
+  end
+end

data/test/presenter/tag_test.rb

@@ -0,0 +1,44 @@
+# -*- encoding: utf-8 -*-
+require "helper"
+
+describe Picasa::Presenter::Tag do
+  describe "album from album list" do
+    before do
+      body = MultiXml.parse(fixture("presenters/tag_list.xml"))
+      @tag = Picasa::Presenter::Tag.new(body["feed"]["entry"][0])
+    end
+
+    it "has author name" do
+      assert_equal "Wojciech Wnętrzak", @tag.author.name
+    end
+
+    it "has author uri" do
+      assert_equal "https://picasaweb.google.com/106136347770555028022", @tag.author.uri
+    end
+
+    it "has links" do
+      assert_equal 2, @tag.links.size
+    end
+
+    it "has updated" do
+      assert_equal "2012-08-17T08:40:24+00:00", @tag.updated.to_s
+    end
+
+    it "has title" do
+      assert_equal "nice", @tag.title
+    end
+
+    it "has summary" do
+      assert_equal "nice", @tag.summary
+    end
+
+    it "has id" do
+      expected = "https://picasaweb.google.com/data/entry/user/106136347770555028022/tag/nice"
+      assert_equal expected, @tag.id
+    end
+
+    it "has weight" do
+      assert_equal 2, @tag.weight
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: picasa
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-23 00:00:00.000000000 Z
+date: 2012-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_xml
@@ -74,6 +74,7 @@ files:
 - Rakefile
 - lib/picasa.rb
 - lib/picasa/api/album.rb
+- lib/picasa/api/tag.rb
 - lib/picasa/client.rb
 - lib/picasa/connection.rb
 - lib/picasa/exceptions.rb
@@ -85,11 +86,14 @@ files:
 - lib/picasa/presenter/link.rb
 - lib/picasa/presenter/media.rb
 - lib/picasa/presenter/photo.rb
+- lib/picasa/presenter/tag.rb
+- lib/picasa/presenter/tag_list.rb
 - lib/picasa/presenter/thumbnail.rb
 - lib/picasa/utils.rb
 - lib/picasa/version.rb
 - picasa.gemspec
 - test/api/album_test.rb
+- test/api/tag_test.rb
 - test/client_test.rb
 - test/connection_test.rb
 - test/fixtures/album/album-list-with-tag.txt
@@ -101,14 +105,14 @@ files:
 - test/fixtures/auth/failure.txt
 - test/fixtures/auth/success.txt
 - test/fixtures/json.txt
+- test/fixtures/not_found.txt
 - test/fixtures/photo/photo-list-all-with-q.txt
 - test/fixtures/photo/photo-list-all.txt
 - test/fixtures/photo/photo-list-user.txt
 - test/fixtures/presenters/album_list.xml
 - test/fixtures/presenters/album_show.xml
 - test/fixtures/presenters/album_show_with_one_photo.xml
-- test/fixtures/tag/tag-list-album.txt
-- test/fixtures/tag/tag-list-photo.txt
+- test/fixtures/presenters/tag_list.xml
 - test/fixtures/tag/tag-list.txt
 - test/helper.rb
 - test/presenter/album_list_test.rb
@@ -119,6 +123,8 @@ files:
 - test/presenter/link_test.rb
 - test/presenter/media_test.rb
 - test/presenter/photo_test.rb
+- test/presenter/tag_list_test.rb
+- test/presenter/tag_test.rb
 - test/presenter/thumbnail_test.rb
 - test/utils_test.rb
 homepage: https://github.com/morgoth/picasa

data/test/fixtures/tag/tag-list-album.txt

@@ -1,77 +0,0 @@
-HTTP/1.1 200 OK
-Expires: Fri, 16 Dec 2011 21:30:40 GMT
-Date: Fri, 16 Dec 2011 21:30:40 GMT
-Cache-Control: private, max-age=0, must-revalidate, no-transform
-Set-Cookie: _rtok=m86aNMszMxZo; Path=/; Secure; HttpOnly
-Set-Cookie: S=photos_html=cb2m9-vV3-J0tLmmzMNNeQ; 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/"Ck8FRH04fCp7ImA9WhRXEEo."
-Last-Modified: Fri, 16 Dec 2011 21:26:55 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: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;Ck8FRH04fCp7ImA9WhRXEEo.&quot;'>
-	<id>https://picasaweb.google.com/data/feed/user/106136347770555028022/albumid/5243667126168669553</id>
-	<updated>2011-12-16T21:26:55.334Z</updated>
-	<category scheme='http://schemas.google.com/g/2005#kind' term='http://schemas.google.com/photos/2007#album'/>
-	<title>test2</title>
-	<subtitle/>
-	<rights>public</rights>
-	<icon>https://lh6.googleusercontent.com/-u_2FJXbbliU/SMU_eBetTXE/AAAAAAAAAmQ/sMUp4PrT-Qg/s160-c/Test2.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/albumid/5243667126168669553'/>
-	<link rel='alternate' type='text/html' href='https://picasaweb.google.com/106136347770555028022/Test2'/>
-	<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%2Falbumid%2F5243667126168669553%3Falt%3Drss'/>
-	<link rel='http://schemas.google.com/photos/2007#report' type='text/html' href='https://picasaweb.google.com/lh/reportAbuse?uname=106136347770555028022&amp;aid=5243667126168669553'/>
-	<link rel='self' type='application/atom+xml' href='https://picasaweb.google.com/data/feed/api/user/106136347770555028022/albumid/5243667126168669553?start-index=1&amp;max-results=500&amp;kind=tag'/>
-	<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>2</openSearch:totalResults>
-	<openSearch:startIndex>1</openSearch:startIndex>
-	<openSearch:itemsPerPage>500</openSearch:itemsPerPage>
-	<gphoto:id>5243667126168669553</gphoto:id>
-	<gphoto:name>Test2</gphoto:name>
-	<gphoto:location/>
-	<gphoto:access>public</gphoto:access>
-	<gphoto:timestamp>1220857200000</gphoto:timestamp>
-	<gphoto:numphotos>4</gphoto:numphotos>
-	<gphoto:user>106136347770555028022</gphoto:user>
-	<gphoto:nickname>Wojciech Wnętrzak</gphoto:nickname>
-	<gphoto:allowPrints>true</gphoto:allowPrints>
-	<gphoto:allowDownloads>true</gphoto:allowDownloads>
-	<entry gd:etag='W/&quot;Ck8FRH04fCp7ImA9WhRXEEo.&quot;'>
-		<id>https://picasaweb.google.com/data/entry/user/106136347770555028022/albumid/5243667126168669553/tag/nice</id>
-		<updated>2011-12-16T21:26:55.334Z</updated>
-		<category scheme='http://schemas.google.com/g/2005#kind' term='http://schemas.google.com/photos/2007#tag'/>
-		<title>nice</title>
-		<summary>nice</summary>
-		<link rel='alternate' type='text/html' href='https://picasaweb.google.com/lh/searchbrowse?q=nice&amp;psc=G&amp;uname=106136347770555028022&amp;filter=0'/>
-		<link rel='self' type='application/atom+xml' href='https://picasaweb.google.com/data/entry/api/user/106136347770555028022/albumid/5243667126168669553/tag/nice'/>
-		<author>
-			<name>Wojciech Wnętrzak</name>
-			<uri>https://picasaweb.google.com/106136347770555028022</uri>
-		</author>
-		<gphoto:weight>2</gphoto:weight>
-	</entry>
-	<entry gd:etag='W/&quot;Ck8FRH04fCp7ImA9WhRXEEo.&quot;'>
-		<id>https://picasaweb.google.com/data/entry/user/106136347770555028022/albumid/5243667126168669553/tag/ziemniaki</id>
-		<updated>2011-12-16T21:26:55.334Z</updated>
-		<category scheme='http://schemas.google.com/g/2005#kind' term='http://schemas.google.com/photos/2007#tag'/>
-		<title>ziemniaki</title>
-		<summary>ziemniaki</summary>
-		<link rel='alternate' type='text/html' href='https://picasaweb.google.com/lh/searchbrowse?q=ziemniaki&amp;psc=G&amp;uname=106136347770555028022&amp;filter=0'/>
-		<link rel='self' type='application/atom+xml' href='https://picasaweb.google.com/data/entry/api/user/106136347770555028022/albumid/5243667126168669553/tag/ziemniaki'/>
-		<author>
-			<name>Wojciech Wnętrzak</name>
-			<uri>https://picasaweb.google.com/106136347770555028022</uri>
-		</author>
-	</entry>
-</feed>

data/test/fixtures/tag/tag-list-photo.txt

@@ -1,72 +0,0 @@
-HTTP/1.1 200 OK
-Expires: Fri, 16 Dec 2011 21:33:47 GMT
-Date: Fri, 16 Dec 2011 21:33:47 GMT
-Cache-Control: private, max-age=0, must-revalidate, no-transform
-Set-Cookie: _rtok=FmHRbgk4VV6P; Path=/; Secure; HttpOnly
-Set-Cookie: S=photos_html=cae0NlLGoySoeaqWcgY1pg; 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/"Ck8FRH04fCp7ImA9WhRXEEo."
-Last-Modified: Fri, 16 Dec 2011 21:26:55 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:exif='http://schemas.google.com/photos/exif/2007' xmlns:gphoto='http://schemas.google.com/photos/2007' xmlns:media='http://search.yahoo.com/mrss/' xmlns:openSearch='http://a9.com/-/spec/opensearch/1.1/' xmlns:gd='http://schemas.google.com/g/2005' gd:etag='W/&quot;Ck8FRH04fCp7ImA9WhRXEEo.&quot;'>
-	<id>https://picasaweb.google.com/data/feed/user/106136347770555028022/albumid/5243667126168669553/photoid/5634470303146876834</id>
-	<updated>2011-12-16T21:26:55.334Z</updated>
-	<category scheme='http://schemas.google.com/g/2005#kind' term='http://schemas.google.com/photos/2007#photo'/>
-	<title>pink_floyd_ladies.jpg</title>
-	<subtitle/>
-	<icon>https://lh3.googleusercontent.com/-k2SAcZgBGQc/TjGo41SOn6I/AAAAAAAAAmQ/JsDZRk0qL7E/s288/pink_floyd_ladies.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/albumid/5243667126168669553/photoid/5634470303146876834'/>
-	<link rel='alternate' type='text/html' href='https://picasaweb.google.com/lh/photo/gipEdejdx4mYdBP57zti6dMTjNZETYmyPJy0liipFm0'/>
-	<link rel='self' type='application/atom+xml' href='https://picasaweb.google.com/data/feed/api/user/106136347770555028022/albumid/5243667126168669553/photoid/5634470303146876834?start-index=1&amp;max-results=500&amp;kind=tag'/>
-	<generator version='1.00' uri='http://picasaweb.google.com/'>Picasaweb</generator>
-	<openSearch:totalResults>1</openSearch:totalResults>
-	<openSearch:startIndex>1</openSearch:startIndex>
-	<openSearch:itemsPerPage>500</openSearch:itemsPerPage>
-	<gphoto:id>5634470303146876834</gphoto:id>
-	<gphoto:albumid>5243667126168669553</gphoto:albumid>
-	<gphoto:access>public</gphoto:access>
-	<gphoto:width>1024</gphoto:width>
-	<gphoto:height>768</gphoto:height>
-	<gphoto:size>140724</gphoto:size>
-	<gphoto:checksum/>
-	<gphoto:timestamp>1311877347000</gphoto:timestamp>
-	<gphoto:imageVersion>612</gphoto:imageVersion>
-	<gphoto:commentingEnabled>true</gphoto:commentingEnabled>
-	<gphoto:commentCount>0</gphoto:commentCount>
-	<gphoto:license id='0' name='All Rights Reserved' url=''>ALL_RIGHTS_RESERVED</gphoto:license>
-	<gphoto:viewCount>11</gphoto:viewCount>
-	<exif:tags>
-		<exif:imageUniqueID>26875afdfa1eb82ab62d6ef7ccea95ab</exif:imageUniqueID>
-	</exif:tags>
-	<media:group>
-		<media:content url='https://lh3.googleusercontent.com/-k2SAcZgBGQc/TjGo41SOn6I/AAAAAAAAAmQ/JsDZRk0qL7E/pink_floyd_ladies.jpg' height='768' width='1024' type='image/jpeg' medium='image'/>
-		<media:credit>Wojciech Wnętrzak</media:credit>
-		<media:description type='plain'/>
-		<media:keywords>nice</media:keywords>
-		<media:thumbnail url='https://lh3.googleusercontent.com/-k2SAcZgBGQc/TjGo41SOn6I/AAAAAAAAAmQ/JsDZRk0qL7E/s72/pink_floyd_ladies.jpg' height='54' width='72'/>
-		<media:thumbnail url='https://lh3.googleusercontent.com/-k2SAcZgBGQc/TjGo41SOn6I/AAAAAAAAAmQ/JsDZRk0qL7E/s144/pink_floyd_ladies.jpg' height='108' width='144'/>
-		<media:thumbnail url='https://lh3.googleusercontent.com/-k2SAcZgBGQc/TjGo41SOn6I/AAAAAAAAAmQ/JsDZRk0qL7E/s288/pink_floyd_ladies.jpg' height='216' width='288'/>
-		<media:title type='plain'>pink_floyd_ladies.jpg</media:title>
-	</media:group>
-	<entry gd:etag='W/&quot;Ck8FRH04fCp7ImA9WhRXEEo.&quot;'>
-		<id>https://picasaweb.google.com/data/entry/user/106136347770555028022/albumid/5243667126168669553/photoid/5634470303146876834/tag/nice</id>
-		<updated>2011-12-16T21:26:55.334Z</updated>
-		<category scheme='http://schemas.google.com/g/2005#kind' term='http://schemas.google.com/photos/2007#tag'/>
-		<title>nice</title>
-		<summary>nice</summary>
-		<link rel='alternate' type='text/html' href='https://picasaweb.google.com/lh/searchbrowse?q=nice&amp;psc=G&amp;uname=106136347770555028022&amp;filter=0'/>
-		<link rel='self' type='application/atom+xml' href='https://picasaweb.google.com/data/entry/api/user/106136347770555028022/albumid/5243667126168669553/photoid/5634470303146876834/tag/nice'/>
-		<author>
-			<name>Wojciech Wnętrzak</name>
-			<uri>https://picasaweb.google.com/106136347770555028022</uri>
-		</author>
-	</entry>
-</feed>