picasa 0.5.4 → 0.6.0

data/test/cassettes/photo-destroy.yml

@@ -0,0 +1,55 @@
+--- 
+http_interactions: 
+- request: 
+    method: delete
+    uri: https://picasaweb.google.com/data/entry/api/user/w.wnetrzak@gmail.com/albumid/5793892606777564353/photoid/5806295577614146146?alt=json
+    body: 
+      encoding: US-ASCII
+      base64_string: ""
+    headers: 
+      User-Agent: 
+      - ruby-gem-picasa-v0.5.4 (gzip)
+      Gdata-Version: 
+      - "2"
+      Content-Type: 
+      - application/atom+xml
+      Accept-Encoding: 
+      - gzip, deflate
+      Authorization: 
+      - <FILTERED>
+      If-Match: 
+      - "*"
+  response: 
+    status: 
+      code: 200
+      message: OK
+    headers: 
+      Expires: 
+      - Fri, 02 Nov 2012 23:12:10 GMT
+      Date: 
+      - Fri, 02 Nov 2012 23:12:10 GMT
+      Cache-Control: 
+      - private, max-age=0, must-revalidate
+      Set-Cookie: 
+      - S=photos_html=tC03KtdPGN2r7-aSZe3qSA; Domain=.google.com; Path=/; Secure; HttpOnly
+      - _rtok=aD7_4rBeOlyy; Path=/; Secure; HttpOnly
+      Gdata-Version: 
+      - "2.0"
+      X-Content-Type-Options: 
+      - nosniff
+      X-Frame-Options: 
+      - SAMEORIGIN
+      X-Xss-Protection: 
+      - 1; mode=block
+      Content-Length: 
+      - "0"
+      Server: 
+      - GSE
+      Content-Type: 
+      - text/html; charset=UTF-8
+    body: 
+      encoding: US-ASCII
+      base64_string: ""
+    http_version: 
+  recorded_at: Fri, 02 Nov 2012 23:12:10 GMT
+recorded_with: VCR 2.3.0

data/test/cassettes/tag-create.yml

