flickr 1.0.0 → 1.0.1

data/Rakefile

@@ -4,7 +4,7 @@ require 'rake/rdoctask'
 require 'rake/gempackagetask'
 require 'rubygems'
 
-task :default => [ :test, :gem, :rdoc ]
+task :default => [ :gem, :rdoc ]
 
 Rake::TestTask.new("test") { |t|
   t.test_files = FileList['test*.rb']
@@ -18,17 +18,17 @@ Rake::RDocTask.new { |rdoc|
 spec = Gem::Specification.new do |s|
   s.add_dependency('xml-simple', '>= 1.0.7')
   s.name = 'flickr'
-  s.version = "1.0.0"
+  s.version = "1.0.1"
   s.platform = Gem::Platform::RUBY
-  s.summary = "An insanely easy interface to the Flickr photo-sharing service. By Scott Raymond."
+  s.summary = "An insanely easy interface to the Flickr photo-sharing service. By Scott Raymond. Maintainer: Patrick Plattes"
   s.requirements << 'Flickr developers API key'
   s.files = Dir.glob("*").delete_if { |item| item.include?("svn") }
   s.require_path = '.'
   s.autorequire = 'flickr'
-  s.author = "Scott Raymond"
-  s.email = "sco@redgreenblu.com"
+  s.author = "Scott Raymond, Patrick Plattes"
+  s.email = "patrick@erdbeere.net"
   s.rubyforge_project = "flickr"
-  s.homepage = "http://redgreenblu.com/flickr/"
+  s.homepage = "http://flickr.rubyforge.org/"
 end
 Rake::GemPackageTask.new(spec) do |pkg|
   pkg.need_zip = true

data/flickr.rb

@@ -54,7 +54,7 @@ class Flickr
   attr_accessor :user
 
   # Replace this API key with your own (see http://www.flickr.com/services/api/misc.api_keys.html)
-  def initialize(api_key='86e18ef2a064ff2255845e029208d7f4', email=nil, password=nil)
+  def initialize(api_key=nil, email=nil, password=nil)
     @api_key = api_key
     @host = 'http://flickr.com'
     @api = '/services/rest'
@@ -88,19 +88,19 @@ class Flickr
     @email = email
     @password = password
     user = request('test.login')['user'] rescue fail
-    @user = User.new(user['id'])
+    @user = User.new(user['id'], @api_key)
   end
   
   # Implements flickr.urls.lookupGroup and flickr.urls.lookupUser
   def find_by_url(url)
     response = urls_lookupUser('url'=>url) rescue urls_lookupGroup('url'=>url) rescue nil
-    (response['user']) ? User.new(response['user']['id']) : Group.new(response['group']['id']) unless response.nil?
+    (response['user']) ? User.new(response['user']['id'], @api_key) : Group.new(response['group']['id'], @api_key) unless response.nil?
   end
 
   # Implements flickr.photos.getRecent and flickr.photos.search
   def photos(*criteria)
     photos = (criteria[0]) ? photos_search(criteria[0]) : photos_getRecent
-    photos['photos']['photo'].collect { |photo| Photo.new(photo['id']) }
+    photos['photos']['photo'].collect { |photo| Photo.new(photo['id'], @api_key) }
   end
 
   # Gets public photos with a given tag
@@ -112,15 +112,15 @@ class Flickr
   def users(lookup=nil)
     if(lookup)
       user = people_findByEmail('find_email'=>lookup)['user'] rescue people_findByUsername('username'=>lookup)['user']
-      return User.new(user['nsid'])
+      return User.new(user['nsid'], @api_key)
     else
-      return people_getOnlineList['online']['user'].collect { |person| User.new(person['nsid']) }
+      return people_getOnlineList['online']['user'].collect { |person| User.new(person['nsid'], @api_key) }
     end
   end
 
   # Implements flickr.groups.getActiveList
   def groups
-    groups_getActiveList['activegroups']['group'].collect { |group| Group.new(group['nsid']) }
+    groups_getActiveList['activegroups']['group'].collect { |group| Group.new(group['nsid'], @api_key) }
   end
   
   # Implements flickr.tags.getRelated
@@ -161,13 +161,14 @@ class Flickr
     
     attr_reader :client, :id, :name, :location, :photos_url, :url, :count, :firstdate, :firstdatetaken
 
-    def initialize(id=nil, username=nil, email=nil, password=nil)
+    def initialize(id=nil, username=nil, email=nil, password=nil, api_key=nil)
       @id = id
       @username = username
       @email = email
       @password = password
-      @client = Flickr.new
+      @client = Flickr.new @api_key
       @client.login(email, password) if email and password
+      @api_key = api_key
     end
 
     def username
@@ -197,12 +198,12 @@ class Flickr
         
     # Implements flickr.people.getPublicGroups
     def groups
-      @client.people_getPublicGroups('user_id'=>@id)['groups']['group'].collect { |group| Group.new(group['nsid']) }
+      @client.people_getPublicGroups('user_id'=>@id)['groups']['group'].collect { |group| Group.new(group['nsid'], @api_key) }
     end
     
     # Implements flickr.people.getPublicPhotos
     def photos
-      @client.people_getPublicPhotos('user_id'=>@id)['photos']['photo'].collect { |photo| Photo.new(photo['id']) }
+      @client.people_getPublicPhotos('user_id'=>@id)['photos']['photo'].collect { |photo| Photo.new(photo['id'], @api_key) }
       # what about non-public photos?
     end
 
@@ -213,19 +214,19 @@ class Flickr
 
     # Implements flickr.contacts.getPublicList and flickr.contacts.getList
     def contacts
-      @client.contacts_getPublicList('user_id'=>@id)['contacts']['contact'].collect { |contact| User.new(contact['nsid']) }
+      @client.contacts_getPublicList('user_id'=>@id)['contacts']['contact'].collect { |contact| User.new(contact['nsid'], @api_key) }
       #or
     end
     
     # Implements flickr.favorites.getPublicList and flickr.favorites.getList
     def favorites
-      @client.favorites_getPublicList('user_id'=>@id)['photos']['photo'].collect { |photo| Photo.new(photo['id']) }
+      @client.favorites_getPublicList('user_id'=>@id)['photos']['photo'].collect { |photo| Photo.new(photo['id'], @api_key) }
       #or
     end
     
     # Implements flickr.photosets.getList
     def photosets
-      @client.photosets_getList('user_id'=>@id)['photosets']['photoset'].collect { |photoset| Photoset.new(photoset['id']) }
+      @client.photosets_getList('user_id'=>@id)['photosets']['photoset'].collect { |photoset| Photoset.new(photoset['id'], @api_key) }
     end
 
     # Implements flickr.tags.getListUser
@@ -235,9 +236,9 @@ class Flickr
 
     # Implements flickr.photos.getContactsPublicPhotos and flickr.photos.getContactsPhotos
     def contactsPhotos
-      @client.photos_getContactsPublicPhotos('user_id'=>@id)['photos']['photo'].collect { |photo| Photo.new(photo['id']) }
+      @client.photos_getContactsPublicPhotos('user_id'=>@id)['photos']['photo'].collect { |photo| Photo.new(photo['id'], @api_key) }
       # or
-      #@client.photos_getContactsPhotos['photos']['photo'].collect { |photo| Photo.new(photo['id']) }
+      #@client.photos_getContactsPhotos['photos']['photo'].collect { |photo| Photo.new(photo['id'], @api_key) }
     end
     
     def to_s
@@ -266,9 +267,10 @@ class Flickr
 
     attr_reader :id, :client
 
-    def initialize(id=nil)
+    def initialize(id=nil, api_key=nil)
       @id = id
-      @client = Flickr.new
+      @api_key = api_key
+      @client = Flickr.new @api_key
     end
     
     def title
@@ -330,8 +332,8 @@ class Flickr
     # Implements flickr.photos.getContext
     def context
       context = @client.photos_getContext('photo_id'=>@id)
-      @previousPhoto = Photo.new(context['prevphoto']['id'])
-      @nextPhoto = Photo.new(context['nextphoto']['id'])
+      @previousPhoto = Photo.new(context['prevphoto']['id'], @api_key)
+      @nextPhoto = Photo.new(context['nextphoto']['id'], @api_key)
       return [@previousPhoto, @nextPhoto]
     end
 
@@ -415,7 +417,7 @@ class Flickr
       def getInfo
         info = @client.photos_getInfo('photo_id'=>@id)['photo']
         @title = info['title']
-        @owner = User.new(info['owner']['nsid'])
+        @owner = User.new(info['owner']['nsid'], @api_key)
         @server = info['server']
         @isfavorite = info['isfavorite']
         @license = info['license']
@@ -436,9 +438,10 @@ class Flickr
   class Group
     attr_reader :id, :client, :name, :members, :online, :privacy, :chatid, :chatcount, :url
     
-    def initialize(id=nil)
+    def initialize(id=nil, api_key=nil)
       @id = id
-      @client = Flickr.new
+      @api_key = api_key      
+      @client = Flickr.new @api_key
     end
 
     # Implements flickr.groups.getInfo and flickr.urls.getGroup
@@ -468,16 +471,17 @@ class Flickr
 
     attr_reader :id, :client, :owner, :primary, :photos, :title, :description, :url
 
-    def initialize(id=nil)
+    def initialize(id=nil, api_key=nil)
       @id = id
-      @client = Flickr.new
+      @api_key = api_key
+      @client = Flickr.new @api_key
     end
 
     # Implements flickr.photosets.getInfo
     # private, once we can call it as needed
     def getInfo
       info = @client.photosets_getInfo('photosets_id'=>@id)['photoset']
-      @owner = User.new(info['owner'])
+      @owner = User.new(info['owner'], @api_key)
       @primary = info['primary']
       @photos = info['photos']
       @title = info['title']

metadata

@@ -1,16 +1,15 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.1
+rubygems_version: 0.9.4
 specification_version: 1
 name: flickr
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
-date: 2005-04-19
-summary: An insanely easy interface to the Flickr photo-sharing service. By Scott Raymond.
+  version: 1.0.1
+date: 2008-02-25 00:00:00 +01:00
+summary: "An insanely easy interface to the Flickr photo-sharing service. By Scott Raymond. Maintainer: Patrick Plattes"
 require_paths: 
-  - "."
-author: Scott Raymond
-email: sco@redgreenblu.com
-homepage: http://redgreenblu.com/flickr/
+- .
+email: patrick@erdbeere.net
+homepage: http://flickr.rubyforge.org/
 rubyforge_project: flickr
 description: 
 autorequire: flickr
@@ -19,33 +18,40 @@ bindir: bin
 has_rdoc: false
 required_ruby_version: !ruby/object:Gem::Version::Requirement 
   requirements: 
-    - 
-      - ">"
-      - !ruby/object:Gem::Version 
-        version: 0.0.0
+  - - ">"
+    - !ruby/object:Gem::Version 
+      version: 0.0.0
   version: 
 platform: ruby
+signing_key: 
+cert_chain: 
+post_install_message: 
+authors: 
+- Scott Raymond, Patrick Plattes
 files: 
-  - flickr.rb
-  - index.html
-  - pkg
-  - Rakefile
-  - test_flickr.rb
+- index.html
+- test_flickr.rb
+- flickr.rb
+- Rakefile
 test_files: []
+
 rdoc_options: []
+
 extra_rdoc_files: []
+
 executables: []
+
 extensions: []
+
 requirements: 
-  - Flickr developers API key
+- Flickr developers API key
 dependencies: 
-  - !ruby/object:Gem::Dependency 
-    name: xml-simple
-    version_requirement: 
-    version_requirements: !ruby/object:Gem::Version::Requirement 
-      requirements: 
-        - 
-          - ">="
-          - !ruby/object:Gem::Version 
-            version: 1.0.7
-      version: 
+- !ruby/object:Gem::Dependency 
+  name: xml-simple
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Version::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.0.7
+    version: