picasa 0.6.7 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02b104660dfe262b0e881eda1ddd24351c7abf78
-  data.tar.gz: 7edd6629a0c462b5271666b9eead8c829f679044
+  metadata.gz: 13c65c05a5b00067765a40f4339e4e11f04680f1
+  data.tar.gz: 66624e0d8ce131805533eae31ff58803a66f13af
 SHA512:
-  metadata.gz: e8c5e5fbb39e29d42848233f44458deb51f609580823cf6881a7726cfeeedbe6db9458bf3d6fb245372e13a6d122d9da769e4f29ecca30f0e4f5cef7f871c902
-  data.tar.gz: 50f2d1c52c8b14a8babd8e294f4c5ff48ba11ae60ebdd5b501d8b3fec551d06e5726e37aec8c589befed0b6cd5efaaf7b9f85387c7351380cb3b2af58f4552f3
+  metadata.gz: d233fded3ee7fd4348ba64f3b1849579050467eb64690442ea1367e088b7fbaedd42490a63219b5bd9d8324d58c45c8d15c263d3436b2938e690c8a3ed27b0e9
+  data.tar.gz: 7b4311985a57ebec4c687061f98bf8085c8440f7ee7807c8497cd7efb5b9ea434c77a1972a2c38fcda1e69d3286fe7faa470269c58568a8f5952a3b29a1b69da

data/Gemfile

@@ -3,11 +3,10 @@ source "https://rubygems.org"
 gemspec
 
 gem "multi_json"
-gem "rake"
 
 group :extra do
   gem "thor"
-  gem "debugger", :platform => [:ruby_19, :ruby_20]
+  gem "debugger"
 end
 
 # JSON parsers

data/Rakefile

@@ -8,4 +8,4 @@ Rake::TestTask.new(:test) do |test|
   test.verbose = true
 end
 
-task :default => :test
+task default: :test

data/lib/picasa/api/album.rb

@@ -14,7 +14,7 @@ module Picasa
       # @return [Presenter::AlbumList]
       def list(options = {})
         path = "/data/feed/api/user/#{user_id}"
-        response = Connection.new.get(:path => path, :query => options, :headers => auth_header)
+        response = Connection.new.get(path: path, query: options, headers: auth_header)
 
         Presenter::AlbumList.new(response.parsed_response["feed"])
       end
@@ -31,7 +31,7 @@ module Picasa
       # @raise [NotFoundError] raised when album cannot be found
       def show(album_id, options = {})
         path = "/data/feed/api/user/#{user_id}/albumid/#{album_id}"
-        response = Connection.new.get(:path => path, :query => options, :headers => auth_header)
+        response = Connection.new.get(path: path, query: options, headers: auth_header)
 
         Presenter::Album.new(response.parsed_response["feed"])
       end
@@ -54,7 +54,7 @@ module Picasa
 
         template = Template.new(:new_album, params)
         path = "/data/feed/api/user/#{user_id}"
-        response = Connection.new.post(:path => path, :body => template.render, :headers => auth_header)
+        response = Connection.new.post(path: path, body: template.render, headers: auth_header)
 
         Presenter::Album.new(response.parsed_response["entry"])
       end
@@ -71,7 +71,7 @@ module Picasa
       def destroy(album_id, options = {})
         headers = auth_header.merge({"If-Match" => options.fetch(:etag, "*")})
         path = "/data/entry/api/user/#{user_id}/albumid/#{album_id}"
-        Connection.new.delete(:path => path, :headers => headers)
+        Connection.new.delete(path: path, headers: headers)
         true
       end
       alias :delete :destroy

data/lib/picasa/api/comment.rb

@@ -19,7 +19,7 @@ module Picasa
         path << "/albumid/#{album_id}" if album_id
         path << "/photoid/#{photo_id}" if photo_id
 
-        response = Connection.new.get(:path => path, :query => options.merge(:kind => "comment"), :headers => auth_header)
+        response = Connection.new.get(path: path, query: options.merge(kind: "comment"), headers: auth_header)
 
         Presenter::CommentList.new(response.parsed_response["feed"])
       end
@@ -41,7 +41,7 @@ module Picasa
 
         template = Template.new("new_comment", params)
 
-        response = Connection.new.post(:path => path, :body => template.render, :headers => auth_header)
+        response = Connection.new.post(path: path, body: template.render, headers: auth_header)
 
         Presenter::Comment.new(response.parsed_response["entry"])
       end
@@ -59,7 +59,7 @@ module Picasa
         photo_id = params.delete(:photo_id) || raise(ArgumentError, "You must specify photo_id")
 
         path = "/data/entry/api/user/#{user_id}/albumid/#{album_id}/photoid/#{photo_id}/commentid/#{comment_id}"
-        Connection.new.delete(:path => path, :headers => auth_header)
+        Connection.new.delete(path: path, headers: auth_header)
         true
       end
       alias :delete :destroy

data/lib/picasa/api/photo.rb

@@ -23,7 +23,7 @@ module Picasa
         headers = auth_header.merge({"Content-Type" => "multipart/related; boundary=\"#{params[:boundary]}\""})
 
         path = "/data/feed/api/user/#{user_id}/albumid/#{album_id}"
-        response = Connection.new.post(:path => path, :body => template.render, :headers => headers)
+        response = Connection.new.post(path: path, body: template.render, headers: headers)
 
         Presenter::Photo.new(response.parsed_response["entry"])
       end
@@ -41,7 +41,7 @@ module Picasa
       def destroy(album_id, photo_id, options = {})
         headers = auth_header.merge({"If-Match" => options.fetch(:etag, "*")})
         path = "/data/entry/api/user/#{user_id}/albumid/#{album_id}/photoid/#{photo_id}"
-        Connection.new.delete(:path => path, :headers => headers)
+        Connection.new.delete(path: path, headers: headers)
         true
       end
       alias :delete :destroy

data/lib/picasa/api/tag.rb

@@ -19,7 +19,7 @@ module Picasa
         path << "/albumid/#{album_id}" if album_id
         path << "/photoid/#{photo_id}" if photo_id
 
-        response = Connection.new.get(:path => path, :query => options.merge(:kind => "tag"), :headers => auth_header)
+        response = Connection.new.get(path: path, query: options.merge(kind: "tag"), headers: auth_header)
 
         Presenter::TagList.new(response.parsed_response["feed"])
       end
@@ -41,7 +41,7 @@ module Picasa
 
         template = Template.new("new_tag", params)
 
-        response = Connection.new.post(:path => path, :body => template.render, :headers => auth_header)
+        response = Connection.new.post(path: path, body: template.render, headers: auth_header)
 
         Presenter::Tag.new(response.parsed_response["entry"])
       end
@@ -59,7 +59,7 @@ module Picasa
         photo_id = params.delete(:photo_id) || raise(ArgumentError, "You must specify photo_id")
 
         path = "/data/entry/api/user/#{user_id}/albumid/#{album_id}/photoid/#{photo_id}/tag/#{tag_id}"
-        Connection.new.delete(:path => path, :headers => auth_header)
+        Connection.new.delete(path: path, headers: auth_header)
         true
       end
       alias :delete :destroy

data/lib/picasa/client.rb

@@ -64,10 +64,10 @@ module Picasa
     # @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(
+        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,
@@ -87,7 +87,7 @@ module Picasa
     end
 
     def credentials
-      {:user_id => user_id}.tap do |credentials|
+      {user_id: user_id}.tap do |credentials|
         credentials[:authorization_header] = authorization_header if authorization_header
       end
     end

data/lib/picasa/connection.rb

@@ -6,8 +6,6 @@ module Picasa
     # @option params [String] :query request url query
     # @option params [String] :headers request headers
     def get(params = {})
