Skip to content
This repository has been archived by the owner on Nov 4, 2022. It is now read-only.

Commit

Permalink
Added a License subclass to Photo.
Browse files Browse the repository at this point in the history
  • Loading branch information
@kueda
kueda committed Dec 22, 2009
1 parent 7525196 commit e85ec5e
Show file tree
Hide file tree
Showing 4 changed files with 97 additions and 2 deletions.
7 changes: 6 additions & 1 deletion lib/ruby_picasa/types.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -286,8 +286,12 @@ def coords
[lat, lng]
end
end

class License < Objectify::ElementParser
attributes :id, :name, :url
end

namespaces 'exif', 'georss', 'gml'
namespaces 'exif', 'georss', 'gml', 'gphoto'

attributes :published,
:summary,
Expand Down Expand Up @@ -316,6 +320,7 @@ def coords

has_one :point, RubyPicasa::Photo::Point, 'gml:Point'
has_one :author, Objectify::Atom::Author, 'author'
has_one :license, RubyPicasa::Photo::License, 'gphoto:license'

end

Expand Down
6 changes: 6 additions & 0 deletions spec/ruby_picasa/types_spec.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,12 @@
it 'should have a content' do
@photo.content.should be_an_instance_of(PhotoUrl)
end

it 'should have a license' do
@photo.license.should be_an_instance_of(Photo::License)
@photo.license.id.should == 0
@photo.license.name.should == "All Rights Reserved"
end

