picasa 0.3.3 → 0.4.0

data/lib/picasa/presenter/base.rb

@@ -0,0 +1,29 @@
+module Picasa
+  module Presenter
+    class Base
+      include Utils
+
+      attr_reader :parsed_body
+
+      def initialize(parsed_body)
+        @parsed_body = parsed_body
+      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
+        # Ruby 1.8.7 workaround
+        (public_methods - Object.methods).map { |m| m.to_sym } - [:parsed_body]
+      end
+    end
+  end
+end

data/lib/picasa/presenter/link.rb

@@ -0,0 +1,19 @@
+require "picasa/presenter/base"
+
+module Picasa
+  module Presenter
+    class Link < Base
+      def rel
+        @rel ||= safe_retrieve(parsed_body, "rel")
+      end
+
+      def type
+        @type ||= safe_retrieve(parsed_body, "type")
+      end
+
+      def href
+        @href ||= safe_retrieve(parsed_body, "href")
+      end
+    end
+  end
+end

data/lib/picasa/presenter/media.rb

@@ -0,0 +1,27 @@
+require "picasa/presenter/base"
+
+module Picasa
+  module Presenter
+    class Media < Base
+      def thumbnails
+        @thumbnails ||= array_wrap(safe_retrieve(parsed_body, "thumbnail")).map { |thumbnail| Thumbnail.new(thumbnail) }
+      end
+
+      def credit
+        @credit ||= safe_retrieve(parsed_body, "credit")
+      end
+
+      def description
+        @description ||= safe_retrieve(parsed_body, "description")
+      end
+
+      def keywords
+        @keywords ||= safe_retrieve(parsed_body, "keywords")
+      end
+
+      def title
+        @title ||= safe_retrieve(parsed_body, "title", "__content__")
+      end
+    end
+  end
+end

data/lib/picasa/presenter/photo.rb

@@ -0,0 +1,79 @@
+require "picasa/presenter/base"
+
+module Picasa
+  module Presenter
+    class Photo < Base
+      def links
+        @links ||= safe_retrieve(parsed_body, "link").map { |link| Link.new(link) }
+      end
+
+      def media
+        @media ||= Media.new(safe_retrieve(parsed_body, "group"))
+      end
+
+      def id
+        @id ||= array_wrap(safe_retrieve(parsed_body, "id"))[1]
+      end
+
+      def published
+        @published ||= map_to_date(safe_retrieve(parsed_body, "published"))
+      end
+
+      def updated
+        @updated ||= map_to_date(safe_retrieve(parsed_body, "updated"))
+      end
+
+      def title
+        @title ||= safe_retrieve(parsed_body, "title")
+      end
+
+      def summary
+        @summary ||= safe_retrieve(parsed_body, "summary")
+      end
+
+      def album_id
+        @album_id ||= safe_retrieve(parsed_body, "albumid")
+      end
+
+      def access
+        @access ||= safe_retrieve(parsed_body, "access")
+      end
+
+      def width
+        @width ||= map_to_integer(safe_retrieve(parsed_body, "width"))
+      end
+
+      def height
+        @height ||= map_to_integer(safe_retrieve(parsed_body, "height"))
+      end
+
+      def size
+        @size ||= map_to_integer(safe_retrieve(parsed_body, "size"))
+      end
+
+      def checksum
+        @checksum ||= safe_retrieve(parsed_body, "checksum")
+      end
+
+      def timestamp
+        @timestamp ||= safe_retrieve(parsed_body, "timestamp")
+      end
+
+      def image_version
+        @image_version ||= map_to_integer(safe_retrieve(parsed_body, "imageVersion"))
+      end
+
+      def commenting_enabled
+        @commenting_enabled ||= map_to_boolean(safe_retrieve(parsed_body, "commentingEnabled"))
+      end
+
+      def comment_count
+        @comment_count ||= map_to_integer(safe_retrieve(parsed_body, "commentCount"))
+      end
+
+      def license
+        @license ||= safe_retrieve(parsed_body, "license", "__content__")
+      end
+    end
+  end
+end

data/lib/picasa/presenter/thumbnail.rb

@@ -0,0 +1,19 @@
+require "picasa/presenter/base"
+
+module Picasa
+  module Presenter
+    class Thumbnail < Base
+      def url
+        @url ||= safe_retrieve(parsed_body, "url")
+      end
+
+      def width
+        @width ||= map_to_integer(safe_retrieve(parsed_body, "width"))
+      end
+
+      def height
+        @height ||= map_to_integer(safe_retrieve(parsed_body, "height"))
+      end
+    end
+  end
+end

data/lib/picasa/utils.rb