-      # FIXME: how to add headers to default ones instead of replacing?
-      params[:headers] = Picasa::HTTP.headers.merge(params[:headers]) if params.has_key?(:headers)
       exec_request(params) { |uri, options| HTTP.get(uri, options) }
     end
 
@@ -20,7 +18,6 @@ module Picasa
     def post(params = {})
       params[:headers] ||= {}
       params[:headers]["Content-Type"] ||= "application/atom+xml"
-      params[:headers] = Picasa::HTTP.headers.merge(params[:headers])
       exec_request(params) { |uri, options| HTTP.post(uri, options) }
     end
 
@@ -30,15 +27,26 @@ module Picasa
     # @option params [String] :query request url query
     # @option params [String] :headers request headers
     def delete(params = {})
-      params[:headers] = Picasa::HTTP.headers.merge(params[:headers]) if params.has_key?(:headers)
       exec_request(params) { |uri, options| HTTP.delete(uri, options) }
     end
 
     private
 
+    # Additional params for HTTParty gem can be passed
+    # https://github.com/jnunemaker/httparty/blob/v0.12.0/lib/httparty.rb#L43
     def exec_request(params, &block)
       uri = "#{params.delete(:host)}#{params.delete(:path)}"
-      params.delete_if { |key, value| value.nil? || value.empty? }
+
+      params.tap do |p|
+        p[:headers] = HTTP.headers.merge(p.fetch(:headers, {}))
+        if p.keys.none? { |name| [:http_proxyaddr, :http_proxyport, :http_proxyuser, :http_proxypass].include?(name) }
+          p[:http_proxyaddr] = proxy_uri.host
+          p[:http_proxyport] = proxy_uri.port
+          p[:http_proxyuser] = proxy_uri.user
+          p[:http_proxypass] = proxy_uri.password
+        end
+      end
+
       handle_response(yield(uri, params))
     end
 
@@ -58,5 +66,9 @@ module Picasa
         raise ResponseError.new(response.body, response)
       end
     end
+
+    def proxy_uri
+      @proxy_uri ||= URI.parse(ENV["https_proxy"] || ENV["HTTPS_PROXY"] || "")
+    end
   end
 end

data/lib/picasa/http.rb

@@ -9,20 +9,13 @@ module Picasa
     API_AUTH_URL = "https://www.google.com"
     API_VERSION  = "2"
 
-    def self.proxy
-      proxy_uri = URI.parse(ENV["https_proxy"] || ENV["HTTPS_PROXY"] || "")
-      [proxy_uri.host, proxy_uri.port, proxy_uri.user, proxy_uri.password]
-    end
-
     format         :json
-    default_params :alt => :json
+    default_params alt: :json
 
     headers        "User-Agent"      => "ruby-gem-picasa-v#{VERSION} (gzip)",
                    "GData-Version"   => API_VERSION,
                    "Accept-Encoding" => "gzip, deflate"
 
     base_uri       API_URL
-
-    http_proxy     *proxy
   end
 end

data/lib/picasa/presenter/base.rb

@@ -21,8 +21,7 @@ module Picasa
       private
 
       def methods_to_inspect
-        # Ruby 1.8.7 workaround
-        (public_methods - Object.methods).map { |m| m.to_sym } - [:parsed_body, :entries]
+        public_methods - Object.methods - [:parsed_body, :entries]
       end
     end
   end

data/lib/picasa/utils.rb

@@ -12,7 +12,6 @@ module Picasa
       end
     end
 
-
     def retrieve(hash, keys)
       return if !hash.kind_of?(Hash) || !hash.has_key?(keys.first)
 

data/lib/picasa/version.rb

@@ -1,3 +1,3 @@
 module Picasa
-  VERSION = "0.6.7"
+  VERSION = "0.7.0"
 end

data/picasa.gemspec

@@ -1,27 +1,31 @@
-# -*- encoding: utf-8 -*-
-require File.expand_path('../lib/picasa/version', __FILE__)
+# coding: utf-8
+lib = File.expand_path("../lib", __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require "picasa/version"
 
-Gem::Specification.new do |gem|
-  gem.author = "Wojciech Wnętrzak"
-  gem.email = "w.wnetrzak@gmail.com"
-  gem.description = %q{Ruby client for Google Picasa API}
-  gem.summary = %q{Simple Google Picasa managment}
-  gem.homepage = "https://github.com/morgoth/picasa"
-  gem.license = "MIT"
+Gem::Specification.new do |spec|
+  spec.name          = "picasa"
+  spec.version       = Picasa::VERSION
+  spec.authors       = ["Wojciech Wnętrzak"]
+  spec.email         = ["w.wnetrzak@gmail.com"]
+  spec.description   = %q{Ruby client for Google Picasa API}
+  spec.summary       = %q{Simple Google Picasa managment}
+  spec.homepage      = "https://github.com/morgoth/picasa"
+  spec.license       = "MIT"
 
-  gem.executables = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
-  gem.files = `git ls-files`.split("\n")
-  gem.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
-  gem.name = "picasa"
-  gem.require_paths = ["lib"]
-  gem.version = Picasa::VERSION
+  spec.files         = `git ls-files`.split($/)
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ["lib"]
 
-  gem.add_dependency "httparty"
+  spec.required_ruby_version = ">= 1.9.3"
 
-  gem.add_development_dependency "minitest", ">= 5.0.0"
-  gem.add_development_dependency "webmock"
-  gem.add_development_dependency "mocha", ">= 0.13.0"
-  gem.add_development_dependency "vcr", ">= 2.4.0"
+  spec.add_dependency "httparty"
 
-  gem.post_install_message = "Version 0.7.0 of picasa gem will require Ruby 1.9.3 or greater. If you still need 1.8.7 freeze gem version to ~> 0.6.7"
+  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "minitest", ">= 5.0.0"
+  spec.add_development_dependency "webmock"
+  spec.add_development_dependency "mocha", ">= 0.13.0"
+  spec.add_development_dependency "vcr", ">= 2.4.0"
 end

data/test/helper.rb

@@ -1,5 +1,6 @@
 require "yaml"
 require "zlib"
+require "multi_json"
 
 require "minitest/autorun"
 require "webmock/minitest"
@@ -16,7 +17,7 @@ MultiJson.adapter = ENV["JSON_PARSER"] || "oj"
 VCR.configure do |c|
   c.cassette_library_dir = "test/cassettes"
   c.hook_into :webmock
-  c.default_cassette_options = {:preserve_exact_body_bytes => true}
+  c.default_cassette_options = {preserve_exact_body_bytes: true}
   c.filter_sensitive_data("<FILTERED>") { AuthHeader }
   c.filter_sensitive_data("<FILTERED>") { Password }
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: picasa
 version: !ruby/object:Gem::Version
-  version: 0.6.7
+  version: 0.7.0
 platform: ruby
 authors:
 - Wojciech Wnętrzak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-26 00:00:00.000000000 Z
+date: 2013-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -24,6 +24,34 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -81,7 +109,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.4.0
 description: Ruby client for Google Picasa API
-email: w.wnetrzak@gmail.com
+email:
+- w.wnetrzak@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -168,8 +197,7 @@ homepage: https://github.com/morgoth/picasa
 licenses:
 - MIT
 metadata: {}
-post_install_message: Version 0.7.0 of picasa gem will require Ruby 1.9.3 or greater.
-  If you still need 1.8.7 freeze gem version to ~> 0.6.7
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -177,7 +205,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
@@ -185,8 +213,39 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Simple Google Picasa managment
-test_files: []
+test_files:
+- test/api/album_test.rb
+- 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/cassettes/video-create.yml
+- test/client_test.rb
+- test/connection_test.rb
+- test/file_test.rb
+- test/fixtures/lena.jpg
+- test/fixtures/sample.3gp
+- test/fixtures/sample.txt
+- test/helper.rb
+- test/template_test.rb
+- test/utils_test.rb