picasawebalbums 1.0.1 → 1.1.1

data/lib/PicasaWebAlbums.rb

@@ -2,6 +2,7 @@
 require 'net/http'
 require 'rexml/document'
 require 'date'
+require 'uri'
 require_relative 'album'
 require_relative 'photo'
 require_relative 'tag'

data/lib/PicasaWebAlbums/version.rb

@@ -1,3 +1,3 @@
 module PicasaWebAlbums
-  VERSION = "1.0.1"
+  VERSION = "1.1.1"
 end

data/lib/repository.rb

@@ -67,6 +67,23 @@ module PicasaWebAlbums
       return photo_to_return
     end
     
+    def get_photos_by_tags(tags)
+      url = "http://picasaweb.google.com/data/feed/api/user/#{@email}?kind=photo&tag=#{get_tags_string(tags)}"
+      xml = get_xml(url)
+      photos = []
+      xml.root.elements.each("//entry") do |entry|
+        photo = Photo.new
+        photo.id = entry.elements["gphoto:id"].text
+        photo.url = entry.elements["media:group/media:content"].attributes["url"]
+        photo.width = entry.elements["media:group/media:content"].attributes["width"].to_i
+        photo.height = entry.elements["media:group/media:content"].attributes["height"].to_i
+        photo.caption = entry.elements["media:group/media:description"].text
+        photo.file_name = entry.elements["media:group/media:title"].text
+        photos << photo
+      end
+      return photos
+    end
+    
     def get_all_tags
       xml = get_xml("http://picasaweb.google.com/data/feed/api/user/#{@email}?kind=tag")
       tags = []
@@ -88,6 +105,15 @@ module PicasaWebAlbums
 
     private
     
+    def get_tags_string(tags)
+      tags_string = ""
+      tags.each do |tag|
+        tags_string += URI.escape(tag.strip)
+        tags_string += '%2C' unless tag == tags.last
+      end
+      return tags_string
+    end
+    
     def get_xml(url)
       uri = URI(url)
       request = Net::HTTP::Get.new(uri.request_uri)

data/readme.md

@@ -6,15 +6,15 @@ Gem for accessing photos and albums from Picasa Web Albums
 Installation
 ------------
 
-	gem install PicasaWebAlbums
+	gem install picasawebalbums
 	
 Rails/Application Integration
 -----------------------------
 
 Add one of the below lines to the Gemfile:
 
-- `gem 'PicasaWebAlbums'` (to install it from rubygems)
-- `gem 'PicasaWebAlbums', :git => 'git@github.com:mkraft/PicasaWebAlbums.git'` (to install directly from the git repo)
+- `gem 'picasawebalbums'` (to install it from rubygems)
+- `gem 'picasawebalbums', :git => 'git@github.com:mkraft/PicasaWebAlbums.git'` (to install directly from the git repo)
 
 Then run `bundle install`
 
@@ -24,7 +24,7 @@ Code Examples
 Print the title of all albums
 
 	repo = PicasaWebAlbums.get_repository('someperson@gmail.com', 'somepassword')
-	albums = repo.get_albums
+	albums = repo.get_all_albums
 	albums.each { |album| puts album.title }
 
 Print the URL of each photo in the album titled "Big Boy"
@@ -34,6 +34,12 @@ Print the URL of each photo in the album titled "Big Boy"
 	photos = repo.get_photos_by_album_id(album.id)
 	photos.each { |photo| puts photo.url }
 
+Get photos with specific tags
+
+	repo = PicasaWebAlbums.get_repository('someperson@gmail.com', 'somepassword')
+	photos = repo.get_photos_by_tags(['cat', 'dog'])
+	# returns photos tagged with 'cat' AND 'dog'
+
 Repository Methods
 -------------------
 
@@ -48,6 +54,7 @@ Repository Methods
 
 - `get_photos_by_album_id(album_id)`
 - `get_photo_by_album_id_and_photo_id(album_id, photo_id)`
+- `get_photos_by_tags(tags_array)`
 
 ### Tags
 
@@ -85,4 +92,4 @@ Domain Object Properties
 Additional Documentation
 ------------------------
 
-Additional documentation can be found on the [rubydoc pages](http://rubydoc.info/gems/PicasaWebAlbums).
+Additional documentation can be found on the [rubydoc pages](http://rubydoc.info/gems/picasawebalbums).

data/test/test_tags.rb

@@ -28,6 +28,14 @@ module PicasaWebAlbums
         assert tags.count > 0
       end
     end
+    
+    context "get photos by tags" do
+      should "return at least 1 photo" do
+        repo = PicasaWebAlbums.get_repository('apitest33@gmail.com', 'ruhak23A')
+        photos = repo.get_photos_by_tags(['penny'])
+        assert photos.count > 0
+      end
+    end
   
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: picasawebalbums
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors: