picasa 0.5.4 → 0.6.0

data/lib/picasa/utils.rb

@@ -4,23 +4,21 @@ require "cgi"
 module Picasa
   module Utils
     def safe_retrieve(hash, *keys)
+      result = retrieve(hash, keys)
+      if result.kind_of?(Hash) && result.has_key?('$t') && result.keys.size == 1
+        result['$t']
+      else
+        result
+      end
+    end
+
+    def retrieve(hash, keys)
       return if !hash.kind_of?(Hash) || !hash.has_key?(keys.first)
 
       if keys.size == 1
         hash[keys.first]
       elsif keys.size > 1
-        Utils.safe_retrieve(hash[keys.first], *keys[1..-1])
-      end
-    end
-
-    # Ported from activesupport gem
-    def array_wrap(object)
-      if object.nil?
-        []
-      elsif object.respond_to?(:to_ary)
-        object.to_ary || [object]
-      else
-        [object]
+        Utils.retrieve(hash[keys.first], keys[1..-1])
       end
     end
 
@@ -47,6 +45,6 @@ module Picasa
       end.join("&")
     end
 
-    module_function :safe_retrieve, :array_wrap, :map_to_integer, :map_to_boolean, :map_to_date, :inline_query
+    module_function :safe_retrieve, :retrieve, :map_to_integer, :map_to_boolean, :map_to_date, :inline_query
   end
 end

data/lib/picasa/version.rb

@@ -1,3 +1,3 @@
 module Picasa
-  VERSION = "0.5.4"
+  VERSION = "0.6.0"
 end

data/picasa.gemspec

@@ -15,8 +15,9 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version = Picasa::VERSION
 
-  gem.add_dependency "multi_xml"
+  gem.add_dependency "httparty"
 
   gem.add_development_dependency "webmock"
   gem.add_development_dependency "mocha"
+  gem.add_development_dependency "vcr"
 end

data/test/api/album_test.rb

@@ -3,44 +3,187 @@ require "helper"
 
 describe Picasa::API::Album do
   describe "#list" do
-    it "gives correct parsed body fragment" do
-      stub_request(:get, "https://picasaweb.google.com/data/feed/api/user/w.wnetrzak").to_return(fixture("album/album-list.txt"))
+    before do
+      VCR.use_cassette("album-list") do
+        @album_list = Picasa::API::Album.new(:user_id => "w.wnetrzak").list
+      end
+    end
+
+    it "has author name" do
+      assert_equal "Wojciech Wnętrzak", @album_list.author.name
+    end
+
+    it "has author uri" do
+      assert_equal "https://picasaweb.google.com/106136347770555028022", @album_list.author.uri
+    end
+
+    it "has links" do
+      assert_equal 4, @album_list.links.size
+    end
+
+    it "has title" do
+      assert_equal "106136347770555028022", @album_list.title
+    end
 
-      album_list = Picasa::API::Album.new(:user_id => "w.wnetrzak").list
+    it "has updated" do
+      assert_equal "2012-11-01T04:47:09+00:00", @album_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, @album_list.icon
+    end
+
+    it "has generator" do
+      assert_equal "Picasaweb", @album_list.generator
+    end
+
+    it "has total_results" do
+      assert_equal 1, @album_list.total_results
+    end
+
+    it "has start_index" do
+      assert_equal 1, @album_list.start_index
+    end
 
-      assert_equal 2, album_list.total_results
+    it "has items_per_page" do
+      assert_equal 1000, @album_list.items_per_page
+    end
+
+    it "has user" do
+      assert_equal "106136347770555028022", @album_list.user
+    end
+
+    it "has nickname" do
+      assert_equal "Wojciech Wnętrzak", @album_list.nickname
+    end
+
+    it "has thumbnail" do
+      expected = "https://lh3.googleusercontent.com/-6ezHc54U8x0/AAAAAAAAAAI/AAAAAAAAAAA/PBuxm7Ehn6E/s64-c/106136347770555028022.jpg"
+      assert_equal expected, @album_list.thumbnail
+    end
+
+    it "has entries" do
+      assert_equal 1, @album_list.entries.size
     end
   end
 
   describe "#show" do
-    it "gives correct parsed body fragment" do
-      stub_request(:get, "https://picasaweb.google.com/data/feed/api/user/w.wnetrzak/albumid/5243667126168669553").to_return(fixture("album/album-show.txt"))
+    before do
+      VCR.use_cassette("album-show") do
+        @album = Picasa::API::Album.new(:user_id => "w.wnetrzak").show("5239555770355467953")
+      end
+    end
+
+    it "has author name" do
+      assert_equal "Wojciech Wnętrzak", @album.author.name
+    end
+
+    it "has author uri" do
+      assert_equal "https://picasaweb.google.com/106136347770555028022", @album.author.uri
+    end
+
+    it "has links" do
+      assert_equal 5, @album.links.size
+    end
+
+    it "has published" do
+      assert_nil @album.published
+    end
 
-      album_show = Picasa::API::Album.new(:user_id => "w.wnetrzak").show("5243667126168669553")
+    it "has updated" do
+      assert_equal "2012-10-25T00:32:52+00:00", @album.updated.to_s
+    end
+
+    it "has title" do
+      assert_equal "test", @album.title
+    end
+
+    it "has summary" do
+      assert_nil @album.summary
+    end
+
+    it "has rights" do
+      assert_equal "public", @album.rights
+    end
+
+    it "has id" do
+      assert_equal "5239555770355467953", @album.id
+    end
 
-      assert_equal "Wojciech Wnętrzak", album_show.author.name
+    it "has etag" do
+      assert_equal "W/\"D0YDQ3s-fyp7ImA9WhNSEU8.\"", @album.etag
+    end
+
+    it "has name" do
+      assert_equal "Test", @album.name
+    end
+
+    it "has location" do
+      assert_equal "gdzieś", @album.location
+    end
+
+    it "has access" do
+      assert_equal "public", @album.access
+    end
+
+    it "has timestamp" do
+      assert_equal "1219906800000", @album.timestamp
+    end
+
+    it "has numphotos" do
+      assert_equal 6, @album.numphotos
+    end
+
+    it "has user" do
+      assert_equal "106136347770555028022", @album.user
+    end
+
+    it "has nickname" do
+      assert_equal "Wojciech Wnętrzak", @album.nickname
+    end
+
+    it "has photo entries" do
+      assert_equal 6, @album.entries.size
+    end
+
+    it "has allow_prints" do
+      assert_equal true, @album.allow_prints
+    end
+
+    it "has allow_downloads" do
+      assert_equal true, @album.allow_downloads
     end
   end
 
-  describe "#create" do
-    it "gives correct parsed body fragment" do
-      stub_request(:post, "https://www.google.com/accounts/ClientLogin").to_return(fixture("auth/success.txt"))
-      stub_request(:post, "https://picasaweb.google.com/data/feed/api/user/w.wnetrzak@gmail.com").to_return(fixture("album/album-create.txt"))
+  describe "exceptions" do
+    it "raises NotFound exception when album does not exist" do
+      VCR.use_cassette("album-404") do
+        assert_raises Picasa::NotFoundError, "Invalid entity id: non-existing" do
+          Picasa::API::Album.new(:user_id => "w.wnetrzak").show("non-exisiting")
+        end
+      end
+    end
+  end
 
-      album_show = Picasa::API::Album.new(:user_id => "w.wnetrzak@gmail.com", :password => "secret").create(:title => "album")
+  describe "#create" do
+    it "creates album" do
+      VCR.use_cassette("album-create") do
+        attributes = {:title => "gem-test", :summary => "created from test suite", :access => "protected",
+                      :location => "Gilowice", :keywords => "test"}
+        album = Picasa::API::Album.new(:user_id => "w.wnetrzak@gmail.com", :authorization_header => AuthHeader).create(attributes)
 
-      assert_equal "Wojciech Wnętrzak", album_show.author.name
+        assert_equal "gem-test", album.title
+      end
     end
   end
 
   describe "#destroy" do
     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").to_return(:status => 200, :body => "")
-
-      result = Picasa::API::Album.new(:user_id => "w.wnetrzak@gmail.com", :password => "secret").destroy("123")
-
-      assert_equal true, result
+      VCR.use_cassette("album-destroy") do
+        result = Picasa::API::Album.new(:user_id => "w.wnetrzak@gmail.com", :authorization_header => AuthHeader).destroy("5805920347758933777")
+        assert_equal true, result
+      end
     end
   end
 end

data/test/api/comment_test.rb

@@ -3,6 +3,12 @@ require "helper"
 
 describe Picasa::API::Comment do
   describe "#list" do
+    before do
+      VCR.use_cassette("comment-list") do
+        @comment_list = Picasa::API::Comment.new(:user_id => "w.wnetrzak").list(:album_id => "5239555770355467953")
+      end
+    end
+
     it "throws ArgumentError when photo_id provided without album_id" do
       comment = Picasa::API::Comment.new(:user_id => "w.wnetrzak")
 
@@ -11,16 +17,80 @@ describe Picasa::API::Comment do
       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"))
+    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 5, @comment_list.links.size
+    end
+
+    it "has title" do
+      assert_equal "test", @comment_list.title
+    end
+
+    it "has updated" do
+      assert_equal "2012-10-25T00:32:51+00:00", @comment_list.updated.to_s
+    end
+
+    it "has icon" do
+      expected = "https://lh6.googleusercontent.com/-ZqXRf3HicvI/SLakNnjixrE/AAAAAAAAAkc/3EAZ0eF3-CQ/s160-c/Test.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 500, @comment_list.items_per_page
+    end
+
+    it "has user" do
+      assert_equal "106136347770555028022", @comment_list.user
+    end
 
-      comment_list = Picasa::API::Comment.new(:user_id => "w.wnetrzak").list
+    it "has nickname" do
+      assert_equal "Wojciech Wnętrzak", @comment_list.nickname
+    end
+
+    it "has entries" do
+      assert_equal 1, @comment_list.entries.size
+    end
 
