morgoth-picasa 0.1.3 → 0.1.4

data/VERSION.yml

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

data/lib/picasa.rb

@@ -1,19 +1,17 @@
-module Picasa
-  require 'net/http'
-  require "xmlsimple"
-
-  require 'web_albums.rb'
+require 'net/http'
+require "xmlsimple"
+require 'picasa/web_albums'
 
+module Picasa
   def self.albums(options = {})
-    raise ArgumentError, "You must specify google_user" unless options[:google_user]
+    raise ArgumentError.new("You must specify google_user") unless options[:google_user]
     web_albums = Picasa::WebAlbums.new(options[:google_user])
     web_albums.albums
   end
 
   def self.photos(options = {})
-    unless options[:google_user] and options[:album_id]
-      raise ArgumentError, "You must specify google_user and album_id"
-    end
+    raise ArgumentError.new("You must specify google_user") unless options[:google_user]
+    raise ArgumentError.new("You must specify album_id") unless options[:album_id]
     web_albums = Picasa::WebAlbums.new(options[:google_user])
     web_albums.photos(options[:album_id])
   end

data/lib/{web_albums.rb → picasa/web_albums.rb}

@@ -11,11 +11,11 @@ module Picasa
       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
+        attributes = {}
+        attributes[:id] = album['id'][1]
+        attributes[:title] = album['title'][0]['content']
+        attributes[:photos_count] = album['numphotos'][0].to_i
+        albums << attributes
       end
       albums
     end
@@ -25,14 +25,14 @@ module Picasa
       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 = {}
+        attributes[:title] = photo['group'][0]['description'][0]['content'] #returns nil if empty
+        attributes[:thumbnail_1] = photo['group'][0]['thumbnail'][0]['url']
+        attributes[:thumbnail_2] = photo['group'][0]['thumbnail'][1]['url']
+        attributes[:thumbnail_3] = photo['group'][0]['thumbnail'][2]['url']
         #attributes[:photo] << photo['group'][0]['content']['url']
-        attribute[:photo] = photo['content']['src']
-        photos << attribute
+        attributes[:photo] = photo['content']['src']
+        photos << attributes
       end
       { :photos => photos, :slideshow => xml['link'][2]['href'] }
     end

data/picasa.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{picasa}
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   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-07-02}
+  s.date = %q{2009-07-03}
   s.email = %q{w.wnetrzak@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
      "Rakefile",
      "VERSION.yml",
      "lib/picasa.rb",
-     "lib/web_albums.rb",
+     "lib/picasa/web_albums.rb",
      "picasa.gemspec",
      "test/fixtures/albums",
      "test/fixtures/photos",

data/test/picasa_test.rb

@@ -24,13 +24,26 @@ class PicasaTest < Test::Unit::TestCase
 
     should 'parse it' do
       photos = Picasa.photos(:google_user => 'some.user', :album_id => '666')
-      assert_equal photos[:photos].count.to_i, 10
+      assert_equal 10, photos[:photos].count
       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"
+      assert_equal "http://lh5.ggpht.com/_Kp7xCOU0f_U/SQS8EFqEXjI/AAAAAAAAAFo/aUOA6byXAuE/Jurek.JPG",
+        photos[:photos].first[:photo]
+    end
+  end
+
+  should "Raise argument error if google user is not present" do
+    assert_raise ArgumentError do
+      Picasa.albums
+    end
+  end
+
+  should "Raise argument error if album_id is not present" do
+    assert_raise ArgumentError do
+      Picasa.photos :google_user => 'some.user'
     end
   end
 end

metadata

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