picasawebalbums 1.1.2 → 1.1.3

data/Gemfile

@@ -1,4 +1,3 @@
 source "http://rubygems.org"
 
-# Specify your gem's dependencies in PicasaWebAlbums.gemspec
 gemspec

data/PicasaWebAlbums.gemspec

@@ -10,15 +10,11 @@ Gem::Specification.new do |s|
   s.homepage    = "https://github.com/mkraft/PicasaWebAlbums"
   s.summary     = %q{Provides programmatic access to Picasa Web Albums data.}
   s.description = %q{A simple way to retrieve albums, photos, tags, etc. from Picasa Web Albums.}
-
+  s.license     = 'MIT'
   s.rubyforge_project = "picasawebalbums"
   s.required_ruby_version = '>= 1.9.3'
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
-
-  # specify any dependencies here; for example:
-  # s.add_development_dependency "rspec"
-  # s.add_runtime_dependency "rest-client"
 end

data/{readme.md → README.md}

@@ -13,13 +13,13 @@ Rails/Application Integration
 
 Add one of the below lines to the Gemfile:
 
-- `gem 'picasawebalbums'`, or
+- `gem 'picasawebalbums`, or
 - `gem 'picasawebalbums', :git => 'git@github.com:mkraft/PicasaWebAlbums.git'`
 
 Then run `bundle install`
 
-Code Examples
--------------
+Usage
+-----
 
 Print the title of all albums
 
@@ -40,8 +40,8 @@ Get photos with specific tags
 	photos = repo.get_photos_by_tags(['cat', 'dog'])
 	# returns photos tagged with 'cat' AND 'dog'
 
-Repository Methods
--------------------
+Methods
+-------
 
 ### Album(s)
 
@@ -97,4 +97,38 @@ Additional documentation can be found on the [rubydoc pages](http://rubydoc.info
 Feature Requests and Bugs
 -------------------------
 
-Please feel free to log any bugs or feature requests in the [Issues tab on Github](https://github.com/mkraft/PicasaWebAlbums/issues). Thank you.
+Please feel free to log any bugs or feature requests in the [Issues tab on Github](https://github.com/mkraft/PicasaWebAlbums/issues).
+
+Coming Down the Pike
+--------------------
+
+The goal is to completely mirror all of the Picasa Web Albums API features including
+
+- Create, update, delete albums
+- CUD photos
+- CUD tags
+- CRUD comments
+- CRUD geolocation data
+
+License
+-------
+
+Copyright (C) 2011 Martin Kraft
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/lib/PicasaWebAlbums/version.rb

@@ -1,3 +1,3 @@
 module PicasaWebAlbums
-  VERSION = "1.1.2"
+  VERSION = "1.1.3"
 end

data/lib/repositories/photos_repository.rb

@@ -5,13 +5,7 @@ module PhotosRepository
     xml = get_xml("http://picasaweb.google.com/data/feed/base/user/#{@email}/albumid/#{id}")
     photos = []
     xml.root.elements.each("//entry") do |entry|
-      photo = PicasaWebAlbums::Photo.new
-      photo.id = get_photo_id_from_photo_id_url(entry.elements["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
+      photo = get_photo_from_xml_element(entry)
       photos << photo
     end
     return photos
@@ -33,13 +27,7 @@ module PhotosRepository
     xml = get_xml(url)
     photos = []
     xml.root.elements.each("//entry") do |entry|
-      photo = PicasaWebAlbums::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
+      photo = get_photo_from_xml_element(entry)
       photos << photo
     end
     return photos
@@ -47,6 +35,21 @@ module PhotosRepository
   
   private
   
+  def get_photo_from_xml_element(entry)
+    photo = PicasaWebAlbums::Photo.new
+    if (entry.elements["gphoto:id"] != nil && entry.elements["gphoto:id"].text != "")
+      photo.id = entry.elements["gphoto:id"].text
+    else
+      photo.id = get_photo_id_from_photo_id_url(entry.elements["id"].text)
+    end
+    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
+    return photo
+  end
+  
   def get_tags_string(tags)
     tags_string = ""
     tags.each do |tag|

data/test/test_albums.rb

@@ -1,41 +1,32 @@
 require 'test/unit'
-require 'shoulda'
 require_relative '../lib/picasawebalbums'
 
 module PicasaWebAlbums
   class TestAlbums < Test::Unit::TestCase
   
-    context "get all albums" do
-      repo = PicasaWebAlbums.get_repository('apitest33@gmail.com', 'ruhak23A')
-      should "return albums" do
-        albums = repo.get_all_albums
-        assert_equal 4, albums.count
-      end
+    def setup
+      @repo = PicasaWebAlbums.get_repository('apitest33@gmail.com', 'ruhak23A')
     end
   
-    context "get album by id" do
-      repo = PicasaWebAlbums.get_repository('apitest33@gmail.com', 'ruhak23A')
-      should "return an album" do
-       album = repo.get_album_by_id("5461230096110151249")
-       assert_equal "Banner Images", album.title
-      end
+    def test_get_all_albums
+      albums = @repo.get_all_albums
+      assert_equal 4, albums.count
     end
-  
-    context "get album by title" do
-      repo = PicasaWebAlbums.get_repository('apitest33@gmail.com', 'ruhak23A')
-      should "return an album" do
-       album = repo.get_album_by_title("Bio Profile Pics")
-       assert_equal "5455332611886090353", album.id
-      end
+    
+    def test_get_album_by_id
+      album = @repo.get_album_by_id("5461230096110151249")
+      assert_equal "Banner Images", album.title
     end
-  
-    context "get album by slug" do
-      repo = PicasaWebAlbums.get_repository('apitest33@gmail.com', 'ruhak23A')
-      should "return an album" do
-       album = repo.get_album_by_slug("960x350")
-       assert_equal "5577380987485671713", album.id
-      end
+
+    def test_get_album_by_title
+      album = @repo.get_album_by_title("Bio Profile Pics")
+      assert_equal "5455332611886090353", album.id
     end
   
+    def test_get_album_by_slug
+      album = @repo.get_album_by_slug("960x350")
+      assert_equal "5577380987485671713", album.id
+    end
+    
   end
 end

data/test/test_photos.rb

@@ -1,26 +1,28 @@
 require 'test/unit'
-require 'shoulda'
 require_relative '../lib/picasawebalbums'
 
 module PicasaWebAlbums
   class TestPhotos < Test::Unit::TestCase
   
-    context "get photos from album" do
-      repo = PicasaWebAlbums.get_repository('apitest33@gmail.com', 'ruhak23A')
-      should "return at least 1 photo" do
-       album = repo.get_album_by_id(5461230096110151249)
-       photos = repo.get_photos_by_album_id(album.id)
-       assert_equal true, photos.count > 0
-      end
+    def setup
+      @repo = PicasaWebAlbums.get_repository('apitest33@gmail.com', 'ruhak23A')
     end
   
-    context "get photo by album and id" do
-      repo = PicasaWebAlbums.get_repository('apitest33@gmail.com', 'ruhak23A')
-      should "return 1 photo" do
-       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_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(['penny'])
+      assert photos.count > 0
     end
   
   end

data/test/test_tags.rb

@@ -5,36 +5,23 @@ require_relative '../lib/picasawebalbums'
 module PicasaWebAlbums
   class TestTags < Test::Unit::TestCase
     
-    context "get all tags" do
-      repo = PicasaWebAlbums.get_repository('apitest33@gmail.com', 'ruhak23A')
-      should "return at least 1 tag" do
-        tags = repo.get_all_tags
-        assert tags.count > 0
-      end
+    def setup
+      @repo = PicasaWebAlbums.get_repository('apitest33@gmail.com', 'ruhak23A')
     end
-  
-    context "get tags by album id" do
-      repo = PicasaWebAlbums.get_repository('apitest33@gmail.com', 'ruhak23A')
-      should "return at least 1 tag" do
-        tags = repo.get_tags_by_album_id("5461230096110151249")
-        assert tags.count > 0
-      end
+    
+    def test_get_all_tags
+      tags = @repo.get_all_tags
+      assert tags.count > 0
     end
   
-    context "get tags by album id and photo id" do
-      repo = PicasaWebAlbums.get_repository('apitest33@gmail.com', 'ruhak23A')
-      should "return at least 1 tag" do
-        tags = repo.get_tags_by_album_id_and_photo_id("5461230096110151249", "5577383323184640194")
-        assert tags.count > 0
-      end
+    def test_get_tags_by_album_id
+      tags = @repo.get_tags_by_album_id("5461230096110151249")
+      assert tags.count > 0
     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
+  
+    def test_get_tags_by_album_id_and_photo_id
+      tags = @repo.get_tags_by_album_id_and_photo_id("5461230096110151249", "5577383323184640194")
+      assert tags.count > 0
     end
   
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: picasawebalbums
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-18 00:00:00.000000000 Z
+date: 2011-12-22 00:00:00.000000000 Z
 dependencies: []
 description: A simple way to retrieve albums, photos, tags, etc. from Picasa Web Albums.
 email:
@@ -21,6 +21,7 @@ files:
 - .gitignore
 - Gemfile
 - PicasaWebAlbums.gemspec
+- README.md
 - Rakefile
 - lib/PicasaWebAlbums.rb
 - lib/PicasaWebAlbums/version.rb
@@ -31,12 +32,12 @@ files:
 - lib/repositories/photos_repository.rb
 - lib/repositories/repository.rb
 - lib/repositories/tags_repository.rb
-- readme.md
 - test/test_albums.rb
 - test/test_photos.rb
 - test/test_tags.rb
 homepage: https://github.com/mkraft/PicasaWebAlbums
-licenses: []
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
 require_paths: