picasa 0.5.4 → 0.6.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (89) hide show
  1. data/.gitignore +2 -0
  2. data/.travis.yml +4 -9
  3. data/Gemfile +4 -4
  4. data/README.md +4 -12
  5. data/extra/Thorfile +0 -3
  6. data/lib/picasa.rb +1 -8
  7. data/lib/picasa/api/album.rb +11 -11
  8. data/lib/picasa/api/base.rb +0 -3
  9. data/lib/picasa/api/comment.rb +6 -8
  10. data/lib/picasa/api/photo.rb +9 -9
  11. data/lib/picasa/api/tag.rb +6 -8
  12. data/lib/picasa/client.rb +2 -2
  13. data/lib/picasa/connection.rb +14 -51
  14. data/lib/picasa/exceptions.rb +1 -0
  15. data/lib/picasa/file.rb +8 -0
  16. data/lib/picasa/http.rb +28 -0
  17. data/lib/picasa/presenter/album.rb +15 -15
  18. data/lib/picasa/presenter/album_list.rb +10 -10
  19. data/lib/picasa/presenter/comment.rb +6 -6
  20. data/lib/picasa/presenter/comment_list.rb +10 -10
  21. data/lib/picasa/presenter/media.rb +5 -5
  22. data/lib/picasa/presenter/photo.rb +15 -15
  23. data/lib/picasa/presenter/tag.rb +3 -3
  24. data/lib/picasa/presenter/tag_list.rb +10 -10
  25. data/lib/picasa/utils.rb +11 -13
  26. data/lib/picasa/version.rb +1 -1
  27. data/picasa.gemspec +2 -1
  28. data/test/api/album_test.rb +163 -20
  29. data/test/api/comment_test.rb +95 -10
  30. data/test/api/photo_test.rb +27 -11
  31. data/test/api/tag_test.rb +84 -13
  32. data/test/cassettes/album-404.yml +52 -0
  33. data/test/cassettes/album-create.yml +107 -0
  34. data/test/cassettes/album-destroy.yml +55 -0
  35. data/test/cassettes/album-list.yml +85 -0
  36. data/test/cassettes/album-show.yml +123 -0
  37. data/test/cassettes/auth-failed.yml +50 -0
  38. data/test/cassettes/auth-success.yml +64 -0
  39. data/test/cassettes/comment-400.yml +56 -0
  40. data/test/cassettes/comment-create.yml +88 -0
  41. data/test/cassettes/comment-destroy.yml +53 -0
  42. data/test/cassettes/comment-list.yml +87 -0
  43. data/test/cassettes/photo-412.yml +58 -0
  44. data/test/cassettes/photo-create.yml +1908 -0
  45. data/test/cassettes/photo-destroy.yml +55 -0
  46. data/test/cassettes/tag-create.yml +85 -0
  47. data/test/cassettes/tag-destroy.yml +53 -0
  48. data/test/cassettes/tag-list.yml +79 -0
  49. data/test/client_test.rb +10 -10
  50. data/test/connection_test.rb +0 -35
  51. data/test/helper.rb +21 -7
  52. data/test/utils_test.rb +0 -6
  53. metadata +37 -40
  54. data/test/fixtures/album/album-create.txt +0 -21
  55. data/test/fixtures/album/album-list-with-tag.txt +0 -105
  56. data/test/fixtures/album/album-list.txt +0 -105
  57. data/test/fixtures/album/album-show-with-max-results.txt +0 -131
  58. data/test/fixtures/album/album-show-with-tag-and-many-photos.txt +0 -156
  59. data/test/fixtures/album/album-show-with-tag-and-one-photo.txt +0 -105
  60. data/test/fixtures/album/album-show.txt +0 -169
  61. data/test/fixtures/auth/success.txt +0 -14
  62. data/test/fixtures/comment/comment-list.txt +0 -65
  63. data/test/fixtures/exceptions/forbidden.txt +0 -12
  64. data/test/fixtures/exceptions/not_found.txt +0 -14
  65. data/test/fixtures/exceptions/precondition_failed.txt +0 -14
  66. data/test/fixtures/json.txt +0 -435
  67. data/test/fixtures/photo/photo-created.txt +0 -21
  68. data/test/fixtures/photo/photo-list-all-with-q.txt +0 -556
  69. data/test/fixtures/photo/photo-list-all.txt +0 -623
  70. data/test/fixtures/photo/photo-list-user.txt +0 -388
  71. data/test/fixtures/presenters/album_list.xml +0 -88
  72. data/test/fixtures/presenters/album_show.xml +0 -152
  73. data/test/fixtures/presenters/album_show_with_one_photo.xml +0 -88
  74. data/test/fixtures/presenters/comment_list.xml +0 -48
  75. data/test/fixtures/presenters/tag_list.xml +0 -51
  76. data/test/fixtures/tag/tag-list.txt +0 -68
  77. data/test/presenter/album_list_test.rb +0 -67
  78. data/test/presenter/album_test.rb +0 -189
  79. data/test/presenter/author_test.rb +0 -17
  80. data/test/presenter/base_test.rb +0 -50
  81. data/test/presenter/comment_list_test.rb +0 -67
  82. data/test/presenter/comment_test.rb +0 -56
  83. data/test/presenter/content_test.rb +0 -18
  84. data/test/presenter/link_test.rb +0 -21
  85. data/test/presenter/media_test.rb +0 -29
  86. data/test/presenter/photo_test.rb +0 -90
  87. data/test/presenter/tag_list_test.rb +0 -67
  88. data/test/presenter/tag_test.rb +0 -48
  89. data/test/presenter/thumbnail_test.rb +0 -24
data/lib/picasa/presenter/album.rb CHANGED
@@ -5,23 +5,23 @@ module Picasa
5
5
  class Album < Base
6
6
  # @return [Presenter::Author]
7
7
  def author
8
- @author ||= Author.new(safe_retrieve(parsed_body, "author"))
8
+ @author ||= Author.new(parsed_body["author"][0])
9
9
  end
10
10
 
11
11
  # @return [Array<Presenter::Photo>]
12
12
  def entries
13
- @entries ||= array_wrap(safe_retrieve(parsed_body, "entry")).map { |photo| Photo.new(photo) }
13
+ @entries ||= safe_retrieve(parsed_body, "entry").map { |photo| Photo.new(photo) }
14
14
  end
15
15
  alias :photos :entries
16
16
 
17
17
  # @return [Array<Presenter::Link>]
18
18
  def links
19
- @links ||= array_wrap(safe_retrieve(parsed_body, "link")).map { |link| Link.new(link) }
19
+ @links ||= safe_retrieve(parsed_body, "link").map { |link| Link.new(link) }
20
20
  end
21
21
 
22
22
  # @return [Presenter::Media]
23
23
  def media
24
- @media ||= Media.new(safe_retrieve(parsed_body, "group"))
24
+ @media ||= Media.new(safe_retrieve(parsed_body, "media$group"))
25
25
  end
26
26
 
27
27
  # @return [DateTime]
@@ -36,7 +36,7 @@ module Picasa
36
36
 
37
37
  # @return [String]
38
38
  def etag
39
- @etag ||= safe_retrieve(parsed_body, "etag")
39
+ @etag ||= safe_retrieve(parsed_body, "gd$etag")
40
40
  end
41
41
 
42
42
  # @return [String]
@@ -56,52 +56,52 @@ module Picasa
56
56
 
57
57
  # @return [String]
58
58
  def id
59
- @id ||= array_wrap(safe_retrieve(parsed_body, "id")).last
59
+ @id ||= safe_retrieve(parsed_body, "gphoto$id")
60
60
  end
61
61
 
62
62
  # @return [String]
63
63
  def name
64
- @name ||= safe_retrieve(parsed_body, "name")
64
+ @name ||= safe_retrieve(parsed_body, "gphoto$name")
65
65
  end
66
66
 
67
67
  # @return [String]
68
68
  def location
69
- @location ||= safe_retrieve(parsed_body, "location")
69
+ @location ||= safe_retrieve(parsed_body, "gphoto$location")
70
70
  end
71
71
 
72
72
  # @return [String]
73
73
  def access
74
- @access ||= safe_retrieve(parsed_body, "access")
74
+ @access ||= safe_retrieve(parsed_body, "gphoto$access")
75
75
  end
76
76
 
77
77
  # @return [String]
78
78
  def timestamp
79
- @timestamp ||= safe_retrieve(parsed_body, "timestamp")
79
+ @timestamp ||= safe_retrieve(parsed_body, "gphoto$timestamp")
80
80
  end
81
81
 
82
82
  # @return [String]
83
83
  def numphotos
84
- @numphotos ||= map_to_integer(safe_retrieve(parsed_body, "numphotos"))
84
+ @numphotos ||= map_to_integer(safe_retrieve(parsed_body, "gphoto$numphotos"))
85
85
  end
86
86
 
87
87
  # @return [String]
88
88
  def user
89
- @user ||= safe_retrieve(parsed_body, "user")
89
+ @user ||= safe_retrieve(parsed_body, "gphoto$user")
90
90
  end
91
91
 
92
92
  # @return [String]
93
93
  def nickname
94
- @nickname ||= safe_retrieve(parsed_body, "nickname")
94
+ @nickname ||= safe_retrieve(parsed_body, "gphoto$nickname")
95
95
  end
96
96
 
97
97
  # @return [true, false, nil]
98
98
  def allow_prints
99
- @allow_prints ||= map_to_boolean(safe_retrieve(parsed_body, "allowPrints"))
99
+ @allow_prints ||= map_to_boolean(safe_retrieve(parsed_body, "gphoto$allowPrints"))
100
100
  end
101
101
 
102
102
  # @return [true, false, nil]
103
103
  def allow_downloads
104
- @allow_downloads ||= map_to_boolean(safe_retrieve(parsed_body, "allowDownloads"))
104
+ @allow_downloads ||= map_to_boolean(safe_retrieve(parsed_body, "gphoto$allowDownloads"))
105
105
  end
106
106
  end
107
107
  end
data/lib/picasa/presenter/album_list.rb CHANGED
@@ -5,18 +5,18 @@ module Picasa
5
5
  class AlbumList < Base
6
6
  # @return [Presenter::Author]
7
7
  def author
8
- @author ||= Author.new(safe_retrieve(parsed_body, "author"))
8
+ @author ||= Author.new(parsed_body["author"][0])
9
9
  end
10
10
 
11
11
  # @return [Array<Presenter::Album>]
12
12
  def entries
13
- @entries ||= array_wrap(safe_retrieve(parsed_body, "entry")).map { |entry| Album.new(entry) }
13
+ @entries ||= safe_retrieve(parsed_body, "entry").map { |entry| Album.new(entry) }
14
14
  end
15
15
  alias :albums :entries
16
16
 
17
17
  # @return [Array<Presenter::Link>]
18
18
  def links
19
- @links ||= array_wrap(safe_retrieve(parsed_body, "link")).map { |link| Link.new(link) }
19
+ @links ||= safe_retrieve(parsed_body, "link").map { |link| Link.new(link) }
20
20
  end
21
21
 
22
22
  # @return [String]
@@ -36,37 +36,37 @@ module Picasa
36
36
 
37
37
  # @return [String]
38
38
  def generator
39
- @generator ||= safe_retrieve(parsed_body, "generator", "__content__")
39
+ @generator ||= safe_retrieve(parsed_body, "generator", "$t")
40
40
  end
41
41
 
42
42
  # @return [Integer]
43
43
  def total_results
44
- @total_results ||= map_to_integer(safe_retrieve(parsed_body, "totalResults"))
44
+ @total_results ||= map_to_integer(safe_retrieve(parsed_body, "openSearch$totalResults"))
45
45
  end
46
46
 
47
47
  # @return [Integer]
48
48
  def start_index
49
- @start_index ||= map_to_integer(safe_retrieve(parsed_body, "startIndex"))
49
+ @start_index ||= map_to_integer(safe_retrieve(parsed_body, "openSearch$startIndex"))
50
50
  end
51
51
 
52
52
  # @return [Integer]
53
53
  def items_per_page
54
- @items_per_page ||= map_to_integer(safe_retrieve(parsed_body, "itemsPerPage"))
54
+ @items_per_page ||= map_to_integer(safe_retrieve(parsed_body, "openSearch$itemsPerPage"))
55
55
  end
56
56
 
57
57
  # @return [String]
58
58
  def user
59
- @user ||= safe_retrieve(parsed_body, "user")
59
+ @user ||= safe_retrieve(parsed_body, "gphoto$user")
60
60
  end
61
61
 
62
62
  # @return [String]
63
63
  def nickname
64
- @nickname ||= safe_retrieve(parsed_body, "nickname")
64
+ @nickname ||= safe_retrieve(parsed_body, "gphoto$nickname")
65
65
  end
66
66
 
67
67
  # @return [String]
68
68
  def thumbnail
69
- @thumbnail ||= safe_retrieve(parsed_body, "thumbnail")
69
+ @thumbnail ||= safe_retrieve(parsed_body, "gphoto$thumbnail")
70
70
  end
71
71
  end
72
72
  end
data/lib/picasa/presenter/comment.rb CHANGED
@@ -5,12 +5,12 @@ module Picasa
5
5
  class Comment < Base
6
6
  # @return [Presenter::Author]
7
7
  def author
8
- @author ||= Author.new(safe_retrieve(parsed_body, "author"))
8
+ @author ||= Author.new(parsed_body["author"][0])
9
9
  end
10
10
 
11
11
  # @return [Array<Presenter::Link>]
12
12
  def links
13
- @links ||= array_wrap(safe_retrieve(parsed_body, "link")).map { |link| Link.new(link) }
13
+ @links ||= safe_retrieve(parsed_body, "link").map { |link| Link.new(link) }
14
14
  end
15
15
 
16
16
  # @return [DateTime]
@@ -35,22 +35,22 @@ module Picasa
35
35
 
36
36
  # @return [String]
37
37
  def etag
38
- @etag ||= safe_retrieve(parsed_body, "etag")
38
+ @etag ||= safe_retrieve(parsed_body, "gd$etag")
39
39
  end
40
40
 
41
41
  # @return [String]
42
42
  def content
43
- @content ||= safe_retrieve(parsed_body, "content", "__content__") || safe_retrieve(parsed_body, "content")
43
+ @content ||= safe_retrieve(parsed_body, "content", "$t")
44
44
  end
45
45
 
46
46
  # @return [String]
47
47
  def id
48
- @id ||= array_wrap(safe_retrieve(parsed_body, "id")).last
48
+ @id ||= safe_retrieve(parsed_body, "gphoto$id")
49
49
  end
50
50
 
51
51
  # @return [String]
52
52
  def photo_id
53
- @photo_id ||= safe_retrieve(parsed_body, "photoid")
53
+ @photo_id ||= safe_retrieve(parsed_body, "gphoto$photoid")
54
54
  end
55
55
  end
56
56
  end
data/lib/picasa/presenter/comment_list.rb CHANGED
@@ -5,18 +5,18 @@ module Picasa
5
5
  class CommentList < Base
6
6
  # @return [Presenter::Author]
7
7
  def author
8
- @author ||= Author.new(safe_retrieve(parsed_body, "author"))
8
+ @author ||= Author.new(parsed_body["author"][0])
9
9
  end
10
10
 
11
11
  # @return [Array<Presenter::Comment>]
12
12
  def entries
13
- @entries ||= array_wrap(safe_retrieve(parsed_body, "entry")).map { |entry| Comment.new(entry) }
13
+ @entries ||= safe_retrieve(parsed_body, "entry").map { |entry| Comment.new(entry) }
14
14
  end
15
15
  alias :comments :entries
16
16
 
17
17
  # @return [Array<Presenter::Link>]
18
18
  def links
19
- @links ||= array_wrap(safe_retrieve(parsed_body, "link")).map { |link| Link.new(link) }
19
+ @links ||= safe_retrieve(parsed_body, "link").map { |link| Link.new(link) }
20
20
  end
21
21
 
22
22
  # @return [String]
@@ -36,37 +36,37 @@ module Picasa
36
36
 
37
37
  # @return [String]
38
38
  def generator
39
- @generator ||= safe_retrieve(parsed_body, "generator", "__content__")
39
+ @generator ||= safe_retrieve(parsed_body, "generator", "$t")
40
40
  end
41
41
 
42
42
  # @return [Integer]
43
43
  def total_results
44
- @total_results ||= map_to_integer(safe_retrieve(parsed_body, "totalResults"))
44
+ @total_results ||= map_to_integer(safe_retrieve(parsed_body, "openSearch$totalResults"))
45
45
  end
46
46
 
47
47
  # @return [Integer]
48
48
  def start_index
49
- @start_index ||= map_to_integer(safe_retrieve(parsed_body, "startIndex"))
49
+ @start_index ||= map_to_integer(safe_retrieve(parsed_body, "openSearch$startIndex"))
50
50
  end
51
51
 
52
52
  # @return [Integer]
53
53
  def items_per_page
54
- @items_per_page ||= map_to_integer(safe_retrieve(parsed_body, "itemsPerPage"))
54
+ @items_per_page ||= map_to_integer(safe_retrieve(parsed_body, "openSearch$itemsPerPage"))
55
55
  end
56
56
 
57
57
  # @return [String]
58
58
  def user
59
- @user ||= safe_retrieve(parsed_body, "user")
59
+ @user ||= safe_retrieve(parsed_body, "gphoto$user")
60
60
  end
61
61
 
62
62
  # @return [String]
63
63
  def nickname
64
- @nickname ||= safe_retrieve(parsed_body, "nickname")
64
+ @nickname ||= safe_retrieve(parsed_body, "gphoto$nickname")
65
65
  end
66
66
 
67
67
  # @return [String]
68
68
  def thumbnail
69
- @thumbnail ||= safe_retrieve(parsed_body, "thumbnail")
69
+ @thumbnail ||= safe_retrieve(parsed_body, "gphoto$thumbnail")
70
70
  end
71
71
  end
72
72
  end
data/lib/picasa/presenter/media.rb CHANGED
@@ -5,27 +5,27 @@ module Picasa
5
5
  class Media < Base
6
6
  # @return [Array<Presenter::Thumbnail>]
7
7
  def thumbnails
8
- @thumbnails ||= array_wrap(safe_retrieve(parsed_body, "thumbnail")).map { |thumbnail| Thumbnail.new(thumbnail) }
8
+ @thumbnails ||= safe_retrieve(parsed_body, "media$thumbnail").map { |thumbnail| Thumbnail.new(thumbnail) }
9
9
  end
10
10
 
11
11
  # @return [String]
12
12
  def credit
13
- @credit ||= safe_retrieve(parsed_body, "credit")
13
+ @credit ||= parsed_body["media$credit"][0]["$t"]
14
14
  end
15
15
 
16
16
  # @return [String]
17
17
  def description
18
- @description ||= safe_retrieve(parsed_body, "description")
18
+ @description ||= safe_retrieve(parsed_body, "media$description", "$t")
19
19
  end
20
20
 
21
21
  # @return [String]
22
22
  def keywords
23
- @keywords ||= safe_retrieve(parsed_body, "keywords")
23
+ @keywords ||= safe_retrieve(parsed_body, "media$keywords", "$t")
24
24
  end
25
25
 
26
26
  # @return [String]
27
27
  def title
28
- @title ||= safe_retrieve(parsed_body, "title", "__content__")
28
+ @title ||= safe_retrieve(parsed_body, "media$title", "$t")
29
29
  end
30
30
  end
31
31
  end
data/lib/picasa/presenter/photo.rb CHANGED
@@ -5,12 +5,12 @@ module Picasa
5
5
  class Photo < Base
6
6
  # @return [Array<Presenter::Link>]
7
7
  def links
8
- @links ||= array_wrap(safe_retrieve(parsed_body, "link")).map { |link| Link.new(link) }
8
+ @links ||= safe_retrieve(parsed_body, "link").map { |link| Link.new(link) }
9
9
  end
10
10
 
11
11
  # @return [Presenter::Media]
12
12
  def media