@@ -0,0 +1,44 @@
+require "date"
+
+module Picasa
+  module Utils
+    def safe_retrieve(hash, *keys)
+      return if !hash.kind_of?(Hash) || !hash.has_key?(keys.first)
+
+      if keys.size == 1
+        hash[keys.first]
+      elsif keys.size > 1
+        Utils.safe_retrieve(hash[keys.first], *keys[1..-1])
+      end
+    end
+
+    # Ported from ActiveSupport
+    def array_wrap(object)
+      if object.nil?
+        []
+      elsif object.respond_to?(:to_ary)
+        object.to_ary || [object]
+      else
+        [object]
+      end
+    end
+
+    def map_to_integer(value)
+      value && value.to_i
+    end
+
+    def map_to_date(value)
+      value && DateTime.parse(value)
+    end
+
+    def map_to_boolean(value)
+      return unless value
+      case value
+        when "true"  then true
+        when "false" then false
+      end
+    end
+
+    module_function :safe_retrieve, :array_wrap, :map_to_integer, :map_to_boolean, :map_to_date
+  end
+end

data/lib/picasa/version.rb

@@ -1,3 +1,3 @@
 module Picasa
-  VERSION = "0.3.3"
+  VERSION = "0.4.0"
 end

data/picasa.gemspec

@@ -12,22 +12,11 @@ Gem::Specification.new do |gem|
   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.require_paths = ["lib"]
   gem.version = Picasa::VERSION
 
-  gem.add_dependency "xml-simple"
-  gem.add_development_dependency "fakeweb"
+  gem.add_dependency "multi_xml"
 
-  gem.post_install_message = %{
-*************************************************************************
-
-Version 0.4 of this gem will be totaly rewritten.
-Gem syntax will change with backwards incompatibilities.
-If you don't want to update your code, please specify in your Gemfile:
-gem "picasa", "~> 0.3.0"
-
-Follow https://github.com/morgoth/picasa for updates.
-
-*************************************************************************
-}
+  gem.add_development_dependency "webmock"
+  gem.add_development_dependency "mocha"
 end

data/test/api/album_test.rb

@@ -0,0 +1,24 @@
+# -*- encoding: utf-8 -*-
+require "helper"
+
+describe Picasa::API::Album do
+  describe "#list" do
+    it "gives correct parsed body fragment" do
+      stub_request(:get, "https://picasaweb.google.com/data/feed/api/user/w.wnetrzak").to_return(fixture("album/album-list.txt"))
+
+      album_list = Picasa::API::Album.new(:user_id => "w.wnetrzak").list
+
+      assert_equal 2, album_list.total_results
+    end
+  end
+
+  describe "#show" do
+    it "gives correct parsed body fragment" do
+      stub_request(:get, "https://picasaweb.google.com/data/feed/api/user/w.wnetrzak/albumid/5243667126168669553").to_return(fixture("album/album-show.txt"))
+
+      album_show = Picasa::API::Album.new(:user_id => "w.wnetrzak").show("5243667126168669553")
+
+      assert_equal "Wojciech Wnętrzak", album_show.author.name
+    end
+  end
+end

data/test/client_test.rb

@@ -0,0 +1,14 @@
+require "helper"
+
+describe Picasa::Client do
+  it "has credentials" do
+    client = Picasa::Client.new(:user_id => "john.doe")
+    assert_equal({:user_id => "john.doe"}, client.credentials)
+  end
+
+  it "raises ArgumentError when user_id is missing" do
+    assert_raises(Picasa::ArgumentError, /user_id/) do
+      Picasa::Client.new
+    end
+  end
+end

data/test/connection_test.rb

@@ -0,0 +1,71 @@
+# -*- encoding: utf-8 -*-
+require "helper"
+
+describe Picasa::Connection do
+  before do
+    @connection = Picasa::Connection.new(:user_id => "joe.doe")
+  end
+
+  describe "#inline_params" do
+    it "converts params to inline style" do
+      params = @connection.inline_params({:alt => "json", :kind => "photo"})
+      # make ruby 1.8 tests pass
+      assert_equal "alt=json", params.split("&").sort[0]
+      assert_equal "kind=photo", params.split("&").sort[1]
+    end
+
+    it "changes param keys underscore to dash" do
+      params = @connection.inline_params({:max_results => 10})
+      assert_equal "max-results=10", params
+    end
+
+    it "escapes values" do
+      params = @connection.inline_params({:kind => "żółć"})
+      assert_equal "kind=%C5%BC%C3%B3%C5%82%C4%87", params
+    end
+  end
+
+  describe "#path_with_params" do
+    it "returns path when no params provided" do
+      path = @connection.path_with_params("/data/feed/api")
+      assert_equal "/data/feed/api", path
+    end
+
+    it "adds params to path" do
+      path = @connection.path_with_params("/data/feed/api", {:q => "bomb"})
+      assert_equal "/data/feed/api?q=bomb", path
+    end
+  end
+
+  describe "authentication" do
+    it "successfully authenticates" 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/success.txt"))
+      stub_request(:get, "https://picasaweb.google.com/data/feed/api/user/john.doe@domain.com").to_return(fixture("album/album-list.txt"))
+
+      connection.expects(:authenticate).returns(:result)
+      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"))
+
+      assert_raises(Picasa::ResponseError) do
+        connection.get(uri.path)
+      end
+    end
+  end
+end

