lib/picasa.rb in morgoth-picasa-0.1.1 vs lib/picasa.rb in morgoth-picasa-0.1.2

@@ -1,39 +1,16 @@
 module Picasa
   require 'net/http'
   require "xmlsimple"
 
-  def albums(google_user)
-    http=Net::HTTP.new('picasaweb.google.com')
-    resp, data = http.get("/data/feed/api/user/#{google_user}")
-    xml=XmlSimple.xml_in(data, 'KeyAttr' => 'name')
-    albums = []
-    xml['entry'].each do |album|
-   	  attribute = {}
-      attribute[:id] = album['id'][1]
-      attribute[:title] = album['title'][0]['content']
-      attribute[:photos_count] = album['numphotos'][0]
-   	  albums << attribute
-	  end
-    albums
+  require 'web_albums.rb'
+
+  def self.albums(options = {})
+    web_albums = Picasa::WebAlbums.new(options[:google_user])
+    web_albums.albums
   end
 
-  def photos(google_user, album_id)
-    http=Net::HTTP.new('picasaweb.google.com')
-    resp, data = http.get("/data/feed/api/user/#{google_user}/albumid/#{album_id}")
-    xml=XmlSimple.xml_in(data, 'KeyAttr' => 'name')
-    photos = []
-    xml['entry'].each do |photo|
-   	  attribute = {}
-      attribute[:title] = photo['group'][0]['description'][0]['content'] #returns nil if empty
-      attribute[:thumbnail_1] = photo['group'][0]['thumbnail'][0]['url']
-      attribute[:thumbnail_2] = photo['group'][0]['thumbnail'][1]['url']
-      attribute[:thumbnail_3] = photo['group'][0]['thumbnail'][2]['url']
-      #attributes[:photo] << photo['group'][0]['content']['url']
-      attribute[:photo] = photo['content']['src']
-      photos << attribute
-    end
-    { :photos => photos, :slideshow => xml['link'][2]['href'] }
-	end
-	  
-  module_function :albums, :photos
-end 
+  def self.photos(options = {})
+    web_albums = Picasa::WebAlbums.new(options[:google_user])
+    web_albums.photos(options[:album_id])
+  end
+end