-      assert_equal 1, comment_list.entries.size
+    it "has content" do
+      assert_equal "beautiful place", @comment_list.entries.first.content
+    end
+
+    it "has id" do
+      expected = "z13fufdr3znxifia004cgjbgjkmwyr5ot4g-1351125171797000"
+      assert_equal expected, @comment_list.entries.first.id
     end
   end
 
   describe "#create" do
+    it "creates comment" do
+      VCR.use_cassette("comment-create") do
+        attributes = {:album_id => "5793892606777564353", :photo_id => "5806295577614146146", :content => "żółć"}
+
+        comment = Picasa::API::Comment.new(:user_id => "w.wnetrzak@gmail.com", :authorization_header => AuthHeader).create(attributes)
+
+        assert_equal "żółć", comment.content
+      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
@@ -44,6 +114,17 @@ describe Picasa::API::Comment do
   end
 
   describe "#destroy" do
+    it "destroys comment" do
+      VCR.use_cassette("comment-destroy") do
+        comment_id = "z13aebo5hvi5gjtj004cgjbgjkmwyr5ot4g-1351896079590000"
+        attributes = {:album_id => "5793892606777564353", :photo_id => "5806295577614146146"}
+
+        result = Picasa::API::Comment.new(:user_id => "w.wnetrzak@gmail.com", :authorization_header => AuthHeader).destroy(comment_id, attributes)
+
+        assert_equal true, result
+      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
@@ -57,14 +138,18 @@ describe Picasa::API::Comment do
         comment.destroy("wtf", :photo_id => "455")
       end
     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")
+  describe "exceptions" do
+    it "raises BadRequest exception when bad comment id given" do
+      VCR.use_cassette("comment-400") do
+        comment_id = "13fufdr3znxifia004cgjbgjkmwyr5ot4g-1351125171797000"
+        attributes = {:album_id => "5793892606777564353", :photo_id => "5806295577614146146"}
 
-      assert_equal true, result
+        assert_raises Picasa::BadRequestError, "Invalid entity id: non-existing" do
+          Picasa::API::Comment.new(:user_id => "w.wnetrzak@gmail.com", :authorization_header => AuthHeader).destroy(comment_id, attributes)
+        end
+      end
     end
   end
 end

data/test/api/photo_test.rb

@@ -3,14 +3,14 @@ require "helper"
 
 describe Picasa::API::Photo do
   describe "#create" do
-    it "gives correct parsed body fragment" do
-      stub_request(:post, "https://www.google.com/accounts/ClientLogin").to_return(fixture("auth/success.txt"))
-      stub_request(:post, "https://picasaweb.google.com/data/feed/api/user/w.wnetrzak@gmail.com/albumid/123").to_return(fixture("photo/photo-created.txt"))
+    it "creates photo" do
+      VCR.use_cassette("photo-create") do
+        attributes = {:file_path => image_path("lena.jpg"), :title => "Lena"}
 
-      photo = Picasa::API::Photo.new(:user_id => "w.wnetrzak@gmail.com", :password => "secret")
-      photo_create = photo.create("123", :title => "test", :binary => "binary", :content_type => "image/png")
+        photo = Picasa::API::Photo.new(:user_id => "w.wnetrzak@gmail.com", :authorization_header => AuthHeader).create("5793892606777564353", attributes)
 
-      assert_equal 27040, photo_create.size
+        assert_equal "Lena", photo.title
+      end
     end
 
     it "raises ArgumentError when no title" do
@@ -33,14 +33,30 @@ describe Picasa::API::Photo do
         photo.create("123", :title => "test", :binary => "binary")
       end
     end
+  end
 
-    it "guesses required attributes from file path" do
-      stub_request(:post, "https://www.google.com/accounts/ClientLogin").to_return(fixture("auth/success.txt"))
-      stub_request(:post, "https://picasaweb.google.com/data/feed/api/user/w.wnetrzak@gmail.com/albumid/123").to_return(fixture("photo/photo-created.txt"))
+  describe "#destroy" do
+    it "destroys photo" do
+      VCR.use_cassette("photo-destroy") do
+        album_id = "5793892606777564353"
+        photo_id = "5806295577614146146"
+        result = Picasa::API::Photo.new(:user_id => "w.wnetrzak@gmail.com", :authorization_header => AuthHeader).destroy(album_id, photo_id)
 
-      photo = Picasa::API::Photo.new(:user_id => "w.wnetrzak@gmail.com", :password => "secret")
+        assert_equal true, result
+      end
+    end
+  end
 
-      assert photo.create("123", :file_path => image_path("lena.jpg"))
+  describe "exceptions" do
+    it "raises PreconditionFailedError exception when photo not fresh" do
+      VCR.use_cassette("photo-412") do
+        album_id = "5793892606777564353"
+        photo_id = "5806295577614146146"
+
+        assert_raises Picasa::PreconditionFailedError, "Mismatch: etags = [Not-Fresh], version = [8]" do
+          Picasa::API::Photo.new(:user_id => "w.wnetrzak@gmail.com", :authorization_header => AuthHeader).destroy(album_id, photo_id, :etag => "Not-Fresh")
+        end
+      end
     end
   end
 end