picasawebalbums 1.4.3 → 1.4.4

data/README.md

@@ -39,6 +39,8 @@ 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'
+	
+To test the library with a Picasa Web Albums account, replace the values in /test/config/test_account.yml with the known values from the account.
 
 Methods
 -------

data/lib/PicasaWebAlbums/version.rb

@@ -1,3 +1,3 @@
 module PicasaWebAlbums
-  VERSION = "1.4.3"
+  VERSION = "1.4.4"
 end

data/lib/repositories/albums_repository.rb

@@ -43,9 +43,9 @@ module AlbumsRepository
     return album_to_return
   end
   
-  def create_album(album)
-    entry = "<entry xmlns='http://www.w3.org/2005/Atom' xmlns:media='http://search.yahoo.com/mrss/' xmlns:gphoto='http://schemas.google.com/photos/2007'><title type='text'>#{album.title}</title><summary type='text'>#{album.description}</summary><gphoto:location></gphoto:location><gphoto:access>#{album.access}</gphoto:access><gphoto:timestamp></gphoto:timestamp><media:group><media:keywords></media:keywords></media:group><category scheme='http://schemas.google.com/g/2005#kind' term='http://schemas.google.com/photos/2007#album'></category></entry>"
-    post_new_album(entry)
+  def create_album(new_album)
+    atom = get_album_atom(new_album)
+    post_new_album(atom)
   end
   
   def delete_album_by_id(album_id)
@@ -60,8 +60,27 @@ module AlbumsRepository
     return res.code
   end
   
+  #def update_album(modified_album)
+  #  atom = get_album_atom(modified_album)
+  #  uri = URI(modified_album.edit_url)
+  #  status = ""
+  #  Net::HTTP.start(uri.host, uri.port, :use_ssl => uri.scheme == 'https') do |http|
+  #    request = Net::HTTP::Put.new uri.request_uri
+  #    request['Authorization'] = @authentication_token
+  #    request['Content-Type'] = "application/atom+xml; charset=UTF-8; type=entry"
+  #    request.body = atom
+  #    response = http.request(request)
+  #    status = response.code
+  #  end
+  #  return status
+  #end
+  
   private
   
+  def get_album_atom(album)
+    return "<entry xmlns='http://www.w3.org/2005/Atom' xmlns:media='http://search.yahoo.com/mrss/' xmlns:gphoto='http://schemas.google.com/photos/2007'><title type='text'>#{album.title}</title><summary type='text'>#{album.description}</summary><gphoto:location></gphoto:location><gphoto:access>#{album.access}</gphoto:access><gphoto:timestamp></gphoto:timestamp><media:group><media:keywords></media:keywords></media:group><category scheme='http://schemas.google.com/g/2005#kind' term='http://schemas.google.com/photos/2007#album'></category></entry>"
+  end
+  
   def get_edit_url_from_entry(entry)
     href = ""
     entry.elements.each("link") do |link|

data/test/config/test_account.yml

@@ -0,0 +1,12 @@
+email: apitest33@gmail.com
+password: ruhak23A
+number_of_albums: 3
+album:
+    title: Bio Profile Pics
+    id: "5689734429356072049"
+    slug: BioProfilePics
+    number_of_photos: 1
+    photo:
+        id: "5689734429327880498"
+        caption: Testing!!!?
+        tag: baloney

data/test/integration/test_albums.rb

@@ -0,0 +1,63 @@
+require 'test/unit'
+require_relative '../../lib/picasawebalbums'
+
+module PicasaWebAlbums
+  class TestAlbums < Test::Unit::TestCase
+  
+    def setup
+      @test_account = YAML::load(File.open(File.expand_path('test/config/test_account.yml')))
+      @repo = PicasaWebAlbums.get_repository('apitest33@gmail.com', 'ruhak23A')
+    end
+  
+    def test_get_all_albums
+      albums = @repo.get_all_albums
+      assert_equal @test_account["number_of_albums"], albums.count
+    end
+    
+    def test_get_album_by_id
+      album = @repo.get_album_by_id(@test_account["album"]["id"])
+      assert_equal @test_account["album"]["title"], album.title
+    end
+
+    def test_get_album_by_title
+      album = @repo.get_album_by_title(@test_account["album"]["title"])
+      assert_equal @test_account["album"]["id"], album.id
+    end
+  
+    def test_get_album_by_slug
+      album = @repo.get_album_by_slug(@test_account["album"]["slug"])
+      assert_equal @test_account["album"]["id"], album.id
+    end
+
+    def test_create_new_album
+      album = Album.new
+      album.title = "Programmatic album title"
+      album.description = "This is my programmatic album description!"
+      album.access = "private"
+      status_code = @repo.create_album(album)
+      assert_equal "201", status_code
+      #update_album(album.title)
+      delete_album
+    end
+
+    private
+    
+    def update_album(album_title)
+      album = @repo.get_album_by_title(album_title)
+      new_description = "Some new description"
+      album.description = new_description
+      @repo.update_album(album)
+      album_retrieved = @repo.get_album_by_title("Programmatic album title")
+      assert_equal new_description, album_retrieved.description
+    end
+    
+    def delete_album
+      album = @repo.get_album_by_title("Programmatic album title")
+      if (album != nil)
+        status_code = @repo.delete_album_by_id(album.id)
+        assert_equal "200", status_code
+      end
+    end
+    
+  end
+end

data/test/integration/test_photos.rb

