picasa 0.2.2 → 0.3

data/.gitignore

@@ -1,5 +1,17 @@
-*.sw?
-.DS_Store
+*.gem
+*.rbc
+.bundle
+.config
+.yardoc
+Gemfile.lock
+InstalledFiles
+_yardoc
 coverage
-rdoc
+doc/
+lib/bundler/man
 pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp

data/.travis.yml

@@ -0,0 +1,6 @@
+notifications:
+  disabled: true
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3

data/Gemfile

@@ -0,0 +1,6 @@
+source 'http://rubygems.org'
+
+gemspec
+
+gem "rake"
+gem "minitest", :platform => :ruby_18

data/README.md

@@ -0,0 +1,45 @@
+# Picasa
+
+Simple google picasa managment.
+Only for public albums so far.
+
+## Installation
+
+```
+gem install picasa
+```
+
+## Usage
+
+``` ruby
+Picasa.albums(:google_user => 'google_username')
+# => [ {:id => "666", :title => "satan-album", :photos_count => 6, :photo => "url",
+#      :thumbnail => "url", :slideshow => "url", :summary => "summary"},
+#     {another one} ]
+
+Picasa.photos(:google_user => 'google_username', :album_id => 'album_id')
+#=> {:photos => [{ :title, :thumbnail_1, :thumbnail_2, :thumbnail_3, :photo },{}],
+#    :slideshow => "link to picasa slideshow"}
+```
+
+or you can set google user for all requests like this:
+
+``` ruby
+Picasa.config do |c|
+  c.google_user = 'google.user'
+end
+```
+
+and use it:
+
+``` ruby
+Picasa.albums
+Picasa.photos(:album_id => 'album_id')
+```
+
+## Continuous Integration
+[![Build Status](https://secure.travis-ci.org/morgoth/picasa.png)](http://travis-ci.org/morgoth/picasa)
+
+## Copyright
+
+Copyright (c) 2011 Wojciech Wnętrzak, released under the MIT license.

data/Rakefile

@@ -1,57 +1,11 @@
-# encoding: UTF-8
+#!/usr/bin/env rake
+require "bundler/gem_tasks"
 
-require 'rubygems'
-require 'rake'
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "picasa"
-    gem.description = %Q{Simple Google Picasa managment}
-    gem.summary = %Q{simple google picasa managment}
-    gem.email = "w.wnetrzak@gmail.com"
-    gem.homepage = "http://github.com/morgoth/picasa"
-    gem.authors = ["Wojciech Wnętrzak"]
-    gem.add_dependency('xml-simple')
-    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
-rescue LoadError
-  puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
-end
-
-require 'rake/testtask'
+require "rake/testtask"
 Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
+  test.libs << "lib" << "test"
+  test.pattern = "test/**/test_*.rb"
   test.verbose = true
 end
 
-begin
-  require 'rcov/rcovtask'
-  Rcov::RcovTask.new do |test|
-    test.libs << 'test'
-    test.pattern = 'test/**/test_*.rb'
-    test.verbose = true
-  end
-rescue LoadError
-  task :rcov do
-    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
-  end
-end
-
-task :test => :check_dependencies
-
 task :default => :test
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "picasa #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end

data/lib/picasa.rb

@@ -1,7 +1,6 @@
-require 'net/http'
-require 'xmlsimple'
-require 'picasa/web_albums'
-require 'picasa/config'
+require "picasa/web_albums"
+require "picasa/config"
+require "picasa/version"
 
 module Picasa
   def self.albums(options = {})

data/lib/picasa/config.rb

@@ -1,4 +1,4 @@
-require 'singleton'
+require "singleton"
 
 module Picasa
   class Config

data/lib/picasa/version.rb

@@ -0,0 +1,3 @@
+module Picasa
+  VERSION = "0.3"
+end

data/lib/picasa/web_albums.rb

@@ -1,7 +1,10 @@
+require "net/http"
+require "xmlsimple"
+
 module Picasa
   class WebAlbums
     def initialize(user)
-      Picasa.config.google_user = user || Picasa.config.google_user
+      Picasa.config.google_user = user if user
       raise ArgumentError.new("You must specify google_user") unless Picasa.config.google_user
     end
 
@@ -9,17 +12,17 @@ module Picasa
       data = connect("/data/feed/api/user/#{Picasa.config.google_user}")
       xml = XmlSimple.xml_in(data)
       albums = []
-      xml['entry'].each do |album|
+      xml["entry"].each do |album|
         attributes = {}
-        attributes[:id] = album['id'][1]
-        attributes[:title] = album['title'][0]['content']
-        attributes[:summary] = album['summary'][0]['content']
-        attributes[:photos_count] = album['numphotos'][0].to_i
-        attributes[:photo] = album['group'][0]['content']['url']
-        attributes[:thumbnail] = album['group'][0]['thumbnail'][0]['url']
-        attributes[:slideshow] = album['link'][1]['href'] + "#slideshow"
+        attributes[:id] = album["id"][1]
+        attributes[:title] = album["title"][0]["content"]
+        attributes[:summary] = album["summary"][0]["content"]
+        attributes[:photos_count] = album["numphotos"][0].to_i
+        attributes[:photo] = album["group"][0]["content"]["url"]
+        attributes[:thumbnail] = album["group"][0]["thumbnail"][0]["url"]
+        attributes[:slideshow] = album["link"][1]["href"] + "#slideshow"
         albums << attributes
-      end if xml['entry']
+      end if xml["entry"]
       albums
     end
 
@@ -27,16 +30,16 @@ module Picasa
       data = connect("/data/feed/api/user/#{Picasa.config.google_user}/albumid/#{album_id}")
       xml = XmlSimple.xml_in(data)
       photos = []
-      xml['entry'].each do |photo|
+      xml["entry"].each do |photo|
         attributes = {}
-        attributes[:title] = photo['group'][0]['description'][0]['content']
-        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['content']['src']
+        attributes[:title] = photo["group"][0]["description"][0]["content"]
+        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["content"]["src"]
         photos << attributes
-      end if xml['entry']
-      { :photos => photos, :slideshow => xml['link'][1]['href'] + "#slideshow" }
+      end if xml["entry"]
+      { :photos => photos, :slideshow => xml["link"][1]["href"] + "#slideshow" }
     end
 
     private

data/picasa.gemspec

@@ -1,66 +1,33 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
+require File.expand_path('../lib/picasa/version', __FILE__)
 
-Gem::Specification.new do |s|
-  s.name = %q{picasa}
-  s.version = "0.2.2"
+Gem::Specification.new do |gem|
+  gem.authors = ["Wojciech Wnętrzak"]
+  gem.email = ["w.wnetrzak@gmail.com"]
+  gem.description = %q{Simple Google Picasa managment}
+  gem.summary = %q{simple google picasa managment}
+  gem.homepage = "https://github.com/morgoth/picasa"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Wojciech Wnętrzak"]
-  s.date = %q{2010-08-01}
-  s.description = %q{Simple Google Picasa managment}
-  s.email = %q{w.wnetrzak@gmail.com}
-  s.extra_rdoc_files = [
-    "LICENSE",
-     "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION.yml",
-     "lib/picasa.rb",
-     "lib/picasa/config.rb",
-     "lib/picasa/web_albums.rb",
-     "picasa.gemspec",
-     "test/fixtures/albums",
-     "test/fixtures/photos",
-     "test/helper.rb",
-     "test/test_config.rb",
-     "test/test_web_albums.rb"
-  ]
-  s.homepage = %q{http://github.com/morgoth/picasa}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{simple google picasa managment}
-  s.test_files = [
-    "test/test_web_albums.rb",
-     "test/test_config.rb",
-     "test/helper.rb"
-  ]
+  gem.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  gem.files = `git ls-files`.split("\n")
+  gem.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
+  gem.name = "picasa"
+  gem.require_paths = ['lib']
+  gem.version = Picasa::VERSION
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+  gem.add_dependency "xml-simple"
+  gem.add_development_dependency "fakeweb"
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<xml-simple>, [">= 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<test-unit>, [">= 2.0.6"])
-      s.add_dependency(%q<fakeweb>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<xml-simple>, [">= 0"])
-    s.add_dependency(%q<test-unit>, [">= 2.0.6"])
-    s.add_dependency(%q<fakeweb>, [">= 0"])
-  end
-end
+  gem.post_install_message = %{
+*************************************************************************
+
+Version 0.4 of this gem will be totaly rewritten.
+Gem syntax will change with backwards incompatibilities.
+If you don't want to update your code, please specify in your Gemfile:
+gem "picasa", "~> 0.3.0"
 
+Follow https://github.com/morgoth/picasa for updates.
+
+*************************************************************************
+}
+end

data/test/helper.rb

@@ -1,14 +1,16 @@
-require 'rubygems'
-gem 'test-unit'
-require 'test/unit'
-require 'fakeweb'
+require "minitest/autorun"
+require "fakeweb"
 
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'picasa'
+require "picasa"
 
-def fixture_file(filename)
-  return '' if filename == ''
-  file_path = File.expand_path(File.dirname(__FILE__) + '/fixtures/' + filename)
-  File.read(file_path)
+class MiniTest::Unit::TestCase
+  def setup
+    FakeWeb.allow_net_connect = false
+  end
+
+  def fixture_file(filename)
+    return "" if filename == ""
+    file_path = File.expand_path(File.dirname(__FILE__) + "/fixtures/" + filename)
+    File.read(file_path)
+  end
 end

data/test/test_config.rb

@@ -1,21 +1,12 @@
-require 'helper'
+require "helper"
 
-class TestConfig < Test::Unit::TestCase
-  test "Not raise argument error if google user is set by configuration block" do
+describe Picasa::Config do
+  it "should take user passed to method instead of config" do
     Picasa.config do |c|
-      c.google_user = 'some.user'
+      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
+    assert_equal "some.user", Picasa.config.google_user
+    Picasa::WebAlbums.new("important.user")
+    assert_equal "important.user", Picasa.config.google_user
   end
-end
+end

data/test/test_web_albums.rb

@@ -1,44 +1,43 @@
-require 'helper'
+require "helper"
 
-class TestWebAlbums < Test::Unit::TestCase
-  test 'Should parse albums page' do
-    page = fixture_file('albums')
+describe Picasa::WebAlbums do
+  it "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')
+    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]
-    assert_not_nil albums.first[:slideshow]
+    refute_nil albums.first[:photo]
+    refute_nil albums.first[:thumbnail]
+    refute_nil albums.first[:slideshow]
   end
 
-  test 'Should parse photos page' do
-    page = fixture_file('photos')
+  it "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')
+    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]
+    refute_nil photos[:slideshow]
+    refute_nil photos[:photos].first[:thumbnail_1]
+    refute_nil photos[:photos].first[:thumbnail_2]
+    refute_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]
+    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
+  it "should raise argument error if google user is not present" do
+    assert_raises 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'
+  it "should raise argument error if album_id is not present" do
+    assert_raises ArgumentError do
+      Picasa.photos :google_user => "some.user"
     end
   end
 end

metadata

@@ -1,81 +1,54 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: picasa
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 2
-  - 2
-  version: 0.2.2
+version: !ruby/object:Gem::Version
+  version: '0.3'
+  prerelease: 
 platform: ruby
-authors: 
-- "Wojciech Wn\xC4\x99trzak"
+authors:
+- Wojciech Wnętrzak
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-08-01 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-12-05 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: xml-simple
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &8245980 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: test-unit
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 0
-        - 6
-        version: 2.0.6
-  type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: *8245980
+- !ruby/object:Gem::Dependency
   name: fakeweb
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &8245440 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: *8245440
 description: Simple Google Picasa managment
-email: w.wnetrzak@gmail.com
+email:
+- w.wnetrzak@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
-- LICENSE
-- README.rdoc
-files: 
-- .document
+extra_rdoc_files: []
+files:
 - .gitignore
+- .travis.yml
+- Gemfile
 - LICENSE
-- README.rdoc
+- README.md
 - Rakefile
-- VERSION.yml
 - lib/picasa.rb
 - lib/picasa/config.rb
+- lib/picasa/version.rb
 - lib/picasa/web_albums.rb
 - picasa.gemspec
 - test/fixtures/albums
@@ -83,39 +56,47 @@ files:
 - test/helper.rb
 - test/test_config.rb
 - test/test_web_albums.rb
-has_rdoc: true
-homepage: http://github.com/morgoth/picasa
+homepage: https://github.com/morgoth/picasa
 licenses: []
+post_install_message: ! '
+
+  *************************************************************************
+
 
-post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
-require_paths: 
+  Version 0.4 of this gem will be totaly rewritten.
+
+  Gem syntax will change with backwards incompatibilities.
+
+  If you don''t want to update your code, please specify in your Gemfile:
+
+  gem "picasa", "~> 0.3.0"
+
+
+  Follow https://github.com/morgoth/picasa for updates.
+
+
+  *************************************************************************
+
+'
+rdoc_options: []
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: simple google picasa managment
-test_files: 
-- test/test_web_albums.rb
-- test/test_config.rb
-- test/helper.rb
+test_files: []

data/.document

@@ -1,5 +0,0 @@
-README.rdoc
-lib/**/*.rb
-bin/*
-features/**/*.feature
-LICENSE

data/README.rdoc

@@ -1,34 +0,0 @@
-= Picasa
-
-Simple google picasa managment.
-Only for public albums so far.
-
-= Installation
-
-  gem install picasa
-
-== Usage
-
-  Picasa.albums(:google_user => 'google_username')
-  # => [ {:id => "666", :title => "satan-album", :photos_count => 6, :photo => "url",
-  #      :thumbnail => "url", :slideshow => "url", :summary => "summary"},
-  #     {another one} ]
-
-  Picasa.photos(:google_user => 'google_username', :album_id => 'album_id')
-  #=> {:photos => [{ :title, :thumbnail_1, :thumbnail_2, :thumbnail_3, :photo },{}],
-  #    :slideshow => "link to picasa slideshow"}
-
-or you can set google user for all requests like this:
-
-  Picasa.config do |c|
-    c.google_user = 'google.user'
-  end
-
-and use it:
-
-  Picasa.albums
-  Picasa.photos(:album_id => 'album_id')
-
-= Copyright
-
-Copyright (c) 2009 Wojciech Wnętrzak, released under the MIT license.

data/VERSION.yml

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