picasa-ruby 0.1.1 → 0.1.2

data/CHANGELOG

@@ -1,2 +1,3 @@
+v0.1.2 added photos and albums
 v0.1.1 update client
 v0.1.0 first release

data/Rakefile

@@ -3,7 +3,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('picasa-ruby', '0.1.1') do |p|
+Echoe.new('picasa-ruby', '0.1.2') do |p|
   p.description    = "Ruby library for Picasa Web Albums API."
   p.url            = "http://github.com/23ninja/picasa-ruby"
   p.author         = "Iskander Haziev"

data/lib/picasa/album.rb

@@ -1,7 +1,5 @@
 module Picasa
   class Album
-    def initialize
-      
-    end
+    attr_accessor :id, :title, :summary, :size, :image, :thumbnail
   end
 end

data/lib/picasa/client.rb

@@ -1,25 +1,75 @@
 require 'oauth'
 require 'oauth/request_proxy/typhoeus_request'
+require 'xmlsimple'
 module Picasa
   class Client
     BASE_URL = 'https://picasaweb.google.com/data'
     
-    def initialize(api_key, api_secret, oauth_token, oauth_secret = nil)
-      @consumer = ::OAuth::Consumer.new(api_key,api_secret, :site => BASE_URL)
-      @token = ::OAuth::Token.new(oauth_token, oauth_secret)
-      @oauth_params = {:consumer => @consumer, :token => @token}
+    def initialize(api_key = nil, api_secret = nil, token = nil, secret = nil)
+      @api_key, @api_secret = api_key, api_secret
       @client = ::Typhoeus::Hydra.new
+      # if api call protected, create token and consumer
+      if protected_api_call?
+        @consumer = ::OAuth::Consumer.new(api_key,api_secret, :site => BASE_URL)
+        @token = ::OAuth::Token.new(token, secret)
+      end
     end
     
     def call(uri)
       request = ::Typhoeus::Request.new(BASE_URL + uri)
+      authorize_request!(request) if protected_api_call?
+      @client.queue(request)
+      @client.run
+      XmlSimple.xml_in(request.response.body)
+    end
+    
+    def albums(user)
+      xml = call("/feed/api/user/#{user}")
+      albums = []
+      xml['entry'].each do |entry|
+        album = Picasa::Album.new
+        album.id = entry['id'][1]
+        album.title = entry['title'][0]['content']
+        album.summary = entry['summary'][0]['content']
+        album.size = entry['numphotos'][0].to_i
+        album.image = entry['group'][0]['content']['url']
+        album.thumbnail = entry['group'][0]['thumbnail'][0]['url']
+        albums << album
+      end if xml['entry']
+      albums
+    end
+    
+    def photos(user, album_id)
+      xml = call("/feed/api/user/#{user}/albumid/#{album_id}")
+      photos = []
+      xml['entry'].each do |entry|
+        photo = Picasa::Photo.new
+        photo.title = entry['group'][0]['description'][0]['content']
+        photo.thumbnails = [
+          entry['group'][0]['thumbnail'][0]['url'],
+          entry['group'][0]['thumbnail'][1]['url'],
+          entry['group'][0]['thumbnail'][2]['url']
+        ]
+        photo.image = entry['content']['src']
+        photos << photo
+      end if xml['entry']
+      photos
+    end
+    
+    protected
+    def protected_api_call?
+      !@api_key.nil?
+    end
+    
+    def authorize_request!(request)
       oauth_helper = ::OAuth::Client::Helper.new(
-        request, @oauth_params.merge(:request_uri => BASE_URL + uri)
+        request, {
+          :consumer => @consumer, 
+          :token => @token,
+          :request_uri => request.url
+        }
       )
       request.headers.merge!({"Authorization" => oauth_helper.header})
-      @client.queue(request)
-      @client.run
-      response = request.response
     end
   end
 end

data/lib/picasa/photo.rb

@@ -1,7 +1,5 @@
 module Picasa
   class Photo
-    def initialize
-      
-    end
+    attr_accessor :title, :image, :thumbnails
   end
 end

data/picasa-ruby.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{picasa-ruby}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Iskander Haziev}]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: picasa-ruby
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-08-01 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth
-  requirement: &7203820 !ruby/object:Gem::Requirement
+  requirement: &7169500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *7203820
+  version_requirements: *7169500
 - !ruby/object:Gem::Dependency
   name: typhoeus
-  requirement: &7198000 !ruby/object:Gem::Requirement
+  requirement: &7166040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *7198000
+  version_requirements: *7166040
 description: Ruby library for Picasa Web Albums API.
 email: gvalmon@gmail.com
 executables: []