data/test/fixtures/album/album-list-with-tag.txt

@@ -0,0 +1,105 @@
+HTTP/1.1 200 OK
+Expires: Mon, 05 Dec 2011 19:18:21 GMT
+Date: Mon, 05 Dec 2011 19:18:21 GMT
+Cache-Control: private, max-age=0, must-revalidate, no-transform
+Set-Cookie: _rtok=JfOWbv9ilfmB; Path=/; Secure; HttpOnly
+Set-Cookie: S=photos_html=gA8kpkA3OJJn4_tnnq1H7w; Domain=.google.com; Path=/; Secure; HttpOnly
+Content-Type: application/atom+xml; charset=UTF-8; type=feed
+Vary: Accept, X-GData-Authorization, GData-Version, Cookie
+GData-Version: 2.0
+ETag: W/"CEIFQngzeSp7ImA9WhRQEUw."
+Last-Modified: Mon, 05 Dec 2011 19:15:13 GMT
+X-Content-Type-Options: nosniff
+X-Frame-Options: SAMEORIGIN
+X-XSS-Protection: 1; mode=block
+Server: GSE
+Transfer-Encoding: chunked
+
+<?xml version='1.0' encoding='UTF-8'?>
+<feed xmlns='http://www.w3.org/2005/Atom' xmlns:gphoto='http://schemas.google.com/photos/2007' xmlns:media='http://search.yahoo.com/mrss/' xmlns:openSearch='http://a9.com/-/spec/opensearch/1.1/' xmlns:gd='http://schemas.google.com/g/2005' gd:etag='W/&quot;CEIFQngzeSp7ImA9WhRQEUw.&quot;'>
+	<id>https://picasaweb.google.com/data/feed/user/106136347770555028022</id>
+	<updated>2011-12-05T19:15:13.681Z</updated>
+	<category scheme='http://schemas.google.com/g/2005#kind' term='http://schemas.google.com/photos/2007#user'/>
+	<title>106136347770555028022</title>
+	<subtitle/>
+	<icon>https://lh3.googleusercontent.com/-6ezHc54U8x0/AAAAAAAAAAI/AAAAAAAAAAA/PBuxm7Ehn6E/s64-c/106136347770555028022.jpg</icon>
+	<link rel='http://schemas.google.com/g/2005#feed' type='application/atom+xml' href='https://picasaweb.google.com/data/feed/api/user/106136347770555028022'/>
+	<link rel='alternate' type='text/html' href='https://picasaweb.google.com/106136347770555028022'/>
+	<link rel='http://schemas.google.com/photos/2007#slideshow' type='application/x-shockwave-flash' href='https://picasaweb.google.com/s/c/bin/slideshow.swf?host=picasaweb.google.com&amp;RGB=0x000000&amp;feed=https%3A%2F%2Fpicasaweb.google.com%2Fdata%2Ffeed%2Fapi%2Fuser%2F106136347770555028022%3Falt%3Drss'/>
+	<link rel='self' type='application/atom+xml' href='https://picasaweb.google.com/data/feed/api/user/106136347770555028022?start-index=1&amp;max-results=1000&amp;tag=ziemniaki'/>
+	<author>
+		<name>Wojciech Wnętrzak</name>
+		<uri>https://picasaweb.google.com/106136347770555028022</uri>
+	</author>
+	<generator version='1.00' uri='http://picasaweb.google.com/'>Picasaweb</generator>
+	<openSearch:totalResults>2</openSearch:totalResults>
+	<openSearch:startIndex>1</openSearch:startIndex>
+	<openSearch:itemsPerPage>1000</openSearch:itemsPerPage>
+	<gphoto:user>106136347770555028022</gphoto:user>
+	<gphoto:nickname>Wojciech Wnętrzak</gphoto:nickname>
+	<gphoto:thumbnail>https://lh3.googleusercontent.com/-6ezHc54U8x0/AAAAAAAAAAI/AAAAAAAAAAA/PBuxm7Ehn6E/s64-c/106136347770555028022.jpg</gphoto:thumbnail>
+	<entry gd:etag='&quot;YDsqeyI.&quot;'>
+		<id>https://picasaweb.google.com/data/entry/user/106136347770555028022/albumid/5243667126168669553</id>
+		<published>2008-09-08T07:00:00.000Z</published>
+		<updated>2011-12-05T19:12:04.255Z</updated>
+		<category scheme='http://schemas.google.com/g/2005#kind' term='http://schemas.google.com/photos/2007#album'/>
+		<title>test2</title>
+		<summary/>
+		<rights>public</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/5243667126168669553'/>
+		<link rel='alternate' type='text/html' href='https://picasaweb.google.com/106136347770555028022/Test2'/>
+		<link rel='self' type='application/atom+xml' href='https://picasaweb.google.com/data/entry/api/user/106136347770555028022/albumid/5243667126168669553'/>
+		<author>
+			<name>Wojciech Wnętrzak</name>
+			<uri>https://picasaweb.google.com/106136347770555028022</uri>
+		</author>
+		<gphoto:id>5243667126168669553</gphoto:id>
+		<gphoto:name>Test2</gphoto:name>
+		<gphoto:location/>
+		<gphoto:access>public</gphoto:access>
+		<gphoto:timestamp>1220857200000</gphoto:timestamp>
+		<gphoto:numphotos>3</gphoto:numphotos>
+		<gphoto:user>106136347770555028022</gphoto:user>
+		<gphoto:nickname>Wojciech Wnętrzak</gphoto:nickname>
+		<media:group>
+			<media:content url='https://lh6.googleusercontent.com/-u_2FJXbbliU/SMU_eBetTXE/AAAAAAAAAkU/3XThNVnAM-4/Test2.jpg' type='image/jpeg' medium='image'/>
+			<media:credit>Wojciech Wnętrzak</media:credit>
+			<media:description type='plain'/>
+			<media:keywords/>
+			<media:thumbnail url='https://lh6.googleusercontent.com/-u_2FJXbbliU/SMU_eBetTXE/AAAAAAAAAkU/3XThNVnAM-4/s160-c/Test2.jpg' height='160' width='160'/>
+			<media:title type='plain'>test2</media:title>
+		</media:group>
+	</entry>
+	<entry gd:etag='&quot;YDUqeyI.&quot;'>
+		<id>https://picasaweb.google.com/data/entry/user/106136347770555028022/albumid/5239555770355467953</id>
+		<published>2008-08-28T07:00:00.000Z</published>
+		<updated>2011-07-30T07:16:41.444Z</updated>
+		<category scheme='http://schemas.google.com/g/2005#kind' term='http://schemas.google.com/photos/2007#album'/>
+		<title>test</title>
+		<summary>Opis albumu</summary>
+		<rights>public</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/5239555770355467953'/>
+		<link rel='alternate' type='text/html' href='https://picasaweb.google.com/106136347770555028022/Test'/>
+		<link rel='self' type='application/atom+xml' href='https://picasaweb.google.com/data/entry/api/user/106136347770555028022/albumid/5239555770355467953'/>
+		<author>
+			<name>Wojciech Wnętrzak</name>
+			<uri>https://picasaweb.google.com/106136347770555028022</uri>
+		</author>
+		<gphoto:id>5239555770355467953</gphoto:id>
+		<gphoto:name>Test</gphoto:name>
+		<gphoto:location>gdzieś</gphoto:location>
+		<gphoto:access>public</gphoto:access>
+		<gphoto:timestamp>1219906800000</gphoto:timestamp>
+		<gphoto:numphotos>6</gphoto:numphotos>
+		<gphoto:user>106136347770555028022</gphoto:user>
+		<gphoto:nickname>Wojciech Wnętrzak</gphoto:nickname>
+		<media:group>
+			<media:content url='https://lh6.googleusercontent.com/-ZqXRf3HicvI/SLakNnjixrE/AAAAAAAAAkc/3EAZ0eF3-CQ/Test.jpg' type='image/jpeg' medium='image'/>
+			<media:credit>Wojciech Wnętrzak</media:credit>
+			<media:description type='plain'>Opis albumu</media:description>
+			<media:keywords/>
+			<media:thumbnail url='https://lh6.googleusercontent.com/-ZqXRf3HicvI/SLakNnjixrE/AAAAAAAAAkc/3EAZ0eF3-CQ/s160-c/Test.jpg' height='160' width='160'/>
+			<media:title type='plain'>test</media:title>
+		</media:group>
+	</entry>
+</feed>