picasa 0.7.5 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a919f287a26d11d7377d530bd7d63463f8d4e66d
-  data.tar.gz: 685f7dd9e7e0501cd01c135bc3255e170f553a14
+  metadata.gz: 91a09cb41c7e4e13eb830c390c2cac41ec9bc159
+  data.tar.gz: 25ab483fc8fbe5ef7095ed336b991b19ca01830d
 SHA512:
-  metadata.gz: b1c329012564890cd7354f63df9e10fc29559c546fe9465bca55ed438b22c45c6008fa2279d7b16e6f3690399e853eed4daf47bac860cf4ab279a7ee6f78e665
-  data.tar.gz: 8e86bea1f9ce94b379886efdab037cdcb8eb6aac19f07164e613ee29dddb42a189a9618e66d645b0042145ba0e752a62f0c80e3497af2c5965e8f408e8134773
+  metadata.gz: b11f16ab4af155c874d5511eeb0ab4787720cff01639ada8508f93591a14a1318102e683adc74b446ad0519ae9bfc24c89825ec3638d74db88b6cb06336b04c9
+  data.tar.gz: 5f8638b15e131fa0109f08bdcda0ad4c7ffe53a34acbcbd032172b193ae7ff99e04daef20965e2166ef1d6171275cad64bc277ffa08cfa700c02c7ae55a7f178

data/README.md

@@ -28,17 +28,23 @@ client.photo.create("album_id", file_path: "path/to/my-photo.png")
 
 When request is authenticated, response will contain private data, however this can be controlled by `access` parameter.
 
-You can authenticate by specifing password:
+You can authenticate by specifing access_token:
 
 ```ruby
-client = Picasa::Client.new(user_id: "some.user@gmail.com", password: "secret")
+client = Picasa::Client.new(user_id: "some.user@gmail.com", access_token: "access-token")
 ```
 
