picasa 0.1.9 → 0.2.0

data/Rakefile

@@ -13,8 +13,8 @@ begin
     gem.homepage = "http://github.com/morgoth/picasa"
     gem.authors = ["Wojciech Wnętrzak"]
     gem.add_dependency('xml-simple')
-    gem.add_development_dependency('shoulda')
-    gem.add_development_dependency('fakeweb')
+    gem.add_development_dependency 'test-unit', '>=2.0.6'
+    gem.add_development_dependency 'fakeweb'
 
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :major: 0
-:minor: 1
-:patch: 9
+:minor: 2
+:patch: 0
 :build: 

data/lib/picasa/web_albums.rb

@@ -1,7 +1,7 @@
 module Picasa
   class WebAlbums
     def initialize(user)
-      Picasa.config.google_user ||= user
+      Picasa.config.google_user = user || Picasa.config.google_user
       raise ArgumentError.new("You must specify google_user") unless Picasa.config.google_user
     end
 

data/picasa.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{picasa}
-  s.version = "0.1.9"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wojciech Wnętrzak"]
@@ -27,10 +27,11 @@ Gem::Specification.new do |s|
      "lib/picasa/config.rb",
      "lib/picasa/web_albums.rb",
      "picasa.gemspec",
+     "test/config_test.rb",
      "test/fixtures/albums",
      "test/fixtures/photos",
-     "test/picasa_test.rb",
-     "test/test_helper.rb"
+     "test/test_helper.rb",
+     "test/web_albums_test.rb"
   ]
   s.homepage = %q{http://github.com/morgoth/picasa}
   s.rdoc_options = ["--charset=UTF-8"]
@@ -38,7 +39,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.5}
   s.summary = %q{simple google picasa managment}
   s.test_files = [
-    "test/picasa_test.rb",
+    "test/web_albums_test.rb",
+     "test/config_test.rb",
      "test/test_helper.rb"
   ]
 
@@ -48,16 +50,16 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<xml-simple>, [">= 0"])
-      s.add_development_dependency(%q<shoulda>, [">= 0"])
+      s.add_development_dependency(%q<test-unit>, [">= 2.0.6"])
       s.add_development_dependency(%q<fakeweb>, [">= 0"])
     else
       s.add_dependency(%q<xml-simple>, [">= 0"])
-      s.add_dependency(%q<shoulda>, [">= 0"])
+      s.add_dependency(%q<test-unit>, [">= 2.0.6"])
       s.add_dependency(%q<fakeweb>, [">= 0"])
     end
   else
     s.add_dependency(%q<xml-simple>, [">= 0"])
-    s.add_dependency(%q<shoulda>, [">= 0"])
+    s.add_dependency(%q<test-unit>, [">= 2.0.6"])
     s.add_dependency(%q<fakeweb>, [">= 0"])
   end
 end

data/test/config_test.rb

@@ -0,0 +1,21 @@
+require 'test_helper'
+
+class ConfigTest < Test::Unit::TestCase
+  test "Not raise argument error if google user is set by configuration block" do
+    Picasa.config do |c|
+      c.google_user = 'some.user'
+    end
+    assert_nothing_raised do
+      Picasa::WebAlbums.new(nil)
+    end
+  end
+
+  test "Take user passed to method instead of config" do
+    Picasa.config do |c|
+      c.google_user = 'some.user'
+    end
+    assert_equal 'some.user', Picasa.config.google_user
+    Picasa::WebAlbums.new('important.user')
+    assert_equal 'important.user', Picasa.config.google_user
+  end
+end

data/test/test_helper.rb

@@ -1,15 +1,12 @@
 require 'rubygems'
+gem 'test-unit'
 require 'test/unit'
-require 'shoulda'
 require 'fakeweb'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'picasa'
 
-class Test::Unit::TestCase
-end
-
 def fixture_file(filename)
   return '' if filename == ''
   file_path = File.expand_path(File.dirname(__FILE__) + '/fixtures/' + filename)

data/test/web_albums_test.rb

@@ -0,0 +1,43 @@
+require 'test_helper'
+
+class WebAlbumsTest < Test::Unit::TestCase
+  test 'Should parse albums page' do
+    page = fixture_file('albums')
+    FakeWeb.register_uri(:get, "picasaweb.google.com/data/feed/api/user/some.user", :response => page)
+
+    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]
+    assert_not_nil albums.first[:photo]
+    assert_not_nil albums.first[:thumbnail]
+  end
+
+  test 'Should parse photos page' do
+    page = fixture_file('photos')
+    FakeWeb.register_uri(:get, "picasaweb.google.com/data/feed/api/user/some.user/albumid/666", :response => page)
+
+    photos = Picasa.photos(:google_user => 'some.user', :album_id => '666')
+    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 "http://lh5.ggpht.com/_Kp7xCOU0f_U/SQS8EFqEXjI/AAAAAAAAAFo/aUOA6byXAuE/Jurek.JPG",
+      photos[:photos].first[:photo]
+  end
+
+  test "Raise argument error if google user is not present" do
+    assert_raise ArgumentError do
+      Picasa::WebAlbums.new
+    end
+  end
+
+  test "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: picasa
 version: !ruby/object:Gem::Version 
-  version: 0.1.9
+  version: 0.2.0
 platform: ruby
 authors: 
 - "Wojciech Wn\xC4\x99trzak"
@@ -23,14 +23,14 @@ dependencies:
         version: "0"
     version: 
 - !ruby/object:Gem::Dependency 
-  name: shoulda
+  name: test-unit
   type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 2.0.6
     version: 
 - !ruby/object:Gem::Dependency 
   name: fakeweb
@@ -62,10 +62,11 @@ files:
 - lib/picasa/config.rb
 - lib/picasa/web_albums.rb
 - picasa.gemspec
+- test/config_test.rb
 - test/fixtures/albums
 - test/fixtures/photos
-- test/picasa_test.rb
 - test/test_helper.rb
+- test/web_albums_test.rb
 has_rdoc: true
 homepage: http://github.com/morgoth/picasa
 licenses: []
@@ -95,5 +96,6 @@ signing_key:
 specification_version: 3
 summary: simple google picasa managment
 test_files: 
-- test/picasa_test.rb
+- test/web_albums_test.rb
+- test/config_test.rb
 - test/test_helper.rb

data/test/picasa_test.rb

@@ -1,60 +0,0 @@
-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
-
-    should 'parse it' do
-      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]
-      assert_not_nil albums.first[:photo]
-      assert_not_nil albums.first[:thumbnail]
-    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
-
-    should 'parse it' do
-      photos = Picasa.photos(:google_user => 'some.user', :album_id => '666')
-      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 "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::WebAlbums.new
-    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
-
-  should "Not raise argument error if google user is set by configuration block" do
-    Picasa.config do |c|
-      c.google_user = 'some.user'
-    end
-    assert_nothing_raised do
-      Picasa::WebAlbums.new(nil)
-    end
-  end
-end