13
- @media ||= Media.new(safe_retrieve(parsed_body, "group"))
13
+ @media ||= Media.new(safe_retrieve(parsed_body, "media$group"))
14
14
  end
15
15
 
16
16
  # @return [Presenter::Content]
@@ -20,12 +20,12 @@ module Picasa
20
20
 
21
21
  # @return [String]
22
22
  def id
23
- @id ||= array_wrap(safe_retrieve(parsed_body, "id")).last
23
+ @id ||= safe_retrieve(parsed_body, "gphoto$id").last
24
24
  end
25
25
 
26
26
  # @return [String]
27
27
  def etag
28
- @etag ||= safe_retrieve(parsed_body, "etag")
28
+ @etag ||= safe_retrieve(parsed_body, "gd$etag")
29
29
  end
30
30
 
31
31
  # @return [DateTime]
@@ -50,57 +50,57 @@ module Picasa
50
50
 
51
51
  # @return [String]
52
52
  def album_id
53
- @album_id ||= safe_retrieve(parsed_body, "albumid")
53
+ @album_id ||= safe_retrieve(parsed_body, "gphoto$albumid")
54
54
  end
55
55
 
56
56
  # @return [String]
57
57
  def access
58
- @access ||= safe_retrieve(parsed_body, "access")
58
+ @access ||= safe_retrieve(parsed_body, "gphoto$access")
59
59
  end
60
60
 
61
61
  # @return [Integer]
62
62
  def width
63
- @width ||= map_to_integer(safe_retrieve(parsed_body, "width"))
63
+ @width ||= map_to_integer(safe_retrieve(parsed_body, "gphoto$width"))
64
64
  end
65
65
 
66
66
  # @return [Integer]
67
67
  def height
68
- @height ||= map_to_integer(safe_retrieve(parsed_body, "height"))
68
+ @height ||= map_to_integer(safe_retrieve(parsed_body, "gphoto$height"))
69
69
  end
70
70
 
71
71
  # @return [Integer]
72
72
  def size
73
- @size ||= map_to_integer(safe_retrieve(parsed_body, "size"))
73
+ @size ||= map_to_integer(safe_retrieve(parsed_body, "gphoto$size"))
74
74
  end
75
75
 
76
76
  # @return [String]
77
77
  def checksum
78
- @checksum ||= safe_retrieve(parsed_body, "checksum")
78
+ @checksum ||= safe_retrieve(parsed_body, "gphoto$checksum")
79
79
  end
80
80
 
81
81
  # @return [String]
82
82
  def timestamp
83
- @timestamp ||= safe_retrieve(parsed_body, "timestamp")
83
+ @timestamp ||= safe_retrieve(parsed_body, "gphoto$timestamp")
84
84
  end
85
85
 
86
86
  # @return [Integer]
87
87
  def image_version
88
- @image_version ||= map_to_integer(safe_retrieve(parsed_body, "imageVersion"))
88
+ @image_version ||= map_to_integer(safe_retrieve(parsed_body, "gphoto$imageVersion"))
89
89
  end
90
90
 
91
91
  # @return [true, false, nil]
92
92
  def commenting_enabled
93
- @commenting_enabled ||= map_to_boolean(safe_retrieve(parsed_body, "commentingEnabled"))
93
+ @commenting_enabled ||= map_to_boolean(safe_retrieve(parsed_body, "gphoto$commentingEnabled"))
94
94
  end
95
95
 
96
96
  # @return [Integer]
97
97
  def comment_count
98
- @comment_count ||= map_to_integer(safe_retrieve(parsed_body, "commentCount"))
98
+ @comment_count ||= map_to_integer(safe_retrieve(parsed_body, "gphoto$commentCount"))
99
99
  end
100
100
 
101
101
  # @return [String]
102
102
  def license
103
- @license ||= safe_retrieve(parsed_body, "license", "__content__")
103
+ @license ||= safe_retrieve(parsed_body, "gphoto$license", "name")
104
104
  end
105
105
  end
106
106
  end
data/lib/picasa/presenter/tag.rb CHANGED
@@ -5,12 +5,12 @@ module Picasa
5
5
  class Tag < Base
