picasa 0.4.2 → 0.5.0

data/.travis.yml

@@ -9,3 +9,7 @@ env:
   - XML_PARSER=libxml
   # does not work yet
   # - XML_PARSER=ox
+
+matrix:
+  allow_failures:
+    - env: XML_PARSER=rexml

data/README.md

@@ -19,17 +19,40 @@ client.album.list
 
 client.album.show("album_id")
 # => Picasa::Presenter::Album
+
+client.photo.create("album_id", file_path: "path/to/my-photo.png")
+# => Picasa::Presenter::Photo
 ```
 
 If password is specified, all requests will be authenticated.
-This affect results to contain private data.
+This affect results to contain private data, however it can be controlled by `access` parameter.
+
+## Caveats
+
+Currently picasa wont work with `ox` xml parser.
+Using `rexml` parser wont return `etag` attribute properly.
+I recommend to use `libxml` or `nokogiri`.
+
+## Extra
+
+You can install thor script for uploading all photos from given directory:
+
+```
+thor install https://github.com/morgoth/picasa/raw/master/extra/Thorfile --as picasa_uploader --force
+```
+
+And then use it (it will create album taking title from folder name and upload all photos from that directory):
+
+```
+GOOGLE_USER_ID=your.email@gmail.com GOOGLE_PASSWORD=secret thor picasa_uploader:upload_all path-to-folder-with-photos
+```
 
 ## Continuous Integration
 [![Build Status](https://secure.travis-ci.org/morgoth/picasa.png)](http://travis-ci.org/morgoth/picasa)
 
 ## Contributors
 
-* [Bram Wijnands](https://github.com/BRamBoo)
+* [Bram Wijnands](https://github.com/Bram--)
 * [Rafael Souza](https://github.com/rafaels)
 * [jsaak](https://github.com/jsaak)
 * [Javier Guerra](https://github.com/javierg)

data/extra/Thorfile

@@ -0,0 +1,41 @@
+require "picasa"
+
+# Temporary requirement
+MultiXml.parser = :libxml
+
+class PicasaUploader < Thor
+  include Thor::Actions
+
+  desc "upload_all DIR", "Uploads all photos from given directory"
+  def upload_all(dir = File.basename(Dir.getwd))
+    require_credentials
+    album_presenter = create_album(File.basename(dir))
+    photos_number = 0
+    inside(dir, :verbose => true) do
+      Dir.entries(".").select { |e| e =~ /\.(jpg|jpeg|png|gif|bmp)$/i }.sort.each do |file|
+        create_photo(album_presenter, file)
+        photos_number += 1
+      end
+    end
+    say "Finished uploading #{photos_number} photos"
+  end
+
+  no_tasks do
+    def require_credentials
+      say "You must specify GOOGLE_USER_ID env variable" and exit unless ENV["GOOGLE_USER_ID"]
+      say "You must specify GOOGLE_PASSWORD env variable" and exit unless ENV["GOOGLE_PASSWORD"]
+    end
+
+    def create_album(album)
+      say("Creating album: #{album}")
+      client = Picasa::Client.new(user_id: ENV["GOOGLE_USER_ID"], password: ENV["GOOGLE_PASSWORD"])
+      client.album.create(title: album)
+    end
+
+    def create_photo(album, path)
+      say("Uploading photo #{path} to album #{album.title}")
+      client = Picasa::Client.new(user_id: ENV["GOOGLE_USER_ID"], password: ENV["GOOGLE_PASSWORD"])
+      client.photo.create(album.id, file_path: path)
+    end
+  end
+end

data/lib/picasa.rb

@@ -5,7 +5,11 @@ require "picasa/utils"
 require "picasa/exceptions"
 require "picasa/connection"
 require "picasa/client"
+require "picasa/file"
+require "picasa/template"
+
 require "picasa/api/album"
+require "picasa/api/photo"
 require "picasa/api/tag"
 
 require "picasa/presenter/album"

data/lib/picasa/api/album.rb

@@ -1,22 +1,15 @@
+require "picasa/api/base"
+
 module Picasa
   module API
-    class Album
-      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
-
+    class Album < Base
       # Returns album list
       #
       # @param [Hash] options additional options included in request
+      # @option options [all, private, public, visible] :access which data should be retrieved when authenticated
+      # @option options [String] :fields which fields should be retrieved https://developers.google.com/gdata/docs/2.0/reference#PartialResponseRequest
+      # @option options [String, Integer] :max_results how many albums response should include
+      # @option options [String, Integer] :start_index 1-based index of the first result to be retrieved
       #
       # @return [Presenter::AlbumList]
       def list(options = {})
@@ -41,6 +34,44 @@ module Picasa
 
         Presenter::Album.new(parsed_body["feed"])
       end
+
+      # Creates album
+      #
+      # @param [Hash] params album parameters
+      # @option options [String] :title title of album (required)
+      # @option options [String] :summary summary of album
+      # @option options [String] :location location of album photos (i.e. Poland)
+      # @option options [String] :access [public, private, protected]
+      # @option options [String] :timestamp timestamp of album (default to now)
+      # @option options [String] :keywords keywords (i.e. "vacation, poland")
+      #
+      # @return [Presenter::Album]
+      def create(params = {})
+        params[:title] || raise(ArgumentError, "You must specify title")
+        params[:timestamp] ||= Time.now.to_i
+
+        template = Template.new(:new_album, params)
+        uri = URI.parse("/data/feed/api/user/#{user_id}")
+        parsed_body = Connection.new(credentials).post(uri.path, template.render)
+        Presenter::Album.new(parsed_body["entry"])
+      end
+
+      # Destroys given album
+      #
+      # @param [String] album_id album id
+      # @param [Hash] options request parameters
+      # @option options [String] :etag destroys only when ETag matches - protects before destroying other client changes
+      #
+      # @return [true]
+      # @raise [NotFoundError] raised when album cannot be found
+      # @raise [PreconditionFailedError] raised when ETag does not match
+      def destroy(album_id, options = {})
+        headers = {"If-Match" => options.fetch(:etag, "*")}
+        uri = URI.parse("/data/entry/api/user/#{user_id}/albumid/#{album_id}")
+        Connection.new(credentials).delete(uri.path, headers)
+        true
+      end
+      alias :delete :destroy
     end
   end
 end

data/lib/picasa/api/base.rb

@@ -0,0 +1,18 @@
+module Picasa
+  module API
+    class Base
+      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
+    end
+  end
+end

data/lib/picasa/api/photo.rb

@@ -0,0 +1,30 @@
+require "picasa/api/base"
+
+module Picasa
+  module API
+    class Photo < Base
+      # Creates photo for given album
+      #
+      # @param [String] album_id album id
+      # @param [Hash] options request parameters
+      # @option options [String] :file_path path to photo file, rest of required attributes might be guessed based on file (i.e. "/home/john/Images/me.png")
+      # @option options [String] :title title of photo
+      # @option options [String] :summary summary of photo
+      # @option options [String] :binary binary data (i.e. File.open("my-photo.png", "rb").read)
+      # @option options [String] :content_type ["image/jpeg", "image/png", "image/bmp", "image/gif"] content type of given image
+      def create(album_id, params = {})
+        file = params[:file_path] ? File.new(params.delete(:file_path)) : nil
+        params[:boundary]     ||= "===============PicasaRubyGem=="
+        params[:title]        ||= (file && file.name) || raise(ArgumentError.new("title must be specified"))
+        params[:binary]       ||= (file && file.binary) || raise(ArgumentError.new("binary must be specified"))
+        params[:content_type] ||= (file && file.content_type) || raise(ArgumentError.new("content_type must be specified"))
+        template = Template.new(:new_photo, params)
+        headers = {"Content-Type" => "multipart/related; boundary=\"#{params[:boundary]}\""}
+
+        uri = URI.parse("/data/feed/api/user/#{user_id}/albumid/#{album_id}")
+        parsed_body = Connection.new(credentials).post(uri.path, template.render, headers)
+        Presenter::Photo.new(parsed_body["entry"])
+      end
+    end
+  end
+end

data/lib/picasa/api/tag.rb

@@ -1,24 +1,13 @@
+require "picasa/api/base"
+
 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
-
+    class Tag < Base
       # 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)
+      # @option options [String] :album_id retrieve tags for given album
+      # @option options [String] :photo_id retrieve tags for given photo (album_id must be provided)
       #
       # @return [Presenter::TagList]
       def list(options = {})

data/lib/picasa/client.rb

@@ -21,6 +21,17 @@ module Picasa
       API::Album.new(credentials)
     end
 
+    # @return [API::Photo]
+    #
+    # @example
+    #   client = Picasa::Client.new(user_id: "my.email@google.com", password: "secret")
+    #   photo = client.photo.create("album-id", title: "My picture", binary: "image-binary-data", content_type: "image/jpeg")
+    #   photo.id
+    #   # => "4322232322421"
+    def photo
+      API::Photo.new(credentials)
+    end
+
     # @return [API::Tag]
     #
     # @example

data/lib/picasa/connection.rb

@@ -23,6 +23,23 @@ module Picasa
 
       path = path_with_params(path, params)
       request = Net::HTTP::Get.new(path, headers)
+      response = handle_response(http.request(request))
+      MultiXml.parse(response.body)
+    end
+
+    def post(path, body, custom_headers = {})
+      authenticate if auth?
+
+      request = Net::HTTP::Post.new(path, headers.merge(custom_headers))
+      request.body = body
+      response = handle_response(http.request(request))
+      MultiXml.parse(response.body)
+    end
+
+    def delete(path, custom_headers = {})
+      authenticate if auth?
+
+      request = Net::HTTP::Delete.new(path, headers.merge(custom_headers))
       handle_response(http.request(request))
     end
 
@@ -43,16 +60,24 @@ module Picasa
     def handle_response(response)
       case response.code.to_i
       when 200...300
-        MultiXml.parse(response.body)
+        response
+      when 403
+        raise ForbiddenError.new(response.body, response)
       when 404
         raise NotFoundError.new(response.body, response)
+      when 412
+        raise PreconditionFailedError.new(response.body, response)
       else
-        raise ResponseError.new(reponse.body, response)
+        raise ResponseError.new(response.body, response)
       end
     end
 
     def headers
-      {"User-Agent" => "ruby-gem-v#{Picasa::VERSION}", "GData-Version" => API_VERSION}.tap do |headers|
+      {
+        "User-Agent"    => client_name,
+        "GData-Version" => API_VERSION,
+        "Content-Type"  => "application/atom+xml"
+      }.tap do |headers|
         headers["Authorization"] = "GoogleLogin auth=#{@auth_key}" if @auth_key
       end
     end
@@ -61,23 +86,14 @@ module Picasa
       !password.nil?
     end
 
-    def validate_email!
-      unless user_id =~ /[a-z0-9][a-z0-9._%+-]+[a-z0-9]@[a-z0-9][a-z0-9.-][a-z0-9]+\.[a-z]{2,6}/i
-        raise ArgumentError.new("user_id must be a valid E-mail address when authentication is used.")
-      end
-    end
-
     def authenticate
-      validate_email!
-
       data = inline_params({"accountType" => "HOSTED_OR_GOOGLE",
                             "Email"       => user_id,
                             "Passwd"      => password,
                             "service"     => "lh2",
-                            "source"      => "ruby-gem-v#{Picasa::VERSION}"})
+                            "source"      => client_name})
 
-      response = http(API_AUTH_URL).post("/accounts/ClientLogin", data)
-      raise ResponseError.new(response.body, response) unless response.is_a? Net::HTTPSuccess
+      response = handle_response(http(API_AUTH_URL).post("/accounts/ClientLogin", data))
 
       @auth_key = extract_auth_key(response.body)
     end
@@ -87,5 +103,9 @@ module Picasa
       params = Hash[response]
       params["Auth"]
     end
+
+    def client_name
+      "ruby-gem-v#{Picasa::VERSION}"
+    end
   end
 end

data/lib/picasa/exceptions.rb

@@ -16,4 +16,6 @@ module Picasa
   end
 
   class NotFoundError < ResponseError; end
+  class ForbiddenError < ResponseError; end
+  class PreconditionFailedError < ResponseError; end
 end

data/lib/picasa/file.rb

@@ -0,0 +1,36 @@
+module Picasa
+  class File
+    attr_reader :path
+
+    def initialize(path)
+      @path = path || raise(ArgumentError.new("path not specified"))
+    end
+
+    def name
+      @name ||= ::File.basename(path, ".*")
+    end
+
+    def extension
+      @extension ||= ::File.extname(path)[1..-1]
+    end
+
+    def binary
+      @binary ||= ::File.open(path, "rb").read
+    end
+
+    def content_type
+      @content_type ||= case extension
+      when /^jpe?g$/i
+        "image/jpeg"
+      when /^gif$/i
+        "image/gif"
+      when /^png$/i
+        "image/png"
+      when /^bmp$/i
+        "image/bmp"
+      else
+        raise StandarError.new("Content type cannot be guessed from file extension: #{extension}")
+      end
+    end
+  end
+end

data/lib/picasa/presenter/album.rb

@@ -16,7 +16,7 @@ module Picasa
 
       # @return [Array<Presenter::Link>]
       def links
-        @links ||= safe_retrieve(parsed_body, "link").map { |link| Link.new(link) }
+        @links ||= array_wrap(safe_retrieve(parsed_body, "link")).map { |link| Link.new(link) }
       end
 
       # @return [Presenter::Media]
@@ -34,6 +34,11 @@ module Picasa
         @updated ||= map_to_date(safe_retrieve(parsed_body, "updated"))
       end
 
+      # @return [String]
+      def etag
+        @etag ||= safe_retrieve(parsed_body, "etag")
+      end
+
       # @return [String]
       def title
         @title ||= safe_retrieve(parsed_body, "title")
@@ -88,6 +93,16 @@ module Picasa
       def nickname
         @nickname ||= safe_retrieve(parsed_body, "nickname")
       end
+
+      # @return [true, false, nil]
+      def allow_prints
+        @allow_prints ||= map_to_boolean(safe_retrieve(parsed_body, "allowPrints"))
+      end
+
+      # @return [true, false, nil]
+      def allow_downloads
+        @allow_downloads ||= map_to_boolean(safe_retrieve(parsed_body, "allowDownloads"))
+      end
     end
   end
 end

data/lib/picasa/presenter/album_list.rb

@@ -16,7 +16,7 @@ module Picasa
 
       # @return [Array<Presenter::Link>]
       def links
-        @links ||= safe_retrieve(parsed_body, "link").map { |link| Link.new(link) }
+        @links ||= array_wrap(safe_retrieve(parsed_body, "link")).map { |link| Link.new(link) }
       end
 
       # @return [String]

data/lib/picasa/presenter/photo.rb

@@ -23,6 +23,11 @@ module Picasa
         @id ||= array_wrap(safe_retrieve(parsed_body, "id"))[1]
       end
 
+      # @return [String]
+      def etag
+        @etag ||= safe_retrieve(parsed_body, "etag")
+      end
+
       # @return [DateTime]
       def published
         @published ||= map_to_date(safe_retrieve(parsed_body, "published"))

data/lib/picasa/presenter/tag.rb

@@ -10,7 +10,7 @@ module Picasa
 
       # @return [Array<Presenter::Link>]
       def links
-        @links ||= safe_retrieve(parsed_body, "link").map { |link| Link.new(link) }
+        @links ||= array_wrap(safe_retrieve(parsed_body, "link")).map { |link| Link.new(link) }
       end
 
       # @return [DateTime]
@@ -23,6 +23,11 @@ module Picasa
         @title ||= safe_retrieve(parsed_body, "title")
       end
 
+      # @return [String]
+      def etag
+        @etag ||= safe_retrieve(parsed_body, "etag")
+      end
+
       # @return [String]
       def summary
         @summary ||= safe_retrieve(parsed_body, "summary")

data/lib/picasa/presenter/tag_list.rb

@@ -16,7 +16,7 @@ module Picasa
 
       # @return [Array<Presenter::Link>]
       def links
-        @links ||= safe_retrieve(parsed_body, "link").map { |link| Link.new(link) }
+        @links ||= array_wrap(safe_retrieve(parsed_body, "link")).map { |link| Link.new(link) }
       end
 
       # @return [String]

data/lib/picasa/template.rb

@@ -0,0 +1,25 @@
+require "ostruct"
+require "erb"
+
+module Picasa
+  class Template
+    attr_reader :name, :params
+
+    def initialize(name, params)
+      @name   = name
+      @params = params
+    end
+
+    def file
+      @file ||= IO.read(::File.expand_path("../templates/#{name}.xml.erb", __FILE__))
+    end
+
+    def struct
+      @struct ||= OpenStruct.new(params)
+    end
+
+    def render
+      ERB.new(file).result(struct.instance_eval { binding })
+    end
+  end
+end

data/lib/picasa/templates/new_album.xml.erb

@@ -0,0 +1,19 @@
+<entry xmlns="http://www.w3.org/2005/Atom" xmlns:media="http://search.yahoo.com/mrss/" xmlns:gphoto="http://schemas.google.com/photos/2007">
+  <title type="text"><%= title %></title>
+  <% if summary %>
+  <summary type="text"><%= summary %></summary>
+  <% end %>
+  <% if location %>
+  <gphoto:location><%= location %></gphoto:location>
+  <% end %>
+  <% if access %>
+  <gphoto:access><%= access %></gphoto:access>
+  <% end %>
+  <gphoto:timestamp><%= timestamp %></gphoto:timestamp>
+  <% if keywords %>
+  <media:group>
+    <media:keywords><%= keywords %></media:keywords>
+  </media:group>
+  <% end %>
+  <category scheme="http://schemas.google.com/g/2005#kind" term="http://schemas.google.com/photos/2007#album"></category>
+</entry>

data/lib/picasa/templates/new_photo.xml.erb

@@ -0,0 +1,15 @@
+--<%= boundary %>
+Content-type: application/atom+xml
+
+<entry xmlns="http://www.w3.org/2005/Atom">
+  <title><%= title %></title>
+  <% if summary %>
+  <summary><%= summary %></summary>
+  <% end %>
+  <category scheme="http://schemas.google.com/g/2005#kind" term="http://schemas.google.com/photos/2007#photo"/>
+</entry>
+--<%= boundary %>
+Content-type: <%= content_type %>
+
+<%= binary %>
+--<%= boundary %>

data/lib/picasa/utils.rb

@@ -12,7 +12,7 @@ module Picasa
       end
     end
 
-    # Ported from ActiveSupport
+    # Ported from activesupport gem
     def array_wrap(object)
       if object.nil?
         []

data/lib/picasa/version.rb

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

data/test/api/album_test.rb

@@ -21,4 +21,26 @@ describe Picasa::API::Album do
       assert_equal "Wojciech Wnętrzak", album_show.author.name
     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"))
+
+      album_show = Picasa::API::Album.new(:user_id => "w.wnetrzak@gmail.com", :password => "secret").create(:title => "album")
+
+      assert_equal "Wojciech Wnętrzak", album_show.author.name
+    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
+    end
+  end
 end

data/test/api/photo_test.rb

@@ -0,0 +1,46 @@
+# -*- encoding: utf-8 -*-
+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"))
+
+      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")
+
+      assert_equal 27040, photo_create.size
+    end
+
+    it "raises ArgumentError when no title" do
+      photo = Picasa::API::Photo.new(:user_id => "w.wnetrzak@gmail.com", :password => "secret")
+      assert_raises Picasa::ArgumentError, /title/ do
+        photo.create("123", :binary => "binary", :content_type => "image/png")
+      end
+    end
+
+    it "raises ArgumentError when no binary" do
+      photo = Picasa::API::Photo.new(:user_id => "w.wnetrzak@gmail.com", :password => "secret")
+      assert_raises Picasa::ArgumentError, /binary/ do
+        photo.create("123", :title => "test", :content_type => "image/png")
+      end
+    end
+
+    it "raises ArgumentError when no content type" do
+      photo = Picasa::API::Photo.new(:user_id => "w.wnetrzak@gmail.com", :password => "secret")
+      assert_raises Picasa::ArgumentError, /content_type/ do
+        photo.create("123", :title => "test", :binary => "binary")
+      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"))
+
+      photo = Picasa::API::Photo.new(:user_id => "w.wnetrzak@gmail.com", :password => "secret")
+
+      assert photo.create("123", :file_path => image_path("lena.jpg"))
+    end
+  end
+end

data/test/connection_test.rb

@@ -41,13 +41,25 @@ describe Picasa::Connection 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"))
+    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(uri.path)
     end
   end
 
+  it "raises PreconditionFailed exception when 412 returned" do
+    connection = Picasa::Connection.new(:user_id => "john.doe@domain.com", :password => "secret")
+    uri        = URI.parse("/data/feed/api/user/#{connection.user_id}/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(uri.path, {"If-Match" => "oldetag"})
+    end
+  end
+
   describe "authentication" do
     it "successfully authenticates" do
       connection = Picasa::Connection.new(:user_id => "john.doe@domain.com", :password => "secret")
@@ -60,21 +72,13 @@ describe Picasa::Connection do
       refute_nil connection.get(uri.path)
     end
 
-    it "raises ArgumentError when invalid email given" do
-      connection = Picasa::Connection.new(:user_id => "john.doe", :password => "secret")
-
-      assert_raises(Picasa::ArgumentError) do
-        connection.get("/")
-      end
-    end
-
     it "raises an ResponseError when authentication failed" do
       connection = Picasa::Connection.new(:user_id => "john.doe@domain.com", :password => "secret")
       uri        = URI.parse("/data/feed/api/user/#{connection.user_id}")
 
-      stub_request(:post, "https://www.google.com/accounts/ClientLogin").to_return(fixture("auth/failure.txt"))
+      stub_request(:post, "https://www.google.com/accounts/ClientLogin").to_return(fixture("exceptions/forbidden.txt"))
 
-      assert_raises(Picasa::ResponseError) do
+      assert_raises(Picasa::ForbiddenError) do
         connection.get(uri.path)
       end
     end

data/test/file_test.rb

@@ -0,0 +1,29 @@
+require "helper"
+
+describe Picasa::File do
+  it "raises argument error when nil path given" do
+    assert_raises Picasa::ArgumentError do
+      Picasa::File.new(nil)
+    end
+  end
+
+  it "it returns file name" do
+    file = Picasa::File.new(image_path("lena.jpg"))
+    assert_equal "lena", file.name
+  end
+
+  it "it returns file extension" do
+    file = Picasa::File.new(image_path("lena.jpg"))
+    assert_equal "jpg", file.extension
+  end
+
+  it "it guesses content type" do
+    file = Picasa::File.new(image_path("lena.jpg"))
+    assert_equal "image/jpeg", file.content_type
+  end
+
+  it "returns binary read file" do
+    file = Picasa::File.new(image_path("lena.jpg"))
+    assert_equal String, file.binary.class
+  end
+end

data/test/fixtures/album/album-create.txt

@@ -0,0 +1,21 @@
+HTTP/1.1 201 Created
+Gdata-version: 2.0
+Content-length: 2988
+Via: HTTP/1.1 GWA
+Content-location: https://picasaweb.google.com/data/entry/api/user/106136347770555028022/albumid/5783214424453412737
+X-content-type-options: nosniff
+Etag: "YD0qeyI."
+Set-cookie: _rtok=v2BIV10GEHe2; Path=/; Secure; HttpOnly, S=photos_html=TyVjxRd5Em09qzhPl6Kjsw; Domain=.google.com; Path=/; Secure; HttpOnly
+Expires: Sat, 01 Sep 2012 14:25:36 GMT
+Vary: Accept, X-GData-Authorization, GData-Version
+X-google-cache-control: remote-fetch
+Server: GSE
+X-xss-protection: 1; mode=block
+Location: https://picasaweb.google.com/data/entry/api/user/106136347770555028022/albumid/5783214424453412737
+Cache-control: private, max-age=0, must-revalidate, no-transform
+Date: Sat, 01 Sep 2012 14:25:36 GMT
+X-frame-options: SAMEORIGIN
+Content-type: application/atom+xml; charset=UTF-8; type=entry
+-content-encoding: gzip
+
+<?xml version='1.0' encoding='UTF-8'?><entry xmlns='http://www.w3.org/2005/Atom' xmlns:app='http://www.w3.org/2007/app' xmlns:gphoto='http://schemas.google.com/photos/2007' xmlns:media='http://search.yahoo.com/mrss/' xmlns:gd='http://schemas.google.com/g/2005' xmlns:gml='http://www.opengis.net/gml' xmlns:georss='http://www.georss.org/georss' gd:etag='&quot;YD0qeyI.&quot;'><id>https://picasaweb.google.com/data/entry/user/106136347770555028022/albumid/5783214424453412737</id><published>1970-01-16T14:01:49.000Z</published><updated>2012-09-01T14:25:36.447Z</updated><app:edited>2012-09-01T14:25:36.447Z</app:edited><category scheme='http://schemas.google.com/g/2005#kind' term='http://schemas.google.com/photos/2007#album'/><title>Trip To Poland</title><summary>This was the recent trip I took to Poland.</summary><rights>protected</rights><link rel='http://schemas.google.com/g/2005#feed' type='application/atom+xml' href='https://picasaweb.google.com/data/feed/api/user/106136347770555028022/albumid/5783214424453412737'/><link rel='alternate' type='text/html' href='https://picasaweb.google.com/106136347770555028022/TripToPoland'/><link rel='self' type='application/atom+xml' href='https://picasaweb.google.com/data/entry/api/user/106136347770555028022/albumid/5783214424453412737'/><link rel='edit' type='application/atom+xml' href='https://picasaweb.google.com/data/entry/api/user/106136347770555028022/albumid/5783214424453412737'/><link rel='http://schemas.google.com/acl/2007#accessControlList' type='application/atom+xml' href='https://picasaweb.google.com/data/entry/api/user/106136347770555028022/albumid/5783214424453412737/acl'/><author><name>Wojciech Wnętrzak</name><uri>https://picasaweb.google.com/106136347770555028022</uri></author><gphoto:id>5783214424453412737</gphoto:id><gphoto:name>TripToPoland</gphoto:name><gphoto:location>Poland</gphoto:location><gphoto:access>protected</gphoto:access><gphoto:timestamp>1346509000</gphoto:timestamp><gphoto:numphotos>0</gphoto:numphotos><gphoto:numphotosremaining>1000</gphoto:numphotosremaining><gphoto:bytesUsed>0</gphoto:bytesUsed><gphoto:user>106136347770555028022</gphoto:user><gphoto:nickname>Wojciech Wnętrzak</gphoto:nickname><media:group><media:content url='https://lh3.googleusercontent.com/-8od2ksbQgT0/UEIa4NV194E/AAAAAAAAAqI/XIYGNrflH9A/TripToPoland.jpg' type='image/jpeg' medium='image'/><media:credit>Wojciech Wnętrzak</media:credit><media:description type='plain'>This was the recent trip I took to Poland.</media:description><media:keywords/><media:thumbnail url='https://lh3.googleusercontent.com/-8od2ksbQgT0/UEIa4NV194E/AAAAAAAAAqI/XIYGNrflH9A/s160-c/TripToPoland.jpg' height='160' width='160'/><media:title type='plain'>Trip To Poland</media:title></media:group><georss:where><gml:Envelope><gml:lowerCorner>49.0025444 14.1336215</gml:lowerCorner><gml:upperCorner>54.8363315 24.1566505</gml:upperCorner></gml:Envelope><gml:Point><gml:pos>51.919438 19.145136</gml:pos></gml:Point></georss:where></entry>

data/test/fixtures/exceptions/precondition_failed.txt

@@ -0,0 +1,14 @@
+HTTP/1.1 412 Precondition Failed
+Expires: Sat, 01 Sep 2012 17:21:46 GMT
+Date: Sat, 01 Sep 2012 17:21:46 GMT
+Cache-Control: private, max-age=0, must-revalidate
+Set-Cookie: _rtok=3ODY353H4sXQ; Path=/; Secure; HttpOnly
+Set-Cookie: S=photos_html=kOBZzBdZTgXA12OVzxVTbg; 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
+
+Mismatch: etags = [oldetag], version = [7]

data/test/fixtures/photo/photo-created.txt

@@ -0,0 +1,21 @@
+HTTP/1.1 201 Created
+Gdata-version: 2.0
+Content-length: 3698
+Via: HTTP/1.1 GWA
+Content-location: https://picasaweb.google.com/data/entry/api/user/106136347770555028022/albumid/5782912491601845665/photoid/5782919030689216834
+X-content-type-options: nosniff
+Etag: "YD0qeyI."
+Set-cookie: _rtok=RJK5U_sWX0B8; Path=/; Secure; HttpOnly, S=photos_html=1MH7BnwEbzDbPVcrJGKtlw; Domain=.google.com; Path=/; Secure; HttpOnly
+Expires: Fri, 31 Aug 2012 19:19:21 GMT
+Vary: Accept, X-GData-Authorization, GData-Version
+X-google-cache-control: remote-fetch
+Server: GSE
+X-xss-protection: 1; mode=block
+Location: https://picasaweb.google.com/data/entry/api/user/106136347770555028022/albumid/5782912491601845665/photoid/5782919030689216834
+Cache-control: private, max-age=0, must-revalidate, no-transform
+Date: Fri, 31 Aug 2012 19:19:21 GMT
+X-frame-options: SAMEORIGIN
+Content-type: application/atom+xml; charset=UTF-8; type=entry
+-content-encoding: gzip
+
+<?xml version='1.0' encoding='UTF-8'?><entry xmlns='http://www.w3.org/2005/Atom' xmlns:exif='http://schemas.google.com/photos/exif/2007' xmlns:app='http://www.w3.org/2007/app' xmlns:gphoto='http://schemas.google.com/photos/2007' xmlns:media='http://search.yahoo.com/mrss/' xmlns:gd='http://schemas.google.com/g/2005' gd:etag='&quot;YD0qeyI.&quot;'><id>https://picasaweb.google.com/data/entry/user/106136347770555028022/albumid/5782912491601845665/photoid/5782919030689216834</id><published>2012-08-31T19:19:20.000Z</published><updated>2012-08-31T19:19:20.882Z</updated><app:edited>2012-08-31T19:19:20.882Z</app:edited><category scheme='http://schemas.google.com/g/2005#kind' term='http://schemas.google.com/photos/2007#photo'/><title>ancient-test.jpg</title><summary>sent from playground</summary><content type='image/jpeg' src='https://lh5.googleusercontent.com/-HawhXkeW2Y4/UEEOOB0TuUI/AAAAAAAAAos/V1lCZ7oNAEg/ancient-test.jpg'/><link rel='http://schemas.google.com/g/2005#feed' type='application/atom+xml' href='https://picasaweb.google.com/data/feed/api/user/106136347770555028022/albumid/5782912491601845665/photoid/5782919030689216834'/><link rel='alternate' type='text/html' href='https://picasaweb.google.com/106136347770555028022/PrivateTesting#5782919030689216834'/><link rel='http://schemas.google.com/photos/2007#canonical' type='text/html' href='https://picasaweb.google.com/lh/photo/HerZrwYwEPv8XgInPPde-NMTjNZETYmyPJy0liipFm0'/><link rel='self' type='application/atom+xml' href='https://picasaweb.google.com/data/entry/api/user/106136347770555028022/albumid/5782912491601845665/photoid/5782919030689216834'/><link rel='edit' type='application/atom+xml' href='https://picasaweb.google.com/data/entry/api/user/106136347770555028022/albumid/5782912491601845665/photoid/5782919030689216834'/><link rel='edit-media' type='image/jpeg' href='https://picasaweb.google.com/data/media/api/user/106136347770555028022/albumid/5782912491601845665/photoid/5782919030689216834'/><link rel='http://schemas.google.com/photos/2007#report' type='text/html' href='https://picasaweb.google.com/lh/reportAbuse?uname=106136347770555028022&amp;aid=5782912491601845665&amp;iid=5782919030689216834'/><gphoto:id>5782919030689216834</gphoto:id><gphoto:albumid>5782912491601845665</gphoto:albumid><gphoto:access>only_you</gphoto:access><gphoto:width>473</gphoto:width><gphoto:height>506</gphoto:height><gphoto:size>27040</gphoto:size><gphoto:checksum/><gphoto:timestamp>1346440760000</gphoto:timestamp><gphoto:imageVersion>651</gphoto:imageVersion><gphoto:commentingEnabled>true</gphoto:commentingEnabled><gphoto:commentCount>0</gphoto:commentCount><gphoto:license id='0' name='Wszelkie prawa zastrzeżone' url=''>ALL_RIGHTS_RESERVED</gphoto:license><exif:tags><exif:imageUniqueID>6b5722298561a74e1476868e2ae28b7d</exif:imageUniqueID></exif:tags><media:group><media:content url='https://lh5.googleusercontent.com/-HawhXkeW2Y4/UEEOOB0TuUI/AAAAAAAAAos/V1lCZ7oNAEg/ancient-test.jpg' height='506' width='473' type='image/jpeg' medium='image'/><media:credit>Wojciech Wnętrzak</media:credit><media:description type='plain'>sent from playground</media:description><media:keywords/><media:thumbnail url='https://lh5.googleusercontent.com/-HawhXkeW2Y4/UEEOOB0TuUI/AAAAAAAAAos/V1lCZ7oNAEg/s72/ancient-test.jpg' height='72' width='68'/><media:thumbnail url='https://lh5.googleusercontent.com/-HawhXkeW2Y4/UEEOOB0TuUI/AAAAAAAAAos/V1lCZ7oNAEg/s144/ancient-test.jpg' height='144' width='135'/><media:thumbnail url='https://lh5.googleusercontent.com/-HawhXkeW2Y4/UEEOOB0TuUI/AAAAAAAAAos/V1lCZ7oNAEg/s288/ancient-test.jpg' height='288' width='270'/><media:title type='plain'>ancient-test.jpg</media:title></media:group></entry>

data/test/helper.rb

@@ -14,6 +14,10 @@ class MiniTest::Unit::TestCase
     WebMock.disable_net_connect!
   end
 
+  def image_path(filename)
+    ::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)

data/test/presenter/album_test.rb

@@ -20,6 +20,10 @@ describe Picasa::Presenter::Album do
       assert_equal 3, @album.links.size
     end
 
+    it "has etag" do
+      assert_equal "\"YDkqeyI.\"", @album.etag
+    end
+
     it "has media credit" do
       assert_equal "Wojciech Wnętrzak", @album.media.credit
     end
@@ -127,6 +131,10 @@ describe Picasa::Presenter::Album do
       assert_equal "5243667126168669553", @album.id
     end
 
+    it "has etag" do
+      assert_equal "W/\"DUICQX0_fSp7ImA9WhdSGEo.\"", @album.etag
+    end
+
     it "has name" do
       assert_equal "Test2", @album.name
     end
@@ -158,6 +166,14 @@ describe Picasa::Presenter::Album do
     it "has photo entries" do
       assert_equal 3, @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 "album from show with single photo" do

data/test/presenter/photo_test.rb

@@ -20,6 +20,10 @@ describe Picasa::Presenter::Photo do
     assert_equal "Wojciech Wnętrzak", @photo.media.credit
   end
 
+  it "has etag" do
+    assert_equal "\"YD4qeyI.\"", @photo.etag
+  end
+
   it "has id" do
     assert_equal "5243667226703402962", @photo.id
   end

data/test/presenter/tag_test.rb

@@ -24,6 +24,10 @@ describe Picasa::Presenter::Tag do
       assert_equal "2012-08-17T08:40:24+00:00", @tag.updated.to_s
     end
 
+    it "has etag" do
+      assert_equal "W/\"CE8GRXczfip7ImA9WhJWEUQ.\"", @tag.etag
+    end
+
     it "has title" do
       assert_equal "nice", @tag.title
     end

data/test/template_test.rb

@@ -0,0 +1,25 @@
+require "helper"
+
+describe Picasa::Template do
+  it "has name" do
+    template = Picasa::Template.new(:new_album, {})
+    assert_equal :new_album, template.name
+  end
+
+  it "has params" do
+    template = Picasa::Template.new(:new_album, {:title => "My album"})
+    assert_equal({:title => "My album"}, template.params)
+  end
+
+  describe "new_album" do
+    it "renders title" do
+      template = Picasa::Template.new(:new_album, {:title => "My album"})
+      assert_match %q{<title type="text">My album</title>}, template.render
+    end
+
+    it "renders summary" do
+      template = Picasa::Template.new(:new_album, {:summary => "My summary"})
+      assert_match %q{<summary type="text">My summary</summary>}, template.render
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: picasa
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-24 00:00:00.000000000 Z
+date: 2012-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_xml
@@ -72,12 +72,16 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- extra/Thorfile
 - lib/picasa.rb
 - lib/picasa/api/album.rb
+- lib/picasa/api/base.rb
+- lib/picasa/api/photo.rb
 - lib/picasa/api/tag.rb
 - lib/picasa/client.rb
 - lib/picasa/connection.rb
 - lib/picasa/exceptions.rb
+- lib/picasa/file.rb
 - lib/picasa/presenter/album.rb
 - lib/picasa/presenter/album_list.rb
 - lib/picasa/presenter/author.rb
@@ -89,23 +93,32 @@ files:
 - lib/picasa/presenter/tag.rb
 - lib/picasa/presenter/tag_list.rb
 - lib/picasa/presenter/thumbnail.rb
+- lib/picasa/template.rb
+- lib/picasa/templates/new_album.xml.erb
+- lib/picasa/templates/new_photo.xml.erb
 - lib/picasa/utils.rb
 - lib/picasa/version.rb
 - picasa.gemspec
 - test/api/album_test.rb
+- test/api/photo_test.rb
 - test/api/tag_test.rb
 - 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/failure.txt
 - test/fixtures/auth/success.txt
+- test/fixtures/exceptions/forbidden.txt
+- test/fixtures/exceptions/not_found.txt
+- test/fixtures/exceptions/precondition_failed.txt
 - test/fixtures/json.txt
-- test/fixtures/not_found.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
@@ -126,6 +139,7 @@ files:
 - 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
 licenses: []