picasa 0.3.1 → 0.3.2

data/Gemfile

@@ -1,4 +1,4 @@
-source 'http://rubygems.org'
+source "https://rubygems.org"
 
 gemspec
 

data/lib/picasa.rb

@@ -4,13 +4,13 @@ require "picasa/version"
 
 module Picasa
   def self.albums(options = {})
-    web_albums = Picasa::WebAlbums.new(options[:google_user])
-    web_albums.albums
+    web_albums = Picasa::WebAlbums.new(options.delete(:google_user))
+    web_albums.albums(options)
   end
 
   def self.photos(options = {})
     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])
+    web_albums = Picasa::WebAlbums.new(options.delete(:google_user))
+    web_albums.photos(options.delete(:album_id), options)
   end
 end

data/lib/picasa/version.rb

@@ -1,3 +1,3 @@
 module Picasa
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

data/lib/picasa/web_albums.rb

@@ -8,8 +8,8 @@ module Picasa
       raise ArgumentError.new("You must specify google_user") unless Picasa.config.google_user
     end
 
-    def albums
-      data = connect("/data/feed/api/user/#{Picasa.config.google_user}")
+    def albums(options = {})
+      data = connect("/data/feed/api/user/#{Picasa.config.google_user}", options)
       xml = XmlSimple.xml_in(data)
       albums = []
       xml["entry"].each do |album|
@@ -26,8 +26,8 @@ module Picasa
       albums
     end
 
-    def photos(album_id)
-      data = connect("/data/feed/api/user/#{Picasa.config.google_user}/albumid/#{album_id}")
+    def photos(album_id, options = {})
+      data = connect("/data/feed/api/user/#{Picasa.config.google_user}/albumid/#{album_id}", options)
       xml = XmlSimple.xml_in(data)
       photos = []
       xml["entry"].each do |photo|
@@ -40,13 +40,14 @@ module Picasa
         attributes[:photo] = photo["content"]["src"]
         photos << attributes
       end if xml["entry"]
-      { :photos => photos, :slideshow => xml["link"][1]["href"] + "#slideshow" }
+      {:photos => photos, :slideshow => xml["link"][1]["href"] + "#slideshow"}
     end
 
     private
 
-    def connect(url)
+    def connect(url, options = {})
       full_url = "http://picasaweb.google.com" + url
+      full_url += "?" + URI.encode_www_form(options) unless options.empty?
       Net::HTTP.get(URI.parse(full_url))
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: picasa
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-02 00:00:00.000000000 Z
+date: 2012-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xml-simple
-  requirement: &82975310 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *82975310
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &82975100 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +37,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *82975100
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Simple Google Picasa managment
 email:
 - w.wnetrzak@gmail.com
@@ -95,7 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: simple google picasa managment