picasa 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 91a09cb41c7e4e13eb830c390c2cac41ec9bc159
-  data.tar.gz: 25ab483fc8fbe5ef7095ed336b991b19ca01830d
+  metadata.gz: 1c620c0f045fc74dc70cd23a64fbd92770c457e1
+  data.tar.gz: 52dada0a9d55ab05a8bf1d685445b727008c89fa
 SHA512:
-  metadata.gz: b11f16ab4af155c874d5511eeb0ab4787720cff01639ada8508f93591a14a1318102e683adc74b446ad0519ae9bfc24c89825ec3638d74db88b6cb06336b04c9
-  data.tar.gz: 5f8638b15e131fa0109f08bdcda0ad4c7ffe53a34acbcbd032172b193ae7ff99e04daef20965e2166ef1d6171275cad64bc277ffa08cfa700c02c7ae55a7f178
+  metadata.gz: 06ec8d9e5affa7181a84ab9536161bca5d53efb83749a90e45db4dc0759f080e1491728ae1c57191421661458cda13ac6bb14cc8f28c16b91fefda51a1362d89
+  data.tar.gz: ddcc148b54492c1db5b025e26c5ba71d70c86590c2402a8649517b64d1eece7d6f979221db5f41e7f9d454328bc73720f7d5025a235a76d910bc406c82a643b5

data/README.md

