ZenfolioAPI 0.0.9 → 0.1.0

data/lib/ZenfolioAPI/session.rb

@@ -9,6 +9,8 @@ module ZenfolioAPI
 		# Create the Zenfolio Session
 		#
 		# @author David Slone
+		# @param [String] username
+		# @param [String] password
 		def initialize username, password
 			@username = username
 			@password = password
@@ -27,6 +29,21 @@ module ZenfolioAPI
 			@response = connection.POST(method, params, @auth.token)
 		end
 
+		# The CollectionAddPhoto method adds a photo reference to the specified collection.
+		#
+		# @author David Slone
+		# @param [Integer] collection_id 64-bit identifier of the collection to modify
+		# @param [Integer] photo_id 64-bit identifier of the photo to add
+		def collection_add_photo collection_id, photo_id
+			raise ZenfolioAPI::ZenfolioAPISessionError, "Missing collection_id parameter" if collection_id.nil? || collection_id.to_i == 0
+			raise ZenfolioAPI::ZenfolioAPISessionError, "Missing photo_id parameter" if photo_id.nil? || photo_id.to_i == 0
+
+			@response = api_request 'CollectionAddPhoto', [collection_id, photo_id]
+			raise ZenfolioAPI::ZenfolioAPISessionError, @response['error']['message'] if @response['result'].nil? && @response['error'].length > 0
+
+			# TODO: Finish implementing method
+		end
+
 		# The LoadGroupHierarchy method obtains a snapshot of the entire photoset group hierarchy of the specified user.
 		#
 		# @author David Slone
@@ -171,5 +188,32 @@ module ZenfolioAPI
 
 			photo_set
 		end
+
+		# The LoadPhoto method obtains a snapshot of the specified photo.
+		#
+		# @author David Slone
+		# @param [Integer] photo_id 64-bit identifier of the photo to load.
+		# @param [String] info_level Specifies which Photo snapshot fields to return. This parameter is new in API version 1.4.
+		def load_photo photo_id, info_level = "Full"
+			@response = api_request 'LoadPhoto', [photo_id, info_level]
+			raise ZenfolioAPI::ZenfolioAPISessionError, @response['error']['message'] if @response['result'].nil? && @response['error'].length > 0
+
+			value = @response['result']
+
+			access_descriptor = ZenfolioAPI::Model::AccessDescriptor.new(:realm_id => value['AccessDescriptor']['RealmId'], 
+				:access_type => value['AccessDescriptor']['AccessType'], :is_derived => value['AccessDescriptor']['IsDerived'], 
+				:access_mask => value['AccessDescriptor']['AccessMask'], :password_hint => value['AccessDescriptor']['PasswordHint'], 
+				:src_password_hint => value['AccessDescriptor']['SrcPasswordHint'])
+
+			@photo = ZenfolioAPI::Model::Image.new(:id => value['Id'], :width => value['Width'], :height => value['Height'], :sequence => value['Sequence'], 
+				:access_descriptor => access_descriptor, :owner => value['Owner'], :title => value['Title'], :mime_type => value['MimeType'], 
+				:size => value['Size'], :gallery => value['Gallery'], :original_url => value['OriginalUrl'], :url_core => value['UrlCore'], 
+				:url_host => value['UrlHost'], :url_token => value['UrlToken'], :page_url => value['PageUrl'], :mailbox_id => value['MailboxId'], 
+				:text_cn => value['TextCn'], :flags => value['Flags'], :is_video => value['IsVideo'], :duration => value['Duration'], :caption => value['Caption'], 
+				:file_name => value['FileName'], :uploaded_on => value['UploadedOn']['Value'], :taken_on => value['TakenOn']['Value'], :keywords => value['keywords'], 
+				:categories => value['Categories'], :copyright => value['Copyright'], :rotation => value['Rotation'], :exif_tags => value['ExifTags'], :short_exif => value['ShortExif'])
+
+			@photo
+		end
 	end
 end

data/lib/ZenfolioAPI/version.rb

@@ -1,3 +1,3 @@
 module ZenfolioAPI
-  VERSION = "0.0.9"
+  VERSION = "0.1.0"
 end

data/spec/ZenfolioAPI_spec.rb

@@ -9,6 +9,8 @@ describe ZenfolioAPI do
 
 	it "should list galleries for user" do
 		session.list_galleries
+		session.groups.each do |g|
+		end
 	end
 
 	it "should raise exception for incorrect gallery/collection id" do
@@ -20,6 +22,15 @@ describe ZenfolioAPI do
 		photos = session.images_for_gallery 562597392871954814
 	end
 
+	it "should raise error if photo is not found" do
+		expect { session.load_photo 0 }.to raise_error
+	end
+
+	it "should load specific photo" do
+		photo = session.load_photo 562597394281328477
+		photo.should_not be_nil
+	end
+
 	it "should load a group" do
 		group = session.load_group 562597392652020926
 		group.should_not be_nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ZenfolioAPI
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-26 00:00:00.000000000 Z
+date: 2013-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec