latompa-fleakr 0.5.1 → 0.5.2

data/lib/fleakr/objects/contact.rb

@@ -5,7 +5,7 @@ module Fleakr
       include Fleakr::Support::Object
 
       flickr_attribute :id, :from => '@nsid'
-      flickr_attribute :username
+      flickr_attribute :username,:realname,:location
       flickr_attribute :icon_server, :from => '@iconserver'
       flickr_attribute :icon_farm,   :from => '@iconfarm'
 
@@ -19,7 +19,7 @@ module Fleakr
       # Retrieve a list of contacts for an authenticated user
       def self.find_all_contacts(params={})
         response = Fleakr::Api::MethodRequest.with_response!('contacts.getList',params)
-        (response.body/'contacts/contact').map {|c| Contact.new(c).to_user }
+        (response.body/'contacts/contact').map {|c| Contact.new(c) }
       end
       
       def to_user

data/lib/fleakr/objects/user.rb

@@ -61,7 +61,7 @@ module Fleakr
       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, :with => :load_info
+      lazily_load :name, :photos_url, :profile_url, :photos_count, :location, :with => :load_info
       lazily_load :icon_server, :icon_farm, :pro, :admin, :with => :load_info
 
       scoped_search

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

@@ -5,25 +5,26 @@ module Fleakr::Objects
 
     context "The Contact class" do
       
-      setup do
-        @user_1 = stub()
-        @user_2 = stub()
-        @contact_1, @contact_2 = [stub(:to_user => @user_1), stub(:to_user => @user_2)]
-        
-      end
-      
       should "return a list of users for a specified user's contacts" do
+        # user_1, user_2 = [stub(), stub()]
+        user_1 = stub()
+        user_2 = stub()
+
+        contact_1, contact_2 = [stub(:to_user => user_1), stub(:to_user => user_2)]
+
         response = mock_request_cycle :for => 'contacts.getPublicList', :with => {:user_id => '1'}
 
         contact_1_doc, contact_2_doc = (response.body/'rsp/contacts/contact').to_a
 
-        Contact.stubs(:new).with(contact_1_doc).returns(@contact_1)
-        Contact.stubs(:new).with(contact_2_doc).returns(@contact_2)
-        Contact.find_all_by_user_id('1').should == [@user_1, @user_2]
+        Contact.stubs(:new).with(contact_1_doc).returns(contact_1)
+        Contact.stubs(:new).with(contact_2_doc).returns(contact_2)
+
+        Contact.find_all_by_user_id('1').should == [user_1, user_2]
       end
       
       should "return a list of users for an authenticated user" do
         response = mock_request_cycle :for => 'contacts.getList', :with => {}
+        contact_1, contact_2 = [stub("contact"), stub('contact')]
         contact_1_doc, contact_2_doc = (response.body/'rsp/contacts/contact').to_a
 
         Contact.stubs(:new).with(contact_1_doc).returns(@contact_1)
@@ -34,7 +35,7 @@ module Fleakr::Objects
     end
 
     context "An instance of the Contact class" do
-      context "when populating from an XML document" do
+      context "when populating from an XML document with public contacts" do
         setup do
           @object = Contact.new(Hpricot.XML(read_fixture('contacts.getPublicList')).at('contacts/contact'))
         end
@@ -45,6 +46,21 @@ module Fleakr::Objects
         should_have_a_value_for :icon_farm   => '3'
 
       end
+      
+      context "when populating from an XML document with authenticated user's contacts" do
+        setup do
+          @object = Contact.new(Hpricot.XML(read_fixture('contacts.getList')).at('contacts/contact'))
+        end
+
+        should_have_a_value_for :id          => '9302864@N42'
+        should_have_a_value_for :username    => 'blinky'
+        should_have_a_value_for :icon_server => '2263'
+        should_have_a_value_for :icon_farm   => '3'
+        should_have_a_value_for :realname   =>  'Mr Blinky'
+        should_have_a_value_for :location   =>  'Middletown'
+
+      end
+
 
       context "in general" do
         
@@ -54,7 +70,7 @@ module Fleakr::Objects
           
           User.stubs(:new).returns(user)
           
-          [:id, :username, :icon_server, :icon_farm].each do |method|
+          [:id, :username, :icon_server, :icon_farm, :realname, :location].each do |method|
             contact.stubs(method).with().returns(method.to_s)
             user.expects("#{method}=".to_sym).with(method.to_s)
           end

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

@@ -7,7 +7,7 @@ module Fleakr::Objects
 
     should_have_many :photos, :groups, :sets, :contacts, :tags
     
-    should_autoload_when_accessing :name, :photos_url, :profile_url, :photos_count,  :with => :load_info
+    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
 
     context "The User class" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: latompa-fleakr
 version: !ruby/object:Gem::Version 
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors: 
 - Patrick Reagan