fleakr 0.4.2 → 0.4.3

data/README.rdoc

@@ -119,7 +119,61 @@ Other sizes are available (:square, :thumbnail, :small, :medium, :large, :origin
 are accessed in the same way:
     
     >> photo.original.url
-    => "http://farm4.static.flickr.com/3250/2924549350_1cf67c2d47_o.jpg"    
+    => "http://farm4.static.flickr.com/3250/2924549350_1cf67c2d47_o.jpg"
+    
+=== Tags
+
+Tags are available for users and photos.  Retrieving them is easy:
+
+    >> user = Fleakr.user('the decapitator')
+    >> user.tags
+    => [#<Fleakr::Objects::Tag:0x190d5fc @value="ad">, 
+        #<Fleakr::Objects::Tag:0x1908a20 @value="ads">, ...
+    >> user.photos.first.tags
+    => [#<Fleakr::Objects::Tag:0x17b1b18 @machine_flag="0", @author_id="21775151@N06", ...
+
+All tags have values, but for tags associated with photos there is some additional information:
+
+    >> tag = user.photos.first.tags.first
+    >> tag.id
+    => "21729829-3263659141-427098"
+    >> tag.raw
+    => "decapitator"
+    >> tag.value
+    => "decapitator"
+    >> tag.to_s
+    => "decapitator"
+    >> tag.machine?
+    => false
+    >> tag.author
+    => #<Fleakr::Objects::User:0x1a149f0 @username="the decapitator", ... >
+    
+See Fleakr::Objects::Tag for more information.
+
+=== Comments
+
+Similar to tags, photosets and photos can each have comments:
+
+    >> user.sets.first.comments
+    => [#<Fleakr::Objects::Comment:0x19795cc ...
+    >> user.photos.first.comments
+    => [#<Fleakr::Objects::Comment:0x17bf0b0 @body="Dayum, that's some wishful thinking!" ...
+
+All comments have additional information:
+
+    >> comment = user.photos.first.comments.first
+    >> comment.id
+    => "21729829-3263659141-72157613553885978"
+    >> comment.body
+    => "Dayum, that's some wishful thinking!"
+    >> comment.to_s
+    => "Dayum, that's some wishful thinking!"
+    >> comment.url
+    => "http://www.flickr.com/photos/the_decapitator/3263659141/#comment72157613553885978"
+    >> comment.author
+    => #<Fleakr::Objects::User:0x178e3d4 @username="jaspertandy", ... >
+
+See Fleakr::Objects::Comment for more information.
 
 === Saving Images
 

data/lib/fleakr/objects/comment.rb

@@ -0,0 +1,49 @@
+module Fleakr
+  module Objects # :nodoc:
+
+    # = Comment
+    #
+    # This class represents a comment that can be associated with a single photo or an
+    # entire photoset.
+    #
+    # == Attributes
+    #
+    # [id] The unique identifier for this comment
+    # [url] The direct URL / permalink to reference this comment
+    # [body] The comment itself - also available with <tt>to_s</tt>
+    #
+    class Comment
+      
+      include Fleakr::Support::Object
+      
+      find_all :by_photo_id, :call => 'photos.comments.getList', :path => 'comments/comment'
+      find_all :by_set_id, :using => :photoset_id, :call => 'photosets.comments.getList', :path => 'comments/comment'
+      
+      flickr_attribute :id
+      flickr_attribute :author_id, :from => '@author'
+      flickr_attribute :created, :from => '@datecreate'
+      flickr_attribute :url, :from => '@permalink'
+      flickr_attribute :body, :from => '.'
+
+      # The user who supplied the comment.  See Fleakr::Objects::User for more information
+      #
+      def author
+        @author ||= User.find_by_id(author_id)
+      end
+      
+      # When was this comment created?
+      #
+      def created_at
+        Time.at(created.to_i)
+      end
+      
+      # The contents of the comment - also available as <tt>body</tt>
+      #
+      def to_s
+        body
+      end
+      
+    end
+    
+  end
+end

data/lib/fleakr/objects/group.rb

@@ -8,18 +8,28 @@ module Fleakr
     # [id] This group's ID
     # [name] The name of the group
     #
+    # == Associations
+    #
+    # [photos] The photos that are in this group
+    #
     class Group
 
       include Fleakr::Support::Object
 
       flickr_attribute :id, :from => '@nsid'
       flickr_attribute :name
+      flickr_attribute :adult_flag, :from => '@eighteenplus'
 
       find_all :by_user_id, :call => 'people.getPublicGroups', :path => 'groups/group'
 
       has_many :photos
       
       scoped_search
+      
+      # Is this group adult-only? (e.g. only 18+ allowed to view)
+      def adult?
+        (adult_flag == '1')
+      end
 
     end
   end

data/lib/fleakr/objects/image.rb

@@ -24,9 +24,8 @@ module Fleakr
 
       include Fleakr::Support::Object
 
+      flickr_attribute :width, :height
       flickr_attribute :size,   :from => '@label'
-      flickr_attribute :width
-      flickr_attribute :height
       flickr_attribute :url,    :from => '@source'
       flickr_attribute :page,   :from => '@url'
 

data/lib/fleakr/objects/photo.rb

@@ -20,10 +20,14 @@ module Fleakr
     # [medium] The medium representation of this photo
     # [large] The large representation of this photo
     # [original] The original photo
+    # [previous] The previous photo based on the current context
+    # [next] The next photo based on the current context 
     #
     # == Associations
     #
     # [images] The underlying images for this photo.
+    # [tags] The tags for this photo.
+    # [comments] The comments associated with this photo
     #
     class Photo
 
@@ -31,28 +35,24 @@ module Fleakr
       SIZES = [:square, :thumbnail, :small, :medium, :large, :original]
 
       include Fleakr::Support::Object
+      extend Forwardable
+
+      def_delegators :context, :next, :previous
 
       flickr_attribute :id, :from => ['@id', 'photoid']
-      flickr_attribute :title
-      flickr_attribute :description
+      flickr_attribute :title, :description, :secret, :posted, :taken, :url
       flickr_attribute :farm_id, :from => '@farm'
       flickr_attribute :server_id, :from => '@server'
-      flickr_attribute :secret
-      flickr_attribute :posted
-      flickr_attribute :taken
+      flickr_attribute :owner_id, :from => ['@owner', 'owner@nsid']
       flickr_attribute :updated, :from => '@lastupdate'
       flickr_attribute :comment_count, :from => 'comments'
-      flickr_attribute :url
 
       # TODO:
-      # * owner (user)
       # * visibility
       # * editability
       # * usage
-      # * notes
-      # * tags
 
-      find_all :by_photoset_id, :call => 'photosets.getPhotos', :path => 'photoset/photo'
+      find_all :by_set_id, :using => :photoset_id, :call => 'photosets.getPhotos', :path => 'photoset/photo'
       find_all :by_user_id, :call => 'people.getPublicPhotos', :path => 'photos/photo'
       find_all :by_group_id, :call => 'groups.pools.getPhotos', :path => 'photos/photo'
       
@@ -60,7 +60,7 @@ module Fleakr
       
       lazily_load :posted, :taken, :updated, :comment_count, :url, :description, :with => :load_info
       
-      has_many :images
+      has_many :images, :tags, :comments
 
       # Upload the photo specified by <tt>filename</tt> to the user's Flickr account. When uploading,
       # there are several options available (none are required):
@@ -98,6 +98,19 @@ module Fleakr
         self.populate_from(response.body)
       end
 
+      def context # :nodoc:
+        @context ||= begin
+          response = Fleakr::Api::MethodRequest.with_response!('photos.getContext', :photo_id => self.id)
+          PhotoContext.new(response.body)
+        end
+      end
+
+      # The user who uploaded this photo.  See Fleakr::Objects::User for additional information.
+      # 
+      def owner
+        @owner ||= User.find_by_id(owner_id)
+      end
+
       # When was this photo posted?
       #
       def posted_at

data/lib/fleakr/objects/photo_context.rb

@@ -0,0 +1,49 @@
+module Fleakr
+  module Objects # :nodoc:
+
+    # = PhotoContext
+    #
+    # This class represents the context for a photo as retrieved from the API.  It's not
+    # intended to be used directly, but is used in conjunction with Photo#previous and 
+    # Photo#next
+    #
+    # == Attributes
+    #
+    # [count] The number of photos available
+    
+    class PhotoContext
+      
+      include Fleakr::Support::Object
+      
+      flickr_attribute :count
+      flickr_attribute :next_id,     :from => 'nextphoto@id'
+      flickr_attribute :previous_id, :from => 'prevphoto@id'
+
+      # Is there a previous photo available for the current photo?
+      #
+      def previous?
+        previous_id != '0'
+      end
+      
+      # The previous photo if one is available
+      #
+      def previous
+        Photo.find_by_id(previous_id) if previous?
+      end
+      
+      # Is there a next photo available for the current photo?
+      #
+      def next?
+        next_id != '0'
+      end
+      
+      # The next photo if one is available
+      #
+      def next
+        Photo.find_by_id(next_id) if next?
+      end
+      
+    end
+    
+  end
+end

data/lib/fleakr/objects/set.rb

@@ -13,16 +13,15 @@ module Fleakr
     # == Associations
     # 
     # [photos] The collection of photos for this set. See Fleakr::Objects::Photo
+    # [comments] All comments associated with this set. See Fleakr::Objects::Comment
     #
     class Set
 
       include Fleakr::Support::Object
 
-      has_many :photos, :using => :photoset_id
+      has_many :photos, :comments
 
-      flickr_attribute :id
-      flickr_attribute :title
-      flickr_attribute :description
+      flickr_attribute :id, :title, :description
       flickr_attribute :count, :from => '@photos'
 
       find_all :by_user_id, :call => 'photosets.getList', :path => 'photosets/photoset'

data/lib/fleakr/objects/tag.rb

@@ -0,0 +1,56 @@
+module Fleakr
+  module Objects # :nodoc:
+
+    # = Tag
+    #
+    # This class represents a tag that can be associated with a photo or an individual user.
+    #
+    # == Attributes
+    #
+    # [id] The unique identifier for this tag
+    # [raw] The raw, user-entered value for this tag
+    # [value] The formatted value for this tag. Also available through <tt>to_s</tt>
+    #
+    class Tag
+      
+      include Fleakr::Support::Object
+      
+      flickr_attribute :id, :raw
+      flickr_attribute :author_id, :from => '@author'
+      flickr_attribute :value, :from => '.' # pull this from the current node
+      flickr_attribute :machine_flag, :from => '@machine_tag'
+      
+      find_all :by_photo_id, :call => 'tags.getListPhoto', :path => 'photo/tags/tag'
+      find_all :by_user_id, :call => 'tags.getListUser', :path => 'who/tags/tag'
+      
+      # The first user who created this tag.  See Fleakr::Objects::User for more information
+      #
+      def author
+        @author ||= User.find_by_id(author_id) unless author_id.nil?
+      end
+      
+      # A list of related tags.  Each of the objects in the collection is an instance of Tag
+      #
+      def related
+        @related ||= begin
+          response = Fleakr::Api::MethodRequest.with_response!('tags.getRelated', :tag => value)
+          (response.body/'rsp/tags/tag').map {|e| Tag.new(e) }
+        end
+      end
+      
+      # Is this a machine tag?
+      #
+      def machine?
+        machine_flag != '0'
+      end
+      
+      # The formatted value of the tag.  Also available as <tt>value</tt>
+      #
+      def to_s
+        value
+      end
+      
+    end
+    
+  end
+end

data/lib/fleakr/objects/user.rb

@@ -28,6 +28,7 @@ module Fleakr
     # [groups] A list of this user's public groups. See Fleakr::Objects::Group.
     # [photos] A list of this user's public photos (newest first).  See Fleakr::Objects::Photo.
     # [contacts] A list of this user's contacts - these are simply User objects
+    # [tags] The tags associated with this user
     #
     # == Examples
     #
@@ -44,9 +45,8 @@ module Fleakr
       include Fleakr::Support::Object
 
       flickr_attribute :id, :from => 'user@nsid'
-      flickr_attribute :username
+      flickr_attribute :username, :location
       flickr_attribute :name, :from => 'person/realname'
-      flickr_attribute :location
       flickr_attribute :photos_url, :from => 'person/photosurl'
       flickr_attribute :profile_url, :from => 'person/profileurl'
       flickr_attribute :photos_count, :from => 'person/photos/count'
@@ -55,10 +55,11 @@ module Fleakr
       flickr_attribute :pro, :from => 'person@ispro'
       flickr_attribute :admin, :from => 'person@isadmin'
 
-      has_many :sets, :groups, :photos, :contacts
+      has_many :sets, :groups, :photos, :contacts, :tags
 
       find_one :by_username, :call => 'people.findByUsername'
       find_one :by_email, :using => :find_email, :call => 'people.findByEmail'
+      find_one :by_id, :using => :user_id, :call => 'people.getInfo'
 
       lazily_load :name, :photos_url, :profile_url, :photos_count, :location, :with => :load_info
       lazily_load :icon_server, :icon_farm, :pro, :admin, :with => :load_info

data/lib/fleakr/objects.rb

@@ -3,7 +3,10 @@ require 'fleakr/objects/contact'
 require 'fleakr/objects/error'
 require 'fleakr/objects/group'
 require 'fleakr/objects/image'
+require 'fleakr/objects/photo_context'
 require 'fleakr/objects/photo'
+require 'fleakr/objects/comment'
+require 'fleakr/objects/tag'
 require 'fleakr/objects/search'
 require 'fleakr/objects/set'
 require 'fleakr/objects/user'

data/lib/fleakr/support/object.rb

@@ -8,18 +8,22 @@ module Fleakr
           @attributes ||= []
         end
       
-        def flickr_attribute(name, options = {})
-          self.attributes << Attribute.new(name, options[:from])
-          class_eval "attr_accessor :#{name}"
+        def flickr_attribute(*names_and_options)
+          options = names_and_options.extract_options!
+
+          names_and_options.each do |name|
+            self.attributes << Attribute.new(name, options[:from])
+            class_eval "attr_accessor :#{name}"
+          end
         end
       
         def has_many(*attributes)
-          options = attributes.extract_options!
           class_name = self.name
 
           attributes.each do |attribute|
-            target = "Fleakr::Objects::#{attribute.to_s.classify}"
-            finder_attribute = options[:using].nil? ? "#{class_name.demodulize.underscore}_id": options[:using]
+            target           = "Fleakr::Objects::#{attribute.to_s.classify}"
+            finder_attribute = "#{class_name.demodulize.underscore}_id"
+
             class_eval <<-CODE
               def #{attribute}
                 @#{attribute} ||= #{target}.send("find_all_by_#{finder_attribute}".to_sym, self.id)

data/lib/fleakr/version.rb

@@ -3,7 +3,7 @@ module Fleakr
     
     MAJOR = 0
     MINOR = 4
-    TINY  = 2
+    TINY  = 3
     
     def self.to_s
       [MAJOR, MINOR, TINY].join('.')

data/lib/fleakr.rb

@@ -5,6 +5,7 @@ require 'uri'
 require 'cgi'
 require 'net/http'
 require 'hpricot'
+require 'forwardable'
 
 # Require only what we need from ActiveSupport
 require 'active_support/core_ext/array'

data/test/fixtures/people.getPublicGroups.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <rsp stat="ok">
 <groups>
-	<group nsid="13378274@N00" name="Group #1" admin="0" eighteenplus="0" />
-	<group nsid="52242140489@N01" name="Group #2" admin="0" eighteenplus="0" />
+	<group nsid="13378274@N00" name="Group #1" admin="0" eighteenplus="1" />
+	<group nsid="52242140489@N01" name="Group #2" admin="1" eighteenplus="0" />
 </groups>
 </rsp>

data/test/fixtures/photos.comments.getList.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<rsp stat="ok">
+<comments photo_id="1">
+	<comment id="1" author="10490170@N04" authorname="blip" datecreate="1239217523" permalink="http://www.flickr.com/photos/frootpantz/3422268412/#comment72157616515348062">comment one</comment>
+	<comment id="2" author="10490170@N02" authorname="bleep" datecreate="1239217222" permalink="http://www.flickr.com/photos/frootpantz/3422268413/#comment72157616515348063">comment two</comment>
+</comments>
+</rsp>

data/test/fixtures/photos.getContext.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<rsp stat="ok">
+<count>5584</count>
+<prevphoto id="12345" secret="abc234" server="3560" farm="4" title="Previous" url="/photos/frootpantz/12345/in/photostream/" thumb="http://farm4.static.flickr.com/3560/3369675369_d97d2b1345_s.jpg" media="photo" />
+<nextphoto id="12343" secret="abc123" server="3562" farm="4" title="Next" url="/photos/frootpantz/12343/in/photostream/" thumb="http://farm4.static.flickr.com/3562/3370497926_ba89f4343a_s.jpg" media="photo" />
+</rsp>

data/test/fixtures/photosets.comments.getList.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<rsp stat="ok">
+<comments photo_id="1">
+	<comment id="1" author="10490170@N04" authorname="blip" datecreate="1239217523" permalink="http://www.flickr.com/photos/frootpantz/3422268412/#comment72157616515348062">comment one</comment>
+	<comment id="2" author="10490170@N02" authorname="bleep" datecreate="1239217222" permalink="http://www.flickr.com/photos/frootpantz/3422268413/#comment72157616515348063">comment two</comment>
+</comments>
+</rsp>

data/test/fixtures/tags.getListPhoto.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<rsp stat="ok">
+<photo id="3411015045">
+	<tags>
+		<tag id="1" author="15498419@N05" authorname="stu72" raw="stu 72" machine_tag="0">stu72</tag>
+		<tag id="2" author="15498419@N05" authorname="stu72" raw="ellie" machine_tag="0">ellie</tag>
+	</tags>
+</photo>
+</rsp>

data/test/fixtures/tags.getListUser.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<rsp stat="ok">
+<who id="32719556@N00">
+	<tags>
+		<tag>08fo</tag>
+		<tag>101building</tag>
+		<tag>101cookbooks</tag>
+	</tags>
+</who>
+</rsp>

data/test/fixtures/tags.getRelated.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<rsp stat="ok">
+<tags source="family">
+	<tag>portrait</tag>
+	<tag>baby</tag>
+	<tag>child</tag>
+</tags>
+</rsp>
+

data/test/test_helper.rb

@@ -92,13 +92,15 @@ class Test::Unit::TestCase
   end
 
   def self.should_find_all(thing, options)
-    class_name  = thing.to_s.singularize.camelcase
-    klass       = "Fleakr::Objects::#{class_name}".constantize
-    object_type = class_name.downcase
+    class_name     = thing.to_s.singularize.camelcase
+    klass          = "Fleakr::Objects::#{class_name}".constantize
+    object_type    = class_name.downcase
     
     it "should be able to find all #{thing} by #{options[:by]}" do
       condition_value = '1'
-      response = mock_request_cycle :for => options[:call], :with => {options[:by] => condition_value}
+      finder_options = {(options[:using] || options[:by]) => condition_value}
+    
+      response = mock_request_cycle :for => options[:call], :with => finder_options
       
       stubs = []
       elements = (response.body/options[:path]).map

data/test/unit/fleakr/objects/comment_test.rb

@@ -0,0 +1,66 @@
+require File.dirname(__FILE__) + '/../../../test_helper'
+
+module Fleakr::Objects
+  class CommentTest < Test::Unit::TestCase
+
+    describe "The Comment class" do
+
+      should_find_all :comments, :by => :photo_id, :call => 'photos.comments.getList', :path => 'rsp/comments/comment'
+      should_find_all :comments, :by => :set_id, :using => :photoset_id, :call => 'photosets.comments.getList', :path => 'rsp/comments/comment'
+
+    end
+
+    describe "An instance of the Comment class" do
+
+      context "when populating from the photos_comments_getList XML data" do
+        before do
+          @object = Comment.new(Hpricot.XML(read_fixture('photos.comments.getList')).at('rsp/comments/comment'))
+        end
+
+        should_have_a_value_for :id        => '1'
+        should_have_a_value_for :author_id => '10490170@N04'
+        should_have_a_value_for :created   => '1239217523'
+        should_have_a_value_for :url       => 'http://www.flickr.com/photos/frootpantz/3422268412/#comment72157616515348062'
+        should_have_a_value_for :body      => 'comment one'
+        
+      end
+      
+      context "in general" do
+        
+        before { @comment = Comment.new }
+
+        it "should have a value for :created_at" do
+          @comment.expects(:created).with().returns('1239217523')
+          Time.expects(:at).with(1239217523).returns('time')
+          
+          @comment.created_at.should == 'time'
+        end
+
+        it "should use the body as the string representation" do
+          @comment.expects(:body).with().returns('bod')
+          @comment.to_s.should == 'bod'
+        end
+        
+        it "should be able to find the author of the comment" do
+          author = stub()
+          
+          
+          @comment.stubs(:author_id).with().returns('1')
+          User.expects(:find_by_id).with('1').returns(author)
+          
+          @comment.author.should == author
+        end
+        
+        it "should memoize the owner information" do
+          @comment.stubs(:author_id).with().returns('1')
+          
+          User.expects(:find_by_id).with('1').once.returns(stub())
+          
+          2.times { @comment.author }
+        end
+        
+      end
+    end
+
+  end
+end

data/test/unit/fleakr/objects/group_test.rb

@@ -23,9 +23,24 @@ module Fleakr::Objects
         
         should_have_a_value_for :id   => '13378274@N00'
         should_have_a_value_for :name => 'Group #1'
+        should_have_a_value_for :adult_flag => '1'
         
       end
+
+      it "should know that the group is adult-only" do
+        group = Group.new
+        group.stubs(:adult_flag).with().returns('1')
+        group.adult?.should be(true)
+      end
+      
+      it "should know that the group is not adult-only" do
+        group = Group.new
+        group.stubs(:adult_flag).with().returns('0')
+        group.adult?.should be(false)
+      end
+      
     end
     
   end
-end
+end
+

data/test/unit/fleakr/objects/photo_context_test.rb

@@ -0,0 +1,80 @@
+require File.dirname(__FILE__) + '/../../../test_helper'
+
+module Fleakr::Objects
+  class PhotoContextTest < Test::Unit::TestCase
+    
+    describe "An instance of the PhotoContext class" do
+      
+      before { @context = PhotoContext.new }
+      
+      context "when populating from the photos_getContext XML data" do
+        before do
+          @object = PhotoContext.new(Hpricot.XML(read_fixture('photos.getContext')))
+        end
+        
+        should_have_a_value_for :count       => '5584'
+        should_have_a_value_for :next_id     => '12343'
+        should_have_a_value_for :previous_id => '12345'
+
+      end
+      
+      it "should know that there is a previous photo" do
+        @context.expects(:previous_id).with().returns('1')
+        @context.previous?.should be(true)
+      end
+      
+      it "should know that there isn't a previous photo" do
+        @context.expects(:previous_id).with().returns('0')
+        @context.previous?.should be(false)
+      end
+      
+      it "should know that there is a next photo" do
+        @context.expects(:next_id).with().returns('1')
+        @context.next?.should be(true)
+      end
+      
+      it "should know that there isn't a next photo" do
+        @context.expects(:next_id).with().returns('0')
+        @context.next?.should be(false)
+      end
+      
+      it "should find the previous photo" do
+        photo = stub()
+        
+        @context.expects(:previous_id).with().returns('1')
+        @context.expects(:previous?).with().returns(true)
+        
+        Photo.expects(:find_by_id).with('1').returns(photo)
+        
+        @context.previous.should == photo
+      end
+      
+      it "should not try to find the previous photo if it doesn't exist" do
+        @context.expects(:previous?).with().returns(false)
+        Photo.expects(:find_by_id).never
+        
+        @context.previous.should be(nil)
+      end
+      
+      it "should find the next photo" do
+        photo = stub()
+        @context.expects(:next_id).with().returns('1')
+        @context.expects(:next?).with().returns(true)
+                
+        Photo.expects(:find_by_id).with('1').returns(photo)
+        
+        @context.next.should == photo
+      end
+      
+      it "should not try to find the next photo if it doesn't exist" do
+        @context.expects(:next?).with().returns(false)
+        Photo.expects(:find_by_id).never
+        
+        @context.next.should be(nil)
+      end
+      
+      
+    end
+    
+  end
+end

data/test/unit/fleakr/objects/photo_test.rb

@@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/../../../test_helper'
 module Fleakr::Objects
   class PhotoTest < Test::Unit::TestCase
 
-    should_have_many :images
+    should_have_many :images, :tags, :comments
 
     should_autoload_when_accessing :posted, :taken, :updated, :comment_count, :with => :load_info
     should_autoload_when_accessing :url, :description, :with => :load_info
@@ -11,7 +11,7 @@ module Fleakr::Objects
     describe "The Photo class" do
 
       should_find_all :photos, :by => :user_id, :call => 'people.getPublicPhotos', :path => 'rsp/photos/photo'
-      should_find_all :photos, :by => :photoset_id, :call => 'photosets.getPhotos', :path => 'rsp/photoset/photo'
+      should_find_all :photos, :by => :set_id, :using => :photoset_id, :call => 'photosets.getPhotos', :path => 'rsp/photoset/photo'
       should_find_all :photos, :by => :group_id, :call => 'groups.pools.getPhotos', :path => 'rsp/photos/photo'
       
       should_find_one :photo, :by => :id, :with => :photo_id, :call => 'photos.getInfo'
@@ -74,6 +74,8 @@ module Fleakr::Objects
         should_have_a_value_for :farm_id   => '4'
         should_have_a_value_for :server_id => '3250'
         should_have_a_value_for :secret    => 'cbc1804258'
+        should_have_a_value_for :owner_id  => '21775151@N06'
+        
       end
       
       context "when populating from the photo upload XML data" do
@@ -95,6 +97,7 @@ module Fleakr::Objects
         should_have_a_value_for :description   => 'A Tree'
         should_have_a_value_for :farm_id       => '4'
         should_have_a_value_for :server_id     => '3085'
+        should_have_a_value_for :owner_id      => '31066442@N69'
         should_have_a_value_for :secret        => 'secret'
         should_have_a_value_for :posted        => '1230274722'
         should_have_a_value_for :taken         => '2008-12-25 18:26:55'
@@ -166,10 +169,75 @@ module Fleakr::Objects
           end
         end
         
+        it "should be able to retrieve the context for this photo" do
+          id = '1'
+          
+          context = stub()
+          
+          photo = Photo.new
+          photo.stubs(:id).with().returns(id)
+          
+          response = mock_request_cycle :for => 'photos.getContext', :with => {:photo_id => id}
+          PhotoContext.expects(:new).with(response.body).returns(context)
+          
+          photo.context.should == context
+        end
+        
+        it "should memoize the context data" do
+          id = '1'
+          
+          context = stub()
+          
+          photo = Photo.new
+          photo.stubs(:id).with().returns(id)
+          
+          response = mock_request_cycle :for => 'photos.getContext', :with => {:photo_id => id}
+          PhotoContext.expects(:new).once.returns(context)
+          
+          2.times { photo.context }
+        end
+        
+        it "should be able to retrieve the next photo" do
+          next_photo = stub()
+          
+          photo = Photo.new
+          photo.expects(:context).with().returns(mock {|m| m.expects(:next).with().returns(next_photo)})
+          
+          photo.next.should == next_photo
+        end
+        
+        it "should be able to retrieve the previous photo" do
+          previous_photo = stub()
+
+          photo = Photo.new
+          photo.expects(:context).with().returns(mock {|m| m.expects(:previous).with().returns(previous_photo)})
+
+          photo.previous.should == previous_photo
+        end
+        
+        it "should be able to find the owner of the photo" do
+          owner = stub()
+          
+          photo = Photo.new
+          photo.stubs(:owner_id).with().returns('1')
+          
+          User.expects(:find_by_id).with('1').returns(owner)
+          
+          photo.owner.should == owner
+        end
+        
+        it "should memoize the owner information" do
+          photo = Photo.new
+          photo.stubs(:owner_id).with().returns('1')
+          
+          User.expects(:find_by_id).with('1').once.returns(stub())
+          
+          2.times { photo.owner }
+        end
         
       end
     end
 
   end
 
-end
+end

data/test/unit/fleakr/objects/set_test.rb

@@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/../../../test_helper'
 module Fleakr::Objects
   class SetTest < Test::Unit::TestCase
 
-    should_have_many :photos, :using => 'photoset_id'
+    should_have_many :photos, :comments
 
     describe "The Set class" do
       

data/test/unit/fleakr/objects/tag_test.rb

@@ -0,0 +1,98 @@
+require File.dirname(__FILE__) + '/../../../test_helper'
+
+module Fleakr::Objects
+  class TagTest < Test::Unit::TestCase
+
+    describe "The Tag class" do
+      
+      should_find_all :tags, :by => :photo_id, :call => 'tags.getListPhoto', :path => 'rsp/photo/tags/tag'
+      should_find_all :tags, :by => :user_id, :call => 'tags.getListUser', :path => 'rsp/who/tags/tag'      
+    end
+    
+    describe "An instance of the Tag class" do
+      
+      before { @tag = Tag.new }
+      
+      context "when populating from the tags_getListPhoto XML data" do
+        before do
+          @object = Tag.new(Hpricot.XML(read_fixture('tags.getListPhoto')).at('rsp/photo/tags/tag'))
+        end
+        
+        should_have_a_value_for :id           => '1'
+        should_have_a_value_for :author_id    => '15498419@N05'
+        should_have_a_value_for :value        => 'stu72'
+        should_have_a_value_for :raw          => 'stu 72'
+        should_have_a_value_for :machine_flag => '0'
+        
+      end
+      
+      it "should have an author" do
+        user = stub()
+        
+        @tag.expects(:author_id).at_least_once.with().returns('1')
+        
+        
+        User.expects(:find_by_id).with('1').returns(user)
+        
+        @tag.author.should == user
+      end
+      
+      it "should memoize the author data" do
+        @tag.expects(:author_id).at_least_once.with().returns('1')
+        
+        User.expects(:find_by_id).with('1').once.returns(stub())
+        
+        2.times { @tag.author }
+      end
+      
+      it "should return nil for author if author_id is not present" do
+        @tag.expects(:author_id).with().returns(nil)
+        
+        @tag.author.should be(nil)
+      end
+      
+      it "should have related tags" do
+        @tag.expects(:value).with().returns('foo')
+        
+        response = mock_request_cycle :for => 'tags.getRelated', :with => {:tag => 'foo'}
+
+        stubs = []
+        elements = (response.body/'rsp/tags/tag').map
+        
+        elements.each do |element|
+          stub = stub()
+          stubs << stub
+
+          Tag.expects(:new).with(element).returns(stub)
+        end
+        
+        @tag.related.should == stubs
+      end
+      
+      it "should memoize the data for related tags" do
+        @tag.expects(:value).with().returns('foo')
+        
+        mock_request_cycle :for => 'tags.getRelated', :with => {:tag => 'foo'}
+        
+        2.times { @tag.related }
+      end
+      
+      it "should be able to generate a string representation of itself" do
+        @tag.expects(:value).with().returns('foo')
+        @tag.to_s.should == 'foo'
+      end
+      
+      it "should know that it is not a machine tag" do
+        @tag.expects(:machine_flag).with().returns('0')
+        @tag.machine?.should be(false)
+      end
+      
+      it "should know that it is a machine tag" do
+        @tag.expects(:machine_flag).with().returns('1')
+        @tag.machine?.should be(true)
+      end
+      
+    end
+    
+  end
+end

data/test/unit/fleakr/objects/user_test.rb

@@ -5,7 +5,7 @@ module Fleakr::Objects
 
     should_search_by :user_id
 
-    should_have_many :photos, :groups, :sets, :contacts
+    should_have_many :photos, :groups, :sets, :contacts, :tags
     
     should_autoload_when_accessing :name, :photos_url, :profile_url, :photos_count, :location, :with => :load_info
     should_autoload_when_accessing :icon_server, :icon_farm, :pro, :admin, :icon_url, :with => :load_info
@@ -14,6 +14,7 @@ module Fleakr::Objects
 
       should_find_one :user, :by => :username, :call => 'people.findByUsername', :path => 'rsp/user'
       should_find_one :user, :by => :email, :with => :find_email, :call => 'people.findByEmail', :path => 'rsp/user'
+      should_find_one :user, :by => :id, :with => :user_id, :call => 'people.getInfo', :path => 'rsp/person'
 
     end
 

data/test/unit/fleakr/support/object_test.rb

@@ -12,6 +12,7 @@ class FlickrObject
   flickr_attribute :description, :from => 'desc'
   flickr_attribute :id, :from => '@nsid'
   flickr_attribute :photoset_id, :from => 'photoset@id'
+  flickr_attribute :tag, :category
   
   find_one :by_id, :call => 'people.getInfo'
   
@@ -27,7 +28,7 @@ module Fleakr
       end
       
       it "should know the names of all its attributes" do
-        FlickrObject.attributes.map {|a| a.name.to_s }.should == %w(name description id photoset_id)
+        FlickrObject.attributes.map {|a| a.name.to_s }.should == %w(name description id photoset_id tag category)
       end
       
       it "should be able to find by ID" do
@@ -56,7 +57,7 @@ module Fleakr
     describe "An instance method provided by the Flickr::Object module" do
       
       it "should have default reader methods" do
-        [:name, :description, :id, :photoset_id].each do |method_name|
+        [:name, :description, :id, :photoset_id, :tag, :category].each do |method_name|
           FlickrObject.new.respond_to?(method_name).should == true
         end
       end
@@ -67,6 +68,8 @@ module Fleakr
             <name>Fleakr</name>
             <desc>Awesome</desc>
             <photoset id="1" />
+            <tag>Tag</tag>
+            <category>Category</category>
           XML
 
           @object = FlickrObject.new
@@ -91,6 +94,14 @@ module Fleakr
           
           @object.id.should == '1'
         end
+        
+        it "should have the correct value for :tag" do
+          @object.tag.should == 'Tag'
+        end
+        
+        it "should have the correct value for :category" do
+          @object.category.should == 'Category'
+        end
       end
       
       it "should populate its data from an XML document when initializing" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fleakr
 version: !ruby/object:Gem::Version 
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors: 
 - Patrick Reagan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-03 00:00:00 -05:00
+date: 2009-04-11 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -71,13 +71,16 @@ files:
 - lib/fleakr/core_ext.rb
 - lib/fleakr/objects
 - lib/fleakr/objects/authentication_token.rb
+- lib/fleakr/objects/comment.rb
 - lib/fleakr/objects/contact.rb
 - lib/fleakr/objects/error.rb
 - lib/fleakr/objects/group.rb
 - lib/fleakr/objects/image.rb
 - lib/fleakr/objects/photo.rb
+- lib/fleakr/objects/photo_context.rb
 - lib/fleakr/objects/search.rb
 - lib/fleakr/objects/set.rb
+- lib/fleakr/objects/tag.rb
 - lib/fleakr/objects/user.rb
 - lib/fleakr/objects.rb
 - lib/fleakr/support
@@ -97,11 +100,17 @@ files:
 - test/fixtures/people.getInfo.xml
 - test/fixtures/people.getPublicGroups.xml
 - test/fixtures/people.getPublicPhotos.xml
+- test/fixtures/photos.comments.getList.xml
+- test/fixtures/photos.getContext.xml
 - test/fixtures/photos.getInfo.xml
 - test/fixtures/photos.getSizes.xml
 - test/fixtures/photos.search.xml
+- test/fixtures/photosets.comments.getList.xml
 - test/fixtures/photosets.getList.xml
 - test/fixtures/photosets.getPhotos.xml
+- test/fixtures/tags.getListPhoto.xml
+- test/fixtures/tags.getListUser.xml
+- test/fixtures/tags.getRelated.xml
 - test/test_helper.rb
 - test/unit
 - test/unit/fleakr
@@ -120,13 +129,16 @@ files:
 - test/unit/fleakr/core_ext/true_class_test.rb
 - test/unit/fleakr/objects
 - test/unit/fleakr/objects/authentication_token_test.rb
+- test/unit/fleakr/objects/comment_test.rb
 - test/unit/fleakr/objects/contact_test.rb
 - test/unit/fleakr/objects/error_test.rb
 - test/unit/fleakr/objects/group_test.rb
 - test/unit/fleakr/objects/image_test.rb
+- test/unit/fleakr/objects/photo_context_test.rb
 - test/unit/fleakr/objects/photo_test.rb
 - test/unit/fleakr/objects/search_test.rb
 - test/unit/fleakr/objects/set_test.rb
+- test/unit/fleakr/objects/tag_test.rb
 - test/unit/fleakr/objects/user_test.rb
 - test/unit/fleakr/support
 - test/unit/fleakr/support/attribute_test.rb