-Or by setting custom authorization header, i.e. taken from [OAuth](https://developers.google.com/accounts/docs/OAuth2) authentication (your secret access token after "Bearer" or "OAuth" words):
+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.
 
-```ruby
-client = Picasa::Client.new(user_id: "some.user@gmail.com", authorization_header: "Bearer <access-token>")
-```
+For one time usage, you can retrieve access_token from google playground:
+* Visit https://developers.google.com/oauthplayground
+* Find "Picasa Web v2"
+* Click "Authorize APIs" providing your credentials
+* Click "Exchange authorization code for tokens"
+* Copy `access_token` value
+
+OAuth2 integration is not yet supported in this gem.
 
 ### Proxy
 
@@ -61,15 +67,13 @@ thor update imagery
 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 imagery:upload path-to-folder-with-photos
-# Without specifing password
-GOOGLE_USER_ID=your.email@gmail.com GOOGLE_AUTHORIZATION_HEADER="GoogleLogin auth=token" thor imagery:upload path-to-folder-with-photos
+GOOGLE_USER_ID=your.email@gmail.com GOOGLE_ACCESS_TOKEN=access-token thor imagery:upload 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 imagery:upload --continue path-to-folder-with-photos
+GOOGLE_USER_ID=your.email@gmail.com GOOGLE_ACCESS_TOKEN=access-token thor imagery:upload --continue path-to-folder-with-photos
 ```
 
 If you run out of quota and want to resize images to fit Picasa free storage limits, you can install `rmagick` gem and run (this will modify files):

data/extra/Thorfile

@@ -78,15 +78,16 @@ class Imagery < Thor
 
   no_tasks do
     def client
-      @client ||= Picasa::Client.new(user_id: ENV["GOOGLE_USER_ID"],
-        authorization_header: ENV["GOOGLE_AUTHORIZATION_HEADER"],
-        password: ENV["GOOGLE_PASSWORD"])
+      @client ||= Picasa::Client.new(
+        user_id: ENV["GOOGLE_USER_ID"],
+        access_token: ENV["GOOGLE_ACCESS_TOKEN"]
+      )
     end
 
     def require_credentials
       say "You must specify GOOGLE_USER_ID env variable" and exit if ENV["GOOGLE_USER_ID"].nil?
-      if ENV["GOOGLE_AUTHORIZATION_HEADER"].nil? && ENV["GOOGLE_PASSWORD"].nil?
-        say "You must specify GOOGLE_PASSWORD or GOOGLE_AUTHORIZATION_HEADER env variable" and exit
+      if ENV["GOOGLE_ACCESS_TOKEN"].nil?
+        say "You must specify GOOGLE_ACCESS_TOKEN env variable" and exit
       end
     end
 

data/lib/picasa/api/base.rb

@@ -1,19 +1,26 @@
 module Picasa
   module API
     class Base
-      attr_reader :user_id, :authorization_header
+      attr_reader :user_id, :authorization_header, :access_token
 
       # @param [Hash] credentials
       # @option credentials [String] :user_id google username/email
-      # @option credentials [String] :authorization_header header for authenticating requests
+      # @option credentials [String] :access_token token for authorizing requests
       def initialize(credentials = {})
         @user_id  = credentials.fetch(:user_id)
+        @access_token = credentials[:access_token]
         @authorization_header = credentials[:authorization_header]
       end
 
       def auth_header
         {}.tap do |header|
-          header["Authorization"] = authorization_header if authorization_header
+          token = if access_token
+            "Bearer #{access_token}"
+          elsif authorization_header
+            authorization_header
+          end
+
+          header["Authorization"] = token if token
         end
       end
     end

data/lib/picasa/client.rb

@@ -1,15 +1,21 @@
 module Picasa
   class Client
     attr_reader :user_id
-    attr_accessor :password, :authorization_header
+    attr_accessor :access_token, :authorization_header
 
     # @param [Hash] credentials
     # @option credentials [String] :user_id google username/email
-    # @option credentials [String] :password password for given username/email
     # @option credentials [String] :authorization_header custom authorization header (i.e. taken from OAuth2)
+    # @option credentials [String] :access_token picasa OAuth2 access token
     def initialize(credentials = {})
-      @user_id              = credentials[:user_id] || raise(ArgumentError, "You must specify user_id")
-      @password             = credentials[:password]
+      if credentials[:password]
+        raise(ArgumentError, "Providing password has no effect as google login by password API is not active anymore https://developers.google.com/accounts/docs/AuthForInstalledApps")
+      end
+      @user_id      = credentials[:user_id] || raise(ArgumentError, "You must specify user_id")
+      @access_token = credentials[:access_token]
+      if credentials[:authorization_header]
+        puts "Passing authorization_header is deprecated. Please pass access_token"
+      end
       @authorization_header = credentials[:authorization_header]
     end
 
@@ -21,7 +27,6 @@ module Picasa
     #   album_list.title
     #   # => "My album"
     def album
-      authenticate if authenticates?
       API::Album.new(credentials)
     end
 
@@ -33,7 +38,6 @@ module Picasa
     #   photo.id
     #   # => "4322232322421"
     def photo
-      authenticate if authenticates?
       API::Photo.new(credentials)
     end
 
@@ -45,7 +49,6 @@ module Picasa
     #   tag_list.title
     #   # => "holidays"
     def tag
-      authenticate if authenticates?
       API::Tag.new(credentials)
     end
 
@@ -57,45 +60,16 @@ module Picasa
     #   comment_list.entries.map &:content
     #   # => "nice photo!"
     def comment
-      authenticate if authenticates?
       API::Comment.new(credentials)
     end
 
-    # @return [String]
-    def authenticate
-      response = Connection.new.post(
-        host:    HTTP::API_AUTH_URL,
-        headers: {"Content-Type" => "application/x-www-form-urlencoded"},
-        path:    "/accounts/ClientLogin",
-        body:    Utils.inline_query(
-          "accountType" => "HOSTED_OR_GOOGLE",
-          "Email"       => user_id,
-          "Passwd"      => password,
-          "service"     => "lh2",
-          "source"      => "ruby-gem-picasa-v#{VERSION}"
-        )
-      )
-
-      key = extract_auth_key(response.body)
-      @authorization_header = "GoogleLogin auth=#{key}"
-    end
-
     private
 
-    def authenticates?
-      password && authorization_header.nil?
-    end
-
     def credentials
       {user_id: user_id}.tap do |credentials|
+        credentials[:access_token]         = access_token         if access_token
         credentials[:authorization_header] = authorization_header if authorization_header
       end
     end
-
-    def extract_auth_key(data)
-      response = data.split("\n").map { |v| v.split("=") }
-      params = Hash[response]
-      params["Auth"]
-    end
   end
 end

data/lib/picasa/version.rb

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

data/picasa.gemspec

@@ -28,4 +28,6 @@ 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

data/test/client_test.rb

@@ -7,43 +7,16 @@ describe Picasa::Client do
     end
   end
 
-  it "allows to assign custom authorization header" do
-    client = Picasa::Client.new(:user_id => "john.doe", :authorization_header => "OAuth token")
-    assert_equal "OAuth token", client.authorization_header
-  end
-
-  it "allows to set password on instance" do
-    client = Picasa::Client.new(:user_id => "john.doe", :password => "unknown")
-    client.password = "secret"
-
-    assert_equal "secret", client.password
+  it "raises ArgumentError when providing password" do
+    assert_raises(Picasa::ArgumentError) do
+      client = Picasa::Client.new(:user_id => "john.doe", :password => "unknown")
+    end
   end
 
-  it "allows to set authorization_header on instance" do
+  it "allows to set access_token on instance" do
     client = Picasa::Client.new(:user_id => "john.doe")
-    client.authorization_header = "Bearer some-token"
-
-    assert_equal "Bearer some-token", client.authorization_header
-  end
+    client.access_token = "some-access-token"
 
-  describe "#authenticate" do
-    it "successfully authenticates" do
-      VCR.use_cassette("auth-success") do
-        client = Picasa::Client.new(:user_id => "w.wnetrzak@gmail.com", :password => Password)
-        client.authenticate
-
-        refute_nil client.authorization_header
-      end
-    end
-
-    it "raises an ForbiddenError when authentication failed" do
-      VCR.use_cassette("auth-failed") do
-        client = Picasa::Client.new(:user_id => "w.wnetrzak@gmail.com", :password => "invalid")
-
-        assert_raises(Picasa::ForbiddenError) do
-          client.authenticate
-        end
-      end
-    end
+    assert_equal "some-access-token", client.access_token
   end
 end

data/test/helper.rb

@@ -9,8 +9,7 @@ require "mocha/setup"
 
 require "picasa"
 
-AuthHeader = ENV["PICASA_AUTH_HEADER"] || "GoogleLogin auth=token"
-Password   = ENV["PICASA_PASSWORD"]    || "secret"
+AuthHeader = ENV["PICASA_ACCESS_TOKEN"] || "GoogleLogin auth=token"
 
 MultiJson.adapter = ENV["JSON_PARSER"] || "oj"
 
@@ -19,7 +18,6 @@ VCR.configure do |c|
   c.hook_into :webmock
   c.default_cassette_options = {preserve_exact_body_bytes: true}
   c.filter_sensitive_data("<FILTERED>") { AuthHeader }
-  c.filter_sensitive_data("<FILTERED>") { Password }
 end
 
 class MiniTest::Test

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: picasa
 version: !ruby/object:Gem::Version
-  version: 0.7.5
+  version: 0.8.0
 platform: ruby
 authors:
 - Wojciech Wnętrzak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-24 00:00:00.000000000 Z
+date: 2015-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -176,8 +176,6 @@ files:
 - test/cassettes/album-list.yml
 - test/cassettes/album-show.yml
 - test/cassettes/album-update.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
@@ -205,7 +203,9 @@ homepage: https://github.com/morgoth/picasa
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+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.
 rdoc_options: []
 require_paths:
 - lib
@@ -221,7 +221,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
 summary: Simple Google Picasa managment
@@ -238,8 +238,6 @@ test_files:
 - test/cassettes/album-list.yml
 - test/cassettes/album-show.yml
 - test/cassettes/album-update.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

data/test/cassettes/auth-failed.yml

@@ -1,50 +0,0 @@
---- 
-http_interactions: 
-- request: 
-    method: post
-    uri: https://www.google.com/accounts/ClientLogin?alt=json
-    body: 
-      encoding: US-ASCII
-      string: accountType=HOSTED_OR_GOOGLE&Email=w.wnetrzak%40gmail.com&Passwd=invalid&service=lh2&source=ruby-gem-picasa-v0.5.4
-    headers: 
-      User-Agent: 
-      - ruby-gem-picasa-v0.5.4 (gzip)
-      Gdata-Version: 
-      - "2"
-      Content-Type: 
-      - application/x-www-form-urlencoded
-      Accept-Encoding: 
-      - gzip, deflate
-  response: 
-    status: 
-      code: 403
-      message: Forbidden
-    headers: 
-      Content-Type: 
-      - text/plain
-      Cache-Control: 
-      - no-cache, no-store
-      Pragma: 
-      - no-cache
-      Expires: 
-      - Mon, 01-Jan-1990 00:00:00 GMT
-      Content-Encoding: 
-      - gzip
-      Date: 
-      - Thu, 01 Nov 2012 19:20:53 GMT
-      X-Content-Type-Options: 
-      - nosniff
-      X-Xss-Protection: 
-      - 1; mode=block
-      Content-Length: 
-      - "44"
-      Server: 
-      - GSE
-    body: 
-      encoding: ASCII-8BIT
-      string: !binary |
-        H4sIAAAAAAAAAHMtKsovsnVKTHEsLclIzSvJTE4syczP4wIAm+kHYxgAAAA=
-
-    http_version: 
-  recorded_at: Thu, 01 Nov 2012 19:20:52 GMT
-recorded_with: VCR 2.3.0

data/test/cassettes/auth-success.yml

@@ -1,64 +0,0 @@
---- 
-http_interactions: 
-- request: 
-    method: post
-    uri: https://www.google.com/accounts/ClientLogin?alt=json
-    body: 
-      encoding: US-ASCII
-      string: accountType=HOSTED_OR_GOOGLE&Email=w.wnetrzak%40gmail.com&Passwd=<FILTERED>&service=lh2&source=ruby-gem-picasa-v0.5.4
-    headers: 
-      User-Agent: 
-      - ruby-gem-picasa-v0.5.4 (gzip)
-      Gdata-Version: 
-      - "2"
-      Content-Type: 
-      - application/x-www-form-urlencoded
-      Accept-Encoding: 
-      - gzip, deflate
-  response: 
-    status: 
-      code: 200
-      message: OK
-    headers: 
-      Content-Type: 
-      - text/plain
-      Cache-Control: 
-      - no-cache, no-store
-      Pragma: 
-      - no-cache
-      Expires: 
-      - Mon, 01-Jan-1990 00:00:00 GMT
-      Content-Encoding: 
-      - gzip
-      Date: 
-      - Thu, 01 Nov 2012 19:19:34 GMT
-      X-Content-Type-Options: 
-      - nosniff
-      X-Xss-Protection: 
-      - 1; mode=block
-      Content-Length: 
-      - "666"
-      Server: 
-      - GSE
-    body: 
-      encoding: ASCII-8BIT
-      string: !binary |
-        H4sIAAAAAAAAAK3St66jWgCF4f68iyVyKKYANjmYZNimsUzYZAMm8/Rziqv7
-        BNP87ZI+rUAHf4AnCILd/kYic1rbyfyS6A4Gd/AF4fEZRiNWzbmoyxD35se+
-        Tr6oXwTvOF4Rc7c2n8OkWeK67U29Mg2puiK9Z+U1Hr4ET3lYRaaL6XO7vJED
-        8jjXlcwwWq+3H+sZGJCCFNwP9Vx7Y1/homjQ7D7vJMoQScXL0r9lwhuwTTOC
-        19dZFygM2a5bO9xaCqJ83QcItHtxDJmphqoIzT0/Ef4AsqXZncAs72adI9We
-        nL3uqWTmoMxYyAOf3+3XqQq7eJ5lOA62bC1kyXGNM7oMmMxsCBzLqjbi5Enl
-        xwr+V9p/AxwDsgWS3kqbD9B81p1sEhGF8Q5CRPn0Xbyq1rkaqYtfcE1K6XOo
-        aSM+DyxOEfup1Ra77kYHJ9nqqvQL86lvqYi8P676powaN08s2xb0ntakorfx
-        Xlzrl+E6LHY8tagNkDmgPIFbNN5Ci9WEwW6aki2bVMvsLBybSrcIpaN7ylGC
-        6JcUimuzCZ1nbDd/PskXrKI90xS+oJ32Ghl11wJgUgPT26MrtTBZDCW4LxnQ
-        UiQICnWeppndO2s6gvqc7VMjbHrFko/4zC0Ky+1L1/Q8nqkfYV2q/5Tmf6Fk
-        2RXW+tv+TjemIGitDHDlWtErQxS3DXgeEPl47ChAQZPJAZ5e0gWJV+ffOq2G
-        BvV6Ugfj8HMbsXNsHK9IdycCY52BThF5jy2YqQ1gxMc26sZu8WncGw/a/72y
-        SDKSkLOAIWDPhX5ZQj53hHZiybChK6f4yGQs04Lw9ofG4A33e4v7R2qmIXng
-        65ZWDzphm0pXmX6/gsgPnkKjyH4mQVt6cj9/Ad+8nchxAwAA
-
-    http_version: 
-  recorded_at: Thu, 01 Nov 2012 19:19:33 GMT
-recorded_with: VCR 2.3.0