picasa 0.5.4 → 0.6.0

data/lib/picasa/presenter/album.rb

@@ -5,23 +5,23 @@ module Picasa
     class Album < Base
       # @return [Presenter::Author]
       def author
-        @author ||= Author.new(safe_retrieve(parsed_body, "author"))
+        @author ||= Author.new(parsed_body["author"][0])
       end
 
       # @return [Array<Presenter::Photo>]
       def entries
-        @entries ||= array_wrap(safe_retrieve(parsed_body, "entry")).map { |photo| Photo.new(photo) }
+        @entries ||= safe_retrieve(parsed_body, "entry").map { |photo| Photo.new(photo) }
       end
       alias :photos :entries
 
       # @return [Array<Presenter::Link>]
       def links
-        @links ||= array_wrap(safe_retrieve(parsed_body, "link")).map { |link| Link.new(link) }
+        @links ||= safe_retrieve(parsed_body, "link").map { |link| Link.new(link) }
       end
 
       # @return [Presenter::Media]
       def media
-        @media ||= Media.new(safe_retrieve(parsed_body, "group"))
+        @media ||= Media.new(safe_retrieve(parsed_body, "media$group"))
       end
 
       # @return [DateTime]
@@ -36,7 +36,7 @@ module Picasa
 
       # @return [String]
       def etag
-        @etag ||= safe_retrieve(parsed_body, "etag")
+        @etag ||= safe_retrieve(parsed_body, "gd$etag")
       end
 
       # @return [String]
@@ -56,52 +56,52 @@ module Picasa
 
       # @return [String]
       def id
-        @id ||= array_wrap(safe_retrieve(parsed_body, "id")).last
+        @id ||= safe_retrieve(parsed_body, "gphoto$id")
       end
 
       # @return [String]
       def name
-        @name ||= safe_retrieve(parsed_body, "name")
+        @name ||= safe_retrieve(parsed_body, "gphoto$name")
       end
 
       # @return [String]
       def location
-        @location ||= safe_retrieve(parsed_body, "location")
+        @location ||= safe_retrieve(parsed_body, "gphoto$location")
       end
 
       # @return [String]
       def access
-        @access ||= safe_retrieve(parsed_body, "access")
+        @access ||= safe_retrieve(parsed_body, "gphoto$access")
       end
 
       # @return [String]
       def timestamp
-        @timestamp ||= safe_retrieve(parsed_body, "timestamp")
+        @timestamp ||= safe_retrieve(parsed_body, "gphoto$timestamp")
       end
 
       # @return [String]
       def numphotos
-        @numphotos ||= map_to_integer(safe_retrieve(parsed_body, "numphotos"))
+        @numphotos ||= map_to_integer(safe_retrieve(parsed_body, "gphoto$numphotos"))
       end
 
       # @return [String]
       def user
-        @user ||= safe_retrieve(parsed_body, "user")
+        @user ||= safe_retrieve(parsed_body, "gphoto$user")
       end
 
       # @return [String]
       def nickname
-        @nickname ||= safe_retrieve(parsed_body, "nickname")
+        @nickname ||= safe_retrieve(parsed_body, "gphoto$nickname")
       end
 
       # @return [true, false, nil]
       def allow_prints
-        @allow_prints ||= map_to_boolean(safe_retrieve(parsed_body, "allowPrints"))
+        @allow_prints ||= map_to_boolean(safe_retrieve(parsed_body, "gphoto$allowPrints"))
       end
 
       # @return [true, false, nil]
       def allow_downloads
-        @allow_downloads ||= map_to_boolean(safe_retrieve(parsed_body, "allowDownloads"))
+        @allow_downloads ||= map_to_boolean(safe_retrieve(parsed_body, "gphoto$allowDownloads"))
       end
     end
   end

data/lib/picasa/presenter/album_list.rb

@@ -5,18 +5,18 @@ module Picasa
     class AlbumList < Base
       # @return [Presenter::Author]
       def author
-        @author ||= Author.new(safe_retrieve(parsed_body, "author"))
+        @author ||= Author.new(parsed_body["author"][0])
       end
 
       # @return [Array<Presenter::Album>]
       def entries
-        @entries ||= array_wrap(safe_retrieve(parsed_body, "entry")).map { |entry| Album.new(entry) }
+        @entries ||= safe_retrieve(parsed_body, "entry").map { |entry| Album.new(entry) }
       end
       alias :albums :entries
 
       # @return [Array<Presenter::Link>]
       def links
-        @links ||= array_wrap(safe_retrieve(parsed_body, "link")).map { |link| Link.new(link) }
+        @links ||= safe_retrieve(parsed_body, "link").map { |link| Link.new(link) }
       end
 
       # @return [String]
