picasa 0.5.0 → 0.5.1

data/Gemfile

@@ -2,6 +2,7 @@ source "https://rubygems.org"
 
 gemspec
 
+gem "thor"
 gem "rake"
 gem "minitest", :platform => :ruby_18
 gem "debugger", :platform => :ruby_19

data/README.md

@@ -41,12 +41,24 @@ 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
 ```
 
+Updating script can be done by:
+
+```
+thor update picasa_uploader
+```
+
 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
 ```
 
+If your upload was somehow interrupted, you can resume it by adding `--continue` option:
+
+```
+GOOGLE_USER_ID=your.email@gmail.com GOOGLE_PASSWORD=secret thor picasa_uploader:upload_all --continue path-to-folder-with-photos
+```
+
 ## Continuous Integration
 [![Build Status](https://secure.travis-ci.org/morgoth/picasa.png)](http://travis-ci.org/morgoth/picasa)
 
@@ -56,6 +68,7 @@ GOOGLE_USER_ID=your.email@gmail.com GOOGLE_PASSWORD=secret thor picasa_uploader:
 * [Rafael Souza](https://github.com/rafaels)
 * [jsaak](https://github.com/jsaak)
 * [Javier Guerra](https://github.com/javierg)
+* [Eiichi Takebuchi](https://github.com/GRGSIBERIA)
 
 ## Copyright
 

data/example/add_tags_to_photo.rb

@@ -0,0 +1,20 @@
+require "picasa"
+
+# add tags to your photos in an album.
+begin
+  client = Picasa::Client.new(:user_id => "your_gmail_account", :password => "password")
+  albums = client.album.list.entries
+  album = albums.find { |album| album.title == "New Album" }
+
+  photos = client.album.show(album.id).entries
+
+  photos.each do |photo|
+    client.tag.create(
+        :album_id => album.id,
+        :photo_id => photo.id,
+        :tag_name => "test")
+  end
+
+rescue Picasa::ForbiddenError
+  puts "You have the wrong user_id or password."
+end

data/example/create_new_album.rb

@@ -0,0 +1,13 @@
+require "picasa"
+
+begin
+  client = Picasa::Client.new(:user_id => "your_gmail_account", :password => "password")
+  # create new album.
+  client.album.create(
+      :title => "New Album",
+      :summary => "This is a new album.",
+      :access => "protected")
+
+rescue Picasa::ForbiddenError
+  puts "You have the wrong user_id or password."
+end

data/example/delete_all_photos.rb

@@ -0,0 +1,20 @@
+require "picasa"
+
+# delete all photos in an album.
+begin
+  client = Picasa::Client.new(:user_id => "your_gmail_account", :password => "password")
+  albums = client.album.list.entries
+  album = albums.find { |album| album.title == "New Album" }
+
+  photos = client.album.show(album.id).entries
+
+  photos.each do |photo|
+    if client.tag.delete(album_id, photo.id)
+      "#{photo.title} deleted"
+    else
+      "#{photo.title} failed to delete"
+    end
+  end
+rescue Picasa::ForbiddenError
+  puts "You have the wrong user_id or password."
+end

data/example/get_some_albums.rb

@@ -0,0 +1,12 @@
+require "picasa"
+
+# get some albums.
+begin
+  client = Picasa::Client.new(:user_id => "your_gmail_account", :password => "password")
+
+  albums = client.album.list.entries
+  albums.each { |album| puts album.title }
+
+rescue Picasa::ForbiddenError
+  puts "You have the wrong user_id or password."
+end

data/example/get_some_photos.rb

@@ -0,0 +1,16 @@
+require "picasa"
+
+# get some photos in an album
+begin
+  client = Picasa::Client.new(:user_id => "your_gmail_account", :password => "password")
+
+  albums = client.album.list.entries
+  album = albums.find { |album| album.title == "New Album" }
+
+  photos = client.album.show(album.id).entries
+
+  photos.each { |photo| puts photo.title }
+
+rescue Picasa::ForbiddenError
+  puts "You have the wrong user_id or password."
+end

data/example/upload_photo.rb

@@ -0,0 +1,23 @@
+require "picasa"
+
+# upload photo
+begin
+  client = Picasa::Client.new(:user_id => "your_gmail_account", :password => "password")
+
+  photo_bin = File.binread("./test.jpg")
+
+  albums = client.album.list.entries
+  album = albums.find { |album| album.title == "New Album" }
+
+  client.photo.create(album.id,
+    {
+      :binary => photo_bin,
+      :content_type => "image/jpeg",
+      :title => "Test Photo",
+      :summary => "Hoge hoge"
+    }
+  )
+
+rescue Picasa::ForbiddenError
+  puts "You have the wrong user_id or password."
+end

data/extra/Thorfile

@@ -6,35 +6,58 @@ MultiXml.parser = :libxml
 class PicasaUploader < Thor
   include Thor::Actions
 
-  desc "upload_all DIR", "Uploads all photos from given directory"
+  desc "upload_all DIR", "Uploads all photos from given directory (pass --continue to resume uploading)"
+  method_options continue: false
   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)
+
+    inside(dir, verbose: true) do
+      entries       = Dir.entries(".").select { |e| e =~ /\.(jpg|jpeg|png|gif|bmp)$/i }.sort
+      album_name    = File.basename(dir)
+      photos_number = 0
+
+      if options[:continue]
+        # We're looking for existing album and photos already uploaded
+        albums = client.album.list(fields: "entry(title,gphoto:id)")
+        album  = albums.entries.find { |a| a.title == album_name }
+        if album
+          say "Album #{album_name} found - continuing upload"
+        else
+          say "Album #{album_name} not found in your collection - aborting" and exit
+        end
+
+        photo_titles = client.album.show(album.id, fields: "entry/title").entries.map &:title
+
+        entries.reject! { |e| photo_titles.include?(File.basename(e, ".*")) }
+      else
+        say("Creating album: #{album_name}")
+        album = create_album(album_name)
+      end
+
+      entries.each do |file|
         photos_number += 1
+        say("Uploading photo #{file} to album #{album.title} - #{photos_number}/#{entries.size}")
+        create_photo(album, file)
       end
+      say "Finished uploading #{photos_number} photos"
     end
-    say "Finished uploading #{photos_number} photos"
   end
 
   no_tasks do
+    def client
+      @client ||= Picasa::Client.new(user_id: ENV["GOOGLE_USER_ID"], password: ENV["GOOGLE_PASSWORD"])
+    end
+
     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)
+    def create_album(title)
+      client.album.create(title: title)
     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

data/lib/picasa/api/album.rb

@@ -23,6 +23,7 @@ module Picasa
       #
       # @param [String] album_id album id
       # @param [Hash] options additional options included in request
+      # @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 max number of returned results
       # @option options [String] :tag include photos with given tag only
       #
@@ -41,14 +42,14 @@ module Picasa
       # @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] :access ["public", "private", "protected"] (default to private)
       # @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
+        params[:access] ||= "private"
 
         template = Template.new(:new_album, params)
         uri = URI.parse("/data/feed/api/user/#{user_id}")

data/lib/picasa/api/photo.rb

@@ -18,6 +18,7 @@ module Picasa
         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]}\""}
 
@@ -25,6 +26,24 @@ module Picasa
         parsed_body = Connection.new(credentials).post(uri.path, template.render, headers)
         Presenter::Photo.new(parsed_body["entry"])
       end
+
+	    # Destroys given photo
+      #
+      # @param [String] album_id album id
+	    # @param [String] photo_id photo 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 or photo cannot be found
+      # @raise [PreconditionFailedError] raised when ETag does not match
+      def destroy(album_id, photo_id, options = {})
+        headers = {"If-Match" => options.fetch(:etag, "*")}
+        uri = URI.parse("/data/entry/api/user/#{user_id}/albumid/#{album_id}/photoid/#{photo_id}")
+        Connection.new(credentials).delete(uri.path, headers)
+        true
+      end
+      alias :delete :destroy
     end
   end
 end

data/lib/picasa/api/tag.rb

@@ -20,11 +20,31 @@ module Picasa
         path << "/photoid/#{photo_id}" if photo_id
 
         uri = URI.parse(path)
-
         parsed_body = Connection.new(credentials).get(uri.path, options.merge(:kind => "tag"))
-
         Presenter::TagList.new(parsed_body["feed"])
       end
+
+      # Creates a tag for a photo.
+      #
+      # @param [Hash]
+      # @option options [String] :album_id id pof album
+      # @option options [String] :photo_id id of photo
+      # @option options [String] :title name of tag
+      #
+      # @return [Presenter::Tag]
+      def create(params = {})
+        album_id = params.delete(:album_id) || raise(ArgumentError, "You must specify album_id")
+        photo_id = params.delete(:photo_id) || raise(ArgumentError, "You must specify photo_id")
+        params[:title] || raise(ArgumentError, "You must specify title")
+
+        path = "/data/feed/api/user/#{user_id}/albumid/#{album_id}/photoid/#{photo_id}"
+
+        template = Template.new("new_tag", params)
+
+        uri = URI.parse(path)
+        parsed_body = Connection.new(credentials).post(uri.path, template.render)
+        Presenter::Tag.new(parsed_body["entry"])
+      end
     end
   end
 end

data/lib/picasa/presenter/album.rb

@@ -56,7 +56,7 @@ module Picasa
 
       # @return [String]
       def id
-        @id ||= array_wrap(safe_retrieve(parsed_body, "id"))[1]
+        @id ||= array_wrap(safe_retrieve(parsed_body, "id")).last
       end
 
       # @return [String]

data/lib/picasa/presenter/photo.rb

@@ -5,7 +5,7 @@ module Picasa
     class Photo < Base
       # @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]
@@ -20,7 +20,7 @@ module Picasa
 
       # @return [String]
       def id
-        @id ||= array_wrap(safe_retrieve(parsed_body, "id"))[1]
+        @id ||= array_wrap(safe_retrieve(parsed_body, "id")).last
       end
 
       # @return [String]

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

@@ -0,0 +1,4 @@
+<entry xmlns="http://www.w3.org/2005/Atom">
+  <title><%= title %></title>
+  <category scheme="http://schemas.google.com/g/2005#kind" term="http://schemas.google.com/photos/2007#tag"/>
+</entry>

data/lib/picasa/version.rb

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

data/test/api/tag_test.rb

@@ -3,7 +3,7 @@ require "helper"
 
 describe Picasa::API::Tag do
   describe "#list" do
-    it "throws ArgumentErro when photo_id provided without album_id" do
+    it "throws ArgumentError when photo_id provided without album_id" do
       tag = Picasa::API::Tag.new(:user_id => "w.wnetrzak")
 
       assert_raises Picasa::ArgumentError, /album_id/ do
@@ -19,4 +19,27 @@ describe Picasa::API::Tag do
       assert_equal 2, tag_list.entries.size
     end
   end
+
+  describe "#create" do
+    it "raises ArgumentError when no album_id" do
+      tag = Picasa::API::Tag.new(:user_id => "w.wnetrzak@gmail.com", :password => "secret")
+      assert_raises Picasa::ArgumentError, /album_id/ do
+        tag.create(:photo_id => "455", :title => "title")
+      end
+    end
+
+    it "raises ArgumentError when no photo_id" do
+      tag = Picasa::API::Tag.new(:user_id => "w.wnetrzak@gmail.com", :password => "secret")
+      assert_raises Picasa::ArgumentError, /photo_id/ do
+        tag.create(:album_id => "123", :title => "title")
+      end
+    end
+
+    it "raises ArgumentError when no title" do
+      tag = Picasa::API::Tag.new(:user_id => "w.wnetrzak@gmail.com", :password => "secret")
+      assert_raises Picasa::ArgumentError, /title/ do
+        tag.create(:album_id => "123", :photo_id => "455")
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: picasa
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -72,6 +72,12 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- example/add_tags_to_photo.rb
+- example/create_new_album.rb
+- example/delete_all_photos.rb
+- example/get_some_albums.rb
+- example/get_some_photos.rb
+- example/upload_photo.rb
 - extra/Thorfile
 - lib/picasa.rb
 - lib/picasa/api/album.rb
@@ -96,6 +102,7 @@ files:
 - lib/picasa/template.rb
 - lib/picasa/templates/new_album.xml.erb
 - lib/picasa/templates/new_photo.xml.erb
+- lib/picasa/templates/new_tag.xml.erb
 - lib/picasa/utils.rb
 - lib/picasa/version.rb
 - picasa.gemspec