picasawebalbums 1.1.1 → 1.1.2

data/lib/PicasaWebAlbums/version.rb

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

data/lib/PicasaWebAlbums.rb

@@ -1,12 +1,4 @@
-#require "PicasaWebAlbums/version"
-require 'net/http'
-require 'rexml/document'
-require 'date'
-require 'uri'
-require_relative 'album'
-require_relative 'photo'
-require_relative 'tag'
-require_relative 'repository'
+require_relative 'repositories/repository'
 
 module PicasaWebAlbums
   def self.get_repository(email, password)

data/lib/repositories/albums_repository.rb

@@ -0,0 +1,39 @@
+require 'date'
+require_relative '../domain/album'
+
+module AlbumsRepository
+  def get_all_albums
+    xml = get_xml("http://picasaweb.google.com/data/feed/api/user/#{@email}?kind=album&access=all")
+    albums = []
+    xml.root.elements.each("//entry") do |entry|
+      gallery = PicasaWebAlbums::Album.new
+      gallery.id = entry.elements["gphoto:id"].text
+      gallery.title = entry.elements["title"].text
+      gallery.date_created = DateTime.parse(entry.elements["published"].text)
+      gallery.date_updated = DateTime.parse(entry.elements["updated"].text)
+      gallery.slug = entry.elements["gphoto:name"].text
+      gallery.cover_photo_url = entry.elements["media:group/media:content"].attributes["url"]
+      gallery.description = entry.elements["media:group/media:description"].text
+      albums << gallery
+    end
+    return 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
+  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
+  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
+  end
+end

data/lib/repositories/photos_repository.rb

@@ -0,0 +1,66 @@
+require_relative '../domain/photo'
+
+module PhotosRepository
+  def get_photos_by_album_id(id)
+    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
+      photos << photo
+    end
+    return photos
+  end
+
+  def get_photo_by_album_id_and_photo_id(album_id, photo_id)
+    photos = get_photos_by_album_id(album_id)
+    photo_to_return = PicasaWebAlbums::Photo.new
+    photos.each do |photo|
+      if photo.id == photo_id
+        photo_to_return = photo
+      end
+    end
+    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 = 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
+      photos << photo
+    end
+    return photos
+  end
+  
+  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_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
+  end
+end

data/lib/repositories/repository.rb

@@ -0,0 +1,49 @@
+require 'net/http'
+require 'rexml/document'
+require 'uri'
+require_relative 'albums_repository'
+require_relative 'photos_repository'
+require_relative 'tags_repository'
+
+module PicasaWebAlbums
+  class Repository
+    include AlbumsRepository
+    include PhotosRepository
+    include TagsRepository
+    
+    def initialize(email, password)
+      @email = email
+      @authentication_token = get_authentication_token(email, password)
+    end
+
+    private
+    
+    def get_xml(url)
+      uri = URI(url)
+      request = Net::HTTP::Get.new(uri.request_uri)
+      request['Authorization'] = @authentication_token
+      response = Net::HTTP.start(uri.hostname, uri.port) { |http|
+        http.request(request)
+      }
+      xml = REXML::Document.new(response.body)
+      return xml
+    end
+
+    def get_authentication_token(email, password)
+      uri = URI("https://www.google.com/accounts/ClientLogin")
+      body = ""
+      Net::HTTP.start(uri.host, uri.port, :use_ssl => uri.scheme == 'https') do |http|
+        request = Net::HTTP::Post.new uri.request_uri
+        data = "accountType=HOSTED_OR_GOOGLE&Email=#{email}&Passwd=#{password}&service=lh2&source=someapp1"
+        response = http.request(request, data)
+        body = response.body
+      end
+      start_index = body.index('Auth=')
+      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
+    end
+  end
+end

data/lib/repositories/tags_repository.rb

@@ -0,0 +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")
+    end
+end

data/readme.md

@@ -13,8 +13,8 @@ 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'`, or
+- `gem 'picasawebalbums', :git => 'git@github.com:mkraft/PicasaWebAlbums.git'`
 
 Then run `bundle install`
 
@@ -92,4 +92,9 @@ 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)
+
+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.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: picasawebalbums
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -24,10 +24,13 @@ files:
 - Rakefile
 - lib/PicasaWebAlbums.rb
 - lib/PicasaWebAlbums/version.rb
-- lib/album.rb
-- lib/photo.rb
-- lib/repository.rb
-- lib/tag.rb
+- lib/domain/album.rb
+- lib/domain/photo.rb
+- lib/domain/tag.rb
+- lib/repositories/albums_repository.rb
+- lib/repositories/photos_repository.rb
+- lib/repositories/repository.rb
+- lib/repositories/tags_repository.rb
 - readme.md
 - test/test_albums.rb
 - test/test_photos.rb

data/lib/repository.rb

@@ -1,152 +0,0 @@
-module PicasaWebAlbums
-  class Repository
-    def initialize(email, password)
-      @email = email
-      @authentication_token = get_authentication_token(email, password)
-    end
-
-    def get_all_albums
-      xml = get_xml("http://picasaweb.google.com/data/feed/api/user/#{@email}?kind=album&access=all")
-      albums = []
-      xml.root.elements.each("//entry") do |entry|
-        gallery = Album.new
-        gallery.id = entry.elements["gphoto:id"].text
-        gallery.title = entry.elements["title"].text
-        gallery.date_created = DateTime.parse(entry.elements["published"].text)
-        gallery.date_updated = DateTime.parse(entry.elements["updated"].text)
-        gallery.slug = entry.elements["gphoto:name"].text
-        gallery.cover_photo_url = entry.elements["media:group/media:content"].attributes["url"]
-        gallery.description = entry.elements["media:group/media:description"].text
-        albums << gallery
-      end
-      return 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
-    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
-    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
-    end
-
-    def get_photos_by_album_id(id)
-      xml = get_xml("http://picasaweb.google.com/data/feed/base/user/#{@email}/albumid/#{id}")
-      photos = []
-      xml.root.elements.each("//entry") do |entry|
-        photo = 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
-        photos << photo
-      end
-      return photos
-    end
-
-    def get_photo_by_album_id_and_photo_id(album_id, photo_id)
-      photos = get_photos_by_album_id(album_id)
-      photo_to_return = Photo.new
-      photos.each do |photo|
-        if photo.id == photo_id
-          photo_to_return = photo
-        end
-      end
-      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 = []
-      xml.root.elements.each("//entry") do |entry|
-        tag = 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")
-    end
-
-    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)
-      request['Authorization'] = @authentication_token
-      response = Net::HTTP.start(uri.hostname, uri.port) { |http|
-        http.request(request)
-      }
-      xml = REXML::Document.new(response.body)
-      return xml
-    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
-    end
-
-    def get_authentication_token(email, password)
-      uri = URI("https://www.google.com/accounts/ClientLogin")
-      Net::HTTP.start(uri.host, uri.port, :use_ssl => uri.scheme == 'https') do |http|
-        request = Net::HTTP::Post.new uri.request_uri
-        data = "accountType=HOSTED_OR_GOOGLE&Email=#{email}&Passwd=#{password}&service=lh2&source=someapp1"
-        response = http.request(request, data)
-        @body = response.body
-      end
-      start_index = @body.index('Auth=')
-      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
-    end
-  end
-end