morgoth-picasa 0.1.1 → 0.1.2

data/README.rdoc

@@ -2,25 +2,25 @@
 
 Simple google picasa managment.
 Only for public albums so far.
-  
+
 = Installation
 
   gem sources -a http://gems.github.com
   sudo gem install morgoth-picasa
 
 In RAILS_ROOT/config/environment.rb
-  
+
   config.gem "morgoth-picasa",  :lib => "picasa"
 
 == Usage
 
-  Picasa.albums(google_username)
-  #=> [ {:id => "666", :title => "satan-album", :photos_count => '6'}, {another one} ]
-  
-  Picasa.photos(google_username, album_id)
+  Picasa.albums(:google_username => 'google_username')
+  #=> [ {:id => "666", :title => "satan-album", :photos_count => 6}, {another one} ]
+
+  Picasa.photos(:google_username => google_username, :album_id => 'album_id')
   #=> {:photos => [{ :title, :thumbnail_1, :thumbnail_2, :thumbnail_3, :photo },{}],
-  #       :slideshow => "link to picasa slideshow"}
-  
+  #    :slideshow => "link to picasa slideshow"}
+
 = Copyright
 
 Copyright (c) 2009 Wojciech Wnętrzak, released under the MIT license.

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:minor: 1
-:patch: 1
 :major: 0
+:minor: 1
+:patch: 2

data/lib/picasa.rb

@@ -2,38 +2,15 @@ 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

data/lib/web_albums.rb

@@ -0,0 +1,47 @@
+module Picasa
+  class WebAlbums
+    attr_accessor :google_user
+
+    def initialize(google_user)
+      @google_user = google_user
+    end
+
+    def albums
+      data = connect("/data/feed/api/user/#{google_user}")
+      xml=XmlSimple.xml_in(data)
+      albums = []
+      xml['entry'].each do |album|
+        attribute = {}
+        attribute[:id] = album['id'][1]
+        attribute[:title] = album['title'][0]['content']
+        attribute[:photos_count] = album['numphotos'][0].to_i
+        albums << attribute
+      end
+      albums
+    end
+
+    def photos(album_id)
+      data = connect("/data/feed/api/user/#{google_user}/albumid/#{album_id}")
+      xml = XmlSimple.xml_in(data)
+      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
+
+    private
+
+    def connect(url)
+      full_url = "http://picasaweb.google.com" + url
+      Net::HTTP.get(URI.parse(full_url))
+    end
+  end
+end

data/picasa.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{picasa}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wojciech Wn\304\231trzak"]
-  s.date = %q{2009-05-20}
+  s.date = %q{2009-07-02}
   s.email = %q{w.wnetrzak@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -20,6 +20,7 @@ Gem::Specification.new do |s|
      "Rakefile",
      "VERSION.yml",
      "lib/picasa.rb",
+     "lib/web_albums.rb",
      "picasa.gemspec",
      "test/fixtures/albums",
      "test/fixtures/photos",
@@ -29,7 +30,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/morgoth/picasa}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.3}
+  s.rubygems_version = %q{1.3.4}
   s.summary = %q{simple google picasa managment}
   s.test_files = [
     "test/picasa_test.rb",

data/test/picasa_test.rb

@@ -3,34 +3,34 @@ require 'test_helper'
 class PicasaTest < Test::Unit::TestCase
   context 'with albums page' do
     setup do
-			page = fixture_file('albums')
-			FakeWeb.register_uri(:get, "picasaweb.google.com/data/feed/api/user/some.user", :response => page)
-		end
+      page = fixture_file('albums')
+      FakeWeb.register_uri(:get, "picasaweb.google.com/data/feed/api/user/some.user", :response => page)
+    end
 
     should 'parse it' do
-      albums = Picasa.albums('some.user')
-			assert_equal albums.count, 5
-			assert_equal albums.first[:title], "SAPS in da akcion :P"
-			assert_equal albums[2][:photos_count].to_i, 10
-			assert_equal albums.first[:id], "5277503612406515713"
+      albums = Picasa.albums(:google_user => 'some.user')
+      assert_equal 5, albums.count
+      assert_equal "SAPS in da akcion :P", albums.first[:title]
+      assert_equal 10, albums[2][:photos_count]
+      assert_equal "5277503612406515713", albums.first[:id]
     end
   end
 
   context 'with photos page' do
     setup do
-			page = fixture_file('photos')
-			FakeWeb.register_uri(:get, "picasaweb.google.com/data/feed/api/user/some.user/albumid/666", :response => page)
-		end
+      page = fixture_file('photos')
+      FakeWeb.register_uri(:get, "picasaweb.google.com/data/feed/api/user/some.user/albumid/666", :response => page)
+    end
 
     should 'parse it' do
-      photos = Picasa.photos('some.user', '666')
-			assert_equal photos[:photos].count.to_i, 10
-			assert_not_nil photos[:slideshow]
-			assert_not_nil photos[:photos].first[:thumbnail_1]
-			assert_not_nil photos[:photos].first[:thumbnail_2]
-			assert_not_nil photos[:photos].first[:thumbnail_3]
-			assert_nil photos[:photos].first[:title]
-			assert_equal photos[:photos].first[:photo], "http://lh5.ggpht.com/_Kp7xCOU0f_U/SQS8EFqEXjI/AAAAAAAAAFo/aUOA6byXAuE/Jurek.JPG"
+      photos = Picasa.photos(:google_user => 'some.user', :album_id => '666')
+      assert_equal photos[:photos].count.to_i, 10
+      assert_not_nil photos[:slideshow]
+      assert_not_nil photos[:photos].first[:thumbnail_1]
+      assert_not_nil photos[:photos].first[:thumbnail_2]
+      assert_not_nil photos[:photos].first[:thumbnail_3]
+      assert_nil photos[:photos].first[:title]
+      assert_equal photos[:photos].first[:photo], "http://lh5.ggpht.com/_Kp7xCOU0f_U/SQS8EFqEXjI/AAAAAAAAAFo/aUOA6byXAuE/Jurek.JPG"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: morgoth-picasa
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - "Wojciech Wn\xC4\x99trzak"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-20 00:00:00 -07:00
+date: 2009-07-02 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -39,6 +39,7 @@ files:
 - Rakefile
 - VERSION.yml
 - lib/picasa.rb
+- lib/web_albums.rb
 - picasa.gemspec
 - test/fixtures/albums
 - test/fixtures/photos