it 'should have 3 thumbnails' do
@photo.thumbnails.length.should == 3
Expand Down
1 change: 1 addition & 0 deletions spec/sample/album.atom
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ xmlns:gphoto='http://schemas.google.com/photos/2007'>
<gphoto:client></gphoto:client>
<gphoto:checksum></gphoto:checksum>
<gphoto:timestamp>1218826724000</gphoto:timestamp>
<gphoto:license id="0" name="All Rights Reserved" url="">ALL_RIGHTS_RESERVED</gphoto:license>
<exif:tags>
<exif:imageUniqueID>
0657130896bace739a44ce90a7d5b451</exif:imageUniqueID>
Expand Down
85 changes: 84 additions & 1 deletion spec/sample/search-geo-1-result.atom
View file
Original file line number Diff line number Diff line change
@@ -1 +1,84 @@
<?xml version='1.0' encoding='UTF-8'?><feed xmlns='http://www.w3.org/2005/Atom' xmlns:exif='http://schemas.google.com/photos/exif/2007' xmlns:gphoto='http://schemas.google.com/photos/2007' xmlns:media='http://search.yahoo.com/mrss/' xmlns:openSearch='http://a9.com/-/spec/opensearchrss/1.0/' xmlns:gml='http://www.opengis.net/gml' xmlns:georss='http://www.georss.org/georss'><id>http://picasaweb.google.com/data/feed/api/all</id><updated>2009-11-30T12:22:31.853Z</updated><title type='text'>Search Results</title><link rel='http://schemas.google.com/g/2005#feed' type='application/atom+xml' href='http://picasaweb.google.com/data/feed/api/all'/><link rel='self' type='application/atom+xml' href='http://picasaweb.google.com/data/feed/api/all?start-index=1&amp;max-results=1&amp;kind=photo&amp;bbox=-3.72394842302785%2C40.3987207504843%2C-3.67674237697215%2C40.4346610495157'/><link rel='next' type='application/atom+xml' href='http://picasaweb.google.com/data/feed/api/all?start-index=2&amp;max-results=1&amp;kind=photo&amp;bbox=-3.72394842302785%2C40.3987207504843%2C-3.67674237697215%2C40.4346610495157'/><generator version='1.00' uri='http://picasaweb.google.com/'>Picasaweb</generator><openSearch:totalResults>24945</openSearch:totalResults><openSearch:startIndex>1</openSearch:startIndex><openSearch:itemsPerPage>1</openSearch:itemsPerPage><gphoto:crowded_length>10</gphoto:crowded_length><entry><id>http://picasaweb.google.com/data/entry/api/user/mcrosetti/albumid/5038536056381788481/photoid/5409865239774711522</id><published>2009-11-30T12:00:05.000Z</published><updated>2009-11-30T12:22:31.853Z</updated><category scheme='http://schemas.google.com/g/2005#kind' term='http://schemas.google.com/photos/2007#photo'/><title type='text'>Uno más.jpg</title><summary type='text'>Cena de Navidad con compañeros del fútbol</summary><content type='image/jpeg' src='http://lh6.ggpht.com/_SHCEk4XiaxY/SxOzxduBTuI/AAAAAAAAGl4/uBkaK74CTTU/Uno%20m%C3%A1s.jpg'/><link rel='http://schemas.google.com/g/2005#feed' type='application/atom+xml' href='http://picasaweb.google.com/data/feed/api/user/mcrosetti/albumid/5038536056381788481/photoid/5409865239774711522'/><link rel='alternate' type='text/html' href='http://picasaweb.google.com/mcrosetti/MadridLosMejoresMomentos#5409865239774711522'/><link rel='http://schemas.google.com/photos/2007#canonical' type='text/html' href='http://picasaweb.google.com/lh/photo/Ip81jgvM5pWHzXlwbMuecA'/><link rel='self' type='application/atom+xml' href='http://picasaweb.google.com/data/entry/api/user/mcrosetti/albumid/5038536056381788481/photoid/5409865239774711522'/><link rel='http://schemas.google.com/photos/2007#report' type='text/html' href='http://picasaweb.google.com/lh/reportAbuse?uname=mcrosetti&amp;aid=5038536056381788481&amp;iid=5409865239774711522'/><author type='owner'><name>Maxito</name><uri>http://picasaweb.google.com/mcrosetti</uri><email>mcrosetti</email><gphoto:nickname>Maxito</gphoto:nickname><gphoto:thumbnail>http://lh3.ggpht.com/_SHCEk4XiaxY/AAAAFW54aRs/AAAAAAAAAAA/bxWLJruI9NQ/s32-c/mcrosetti.jpg</gphoto:thumbnail><gphoto:user>mcrosetti</gphoto:user></author><gphoto:id>5409865239774711522</gphoto:id><gphoto:version>14</gphoto:version><gphoto:position>1.92473421E9</gphoto:position><gphoto:albumid>5038536056381788481</gphoto:albumid><gphoto:access>public</gphoto:access><gphoto:width>640</gphoto:width><gphoto:height>480</gphoto:height><gphoto:size>61758</gphoto:size><gphoto:client>picasa</gphoto:client><gphoto:checksum>77e2c024</gphoto:checksum><gphoto:timestamp>1259539121000</gphoto:timestamp><gphoto:imageVersion>6750</gphoto:imageVersion><gphoto:commentCount>0</gphoto:commentCount><exif:tags><exif:fstop>2.8</exif:fstop><exif:make>Canon</exif:make><exif:model>Canon DIGITAL IXUS 60</exif:model><exif:exposure>0.016666668</exif:exposure><exif:flash>true</exif:flash><exif:focallength>5.8</exif:focallength><exif:time>1259539121000</exif:time><exif:imageUniqueID>358e5f03385d40c41dfdf3ad9a80868c</exif:imageUniqueID></exif:tags><media:group><media:content url='http://lh6.ggpht.com/_SHCEk4XiaxY/SxOzxduBTuI/AAAAAAAAGl4/uBkaK74CTTU/Uno%20m%C3%A1s.jpg' height='480' width='640' type='image/jpeg' medium='image'/><media:credit>Maxito</media:credit><media:description type='plain'>Cena de Navidad con compañeros del fútbol</media:description><media:thumbnail url='http://lh6.ggpht.com/_SHCEk4XiaxY/SxOzxduBTuI/AAAAAAAAGl4/uBkaK74CTTU/s72/Uno%20m%C3%A1s.jpg' height='54' width='72'/><media:thumbnail url='http://lh6.ggpht.com/_SHCEk4XiaxY/SxOzxduBTuI/AAAAAAAAGl4/uBkaK74CTTU/s144/Uno%20m%C3%A1s.jpg' height='108' width='144'/><media:thumbnail url='http://lh6.ggpht.com/_SHCEk4XiaxY/SxOzxduBTuI/AAAAAAAAGl4/uBkaK74CTTU/s288/Uno%20m%C3%A1s.jpg' height='216' width='288'/><media:title type='plain'>Uno más.jpg</media:title></media:group><georss:where><gml:Envelope><gml:lowerCorner>-9.6481127 -103.7258992</gml:lowerCorner><gml:upperCorner>90.0 96.3131632</gml:upperCorner></gml:Envelope><gml:Point><gml:pos>40.434988 -3.706368</gml:pos></gml:Point></georss:where><gphoto:albumtitle>Madrid - Los mejores momentos</gphoto:albumtitle><gphoto:albumctitle>MadridLosMejoresMomentos</gphoto:albumctitle><gphoto:albumdesc>Las mejores fotos en Madrid</gphoto:albumdesc><gphoto:location>Madrid</gphoto:location><gphoto:snippet/><gphoto:snippettype>PHOTO_DESCRIPTION</gphoto:snippettype><gphoto:truncated>0</gphoto:truncated></entry></feed>
<?xml version="1.0" encoding="UTF-8"?>
<feed xmlns="http://www.w3.org/2005/Atom" xmlns:exif="http://schemas.google.com/photos/exif/2007" xmlns:gphoto="http://schemas.google.com/photos/2007" xmlns:media="http://search.yahoo.com/mrss/" xmlns:openSearch="http://a9.com/-/spec/opensearchrss/1.0/" xmlns:gml="http://www.opengis.net/gml" xmlns:georss="http://www.georss.org/georss">
<id>http://picasaweb.google.com/data/feed/api/all</id>
<updated>2009-11-30T12:22:31.853Z</updated>
<title type="text">Search Results</title>
<link rel="http://schemas.google.com/g/2005#feed" type="application/atom+xml" href="http://picasaweb.google.com/data/feed/api/all"/>
<link rel="self" type="application/atom+xml" href="http://picasaweb.google.com/data/feed/api/all?start-index=1&amp;max-results=1&amp;kind=photo&amp;bbox=-3.72394842302785%2C40.3987207504843%2C-3.67674237697215%2C40.4346610495157"/>
<link rel="next" type="application/atom+xml" href="http://picasaweb.google.com/data/feed/api/all?start-index=2&amp;max-results=1&amp;kind=photo&amp;bbox=-3.72394842302785%2C40.3987207504843%2C-3.67674237697215%2C40.4346610495157"/>
<generator version="1.00" uri="http://picasaweb.google.com/">Picasaweb</generator>
<openSearch:totalResults>24945</openSearch:totalResults>
<openSearch:startIndex>1</openSearch:startIndex>
<openSearch:itemsPerPage>1</openSearch:itemsPerPage>
<gphoto:crowded_length>10</gphoto:crowded_length>
<entry>
<id>http://picasaweb.google.com/data/entry/api/user/mcrosetti/albumid/5038536056381788481/photoid/5409865239774711522</id>
<published>2009-11-30T12:00:05.000Z</published>
<updated>2009-11-30T12:22:31.853Z</updated>
<category scheme="http://schemas.google.com/g/2005#kind" term="http://schemas.google.com/photos/2007#photo"/>
<title type="text">Uno más.jpg</title>
<summary type="text">Cena de Navidad con compañeros del fútbol</summary>
<content type="image/jpeg" src="http://lh6.ggpht.com/_SHCEk4XiaxY/SxOzxduBTuI/AAAAAAAAGl4/uBkaK74CTTU/Uno%20m%C3%A1s.jpg"/>
<link rel="http://schemas.google.com/g/2005#feed" type="application/atom+xml" href="http://picasaweb.google.com/data/feed/api/user/mcrosetti/albumid/5038536056381788481/photoid/5409865239774711522"/>
<link rel="alternate" type="text/html" href="http://picasaweb.google.com/mcrosetti/MadridLosMejoresMomentos#5409865239774711522"/>
<link rel="http://schemas.google.com/photos/2007#canonical" type="text/html" href="http://picasaweb.google.com/lh/photo/Ip81jgvM5pWHzXlwbMuecA"/>
<link rel="self" type="application/atom+xml" href="http://picasaweb.google.com/data/entry/api/user/mcrosetti/albumid/5038536056381788481/photoid/5409865239774711522"/>
<link rel="http://schemas.google.com/photos/2007#report" type="text/html" href="http://picasaweb.google.com/lh/reportAbuse?uname=mcrosetti&amp;aid=5038536056381788481&amp;iid=5409865239774711522"/>
<author type="owner">
<name>Maxito</name>
<uri>http://picasaweb.google.com/mcrosetti</uri>
<email>mcrosetti</email>
<gphoto:nickname>Maxito</gphoto:nickname>
<gphoto:thumbnail>http://lh3.ggpht.com/_SHCEk4XiaxY/AAAAFW54aRs/AAAAAAAAAAA/bxWLJruI9NQ/s32-c/mcrosetti.jpg</gphoto:thumbnail>
<gphoto:user>mcrosetti</gphoto:user>
</author>
<gphoto:id>5409865239774711522</gphoto:id>
<gphoto:version>14</gphoto:version>
<gphoto:position>1.92473421E9</gphoto:position>
<gphoto:albumid>5038536056381788481</gphoto:albumid>
<gphoto:access>public</gphoto:access>
<gphoto:width>640</gphoto:width>
<gphoto:height>480</gphoto:height>
<gphoto:size>61758</gphoto:size>
<gphoto:client>picasa</gphoto:client>
<gphoto:checksum>77e2c024</gphoto:checksum>
<gphoto:timestamp>1259539121000</gphoto:timestamp>
<gphoto:imageVersion>6750</gphoto:imageVersion>
<gphoto:commentCount>0</gphoto:commentCount>
<exif:tags>
<exif:fstop>2.8</exif:fstop>
<exif:make>Canon</exif:make>
<exif:model>Canon DIGITAL IXUS 60</exif:model>
<exif:exposure>0.016666668</exif:exposure>
<exif:flash>true</exif:flash>
<exif:focallength>5.8</exif:focallength>
<exif:time>1259539121000</exif:time>
<exif:imageUniqueID>358e5f03385d40c41dfdf3ad9a80868c</exif:imageUniqueID>
</exif:tags>
<media:group>
<media:content url="http://lh6.ggpht.com/_SHCEk4XiaxY/SxOzxduBTuI/AAAAAAAAGl4/uBkaK74CTTU/Uno%20m%C3%A1s.jpg" height="480" width="640" type="image/jpeg" medium="image"/>
<media:credit>Maxito</media:credit>
<media:description type="plain">Cena de Navidad con compañeros del fútbol</media:description>
<media:thumbnail url="http://lh6.ggpht.com/_SHCEk4XiaxY/SxOzxduBTuI/AAAAAAAAGl4/uBkaK74CTTU/s72/Uno%20m%C3%A1s.jpg" height="54" width="72"/>
<media:thumbnail url="http://lh6.ggpht.com/_SHCEk4XiaxY/SxOzxduBTuI/AAAAAAAAGl4/uBkaK74CTTU/s144/Uno%20m%C3%A1s.jpg" height="108" width="144"/>
<media:thumbnail url="http://lh6.ggpht.com/_SHCEk4XiaxY/SxOzxduBTuI/AAAAAAAAGl4/uBkaK74CTTU/s288/Uno%20m%C3%A1s.jpg" height="216" width="288"/>
<media:title type="plain">Uno más.jpg</media:title>
</media:group>
<georss:where>
<gml:Envelope>
<gml:lowerCorner>-9.6481127 -103.7258992</gml:lowerCorner>
<gml:upperCorner>90.0 96.3131632</gml:upperCorner>
</gml:Envelope>
<gml:Point>
<gml:pos>40.434988 -3.706368</gml:pos>
</gml:Point>
</georss:where>
<gphoto:albumtitle>Madrid - Los mejores momentos</gphoto:albumtitle>
<gphoto:albumctitle>MadridLosMejoresMomentos</gphoto:albumctitle>
<gphoto:albumdesc>Las mejores fotos en Madrid</gphoto:albumdesc>
<gphoto:location>Madrid</gphoto:location>
<gphoto:snippet/>
<gphoto:snippettype>PHOTO_DESCRIPTION</gphoto:snippettype>
<gphoto:truncated>0</gphoto:truncated>
</entry>
</feed>

0 comments on commit e85ec5e

Please sign in to comment.