slaskis-fleakr 0.5.2 → 0.5.3

data/lib/fleakr.rb

@@ -93,12 +93,17 @@ module Fleakr
   #  Fleakr.api_key = 'ABC123'
   #  Fleakr.user('the decapitator') # => #<Fleakr::Objects::User:0x692648 @username="the decapitator", @id="21775151@N06">
   #  Fleakr.user('user@host.com')   # => #<Fleakr::Objects::User:0x11f484c @username="bckspcr", @id="84481630@N00">
+  #  Fleakr.user( 'http://www.flickr.com/photos/bckspcr/' )   # => #<Fleakr::Objects::User:0x12354a0 @username="bckspcr", @id="84481630@N00">
   #
   def self.user(user_data)
     begin
       Objects::User.find_by_username(user_data)
     rescue ApiError
-      Objects::User.find_by_email(user_data)
+      begin
+        Objects::User.find_by_email(user_data)
+      rescue ApiError
+        Objects::User.find_by_url(user_data)
+      end
     end
   end
   

data/lib/fleakr/objects/collection.rb

@@ -18,13 +18,32 @@ module Fleakr
 
       include Fleakr::Support::Object
 
-      has_many :sets, :collections
+      attr_accessor :collections, :sets
 
-      flickr_attribute :id, :title, :description
+      flickr_attribute :id, :title, :description, :iconlarge, :iconsmall
 
       find_all :by_collection_id, :call => 'collections.getTree', :path => "collections/collection:gt(0)"
       find_all :by_user_id, :call => 'collections.getTree', :path => 'collections/collection'
-
+      
+      def initialize(document=nil)
+        self.populate_from(document) unless document.nil?
+        self.sets = document.search("//set").map{|s| Fleakr::Objects::Set.new(s)} || []
+        self.collections = recurse_collections(document.search("//collection"))
+      end
+      
+      private
+      
+      def recurse_collections(search)
+        collections = Array.new
+        search.each do |e| 
+          c = self.class.new(e)
+          collections << c
+          c.sets = e.search("//set").map{|s| Fleakr::Objects::Set.new(s)} || []
+          c.collections = recurse_collections(e.search("//collection"))
+        end
+        return collections       
+      end
+      
     end
   end
 end

data/lib/fleakr/objects/user.rb

@@ -44,7 +44,7 @@ module Fleakr
 
       include Fleakr::Support::Object
 
-      flickr_attribute :id, :from => 'user@nsid'
+      flickr_attribute :id, :from => ['user@id','user@nsid']
       flickr_attribute :username, :location
       flickr_attribute :name, :from => 'person/realname'
       flickr_attribute :photos_url, :from => 'person/photosurl'
@@ -60,6 +60,7 @@ module Fleakr
       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'
+      find_one :by_url, :using => :url, :call => 'urls.lookupUser'
 
       lazily_load :name, :photos_url, :profile_url, :photos_count, :location, :with => :load_info
       lazily_load :icon_server, :icon_farm, :pro, :admin, :with => :load_info
@@ -90,6 +91,18 @@ module Fleakr
         self.populate_from(response.body)
       end
 
+      def collection_by_id(id)
+        response = Fleakr::Api::MethodRequest.with_response!('collections.getTree', :user_id => self.id)
+        doc = response.body
+        (doc/"//collection").map do |e| 
+          if e[:id] =~ /^\d*-?#{id}$/
+            Collection.new(e)
+          else 
+            nil
+          end
+        end.compact!.first
+      end
+      
     end
   end
 end

data/lib/fleakr/support/object.rb

@@ -39,9 +39,6 @@ module Fleakr
           class_eval <<-CODE
             def self.find_all_#{condition}(value, options = {})
               options.merge!(:#{attribute} => value)
-              
-              logger.info("Ran XPath on response: #{options[:path]}")
-              
               response = Fleakr::Api::MethodRequest.with_response!('#{options[:call]}', options)
               (response.body/'rsp/#{options[:path]}').map {|e| #{target_class}.new(e) }
             end

data/lib/fleakr/version.rb

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

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

@@ -0,0 +1,30 @@
+require File.dirname(__FILE__) + '/../../../test_helper'
+
+module Fleakr::Objects
+  class CollectionTest < Test::Unit::TestCase
+
+    should_have_many :sets, :collections
+
+    context "The Collection class" do
+      
+      should_find_one :collection, :by => :collection_id, :call => 'collections.getTree', :path => 'rsp/collections/collection'
+      
+    end
+
+    context "An instance of the Collection class" do
+      
+      context "when populating from an XML document" do
+        setup do
+          @object = Collection.new(Hpricot.XML(read_fixture('collections.getTree')).at('rsp/collections/collection'))
+        end
+        
+        should_have_a_value_for :id          => '34762917-72157617429277370'
+        should_have_a_value_for :title       => 'test2'
+        should_have_a_value_for :description => ''
+        
+      end
+      
+    end
+
+  end
+end

metadata

@@ -1,16 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: slaskis-fleakr
 version: !ruby/object:Gem::Version 
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors: 
 - Patrick Reagan
-- "Robert Sk\xC3\xB6ld"
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-07-16 00:00:00 -07:00
+date: 2009-08-19 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -72,9 +71,9 @@ files:
 - lib/fleakr/core_ext.rb
 - lib/fleakr/objects
 - lib/fleakr/objects/authentication_token.rb
+- lib/fleakr/objects/collection.rb
 - lib/fleakr/objects/comment.rb
 - lib/fleakr/objects/contact.rb
-- lib/fleakr/objects/collection.rb
 - lib/fleakr/objects/error.rb
 - lib/fleakr/objects/group.rb
 - lib/fleakr/objects/image.rb
@@ -133,6 +132,7 @@ 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/collection_test.rb
 - test/unit/fleakr/objects/comment_test.rb
 - test/unit/fleakr/objects/contact_test.rb
 - test/unit/fleakr/objects/error_test.rb
@@ -148,8 +148,9 @@ files:
 - test/unit/fleakr/support/attribute_test.rb
 - test/unit/fleakr/support/object_test.rb
 - test/unit/fleakr_test.rb
-has_rdoc: true
+has_rdoc: false
 homepage: http://sneaq.net
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --main
@@ -171,9 +172,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: A small, yet powerful, gem to interface with Flickr photostreams
 test_files: []