6
6
  # @return [Presenter::Author]
7
7
  def author
8
- @author ||= Author.new(safe_retrieve(parsed_body, "author"))
8
+ @author ||= Author.new(parsed_body["author"][0])
9
9
  end
10
10
 
11
11
  # @return [Array<Presenter::Link>]
12
12
  def links
13
- @links ||= array_wrap(safe_retrieve(parsed_body, "link")).map { |link| Link.new(link) }
13
+ @links ||= safe_retrieve(parsed_body, "link").map { |link| Link.new(link) }
14
14
  end
15
15
 
16
16
  # @return [DateTime]
@@ -25,7 +25,7 @@ module Picasa
25
25
 
26
26
  # @return [String]
27
27
  def etag
28
- @etag ||= safe_retrieve(parsed_body, "etag")
28
+ @etag ||= safe_retrieve(parsed_body, "gd$etag")
29
29
  end
30
30
 
31
31
  # @return [String]
data/lib/picasa/presenter/tag_list.rb CHANGED
@@ -5,18 +5,18 @@ module Picasa
5
5
  class TagList < Base
6
6
  # @return [Presenter::Author]
7
7
  def author
8
- @author ||= Author.new(safe_retrieve(parsed_body, "author"))
8
+ @author ||= Author.new(parsed_body["author"][0])
9
9
  end
10
10
 
11
11
  # @return [Array<Presenter::Tag>]
12
12
  def entries
13
- @entries ||= array_wrap(safe_retrieve(parsed_body, "entry")).map { |entry| Tag.new(entry) }
13
+ @entries ||= safe_retrieve(parsed_body, "entry").map { |entry| Tag.new(entry) }
14
14
  end
15
15
  alias :tags :entries
16
16
 
17
17
  # @return [Array<Presenter::Link>]
18
18
  def links
19
- @links ||= array_wrap(safe_retrieve(parsed_body, "link")).map { |link| Link.new(link) }
19
+ @links ||= safe_retrieve(parsed_body, "link").map { |link| Link.new(link) }
20
20
  end
21
21
 
22
22
  # @return [String]
@@ -36,37 +36,37 @@ module Picasa
36
36
 
37
37
  # @return [String]
38
38
  def generator
39
- @generator ||= safe_retrieve(parsed_body, "generator", "__content__")
39
+ @generator ||= safe_retrieve(parsed_body, "generator", "$t")
40
40
  end
41
41
 
42
42
  # @return [Integer]
43
43
  def total_results
44
- @total_results ||= map_to_integer(safe_retrieve(parsed_body, "totalResults"))
44
+ @total_results ||= map_to_integer(safe_retrieve(parsed_body, "openSearch$totalResults"))
45
45
  end
46
46
 
47
47
  # @return [Integer]
48
48
  def start_index
49
- @start_index ||= map_to_integer(safe_retrieve(parsed_body, "startIndex"))
49
+ @start_index ||= map_to_integer(safe_retrieve(parsed_body, "openSearch$startIndex"))
50
50
  end
51
51
 
52
52
  # @return [Integer]
53
53
  def items_per_page
54
- @items_per_page ||= map_to_integer(safe_retrieve(parsed_body, "itemsPerPage"))
54
+ @items_per_page ||= map_to_integer(safe_retrieve(parsed_body, "openSearch$itemsPerPage"))
55
55
  end
56
56
 
57
57
  # @return [String]
58
58
  def user
59
- @user ||= safe_retrieve(parsed_body, "user")
59
+ @user ||= safe_retrieve(parsed_body, "gphoto$user")
60
60
  end
61
61
 
62
62
  # @return [String]
63
63
  def nickname
64
- @nickname ||= safe_retrieve(parsed_body, "nickname")
64
+ @nickname ||= safe_retrieve(parsed_body, "gphoto$nickname")
65
65
  end
66
66
 
67
67
  # @return [String]
68
68
  def thumbnail
69
- @thumbnail ||= safe_retrieve(parsed_body, "thumbnail")
69
+ @thumbnail ||= safe_retrieve(parsed_body, "gphoto$thumbnail")
70
70
  end
71
71
  end
72
72
  end