@@ -0,0 +1,85 @@
+--- 
+http_interactions: 
+- request: 
+    method: post
+    uri: https://picasaweb.google.com/data/feed/api/user/w.wnetrzak@gmail.com/albumid/5793892606777564353/photoid/5806295577614146146?alt=json
+    body: 
+      encoding: UTF-8
+      base64_string: |
+        PGVudHJ5IHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDA1L0F0b20iPgog
+        IDx0aXRsZT5iZWF1dHk8L3RpdGxlPgogIDxjYXRlZ29yeSBzY2hlbWU9Imh0
+        dHA6Ly9zY2hlbWFzLmdvb2dsZS5jb20vZy8yMDA1I2tpbmQiIHRlcm09Imh0
+        dHA6Ly9zY2hlbWFzLmdvb2dsZS5jb20vcGhvdG9zLzIwMDcjdGFnIi8+Cjwv
+        ZW50cnk+Cg==
+
+    headers: 
+      User-Agent: 
+      - ruby-gem-picasa-v0.5.4 (gzip)
+      Gdata-Version: 
+      - "2"
+      Content-Type: 
+      - application/atom+xml
+      Accept-Encoding: 
+      - gzip, deflate
+      Authorization: 
+      - <FILTERED>
+  response: 
+    status: 
+      code: 201
+      message: Created
+    headers: 
+      Expires: 
+      - Fri, 02 Nov 2012 19:26:13 GMT
+      Date: 
+      - Fri, 02 Nov 2012 19:26:13 GMT
+      Cache-Control: 
+      - private, max-age=0, must-revalidate, no-transform
+      Set-Cookie: 
+      - S=photos_html=jhp6pSG9D6LFu7OtMckIQQ; Domain=.google.com; Path=/; Secure; HttpOnly
+      - _rtok=_YeYgDBM1shW; Path=/; Secure; HttpOnly
+      Content-Type: 
+      - application/json; charset=UTF-8
+      Access-Control-Allow-Origin: 
+      - "*"
+      Vary: 
+      - Accept, X-GData-Authorization, GData-Version
+      Gdata-Version: 
+      - "2.0"
+      Etag: 
+      - W/"DkQDQ3Y_cCp7ImA9WhNSGEU."
+      Location: 
+      - https://picasaweb.google.com/data/entry/api/user/106136347770555028022/albumid/5793892606777564353/photoid/5806295577614146146/tag/beauty?alt=json&authkey=Gv1sRgCNmigd3KrbOHLA
+      Content-Location: 
+      - https://picasaweb.google.com/data/entry/api/user/106136347770555028022/albumid/5793892606777564353/photoid/5806295577614146146/tag/beauty?alt=json&authkey=Gv1sRgCNmigd3KrbOHLA
+      Content-Encoding: 
+      - gzip
+      Transfer-Encoding: 
+      - chunked
+      X-Content-Type-Options: 
+      - nosniff
+      X-Frame-Options: 
+      - SAMEORIGIN
+      X-Xss-Protection: 
+      - 1; mode=block
+      Server: 
+      - GSE
+    body: 
+      encoding: ASCII-8BIT
+      base64_string: |
+        H4sIAAAAAAAAAN1UXW/TMBT9K8ir+sIa56P5aKVoqjYoCDQ02FQBm5CbuInX
+        OM5sZ2mp8kP4P/wwrlO2VmhAX3jhJZLvPb733HuOs0H3VComSjRGjmWjY0TL
+        RKSszCBwdflyEHUhLddovEErXpSqR6oKkrnW1RjjpmmsxrOEzLBr2yE2yeMt
+        8HcgH0+04A+oXpbugCrJKSfKyoTICmolguPtFUBnaY9qYnjN8DU6W16cXXgf
+        vySnVfiaT0az/PzD9MWVdY0AylLDtqd/FlZQuWIJUaSh8/3aKdEEd9PhWlGJ
+        HTtwvMAbhmFo+75vu5HtupgU85qzFPvhyItGbmAHkPeDoed7uMqFFiYX2YE7
+        8v0wDJyhM4RPgIEsnlNS6zVqj1FdQTe6I+bajjtwnIHtXjqjsRuMHdeKhtEn
+        g4Ul9mjKDoUnUDgTRqLPG9StkB6w0qMlK1NYlqaS/xHezag6eY+MAO0NXGK6
+        oI/kdlOqmnOyNcsvmYKVy46gpAUkSAF9SyBuGKwrQ1jTlca55gWEckkXf1Ov
+        yLGiRCb5XIpG0ZO7eNutX6kknvbrknAaPylpf8FM+9gGYg+EFC0WOy6gQAE9
+        NbwMTMCtz1cH09ozFanYvzXWCawxvlWi7MMpX9J1PL131Pvs9JyzLPXeyPm7
+        V28ne1MaV/23U4IvDUDIzmdG/kcfzsRtwmiSP5uV379p+ZUsuzcp2WE/iicn
+        Q21707Y/AMkZlQRCBQAA
+
+    http_version: 
+  recorded_at: Fri, 02 Nov 2012 19:26:13 GMT
+recorded_with: VCR 2.3.0

data/test/cassettes/tag-destroy.yml

@@ -0,0 +1,53 @@
+--- 
+http_interactions: 
+- request: 
+    method: delete
+    uri: https://picasaweb.google.com/data/entry/api/user/w.wnetrzak@gmail.com/albumid/5793892606777564353/photoid/5806295577614146146/tag/beauty?alt=json
+    body: 
+      encoding: US-ASCII
+      base64_string: ""
+    headers: 
+      User-Agent: 
+      - ruby-gem-picasa-v0.5.4 (gzip)
+      Gdata-Version: 
+      - "2"
+      Content-Type: 
+      - application/atom+xml
+      Accept-Encoding: 
+      - gzip, deflate
+      Authorization: 
+      - <FILTERED>
+  response: 
+    status: 
+      code: 200
+      message: OK
+    headers: 
+      Expires: 
+      - Fri, 02 Nov 2012 22:44:01 GMT
+      Date: 
+      - Fri, 02 Nov 2012 22:44:01 GMT
+      Cache-Control: 
+      - private, max-age=0, must-revalidate
+      Set-Cookie: 
+      - S=photos_html=75VosCHo5p-jdB_YfBYF2Q; Domain=.google.com; Path=/; Secure; HttpOnly
+      - _rtok=BEt5sjzfzGGd; Path=/; Secure; HttpOnly
+      Gdata-Version: 
+      - "2.0"
+      X-Content-Type-Options: 
+      - nosniff
+      X-Frame-Options: 
+      - SAMEORIGIN
+      X-Xss-Protection: 
+      - 1; mode=block
+      Content-Length: 
+      - "0"
+      Server: 
+      - GSE
+      Content-Type: 
+      - text/html; charset=UTF-8
+    body: 
+      encoding: US-ASCII
+      base64_string: ""
+    http_version: 
+  recorded_at: Fri, 02 Nov 2012 22:44:03 GMT
+recorded_with: VCR 2.3.0

data/test/cassettes/tag-list.yml

@@ -0,0 +1,79 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://picasaweb.google.com/data/feed/api/user/w.wnetrzak?alt=json&kind=tag
+    body:
+      encoding: US-ASCII
+      string: ""
+    headers:
+      User-Agent:
+      - ruby-gem-picasa-v0.5.4 (gzip)
+      Gdata-Version:
+      - "2"
+      Accept-Encoding:
+      - gzip, deflate
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Expires:
+      - Thu, 01 Nov 2012 17:26:25 GMT
+      Date:
+      - Thu, 01 Nov 2012 17:26:25 GMT
+      Cache-Control:
+      - private, max-age=0, must-revalidate, no-transform
+      Set-Cookie:
+      - S=photos_html=8eaxzVvcRG3MoQYx2wnWQg; Domain=.google.com; Path=/; Secure; HttpOnly
+      - _rtok=511JCZCLo4RP; Path=/; Secure; HttpOnly
+      Content-Type:
+      - application/json; charset=UTF-8
+      Access-Control-Allow-Origin:
+      - "*"
+      Vary:
+      - Accept, X-GData-Authorization, GData-Version, Cookie
+      Gdata-Version:
+      - "2.0"
+      Etag:
+      - W/"D0UGSHg5fCp7ImA9WhNSF0k."
+      Last-Modified:
+      - Thu, 01 Nov 2012 04:47:09 GMT
+      Content-Encoding:
+      - gzip
+      Transfer-Encoding:
+      - chunked
+      X-Content-Type-Options:
+      - nosniff
+      X-Frame-Options:
+      - SAMEORIGIN
+      X-Xss-Protection:
+      - 1; mode=block
+      Server:
+      - GSE
+    body:
+      encoding: ASCII-8BIT
+      string: !binary |
+        H4sIAAAAAAAAAM1W227aQBD9lcohvDT2rrkmSFZEmutLhXIRUps+LGawN9he
+        d3cdk0R8SP+nH9ZZczGkJOGhUWqQjdZn58ycmZ3hyboHqbhIrI7lOtTasyDx
+        xZAnAS7cXJ/a+7g0AhhanSdrEkeJwvVQ67RDSJ7nTl53hAxIjdIm6WoRI7pA
+        VYI0FFqUYOWHEDPlBEIEETi+iEmBUGZve7lNpJBcAZN+WG5lBwXcJioFnxiE
+        KhDEdVxSEg5fJZv5iOhgWAHNTHh9cmsd05uzq/OgOfqSti/i7kE//Hp1SsfO
+        rYVQXkRd0XPDCi2n3GeK5TBYtT1kmhEjEskUSOLSlltv1Rvtdps2m01a26e1
+        mjXds7IUkVAarVG3ZruuTd1r2ug02h164LRqjW8G6yMyEPLB6nx/sop4YIv4
+        dsY8GaLnGmS8rfY7xmlr+gN3cR3B0rsXw1DZYB1pFrlvauiZWlFYn5MaDkRo
+        SPQsmS14PPebjZv9CSXd5XWx8rtLekfZJG6fhEnrhKhWw/Y3S+vcpYFxIeLJ
+        uJBLQrSNVkVZY9QPqZGWpWmEydV4FgjDSv6MZYVvQwmj7fPPUv5KDRyySHt3
+        CoWa7i28xCWQCSa79ETDRJNQb03/UqLeFmK1ClTEh6BCkW+WZGLjO3+cs3uw
+        RxFT4ZbOKeKTAU/I0ryj8tFhKJT2NuGrl2dHHp3Q4qoaTb3C/G69u1s7xe+m
+        TbhsUoAPswEfmAa8m0TgY6M8u/VTVH63fiyVWpFKQTT6mJKoKs2ktvH4wsRz
+        qzGb2BJUFmnlNVEJc64907bMOWWZDoUsSj1hcXkO++LO5+CHn/rJ719aPrJx
+        0XUk366NvVBHhjGABCRKIJeWegsLKMjaCDEzpKBc1N1GLuNY2esrWmgWXc7i
+        XVC465BCnwsjzwsAriFWPZA9FiwlQekQNJtFlaLPvdnd5uCE++MtxJ2jdZjF
+        g4Tx6INbINqej4z3GnMFwysFTZCUYD/LJPzHI29xktbnWOm2yuKYGU/+evNs
+        yPyD9h2FZPZ/ZiBFruDwpzdjq6bK986qmalCb6PW1RE39B59tw42y/brLWwl
+        4ysD7gPaFH6mfwCS2xOI0AoAAA==
+
+    http_version:
+  recorded_at: Thu, 01 Nov 2012 17:26:25 GMT
+recorded_with: VCR 2.3.0