@@ -0,0 +1,32 @@
+require 'test/unit'
+require 'yaml'
+require_relative '../../lib/picasawebalbums'
+
+module PicasaWebAlbums
+  class TestPhotos < Test::Unit::TestCase
+  
+    def setup
+      @test_account = YAML::load(File.open(File.expand_path('test/config/test_account.yml')))
+      @repo = PicasaWebAlbums.get_repository(@test_account["email"], @test_account["password"])
+    end
+  
+    def test_get_photos_from_album
+      album = @repo.get_album_by_id(@test_account["album"]["id"])
+      photos = @repo.get_photos_by_album_id(album.id)
+      assert_equal photos.count, @test_account["album"]["number_of_photos"]
+    end
+  
+    def test_get_photo_by_album_and_id
+      album = @repo.get_album_by_slug(@test_account["album"]["slug"])
+      photo = @repo.get_photo_by_album_id_and_photo_id(album.id, @test_account["album"]["photo"]["id"])
+      assert_equal @test_account["album"]["photo"]["caption"], photo.caption
+    end
+  
+    def test_get_photos_by_tags
+      tags_array = Array.new(1, @test_account["album"]["photo"]["tag"])
+      photos = @repo.get_photos_by_tags(tags_array)
+      assert_equal photos.count, @test_account["album"]["number_of_photos"]
+    end
+  
+  end
+end

data/test/{test_tags.rb → integration/test_tags.rb}

@@ -1,11 +1,12 @@
 require 'test/unit'
 require 'shoulda'
-require_relative '../lib/picasawebalbums'
+require_relative '../../lib/picasawebalbums'
 
 module PicasaWebAlbums
   class TestTags < Test::Unit::TestCase
     
     def setup
+      @test_account = YAML::load(File.open(File.expand_path('test/config/test_account.yml')))
       @repo = PicasaWebAlbums.get_repository('apitest33@gmail.com', 'ruhak23A')
     end
     

data/test/tests.rb

@@ -0,0 +1,3 @@
+require_relative 'integration/test_albums'
+require_relative 'integration/test_photos'
+require_relative 'integration/test_tags'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: picasawebalbums
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 1.4.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-24 00:00:00.000000000 Z
+date: 2011-12-30 00:00:00.000000000 Z
 dependencies: []
 description: A simple way to retrieve albums, photos, tags, etc. from Picasa Web Albums.
 email:
@@ -32,9 +32,11 @@ files:
 - lib/repositories/photos_repository.rb
 - lib/repositories/repository.rb
 - lib/repositories/tags_repository.rb
-- test/test_albums.rb
-- test/test_photos.rb
-- test/test_tags.rb
+- test/config/test_account.yml
+- test/integration/test_albums.rb
+- test/integration/test_photos.rb
+- test/integration/test_tags.rb
+- test/tests.rb
 homepage: https://github.com/mkraft/PicasaWebAlbums
 licenses:
 - MIT
@@ -61,6 +63,8 @@ signing_key:
 specification_version: 3
 summary: Provides programmatic access to Picasa Web Albums data.
 test_files:
-- test/test_albums.rb
-- test/test_photos.rb
-- test/test_tags.rb
+- test/config/test_account.yml
+- test/integration/test_albums.rb
+- test/integration/test_photos.rb
+- test/integration/test_tags.rb
+- test/tests.rb

data/test/test_albums.rb

@@ -1,50 +0,0 @@
-require 'test/unit'
-require_relative '../lib/picasawebalbums'
-
-module PicasaWebAlbums
-  class TestAlbums < Test::Unit::TestCase
-  
-    def setup
-      @repo = PicasaWebAlbums.get_repository('apitest33@gmail.com', 'ruhak23A')
-    end
-  
-    def test_get_all_albums
-      albums = @repo.get_all_albums
-      assert_equal 3, albums.count
-    end
-    
-    def test_get_album_by_id
-      album = @repo.get_album_by_id("5461230096110151249")
-      assert_equal "Banner Images", album.title
-    end
-
-    def test_get_album_by_title
-      album = @repo.get_album_by_title("Bio Profile Pics")
-      assert_equal "5689734429356072049", album.id
-    end
-  
-    def test_get_album_by_slug
-      album = @repo.get_album_by_slug("960x350")
-      assert_equal "5577380987485671713", album.id
-    end
-    
-    def test_create_new_album
-      album = Album.new
-      album.title = "Programmatic album title"
-      album.description = "This is my programmatic album description!"
-      album.access = "private"
-      status_code = @repo.create_album(album)
-      assert_equal "201", status_code
-      delete_album
-    end
-    
-    def delete_album
-      album = @repo.get_album_by_title("Programmatic album title")
-      if (album != nil)
-        status_code = @repo.delete_album_by_id(album.id)
-        assert_equal "200", status_code
-      end
-    end
-    
-  end
-end

data/test/test_photos.rb

@@ -1,29 +0,0 @@
-require 'test/unit'
-require_relative '../lib/picasawebalbums'
-
-module PicasaWebAlbums
-  class TestPhotos < Test::Unit::TestCase
-  
-    def setup
-      @repo = PicasaWebAlbums.get_repository('apitest33@gmail.com', 'ruhak23A')
-    end
-  
-    def test_get_photos_from_album
-      album = @repo.get_album_by_id(5461230096110151249)
-      photos = @repo.get_photos_by_album_id(album.id)
-      assert_equal true, photos.count > 0
-    end
-  
-    def test_get_photo_by_album_and_id
-      album = @repo.get_album_by_slug("960x350")
-      photo = @repo.get_photo_by_album_id_and_photo_id(album.id, "5577383323184640194")
-      assert_equal "Lake Joe Home.", photo.caption
-    end
-  
-    def test_get_photos_by_tags
-      photos = @repo.get_photos_by_tags(['brick'])
-      assert photos.count > 0
-    end
-  
-  end
-end