picasawebalbums 1.4.4 → 1.4.5

data/.rvmrc

@@ -0,0 +1,48 @@
+#!/usr/bin/env bash
+
+# This is an RVM Project .rvmrc file, used to automatically load the ruby
+# development environment upon cd'ing into the directory
+
+# First we specify our desired <ruby>[@<gemset>], the @gemset name is optional,
+# Only full ruby name is supported here, for short names use:
+#     echo "rvm use 1.9.3" > .rvmrc
+environment_id="ruby-1.9.3-p125@picasawebalbums"
+
+# Uncomment the following lines if you want to verify rvm version per project
+# rvmrc_rvm_version="1.10.3" # 1.10.1 seams as a safe start
+# eval "$(echo ${rvm_version}.${rvmrc_rvm_version} | awk -F. '{print "[[ "$1*65536+$2*256+$3" -ge "$4*65536+$5*256+$6" ]]"}' )" || {
+#   echo "This .rvmrc file requires at least RVM ${rvmrc_rvm_version}, aborting loading."
+#   return 1
+# }
+
+# First we attempt to load the desired environment directly from the environment
+# file. This is very fast and efficient compared to running through the entire
+# CLI and selector. If you want feedback on which environment was used then
+# insert the word 'use' after --create as this triggers verbose mode.
+if [[ -d "${rvm_path:-$HOME/.rvm}/environments"
+  && -s "${rvm_path:-$HOME/.rvm}/environments/$environment_id" ]]
+then
+  \. "${rvm_path:-$HOME/.rvm}/environments/$environment_id"
+  [[ -s "${rvm_path:-$HOME/.rvm}/hooks/after_use" ]] &&
+    \. "${rvm_path:-$HOME/.rvm}/hooks/after_use" || true
+else
+  # If the environment file has not yet been created, use the RVM CLI to select.
+  rvm --create  "$environment_id" || {
+    echo "Failed to create RVM environment '${environment_id}'."
+    return 1
+  }
+fi
+
+# If you use bundler, this might be useful to you:
+# if [[ -s Gemfile ]] && {
+#   ! builtin command -v bundle >/dev/null ||
+#   builtin command -v bundle | grep $rvm_path/bin/bundle >/dev/null
+# }
+# then
+#   printf "%b" "The rubygem 'bundler' is not installed. Installing it now.\n"
+#   gem install bundler
+# fi
+# if [[ -s Gemfile ]] && builtin command -v bundle >/dev/null
+# then
+#   bundle install | grep -vE '^Using|Your bundle is complete'
+# fi

data/README.md

@@ -13,8 +13,8 @@ Rails/Application Integration
 
 Add one of the below lines to the Gemfile:
 
-- `gem 'picasawebalbums`, or
-- `gem 'picasawebalbums', :git => 'git@github.com:mkraft/PicasaWebAlbums.git'`
+- `gem 'picasawebalbums, :require => 'PicasaWebAlbums'`
+- `gem 'picasawebalbums', :require => 'PicasaWebAlbums', :git => 'git@github.com:mkraft/PicasaWebAlbums.git'`
 
 Then run `bundle install`
 
@@ -39,8 +39,13 @@ 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.
+
+Testing
+-------
+
+To run integration tests, replace the values in `/test/config/test_account.yml` with known values from a real Picasa Web Albums account. The `album` can be any album in the account (no changes will be made to it). The `photo` must be from the chosen `album`. Run:
+
+	ruby test/tests.rb
 
 Methods
 -------
@@ -140,4 +145,4 @@ 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.
+SOFTWARE.

data/lib/PicasaWebAlbums.rb

@@ -2,7 +2,6 @@ require_relative 'repositories/repository'
 
 module PicasaWebAlbums
   def self.get_repository(email, password)
-    picasa_repo = Repository.new(email, password)
-    return picasa_repo
+    Repository.new(email, password)
   end
 end

data/lib/PicasaWebAlbums/version.rb

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

data/lib/repositories/albums_repository.rb

@@ -22,25 +22,22 @@ module AlbumsRepository
       gallery.edit_url = get_edit_url_from_entry(entry)
       albums << gallery
     end
-    return albums
+    albums
   end
 
   def get_album_by_id(id)
     albums = get_all_albums
-    album_to_return = albums[albums.find_index{|album| album.id == id.to_s}]
-    return album_to_return
+    albums[albums.find_index{|album| album.id == id.to_s}]
   end
 
   def get_album_by_title(title)
     albums = get_all_albums
-    album_to_return = albums[albums.find_index{|album| album.title == title.to_s}]
-    return album_to_return
+    albums[albums.find_index{|album| album.title == title.to_s}]
   end
 
   def get_album_by_slug(slug)
     albums = get_all_albums
-    album_to_return = albums[albums.find_index{|album| album.slug == slug.to_s}]
-    return album_to_return
+    albums[albums.find_index{|album| album.slug == slug.to_s}]
   end
   
   def create_album(new_album)
@@ -57,7 +54,7 @@ module AlbumsRepository
     req = Net::HTTP::Delete.new(url.request_uri)
     req['Authorization'] = @authentication_token
     res = http.request(req)
-    return res.code
+    res.code
   end
   
   #def update_album(modified_album)
@@ -88,7 +85,7 @@ module AlbumsRepository
         href = link.attributes["href"]
       end
     end
-    return href
+    href
   end
   
   def post_new_album(data)
@@ -102,6 +99,6 @@ module AlbumsRepository
       response = http.request(request)
       status = response.code
     end
-    return status
+    status
   end
 end

data/lib/repositories/photos_repository.rb

@@ -8,7 +8,7 @@ module PhotosRepository
       photo = get_photo_from_xml_element(entry)
       photos << photo
     end
-    return photos
+    photos
   end
 
   def get_photo_by_album_id_and_photo_id(album_id, photo_id)
@@ -19,7 +19,7 @@ module PhotosRepository
         photo_to_return = photo
       end
     end
-    return photo_to_return
+    photo_to_return
   end
   
   def get_photos_by_tags(tags)
@@ -30,7 +30,7 @@ module PhotosRepository
       photo = get_photo_from_xml_element(entry)
       photos << photo
     end
-    return photos
+    photos
   end
   
   private
@@ -52,7 +52,7 @@ module PhotosRepository
     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
+    photo
   end
   
   def get_tags_string(tags)
@@ -61,14 +61,13 @@ module PhotosRepository
       tags_string += URI.escape(tag.strip)
       tags_string += '%2C' unless tag == tags.last
     end
-    return tags_string
+    tags_string
   end
   
   def get_photo_id_from_photo_id_url(photo_id_url)
     start_index = photo_id_url.index('/photoid/') + 9
     slice_of_id_url_to_end = photo_id_url[start_index..-1]
     end_index = slice_of_id_url_to_end.index(/[?|\/]/)
-    id = slice_of_id_url_to_end[0...end_index]
-    return id
+    slice_of_id_url_to_end[0...end_index]
   end
 end

data/lib/repositories/repository.rb

@@ -25,8 +25,7 @@ module PicasaWebAlbums
       response = Net::HTTP.start(uri.hostname, uri.port) { |http|
         http.request(request)
       }
-      xml = REXML::Document.new(response.body)
-      return xml
+      REXML::Document.new(response.body)
     end
 
     def get_authentication_token(email, password)
@@ -42,8 +41,7 @@ module PicasaWebAlbums
       slice_of_auth_to_end = body[start_index..-1]
       end_index = slice_of_auth_to_end.index("\n")
       auth_string = slice_of_auth_to_end[0...end_index]
-      auth_token = "GoogleLogin #{auth_string}"
-      return auth_token
+      "GoogleLogin #{auth_string}"
     end
   end
 end

data/lib/repositories/tags_repository.rb

@@ -1,22 +1,22 @@
 require_relative '../domain/tag'
 
 module TagsRepository
-   def get_all_tags
-      xml = get_xml("http://picasaweb.google.com/data/feed/api/user/#{@email}?kind=tag")
-      tags = []
-      xml.root.elements.each("//entry") do |entry|
-        tag = PicasaWebAlbums::Tag.new
-        tag.text = entry.elements["title"].text
-        tags << tag
-      end
-      return tags
-    end
-    
-    def get_tags_by_album_id(album_id)
-      xml = get_xml("http://picasaweb.google.com/data/feed/api/user/userID/albumid/#{album_id}?kind=tag")
-    end
-    
-    def get_tags_by_album_id_and_photo_id(album_id, photo_id)
-      xml = get_xml("http://picasaweb.google.com/data/feed/api/user/default/albumid/#{album_id}/photoid/#{photo_id}?kind=tag")
+  def get_all_tags
+    xml = get_xml("http://picasaweb.google.com/data/feed/api/user/#{@email}?kind=tag")
+    tags = []
+    xml.root.elements.each("//entry") do |entry|
+      tag = PicasaWebAlbums::Tag.new
+      tag.text = entry.elements["title"].text
+      tags << tag
     end
+    tags
+  end
+
+  def get_tags_by_album_id(album_id)
+    get_xml("http://picasaweb.google.com/data/feed/api/user/userID/albumid/#{album_id}?kind=tag")
+  end
+
+  def get_tags_by_album_id_and_photo_id(album_id, photo_id)
+    get_xml("http://picasaweb.google.com/data/feed/api/user/default/albumid/#{album_id}/photoid/#{photo_id}?kind=tag")
+  end
 end

data/test/integration/test_albums.rb

@@ -6,7 +6,7 @@ module PicasaWebAlbums
   
     def setup
       @test_account = YAML::load(File.open(File.expand_path('test/config/test_account.yml')))
-      @repo = PicasaWebAlbums.get_repository('apitest33@gmail.com', 'ruhak23A')
+      @repo = PicasaWebAlbums.get_repository(@test_account["email"], @test_account["password"])
     end
   
     def test_get_all_albums

data/test/integration/test_tags.rb

@@ -1,5 +1,4 @@
 require 'test/unit'
-require 'shoulda'
 require_relative '../../lib/picasawebalbums'
 
 module PicasaWebAlbums
@@ -7,7 +6,7 @@ module PicasaWebAlbums
     
     def setup
       @test_account = YAML::load(File.open(File.expand_path('test/config/test_account.yml')))
-      @repo = PicasaWebAlbums.get_repository('apitest33@gmail.com', 'ruhak23A')
+      @repo = PicasaWebAlbums.get_repository(@test_account["email"], @test_account["password"])
     end
     
     def test_get_all_tags

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: picasawebalbums
 version: !ruby/object:Gem::Version
-  version: 1.4.4
+  version: 1.4.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-30 00:00:00.000000000 Z
+date: 2012-04-21 00:00:00.000000000 Z
 dependencies: []
 description: A simple way to retrieve albums, photos, tags, etc. from Picasa Web Albums.
 email:
@@ -19,6 +19,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rvmrc
 - Gemfile
 - PicasaWebAlbums.gemspec
 - README.md
@@ -58,7 +59,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: picasawebalbums
-rubygems_version: 1.8.12
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: Provides programmatic access to Picasa Web Albums data.