data/test/client_test.rb

@@ -14,21 +14,21 @@ describe Picasa::Client do
 
   describe "#authenticate" do
     it "successfully authenticates" do
-      client = Picasa::Client.new(:user_id => "john.doe@domain.com", :password => "secret")
-
-      stub_request(:post, "https://www.google.com/accounts/ClientLogin").to_return(fixture("auth/success.txt"))
+      VCR.use_cassette("auth-success") do
+        client = Picasa::Client.new(:user_id => "w.wnetrzak@gmail.com", :password => Password)
+        client.authenticate
 
-      client.authenticate
-      refute_nil client.authorization_header
+        refute_nil client.authorization_header
+      end
     end
 
     it "raises an ForbiddenError when authentication failed" do
-      client = Picasa::Client.new(:user_id => "john.doe@domain.com", :password => "invalid")
+      VCR.use_cassette("auth-failed") do
+        client = Picasa::Client.new(:user_id => "w.wnetrzak@gmail.com", :password => "invalid")
 
-      stub_request(:post, "https://www.google.com/accounts/ClientLogin").to_return(fixture("exceptions/forbidden.txt"))
-
-      assert_raises(Picasa::ForbiddenError) do
-        client.authenticate
+        assert_raises(Picasa::ForbiddenError) do
+          client.authenticate
+        end
       end
     end
   end

data/test/connection_test.rb

@@ -4,39 +4,4 @@ describe Picasa::Connection do
   before do
     @connection = Picasa::Connection.new
   end
-
-  describe "#path_with_query" do
-    it "returns path when no params provided" do
-      path = @connection.path_with_query("/data/feed/api")
-      assert_equal "/data/feed/api", path
-    end
-
-    it "adds params to path" do
-      path = @connection.path_with_query("/data/feed/api", {:q => "bomb"})
-      assert_equal "/data/feed/api?q=bomb", path
-    end
-  end
-
-  it "raises NotFound exception when 404 returned" do
-    connection = Picasa::Connection.new
-    uri        = URI.parse("/data/feed/api/user/some.user/albumid/non-existing")
-
-    stub_request(:get, "https://picasaweb.google.com" + uri.path).to_return(fixture("exceptions/not_found.txt"))
-
-    assert_raises Picasa::NotFoundError, "Invalid entity id: non-existing" do
-      connection.get(:path => uri.path)
-    end
-  end
-
-  it "raises PreconditionFailed exception when 412 returned" do
-    connection = Picasa::Connection.new
-    uri        = URI.parse("/data/feed/api/user/some.user/albumid/123")
-
-    stub_request(:post, "https://www.google.com/accounts/ClientLogin").to_return(fixture("auth/success.txt"))
-    stub_request(:delete, "https://picasaweb.google.com" + uri.path).to_return(fixture("exceptions/precondition_failed.txt"))
-
-    assert_raises Picasa::PreconditionFailedError, "Mismatch: etags = [oldetag], version = [7]" do
-      connection.delete(:path => uri.path, :headers => {"If-Match" => "oldetag"})
-    end
-  end
 end

data/test/helper.rb

@@ -1,13 +1,25 @@
+require "yaml"
+require "zlib"
+
 require "minitest/autorun"
 require "webmock/minitest"
+require "vcr"
 require "mocha"
 
 require "picasa"
 
-xml_parser = ENV["XML_PARSER"] || "libxml"
+AuthHeader = ENV["PICASA_AUTH_HEADER"] || "GoogleLogin auth=token"
+Password   = ENV["PICASA_PASSWORD"]    || "secret"
+
+MultiJson.adapter = ENV["JSON_PARSER"] || "oj"
 
-require xml_parser if ["nokogiri", "libxml", "ox"].include?(xml_parser)
-MultiXml.parser = xml_parser
+VCR.configure do |c|
+  c.cassette_library_dir = "test/cassettes"
+  c.hook_into :webmock
+  c.default_cassette_options = {:serialize_with => :syck, :preserve_exact_body_bytes => true} # Avoid stroing headers as binary
+  c.filter_sensitive_data("<FILTERED>") { AuthHeader }
+  c.filter_sensitive_data("<FILTERED>") { Password }
+end
 
 class MiniTest::Unit::TestCase
   def setup
@@ -18,9 +30,11 @@ class MiniTest::Unit::TestCase
     File.join("test", "fixtures", filename)
   end
 
-  # Recording response is as simple as writing in terminal:
-  # curl -is -H "GData-Version: 2" "https://picasaweb.google.com/data/feed/api/user/username?prettyprint=true" -X GET > test/fixtures/albums.txt
-  def fixture(filename)
-    File.read(File.join("test", "fixtures", filename))
+  # Retrieves gzipped body
+  def decode(cassette_name)
+    cassette = YAML.load_file(File.join("test", "cassettes", cassette_name))
+    gzipped_body = cassette["http_interactions"][0]["response"]["body"]["string"]
+    body_io = StringIO.new(gzipped_body)
+    Zlib::GzipReader.new(body_io).read
   end
 end

data/test/utils_test.rb

@@ -43,12 +43,6 @@ describe Picasa::Utils do
     end
   end
 
-  describe "#array_wrap" do
-    it "wraps hash into array" do
-      assert_equal [{:wt => :f}], Picasa::Utils.array_wrap({:wt => :f})
-    end
-  end
-
   describe "#map_to_integer" do
     it "does not convert nil value" do
       assert_nil Picasa::Utils.map_to_integer(nil)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: picasa
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,10 +9,10 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-04 00:00:00.000000000 Z
+date: 2012-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: multi_xml
+  name: httparty
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -59,6 +59,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: vcr
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Simple Google Picasa managment
 email:
 - w.wnetrzak@gmail.com
@@ -91,6 +107,7 @@ files:
 - lib/picasa/connection.rb
 - lib/picasa/exceptions.rb
 - lib/picasa/file.rb
+- lib/picasa/http.rb
 - lib/picasa/presenter/album.rb
 - lib/picasa/presenter/album_list.rb
 - lib/picasa/presenter/author.rb
@@ -116,47 +133,28 @@ files:
 - test/api/comment_test.rb
 - test/api/photo_test.rb
 - test/api/tag_test.rb
+- test/cassettes/album-404.yml
+- test/cassettes/album-create.yml
+- test/cassettes/album-destroy.yml
+- test/cassettes/album-list.yml
+- test/cassettes/album-show.yml
+- test/cassettes/auth-failed.yml
+- test/cassettes/auth-success.yml
+- test/cassettes/comment-400.yml
+- test/cassettes/comment-create.yml
+- test/cassettes/comment-destroy.yml
+- test/cassettes/comment-list.yml
+- test/cassettes/photo-412.yml
+- test/cassettes/photo-create.yml
+- test/cassettes/photo-destroy.yml
+- test/cassettes/tag-create.yml
+- test/cassettes/tag-destroy.yml
+- test/cassettes/tag-list.yml
 - test/client_test.rb
 - test/connection_test.rb
 - test/file_test.rb
-- test/fixtures/album/album-create.txt
-- test/fixtures/album/album-list-with-tag.txt
-- test/fixtures/album/album-list.txt
-- test/fixtures/album/album-show-with-max-results.txt
-- test/fixtures/album/album-show-with-tag-and-many-photos.txt
-- 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
-- test/fixtures/json.txt
 - test/fixtures/lena.jpg
-- test/fixtures/photo/photo-created.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/presenters/comment_list.xml
-- test/fixtures/presenters/tag_list.xml
-- test/fixtures/tag/tag-list.txt
 - test/helper.rb
-- test/presenter/album_list_test.rb
-- 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
-- test/presenter/photo_test.rb
-- test/presenter/tag_list_test.rb
-- test/presenter/tag_test.rb
-- test/presenter/thumbnail_test.rb
 - test/template_test.rb
 - test/utils_test.rb
 homepage: https://github.com/morgoth/picasa
@@ -184,4 +182,3 @@ signing_key:
 specification_version: 3
 summary: simple google picasa managment
 test_files: []
-has_rdoc: