dustin-r2flickr 0.1.1.6 → 0.1.1.7

data/lib/flickr/photosets.rb

@@ -1,104 +1,102 @@
 require 'flickr/base'
 
 class Flickr::PhotoSets < Flickr::APIBase
-	# photoset can be a PhotoSet or a a photoset id
-	# photo can be a Photo or a photo id
-	def addPhoto(photoset,photo)
-		photo = photo.id if photo.class == Flickr::Photo
-		photoset = photoset.id if photoset.class == Flickr::PhotoSet
+  # photoset can be a PhotoSet or a a photoset id
+  # photo can be a Photo or a photo id
+  def addPhoto(photoset,photo)
+    photo = photo.id if photo.class == Flickr::Photo
+    photoset = photoset.id if photoset.class == Flickr::PhotoSet
 
-		@flickr.call_method('flickr.photosets.addPhoto',
-			'photoset_id' => photoset, 'photo_id' => photo)
-	end
+    @flickr.call_method('flickr.photosets.addPhoto',
+                        'photoset_id' => photoset, 'photo_id' => photo)
+  end
 
-	def create(title,primary_photo, description = nil)
-		primary_photo = primary_photo.id if
-			primary_photo.class == Flickr::Photo
-		args = { 'title' => title, 'primary_photo_id' =>
-			primary_photo}
-		args['description'] = description if description
-		res = @flickr.call_method('flickr.photosets.create',args)
-		id = res.elements['/photoset'].attributes['id']
-		url = res.elements['/photoset'].attributes['url']
-		set = Flickr::PhotoSet.new(id,@flickr)
-		set.title = title
-		set.url = url
-		@flickr.photoset_cache_store(set)
-		return set
-	end
+  def create(title,primary_photo, description = nil)
+    primary_photo = primary_photo.id if
+    primary_photo.class == Flickr::Photo
+    args = { 'title' => title, 'primary_photo_id' => primary_photo }
+    args['description'] = description if description
+    res = @flickr.call_method('flickr.photosets.create',args)
+    id = res.elements['/photoset'].attributes['id']
+    url = res.elements['/photoset'].attributes['url']
+    set = Flickr::PhotoSet.new(id,@flickr)
+    set.title = title
+    set.url = url
+    @flickr.photoset_cache_store(set)
+    return set
+  end
 
-	def delete(photoset)
-		photoset = photoset.id if photoset.class == Flickr::PhotoSet
-		@flickr.call_method('flickr.photosets.delete',
-			'photoset_id' => photoset)
-	end
+  def delete(photoset)
+    photoset = photoset.id if photoset.class == Flickr::PhotoSet
+    @flickr.call_method('flickr.photosets.delete',
+                        'photoset_id' => photoset)
+  end
 
-	def editMeta(photoset,title,description=nil)
-		photoset = photoset.id if photoset.class == Flickr::PhotoSet
-		args = {'photoset_id' => photoset,
-			'title' => title}
-		args['description' ] = description if description
-		@flickr.call_method('flickr.photosets.editMeta',args)
-	end
+  def editMeta(photoset,title,description=nil)
+    photoset = photoset.id if photoset.class == Flickr::PhotoSet
+    args = {'photoset_id' => photoset, 'title' => title}
+    args['description' ] = description if description
+    @flickr.call_method('flickr.photosets.editMeta',args)
+  end
 
-	def editPhotos(photoset,primary_photo,photos)
-		photoset = photoset.id if photoset.class == Flickr::PhotoSet
-		primary_photo = primary_photo.id if
-			primary_photo.class == Flickr::Photo
-		photos=photos.map{|p| p.id if p.class==Flickr::Photo}.join(',')
-		args = {'photoset_id' => photoset,
-			'primary_photo_id' => primary_photo,
-			'photo_ids' => photos }
-		@flickr.call_method('flickr.photosets.editPhotos',args)
-	end
+  def editPhotos(photoset,primary_photo,photos)
+    photoset = photoset.id if photoset.class == Flickr::PhotoSet
+    primary_photo = primary_photo.id if
+    primary_photo.class == Flickr::Photo
+    photos=photos.map{|p| p.id if p.class==Flickr::Photo}.join(',')
+    args = {'photoset_id' => photoset,
+            'primary_photo_id' => primary_photo,
+            'photo_ids' => photos }
+    @flickr.call_method('flickr.photosets.editPhotos',args)
+  end
 
-	def getContext(photo,photoset)
-		photoset = photoset.id if photoset.class == Flickr::PhotoSet
-		photo = photo.id if photo.class == Flickr::Photo
-		res = @flickr.call_method('flickr.photosets.getContext',
-			'photo_id' => photo, 'photoset_id' => photoset)
-		return Flickr::Context.from_xml(res,@flickr)
-	end
+  def getContext(photo,photoset)
+    photoset = photoset.id if photoset.class == Flickr::PhotoSet
+    photo = photo.id if photo.class == Flickr::Photo
+    res = @flickr.call_method('flickr.photosets.getContext',
+                              'photo_id' => photo, 'photoset_id' => photoset)
+    return Flickr::Context.from_xml(res,@flickr)
+  end
 
-	def getList(user=nil)
-		user = user.nsid if user.respond_to?(:nsid)
-		args = {}
-		args['user_id'] = user if user
-		res = @flickr.call_method('flickr.photosets.getList',args)
-		list = []
-		res.elements['/photosets'].each_element do |el|
-			list << Flickr::PhotoSet.from_xml(el,@flickr)
-		end
-		return list
-	end
+  def getList(user=nil)
+    user = user.nsid if user.respond_to?(:nsid)
+    args = {}
+    args['user_id'] = user if user
+    res = @flickr.call_method('flickr.photosets.getList',args)
+    list = []
+    res.elements['/photosets'].each_element do |el|
+      list << Flickr::PhotoSet.from_xml(el,@flickr)
+    end
+    return list
+  end
 
-	def removePhoto(photoset,photo)
-		photoset = photoset.id if photoset.class == Flickr::PhotoSet
-		photo = photo.id if photo.class == Flickr::Photo
-		@flickr.call_method('flickr.photosets.removePhoto',
-			'photo_id' => photo, 'photoset_id' => photoset)
-	end
+  def removePhoto(photoset,photo)
+    photoset = photoset.id if photoset.class == Flickr::PhotoSet
+    photo = photo.id if photo.class == Flickr::Photo
+    @flickr.call_method('flickr.photosets.removePhoto',
+                        'photo_id' => photo, 'photoset_id' => photoset)
+  end
 
-	def getPhotos(photoset,extras=nil)
-		photoset = photoset.id if photoset.class == Flickr::PhotoSet
-		extras = extras.join(',') if extras.class == Array
-		args = { 'photoset_id' => photoset }
-		args['extras'] = extras if extras
-		res = @flickr.call_method('flickr.photosets.getPhotos',args)
-		return Flickr::PhotoSet.from_xml(res.root,@flickr)
-	end
+  def getPhotos(photoset,extras=nil)
+    photoset = photoset.id if photoset.class == Flickr::PhotoSet
+    extras = extras.join(',') if extras.class == Array
+    args = { 'photoset_id' => photoset }
+    args['extras'] = extras if extras
+    res = @flickr.call_method('flickr.photosets.getPhotos',args)
+    return Flickr::PhotoSet.from_xml(res.root,@flickr)
+  end
 
-	def getInfo(photoset)
-		photoset = photoset.id if photoset.class == Flickr::PhotoSet
-		res = @flickr.call_method('flickr.photosets.getInfo',
-			'photoset_id' => photoset)
-		return Flickr::PhotoSet.from_xml(res.root,@flickr)
-	end
+  def getInfo(photoset)
+    photoset = photoset.id if photoset.class == Flickr::PhotoSet
+    res = @flickr.call_method('flickr.photosets.getInfo',
+                              'photoset_id' => photoset)
+    return Flickr::PhotoSet.from_xml(res.root,@flickr)
+  end
 
-	def orderSets(photosets)
-		photosets=photosets.map { |ps|
-			(ps.class==Flickr::PhotoSet) ? ps.id : ps}.join(',')
-		@flickr.call_method('flickr.photosets.orderSets',
-				'photoset_ids' => photosets)
-	end
+  def orderSets(photosets)
+    photosets=photosets.map { |ps|
+      (ps.class==Flickr::PhotoSet) ? ps.id : ps}.join(',')
+      @flickr.call_method('flickr.photosets.orderSets',
+                          'photoset_ids' => photosets)
+  end
 end

data/lib/flickr/pools.rb

@@ -1,70 +1,73 @@
 require 'flickr/groups'
 
 class Flickr::Pools < Flickr::APIBase
-	def initialize(flickr,groups)
-		super(flickr)
-		@groups = groups
-	end
+  
+  def initialize(flickr,groups)
+    super(flickr)
+    @groups = groups
+  end
 
-	# photo can be a Photo or photo_id
-	# group can be a Group or group_id
-	def add(photo,group)
-		group = group.nsid if group.class == Flickr::Group
-		photo = photo.id if photo.class == Flickr::Photo
-		@flickr.call_method('flickr.groups.pools.add',
-			'group_id' => group, 'photo_id' => photo)
-	end
+  # photo can be a Photo or photo_id
+  # group can be a Group or group_id
+  def add(photo,group)
+    group = group.nsid if group.class == Flickr::Group
+    photo = photo.id if photo.class == Flickr::Photo
+    @flickr.call_method('flickr.groups.pools.add',
+                        'group_id' => group, 'photo_id' => photo)
+  end
 
-	# photo can be a Photo or photo_id
-	# group can be a Group or group_id
-	def remove(photo,group)
-		group = group.nsid if group.class == Flickr::Group
-		photo = photo.id if photo.class == Flickr::Photo
-		@flickr.call_method('flickr.groups.pools.add',
-			'group_id' => group, 'photo_id' => photo)
-	end
+  # photo can be a Photo or photo_id
+  # group can be a Group or group_id
+  def remove(photo,group)
+    group = group.nsid if group.class == Flickr::Group
+    photo = photo.id if photo.class == Flickr::Photo
+    @flickr.call_method('flickr.groups.pools.add',
+                        'group_id' => group, 'photo_id' => photo)
+  end
 
-	# photo can be a Photo or photo_id
-	# group can be a Group or group_id
-	def getContext(photo,group)
-		group = group.nsid if group.class == Flickr::Group
-		photo = photo.id if photo.class == Flickr::Photo
-		res = @flickr.call_method('flickr.groups.pools.getContex',
-			'group_id' => group, 'photo_id' => photo)
-		return Flickr::Context.from_xml(res)
-	end
+  # photo can be a Photo or photo_id
+  # group can be a Group or group_id
+  def getContext(photo,group)
+    group = group.nsid if group.class == Flickr::Group
+    photo = photo.id if photo.class == Flickr::Photo
+    res = @flickr.call_method('flickr.groups.pools.getContex',
+                              'group_id' => group, 'photo_id' => photo)
+    return Flickr::Context.from_xml(res)
+  end
 
-	def getGroups
-		res = @flickr.call_method('flickr.groups.pools.getGroups')
-		list = []
-		res.elements['/groups'].each_element do |el|
-			att = el.attributes
-			nsid = att['nsid']
-			g = @flickr.group_cache_lookup(nsid) ||
-				Flickr::Group.new(@flickr,nsid,att['name'])
-			g.name = att['name']
-			g.admin = att['admin'].to_i == 1
-			g.privacy = Flickr::Group::PRIVACY[att['privacy'].to_i]
-			g.photo_count = att['photos'].to_i
-			g.iconserver = att['iconserver'].to_i
+  def getGroups
+    res = @flickr.call_method('flickr.groups.pools.getGroups')
+    list = []
 
-			@flickr.group_cache_store(g)
-			list << g
-		end
-		return list
-	end
+    res.elements['/groups'].each_element do |el|
+      att = el.attributes
+      nsid = att['nsid']
+      g = @flickr.group_cache_lookup(nsid) ||
+        Flickr::Group.new(@flickr,nsid,att['name'])
+      g.name = att['name']
+      g.admin = att['admin'].to_i == 1
+      g.privacy = Flickr::Group::PRIVACY[att['privacy'].to_i]
+      g.photo_count = att['photos'].to_i
+      g.iconserver = att['iconserver'].to_i
 
-	def getPhotos(group,tags=nil,extras=nil,per_page=nil,page=nil)
-		group = group.nsid if group.class == Flickr::Group
-		group = group.id.to_s if group.class == Flickr::PhotoPool
-		args = { 'group_id' => group }
-		args['tags'] = tags.map{|t| t.clean if t.class ==
-			Flick::Tag}.join(',') if tags
-		args['extras'] = extras.join(',') if extras.class == Array
-		args['per_page'] = per_page if per_page
-		args['page'] = page if page
+      @flickr.group_cache_store(g)
+      list << g
+    end
+    
+    return list
+  end
 
-		res = @flickr.call_method('flickr.groups.pools.getPhotos', args)
-		return Flickr::PhotoList.from_xml(res,@flickr)
-	end
+  def getPhotos(group,tags=nil,extras=nil,per_page=nil,page=nil)
+    group = group.nsid if group.class == Flickr::Group
+    group = group.id.to_s if group.class == Flickr::PhotoPool
+    args = { 'group_id' => group }
+    args['tags'] = tags.map{|t| t.clean if t.class ==
+      Flick::Tag}.join(',') if tags
+    args['extras'] = extras.join(',') if extras.class == Array
+    args['per_page'] = per_page if per_page
+    args['page'] = page if page
+
+    res = @flickr.call_method('flickr.groups.pools.getPhotos', args)
+    return Flickr::PhotoList.from_xml(res,@flickr)
+  end
 end

data/lib/flickr/reflection.rb

@@ -1,89 +1,89 @@
 require 'flickr/base'
 
 class Flickr::Method
-	attr_reader :name,:authenticated,:description,:response,:explanation,
-		:arguments, :errors
+  attr_reader :name, :authenticated, :description, :response, :explanation,
+    :arguments, :errors
 
-	def initialize(name,authenticated,description,response,explanation)
-		@name = name
-		@authenticated = authenticated
-		@description = description
-		@response = response
-		@explanation = explanation
-		@arguments = []
-		@errors = []
-	end
+  def initialize(name,authenticated,description,response,explanation)
+    @name = name
+    @authenticated = authenticated
+    @description = description
+    @response = response
+    @explanation = explanation
+    @arguments = []
+    @errors = []
+  end
 end
 
 class Flickr::MethodArgument
-	attr_reader :name, :optional, :description
-	
-	def initialize(name,optional,description)
-		@name = name
-		@optional = optional
-		@description = description
-	end
+  attr_reader :name, :optional, :description
+
+  def initialize(name,optional,description)
+    @name = name
+    @optional = optional
+    @description = description
+  end
 end
 
 class Flickr::Reflection < Flickr::APIBase
-	# We don't bother with caching because it's not worth it for the
-	# reflection API.
-	def getMethodInfo(method_name)
-		res = @flickr.call_method('flickr.reflection.getMethodInfo',
-			'method_name' => method_name)
-		els = res.elements
-		att = res.root.attributes
-		desc = els['/method/description'] ?
-			els['/method/description'].text : nil
-		resp = els['/method/response'] ?
-			els['/method/response'].text : nil
-		expl = els['/method/explanation'] ?
-			els['/method/explanation'].text : nil
-		meth = Flickr::Method.new(att['name'],att['needslogin'].to_i==1,
-			desc,resp,expl)
-		els['/method/arguments'].each_element do |el|
-			att = el.attributes
-			arg = Flickr::MethodArgument.new(att['name'],
-				att['optional'].to_i == 1,el.text)
-			meth.arguments << arg
-		end
-		els['/method/errors'].each_element do |el|
-			att = el.attributes
-			err = XMLRPC::FaultException.new(att['code'].to_i,
-				el.text)
-			meth.errors << err
-		end		
-		return meth
-	end
+  # We don't bother with caching because it's not worth it for the
+  # reflection API.
+  def getMethodInfo(method_name)
+    res = @flickr.call_method('flickr.reflection.getMethodInfo',
+                              'method_name' => method_name)
+    els = res.elements
+    att = res.root.attributes
+    desc = els['/method/description'] ?
+      els['/method/description'].text : nil
+    resp = els['/method/response'] ?
+      els['/method/response'].text : nil
+    expl = els['/method/explanation'] ?
+      els['/method/explanation'].text : nil
+    meth = Flickr::Method.new(att['name'],att['needslogin'].to_i==1,
+                              desc,resp,expl)
+    els['/method/arguments'].each_element do |el|
+      att = el.attributes
+      arg = Flickr::MethodArgument.new(att['name'],
+                                       att['optional'].to_i == 1,el.text)
+      meth.arguments << arg
+    end
+    els['/method/errors'].each_element do |el|
+      att = el.attributes
+      err = XMLRPC::FaultException.new(att['code'].to_i,
+                                       el.text)
+      meth.errors << err
+    end		
+    return meth
+  end
 
-	def getMethods
-		res = @flickr.call_method('flickr.reflection.getMethods')
-		list = []
-		res.elements['/methods'].each_element do |el|
-			list << el.text
-		end
-		return list
-	end
+  def getMethods
+    res = @flickr.call_method('flickr.reflection.getMethods')
+    list = []
+    res.elements['/methods'].each_element do |el|
+      list << el.text
+    end
+    return list
+  end
 
-	def missing_methods
-		list = []
-		methods = self.getMethods
-		methods.each do |mname|
-			parts = mname.split('.')
-			parts.shift
-			call = parts.pop
-			obj = @flickr
-			parts.each do |part|
-				if obj.respond_to?(part)
-					obj = obj.method(part).call
-				else
-					obj = nil
-					list << mname
-					break
-				end
-			end
-			list << mname if (obj && !obj.respond_to?(call))
-		end
-		return list
-	end
+  def missing_methods
+    list = []
+    methods = self.getMethods
+    methods.each do |mname|
+      parts = mname.split('.')
+      parts.shift
+      call = parts.pop
+      obj = @flickr
+      parts.each do |part|
+        if obj.respond_to?(part)
+          obj = obj.method(part).call
+        else
+          obj = nil
+          list << mname
+          break
+        end
+      end
+      list << mname if (obj && !obj.respond_to?(call))
+    end
+    return list
+  end
 end