picasa 0.1.8 → 0.1.9

data/README.rdoc

@@ -23,7 +23,9 @@ In RAILS_ROOT/config/environment.rb
 
 or you can set google user in initializer like this:
 
-  Picasa::WebAlbums.google_user = "google_username"
+  Picasa.config do |c|
+    c.google_user = 'google.user'
+  end
 
 and use it:
 

data/Rakefile

@@ -13,6 +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 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: 8
+:patch: 9
 :build: 

data/lib/picasa.rb

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

data/lib/picasa/config.rb

@@ -0,0 +1,15 @@
+require 'singleton'
+
+module Picasa
+  class Config
+    include Singleton
+    attr_accessor :google_user
+  end
+
+  def self.config
+    if block_given?
+      yield Config.instance
+    end
+    Config.instance
+  end
+end

data/lib/picasa/web_albums.rb

@@ -1,19 +1,13 @@
 module Picasa
   class WebAlbums
-    attr_reader :google_user
-
-    def self.google_user=(user)
-      @@google_user = user
-    end
-
     def initialize(user)
-      @google_user = user || @@google_user
-      raise ArgumentError.new("You must specify google_user") unless @google_user
+      Picasa.config.google_user ||= user
+      raise ArgumentError.new("You must specify google_user") unless Picasa.config.google_user
     end
 
     def albums
-      data = connect("/data/feed/api/user/#{google_user}")
-      xml=XmlSimple.xml_in(data)
+      data = connect("/data/feed/api/user/#{Picasa.config.google_user}")
+      xml = XmlSimple.xml_in(data)
       albums = []
       xml['entry'].each do |album|
         attributes = {}
@@ -28,7 +22,7 @@ module Picasa
     end
 
     def photos(album_id)
-      data = connect("/data/feed/api/user/#{google_user}/albumid/#{album_id}")
+      data = connect("/data/feed/api/user/#{Picasa.config.google_user}/albumid/#{album_id}")
       xml = XmlSimple.xml_in(data)
       photos = []
       xml['entry'].each do |photo|

data/picasa.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{picasa}
-  s.version = "0.1.8"
+  s.version = "0.1.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wojciech Wnętrzak"]
-  s.date = %q{2009-12-10}
+  s.date = %q{2010-01-27}
   s.description = %q{Simple Google Picasa managment}
   s.email = %q{w.wnetrzak@gmail.com}
   s.extra_rdoc_files = [
@@ -24,6 +24,7 @@ Gem::Specification.new do |s|
      "Rakefile",
      "VERSION.yml",
      "lib/picasa.rb",
+     "lib/picasa/config.rb",
      "lib/picasa/web_albums.rb",
      "picasa.gemspec",
      "test/fixtures/albums",
@@ -47,11 +48,17 @@ 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<fakeweb>, [">= 0"])
     else
       s.add_dependency(%q<xml-simple>, [">= 0"])
+      s.add_dependency(%q<shoulda>, [">= 0"])
+      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<fakeweb>, [">= 0"])
   end
 end
 

data/test/picasa_test.rb

@@ -49,8 +49,10 @@ class PicasaTest < Test::Unit::TestCase
     end
   end
 
-  should "Not raise argument error if google user is set by class variable" do
-    Picasa::WebAlbums.google_user = "some.user"
+  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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: picasa
 version: !ruby/object:Gem::Version 
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors: 
 - "Wojciech Wn\xC4\x99trzak"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-10 00:00:00 +01:00
+date: 2010-01-27 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,6 +22,26 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: shoulda
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: fakeweb
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 description: Simple Google Picasa managment
 email: w.wnetrzak@gmail.com
 executables: []
@@ -39,6 +59,7 @@ files:
 - Rakefile
 - VERSION.yml
 - lib/picasa.rb
+- lib/picasa/config.rb
 - lib/picasa/web_albums.rb
 - picasa.gemspec
 - test/fixtures/albums