@@ -36,37 +36,37 @@ module Picasa
 
       # @return [String]
       def generator
-        @generator ||= safe_retrieve(parsed_body, "generator", "__content__")
+        @generator ||= safe_retrieve(parsed_body, "generator", "$t")
       end
 
       # @return [Integer]
       def total_results
-        @total_results ||= map_to_integer(safe_retrieve(parsed_body, "totalResults"))
+        @total_results ||= map_to_integer(safe_retrieve(parsed_body, "openSearch$totalResults"))
       end
 
       # @return [Integer]
       def start_index
-        @start_index ||= map_to_integer(safe_retrieve(parsed_body, "startIndex"))
+        @start_index ||= map_to_integer(safe_retrieve(parsed_body, "openSearch$startIndex"))
       end
 
       # @return [Integer]
       def items_per_page
-        @items_per_page ||= map_to_integer(safe_retrieve(parsed_body, "itemsPerPage"))
+        @items_per_page ||= map_to_integer(safe_retrieve(parsed_body, "openSearch$itemsPerPage"))
       end
 
       # @return [String]
       def user
-        @user ||= safe_retrieve(parsed_body, "user")
+        @user ||= safe_retrieve(parsed_body, "gphoto$user")
       end
 
       # @return [String]
       def nickname
-        @nickname ||= safe_retrieve(parsed_body, "nickname")
+        @nickname ||= safe_retrieve(parsed_body, "gphoto$nickname")
       end
 
       # @return [String]
       def thumbnail
-        @thumbnail ||= safe_retrieve(parsed_body, "thumbnail")
+        @thumbnail ||= safe_retrieve(parsed_body, "gphoto$thumbnail")
       end
     end
   end

data/lib/picasa/presenter/comment.rb

@@ -5,12 +5,12 @@ module Picasa
     class Comment < Base
       # @return [Presenter::Author]
       def author
-        @author ||= Author.new(safe_retrieve(parsed_body, "author"))
+        @author ||= Author.new(parsed_body["author"][0])
       end
 
       # @return [Array<Presenter::Link>]
       def links
-        @links ||= array_wrap(safe_retrieve(parsed_body, "link")).map { |link| Link.new(link) }
+        @links ||= safe_retrieve(parsed_body, "link").map { |link| Link.new(link) }
       end
 
       # @return [DateTime]
@@ -35,22 +35,22 @@ module Picasa
 
       # @return [String]
       def etag
-        @etag ||= safe_retrieve(parsed_body, "etag")
+        @etag ||= safe_retrieve(parsed_body, "gd$etag")
       end
 
       # @return [String]
       def content
-        @content ||= safe_retrieve(parsed_body, "content", "__content__") || safe_retrieve(parsed_body, "content")
+        @content ||= safe_retrieve(parsed_body, "content", "$t")
       end
 
       # @return [String]
       def id
-        @id ||= array_wrap(safe_retrieve(parsed_body, "id")).last
+        @id ||= safe_retrieve(parsed_body, "gphoto$id")
       end
 
       # @return [String]
       def photo_id
-        @photo_id ||= safe_retrieve(parsed_body, "photoid")
+        @photo_id ||= safe_retrieve(parsed_body, "gphoto$photoid")
       end
     end
   end

data/lib/picasa/presenter/comment_list.rb

@@ -5,18 +5,18 @@ module Picasa
     class CommentList < Base
       # @return [Presenter::Author]
       def author
-        @author ||= Author.new(safe_retrieve(parsed_body, "author"))
+        @author ||= Author.new(parsed_body["author"][0])
       end
 
       # @return [Array<Presenter::Comment>]
       def entries
-        @entries ||= array_wrap(safe_retrieve(parsed_body, "entry")).map { |entry| Comment.new(entry) }
+        @entries ||= 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) }
+        @links ||= safe_retrieve(parsed_body, "link").map { |link| Link.new(link) }
       end
 
       # @return [String]
@@ -36,37 +36,37 @@ module Picasa
 
       # @return [String]
       def generator
-        @generator ||= safe_retrieve(parsed_body, "generator", "__content__")
+        @generator ||= safe_retrieve(parsed_body, "generator", "$t")
       end
 
       # @return [Integer]
       def total_results
-        @total_results ||= map_to_integer(safe_retrieve(parsed_body, "totalResults"))
+        @total_results ||= map_to_integer(safe_retrieve(parsed_body, "openSearch$totalResults"))
       end
 
       # @return [Integer]
       def start_index
-        @start_index ||= map_to_integer(safe_retrieve(parsed_body, "startIndex"))
+        @start_index ||= map_to_integer(safe_retrieve(parsed_body, "openSearch$startIndex"))
       end
 
       # @return [Integer]
       def items_per_page
-        @items_per_page ||= map_to_integer(safe_retrieve(parsed_body, "itemsPerPage"))
+        @items_per_page ||= map_to_integer(safe_retrieve(parsed_body, "openSearch$itemsPerPage"))
       end
 
       # @return [String]
       def user
-        @user ||= safe_retrieve(parsed_body, "user")
+        @user ||= safe_retrieve(parsed_body, "gphoto$user")
       end
 
       # @return [String]
       def nickname
-        @nickname ||= safe_retrieve(parsed_body, "nickname")
+        @nickname ||= safe_retrieve(parsed_body, "gphoto$nickname")
       end
 
       # @return [String]
       def thumbnail
-        @thumbnail ||= safe_retrieve(parsed_body, "thumbnail")
+        @thumbnail ||= safe_retrieve(parsed_body, "gphoto$thumbnail")
       end
     end
   end

data/lib/picasa/presenter/media.rb

@@ -5,27 +5,27 @@ module Picasa
     class Media < Base
       # @return [Array<Presenter::Thumbnail>]
       def thumbnails
-        @thumbnails ||= array_wrap(safe_retrieve(parsed_body, "thumbnail")).map { |thumbnail| Thumbnail.new(thumbnail) }
+        @thumbnails ||= safe_retrieve(parsed_body, "media$thumbnail").map { |thumbnail| Thumbnail.new(thumbnail) }
       end
 
       # @return [String]
       def credit
-        @credit ||= safe_retrieve(parsed_body, "credit")
+        @credit ||= parsed_body["media$credit"][0]["$t"]
       end
 
       # @return [String]
       def description
-        @description ||= safe_retrieve(parsed_body, "description")
+        @description ||= safe_retrieve(parsed_body, "media$description", "$t")
       end
 
       # @return [String]
       def keywords
-        @keywords ||= safe_retrieve(parsed_body, "keywords")
+        @keywords ||= safe_retrieve(parsed_body, "media$keywords", "$t")
       end
 
       # @return [String]
       def title
-        @title ||= safe_retrieve(parsed_body, "title", "__content__")
+        @title ||= safe_retrieve(parsed_body, "media$title", "$t")
       end
     end
   end

data/lib/picasa/presenter/photo.rb

@@ -5,12 +5,12 @@ module Picasa
     class Photo < Base
       # @return [Array<Presenter::Link>]
       def links
-        @links ||= array_wrap(safe_retrieve(parsed_body, "link")).map { |link| Link.new(link) }
+        @links ||= safe_retrieve(parsed_body, "link").map { |link| Link.new(link) }
       end
 
       # @return [Presenter::Media]
       def media
-        @media ||= Media.new(safe_retrieve(parsed_body, "group"))
+        @media ||= Media.new(safe_retrieve(parsed_body, "media$group"))
       end
 
       # @return [Presenter::Content]
@@ -20,12 +20,12 @@ module Picasa
 
       # @return [String]
       def id
-        @id ||= array_wrap(safe_retrieve(parsed_body, "id")).last
+        @id ||= safe_retrieve(parsed_body, "gphoto$id").last
       end
 
       # @return [String]
       def etag
-        @etag ||= safe_retrieve(parsed_body, "etag")
+        @etag ||= safe_retrieve(parsed_body, "gd$etag")
       end
 
       # @return [DateTime]
@@ -50,57 +50,57 @@ module Picasa
 
       # @return [String]
       def album_id
-        @album_id ||= safe_retrieve(parsed_body, "albumid")
+        @album_id ||= safe_retrieve(parsed_body, "gphoto$albumid")
       end
 
       # @return [String]
       def access
-        @access ||= safe_retrieve(parsed_body, "access")
+        @access ||= safe_retrieve(parsed_body, "gphoto$access")
       end
 
       # @return [Integer]
       def width
-        @width ||= map_to_integer(safe_retrieve(parsed_body, "width"))
+        @width ||= map_to_integer(safe_retrieve(parsed_body, "gphoto$width"))
       end
 
       # @return [Integer]
       def height
-        @height ||= map_to_integer(safe_retrieve(parsed_body, "height"))
+        @height ||= map_to_integer(safe_retrieve(parsed_body, "gphoto$height"))
       end
 
       # @return [Integer]
       def size
-        @size ||= map_to_integer(safe_retrieve(parsed_body, "size"))
+        @size ||= map_to_integer(safe_retrieve(parsed_body, "gphoto$size"))
       end
 
       # @return [String]
       def checksum
-        @checksum ||= safe_retrieve(parsed_body, "checksum")
+        @checksum ||= safe_retrieve(parsed_body, "gphoto$checksum")
       end
 
       # @return [String]
       def timestamp
-        @timestamp ||= safe_retrieve(parsed_body, "timestamp")
+        @timestamp ||= safe_retrieve(parsed_body, "gphoto$timestamp")
       end
 
       # @return [Integer]
       def image_version
-        @image_version ||= map_to_integer(safe_retrieve(parsed_body, "imageVersion"))
+        @image_version ||= map_to_integer(safe_retrieve(parsed_body, "gphoto$imageVersion"))
       end
 
       # @return [true, false, nil]
       def commenting_enabled
-        @commenting_enabled ||= map_to_boolean(safe_retrieve(parsed_body, "commentingEnabled"))
+        @commenting_enabled ||= map_to_boolean(safe_retrieve(parsed_body, "gphoto$commentingEnabled"))
       end
 
       # @return [Integer]
       def comment_count
-        @comment_count ||= map_to_integer(safe_retrieve(parsed_body, "commentCount"))
+        @comment_count ||= map_to_integer(safe_retrieve(parsed_body, "gphoto$commentCount"))
       end
 
       # @return [String]
       def license
-        @license ||= safe_retrieve(parsed_body, "license", "__content__")
+        @license ||= safe_retrieve(parsed_body, "gphoto$license", "name")
       end
     end
   end

data/lib/picasa/presenter/tag.rb

@@ -5,12 +5,12 @@ module Picasa
     class Tag < Base
       # @return [Presenter::Author]
       def author
-        @author ||= Author.new(safe_retrieve(parsed_body, "author"))
+        @author ||= Author.new(parsed_body["author"][0])
       end
 
       # @return [Array<Presenter::Link>]
       def links
-        @links ||= array_wrap(safe_retrieve(parsed_body, "link")).map { |link| Link.new(link) }
+        @links ||= safe_retrieve(parsed_body, "link").map { |link| Link.new(link) }
       end
 
       # @return [DateTime]
@@ -25,7 +25,7 @@ module Picasa
 
       # @return [String]
       def etag
-        @etag ||= safe_retrieve(parsed_body, "etag")
+        @etag ||= safe_retrieve(parsed_body, "gd$etag")
       end
 
       # @return [String]

data/lib/picasa/presenter/tag_list.rb

@@ -5,18 +5,18 @@ module Picasa
     class TagList < Base
       # @return [Presenter::Author]
       def author
-        @author ||= Author.new(safe_retrieve(parsed_body, "author"))
+        @author ||= Author.new(parsed_body["author"][0])
       end
 
       # @return [Array<Presenter::Tag>]
       def entries
-        @entries ||= array_wrap(safe_retrieve(parsed_body, "entry")).map { |entry| Tag.new(entry) }
+        @entries ||= safe_retrieve(parsed_body, "entry").map { |entry| Tag.new(entry) }
       end
       alias :tags :entries
 
       # @return [Array<Presenter::Link>]
       def links
-        @links ||= array_wrap(safe_retrieve(parsed_body, "link")).map { |link| Link.new(link) }
+        @links ||= safe_retrieve(parsed_body, "link").map { |link| Link.new(link) }
       end
 
       # @return [String]
@@ -36,37 +36,37 @@ module Picasa
 
       # @return [String]
       def generator
-        @generator ||= safe_retrieve(parsed_body, "generator", "__content__")
+        @generator ||= safe_retrieve(parsed_body, "generator", "$t")
       end
 
       # @return [Integer]
       def total_results
-        @total_results ||= map_to_integer(safe_retrieve(parsed_body, "totalResults"))
+        @total_results ||= map_to_integer(safe_retrieve(parsed_body, "openSearch$totalResults"))
       end
 
       # @return [Integer]
       def start_index
-        @start_index ||= map_to_integer(safe_retrieve(parsed_body, "startIndex"))
+        @start_index ||= map_to_integer(safe_retrieve(parsed_body, "openSearch$startIndex"))
       end
 
       # @return [Integer]
       def items_per_page
-        @items_per_page ||= map_to_integer(safe_retrieve(parsed_body, "itemsPerPage"))
+        @items_per_page ||= map_to_integer(safe_retrieve(parsed_body, "openSearch$itemsPerPage"))
       end
 
       # @return [String]
       def user
-        @user ||= safe_retrieve(parsed_body, "user")
+        @user ||= safe_retrieve(parsed_body, "gphoto$user")
       end
 
       # @return [String]
       def nickname
-        @nickname ||= safe_retrieve(parsed_body, "nickname")
+        @nickname ||= safe_retrieve(parsed_body, "gphoto$nickname")
       end
 
       # @return [String]
       def thumbnail
-        @thumbnail ||= safe_retrieve(parsed_body, "thumbnail")
+        @thumbnail ||= safe_retrieve(parsed_body, "gphoto$thumbnail")
       end
     end
   end