@@ -8,7 +8,7 @@ Ruby library for [Picasa Web Albums Data API](https://developers.google.com/pica
 gem install picasa
 ```
 
-## Usage
+# Usage
 
 [Documentation](http://rubydoc.info/github/morgoth/picasa)
 
@@ -24,7 +24,7 @@ client.photo.create("album_id", file_path: "path/to/my-photo.png")
 # => Picasa::Presenter::Photo
 ```
 
-### Authentication
+## Authentication
 
 When request is authenticated, response will contain private data, however this can be controlled by `access` parameter.
 
@@ -37,6 +37,8 @@ client = Picasa::Client.new(user_id: "some.user@gmail.com", access_token: "acces
 As authenticating by providing password is no longer possible due to google API shutdown https://developers.google.com/accounts/docs/AuthForInstalledApps
 you need to set `access_token` for authenticated requests.
 
+### One time usage
+
 For one time usage, you can retrieve access_token from google playground:
 * Visit https://developers.google.com/oauthplayground
 * Find "Picasa Web v2"
@@ -46,7 +48,50 @@ For one time usage, you can retrieve access_token from google playground:
 
 OAuth2 integration is not yet supported in this gem.
 
-### Proxy
+### Permanent server side usage
+
+* Go to https://console.developers.google.com
+* Register an account and create project
+* On "APIs & auth > Credentials" click "Create new Client ID"
+* Choose "Installed application > Other"
+* Note "Client ID" and "Client secret"
+* Craft URL replacing `YOUR_CLIENT_ID` `https://accounts.google.com/o/oauth2/auth?scope=http://picasaweb.google.com/data/&redirect_uri=urn:ietf:wg:oauth:2.0:oob&response_type=code&client_id=YOUR_CLIENT_ID`
+* Visit URL, grant access to your account and note `code`
+* Install gem `signet`
+* One time setup, to fetch `refresh_token`
+```ruby
+client_id = "client-id"
+client_secret = "client-secret"
+code = "authorization-code"
+
+require "signet/oauth_2/client"
+signet = Signet::OAuth2::Client.new(
+  code: code,
+  token_credential_uri: "https://www.googleapis.com/oauth2/v3/token",
+  client_id: client_id,
+  client_secret: client_secret,
+  redirect_uri: "urn:ietf:wg:oauth:2.0:oob"
+)
+signet.fetch_access_token!
+signet.refresh_token
+```
+* Note `refresh_token`
+* Before gem usage, you can get `access_token` by:
+```ruby
+require "signet/oauth_2/client"
+signet = Signet::OAuth2::Client.new(
+  client_id: client_id,
+  client_secret: client_secret,
+  token_credential_uri: "https://www.googleapis.com/oauth2/v3/token",
+  refresh_token: refresh_token
+)
+signet.refresh!
+
+# Use access token with picasa gem
+signet.access_token
+```
+
+## Proxy
 
 You can connect via proxy server setting `https_proxy` or `HTTPS_PROXY` environment variable to valid URL.
 
@@ -82,7 +127,7 @@ If you run out of quota and want to resize images to fit Picasa free storage lim
 thor imagery:resize path-to-folder-with-photos
 ```
 
-### Boost
+## Boost
 
 Picasa uses gzipped requests to speedup fetching results. Benchmarks are available on [Vinicius Teles gist](https://gist.github.com/4012466)
 

data/examples/add_tags_to_photo.rb

@@ -1,20 +1,15 @@
 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" }
+client = Picasa::Client.new(user_id: "your-gmail-account@gmail.com", access_token: "oauth-access-token")
+albums = client.album.list.entries
+album = albums.find { |album| album.title == "New Album" }
 
-  photos = client.album.show(album.id).entries
+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."
+photos.each do |photo|
+  client.tag.create(
+      :album_id => album.id,
+      :photo_id => photo.id,
+      :tag_name => "test")
 end

data/examples/create_new_album.rb

@@ -1,14 +1,9 @@
 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
+client = Picasa::Client.new(user_id: "your-gmail-account@gmail.com", access_token: "oauth-access-token")
+# create new album.
+client.album.create(
+  :title => "New Album",
+  :summary => "This is a new album.",
+  :access => "protected"
+)

data/examples/delete_all_photos.rb

@@ -1,20 +1,16 @@
 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" }
+client = Picasa::Client.new(user_id: "your-gmail-account@gmail.com", access_token: "oauth-access-token")
+albums = client.album.list.entries
+album = albums.find { |album| album.title == "New Album" }
 
-  photos = client.album.show(album.id).entries
+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
+photos.each do |photo|
+  if client.tag.delete(album_id, photo.id)
+    "#{photo.title} deleted"
+  else
+    "#{photo.title} failed to delete"
   end
-rescue Picasa::ForbiddenError
-  puts "You have the wrong user_id or password."
 end

data/examples/download_all_albums.rb

@@ -7,35 +7,30 @@ require "open-uri"
 username = "user@gmail.com"
 dir = "/Users/path.../"
 
-begin
-  client = Picasa::Client.new(:user_id => username)
-  albums = client.album.list.entries
-
-  albums.each do |album|
-  	Dir.chdir(dir)
-  	this_album = client.album.show(album.id).entries
-  	Dir.mkdir(album.title)
-  	Dir.chdir(album.title)
-
-		for photo in this_album
-			begin
-				get_string = photo.content.src
-				puts "processing" << photo.id
-
-			rescue Exception => e
-				puts photo.id << "  **ERROR**"
-				puts e
-			end
-
-		  open(get_string) do |f|
- 				File.open(photo.title, "wb") do |file|
-          file.puts f.read
- 			  end
-		  end
-		  puts "======================================"
+client = Picasa::Client.new(:user_id => username)
+albums = client.album.list.entries
+
+albums.each do |album|
+	Dir.chdir(dir)
+	this_album = client.album.show(album.id).entries
+	Dir.mkdir(album.title)
+	Dir.chdir(album.title)
+
+	for photo in this_album
+		begin
+			get_string = photo.content.src
+			puts "processing" << photo.id
+
+		rescue Exception => e
+			puts photo.id << "  **ERROR**"
+			puts e
 		end
-  end
 
-rescue Picasa::ForbiddenError
-  puts "You have the wrong user_id or password."
+	  open(get_string) do |f|
+  		File.open(photo.title, "wb") do |file|
+        file.puts f.read
+  	  end
+	  end
+	  puts "======================================"
+	end
 end

data/examples/download_one_album.rb

@@ -7,31 +7,27 @@ require "open-uri"
 username = "user@gmail.com"
 dir = "/Users/path.../"
 
-begin
-  client = Picasa::Client.new(:user_id => username)
-  albums = client.album.list.entries
+client = Picasa::Client.new(:user_id => username)
+albums = client.album.list.entries
 
-  album = albums.find { |album| album.title == "your_album_name" }
-  photos = client.album.show(album.id).entries
+album = albums.find { |album| album.title == "your_album_name" }
+photos = client.album.show(album.id).entries
 
-  photos.each do |photo|
-    begin
-  		get_string = photo.content.src
-  		puts "processing " << photo.id
+photos.each do |photo|
+  begin
+		get_string = photo.content.src
+		puts "processing " << photo.id
 
-    rescue Exception => e
-      puts photo.id << "  **ERROR**"
-      puts e
+  rescue Exception => e
+    puts photo.id << "  **ERROR**"
+    puts e
 
-      Dir.chdir(dir)
-			open(get_string) do |f|
-        File.open(photo.title, "wb") do |file|
-    			file.puts f.read
-   		  end
-			end
-			puts "======================================"
+    Dir.chdir(dir)
+		open(get_string) do |f|
+      File.open(photo.title, "wb") do |file|
+   			file.puts f.read
+ 		  end
 		end
-  end
-rescue Picasa::ForbiddenError
-  puts "You have the wrong user_id or password."
+		puts "======================================"
+	end
 end

data/examples/get_some_albums.rb

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

data/examples/get_some_photos.rb

@@ -1,16 +1,11 @@
 require "picasa"
 
 # get some photos in an album
-begin
-  client = Picasa::Client.new(:user_id => "your_gmail_account", :password => "password")
+client = Picasa::Client.new(user_id: "your-gmail-account@gmail.com", access_token: "oauth-access-token")
 
-  albums = client.album.list.entries
-  album = albums.find { |album| album.title == "New Album" }
+albums = client.album.list.entries
+album = albums.find { |album| album.title == "New Album" }
 
-  photos = client.album.show(album.id).entries
+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
+photos.each { |photo| puts photo.title }

data/examples/refresh-access-token.rb

@@ -0,0 +1,29 @@
+require "signet/oauth_2/client"
+
+# Setup your private credentials
+client_id = "client-id"
+client_secret = "client-secret"
+code = "authorization-code"
+
+signet = Signet::OAuth2::Client.new(
+  code: code,
+  token_credential_uri: "https://www.googleapis.com/oauth2/v3/token",
+  client_id: client_id,
+  client_secret: client_secret,
+  redirect_uri: "urn:ietf:wg:oauth:2.0:oob"
+)
+signet.fetch_access_token!
+refresh_token = signet.refresh_token
+# Note and store refresh_token
+
+# In your app fetch access_token by:
+signet = Signet::OAuth2::Client.new(
+  client_id: client_id,
+  client_secret: client_secret,
+  token_credential_uri: "https://www.googleapis.com/oauth2/v3/token",
+  refresh_token: refresh_token
+)
+signet.refresh!
+
+# Use access token with picasa gem
+signet.access_token

data/examples/upload_photo.rb

@@ -1,23 +1,18 @@
 require "picasa"
 
 # upload photo
-begin
-  client = Picasa::Client.new(:user_id => "your_gmail_account", :password => "password")
+client = Picasa::Client.new(user_id: "your-gmail-account@gmail.com", access_token: "oauth-access-token")
 
-  photo_bin = File.binread("./test.jpg")
+photo_bin = File.binread("./test.jpg")
 
-  albums = client.album.list.entries
-  album = albums.find { |album| album.title == "New Album" }
+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
+client.photo.create(album.id,
+  {
+    :binary => photo_bin,
+    :content_type => "image/jpeg",
+    :title => "Test Photo",
+    :summary => "Hoge hoge"
+  }
+)

data/lib/picasa/presenter/base.rb

@@ -10,18 +10,7 @@ module Picasa
       end
 
       def inspect
-        inspection = methods_to_inspect.map do |method|
-          value = send(method)
-          value = value.nil? ? "nil" : value.inspect
-          "#{method}: #{value}"
-        end.join(", ")
-        "#<#{self.class} #{inspection}>"
-      end
-
-      private
-
-      def methods_to_inspect
-        public_methods - Object.methods - [:parsed_body, :entries]
+        "#<#{self.class}>"
       end
     end
   end

data/lib/picasa/presenter/media.rb

@@ -10,12 +10,16 @@ module Picasa
 
       # @return [String]
       def cover_photo_url
-        @cover_photo_url ||= parsed_body['media$content'][0]['url']
+        return @cover_photo_url if defined?(@cover_photo_url)
+        content = safe_retrieve(parsed_body, "media$content")
+        @cover_photo_url = content && content[0]["url"]
       end
 
       # @return [String]
       def credit
-        @credit ||= parsed_body["media$credit"][0]["$t"]
+        return @credit if defined?(@credit)
+        content = safe_retrieve(parsed_body, "media$credit")
+        @credit = content && content[0]["$t"]
       end
 
       # @return [String]

data/lib/picasa/version.rb

@@ -1,3 +1,3 @@
 module Picasa
-  VERSION = "0.8.0"
+  VERSION = "0.9.0"
 end

data/picasa.gemspec

@@ -28,6 +28,4 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "webmock"
   spec.add_development_dependency "mocha", ">= 0.13.0"
   spec.add_development_dependency "vcr", ">= 2.4.0"
-
-  spec.post_install_message = "Authenticating by providing password is no longer possible due to google API shutdown https://developers.google.com/accounts/docs/AuthForInstalledApps You need to set `access_token` for authenticated requests now."
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: picasa
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Wojciech Wnętrzak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-03 00:00:00.000000000 Z
+date: 2015-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -128,6 +128,7 @@ files:
 - examples/download_one_album.rb
 - examples/get_some_albums.rb
 - examples/get_some_photos.rb
+- examples/refresh-access-token.rb
 - examples/upload_photo.rb
 - extra/Thorfile
 - lib/picasa.rb
@@ -203,9 +204,7 @@ homepage: https://github.com/morgoth/picasa
 licenses:
 - MIT
 metadata: {}
-post_install_message: Authenticating by providing password is no longer possible due
-  to google API shutdown https://developers.google.com/accounts/docs/AuthForInstalledApps
-  You need to set `access_token` for authenticated requests now.
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -221,7 +220,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Simple Google Picasa managment
@@ -261,3 +260,4 @@ test_files:
 - test/presenter/photo_test.rb
 - test/template_test.rb
 - test/utils_test.rb
+has_rdoc: