benschwarz-flickr-wrapper 0.1.2 → 0.1.3

data/flickr-wrapper.gemspec

@@ -1,13 +1,13 @@
 Gem::Specification.new do |s|
   s.name = "flickr-wrapper"
-  s.version = "0.1.2"
-  s.date = "2008-05-10"
+  s.version = "0.1.3"
+  s.date = "2008-06-07"
   s.summary = "A grassroots wrapper for flickr"
   s.email = "ben@germanforblack.com"
   s.homepage = "http://github.com/benschwarz/flickr-wrapper"
   s.description = "A grassroots wrapper around flickr - Strictly for convenience"
   s.authors = ["Ben Schwarz"]
-  s.files = ["README", "flickr-wrapper.gemspec", "lib/flickr-wrapper.rb", "lib/flickr-wrapper/base.rb", "lib/flickr-wrapper/machine_tag.rb", "lib/flickr-wrapper/photo.rb", "lib/flickr-wrapper/photoset.rb", "lib/flickr-wrapper/tag.rb", "lib/flickr-wrapper/user.rb", "lib/vendor", "lib/vendor/parallel", "lib/vendor/parallel/parallel.rb"]
+  s.files = ["README", "flickr-wrapper.gemspec", "lib/flickr-wrapper.rb", "lib/flickr-wrapper/base.rb", "lib/flickr-wrapper/machine_tag.rb", "lib/flickr-wrapper/photo.rb", "lib/flickr-wrapper/photoset.rb", "lib/flickr-wrapper/tag.rb", "lib/flickr-wrapper/user.rb", "lib/vendor/parallel.rb"]
   s.require_path = "lib"
   
   # Deps

data/lib/flickr-wrapper.rb

@@ -1,15 +1,20 @@
 # Dependencies
-require 'rubygems'
+begin
+  require 'minigems'
+rescue LoadError
+  require 'rubygems'
+end
+
 require 'flickr-rest'
 require 'time'
 require 'validatable'
 
 # Concurrency
-require File.join(File.dirname(__FILE__), 'vendor', 'parallel', 'parallel.rb')
+require File.join(File.dirname(__FILE__), 'vendor', 'parallel.rb')
 
 # Namespace junkie
 module Flickr
-  MAX_THREADS = 5
+  MAX_THREADS = 50
 end
 
 # Classes

data/lib/flickr-wrapper/photo.rb

@@ -35,7 +35,7 @@ class Flickr::Photo < Flickr::Base
   
   def sizes
     hash = {}
-    (Flickr::Query.new(user_id).execute('flickr.photos.getSizes', :photo_id => id)/:size).each do |size|
+    (Flickr::Query.new(user_id).execute('flickr.photos.getSizes', :photo_id => id)/:size).parallel_each(Flickr::MAX_THREADS) do |size|
       hash[size['label'].downcase.to_sym] = Size.new(*%w(width height source url).map{|a| size[a]})
     end
     hash

data/lib/flickr-wrapper/photoset.rb

@@ -26,7 +26,7 @@ class Flickr::PhotoSet < Flickr::Base
   # > photosets.getPhotos (1 call)
   # > Photo.find ID (n calls)
   def photos
-    (Flickr::Query.new(user_id).execute('flickr.photosets.getPhotos', :photoset_id => id)/:photo).parallel_map(Flickr::MAX_THREADS) do |photo|
+    return (Flickr::Query.new(user_id).execute('flickr.photosets.getPhotos', :photoset_id => id)/:photo).parallel_map(Flickr::MAX_THREADS) do |photo|
       Flickr::Photo.find user_id, photo[:id]
     end
   end

data/lib/flickr-wrapper/user.rb

@@ -27,7 +27,7 @@ class Flickr::User < Flickr::Base
     get_info.at(:realname).inner_text
   end
   
-  # The psyical location string as entered in flickr
+  # The location string as entered in flickr
   def location
     get_info.at(:location).inner_text || "Unknown"
   end
@@ -37,6 +37,15 @@ class Flickr::User < Flickr::Base
     (get_info.at(:person)["ispro"] == "1") ? true : false 
   end
   
+  # Do they have a buddy icon or not?
+  def buddy_icon?
+    (icon_server > 0) ? true : false 
+  end
+  
+  def buddy_icon_url
+    buddy_icon? ? "http://farm#{icon_farm}.static.flickr.com/#{icon_server}/buddyicons/#{nsid}.jpg" : "http://www.flickr.com/images/buddyicon.jpg"
+  end
+  
   #
   # ==== Private methods
   #
@@ -47,4 +56,12 @@ class Flickr::User < Flickr::Base
       @info = Flickr::Query.new(@nsid).execute('flickr.people.getInfo', :user_id => nsid) unless @info
       @info
     end
+    
+    def icon_server
+      get_info.at(:person)["iconserver"].to_i
+    end
+    
+    def icon_farm
+      get_info.at(:person)["iconfarm"].to_i
+    end
 end

data/lib/vendor/{parallel/parallel.rb → parallel.rb}

@@ -1,5 +1,5 @@
 # Stolen from http://rubyforge.org/projects/concurrent
-
+ 
 #
 # concurrent/parallel - data-parallel programming for Ruby
 #
@@ -7,12 +7,12 @@
 #
 # This file is made available under the same terms as Ruby.
 #
-
+ 
 module Concurrent #:nodoc:
 module Parallel #:nodoc:
 end
 end
-
+ 
 module Enumerable #:nodoc:
   def parallel_each( n, &block )
     parallel_subsets( n ).map do |slice|
@@ -22,7 +22,7 @@ module Enumerable #:nodoc:
     end
     self
   end
-
+ 
   def parallel_map( n, &block )
     parallel_subsets( n ).map do |slice|
       Thread.new { slice.map &block }
@@ -30,7 +30,7 @@ module Enumerable #:nodoc:
       a.push *thread.value
     end
   end
-
+ 
   def parallel_select( n, &block )
     parallel_subsets( n ).map do |slice|
       Thread.new { slice.select &block }
@@ -38,7 +38,7 @@ module Enumerable #:nodoc:
       a.push *thread.value
     end
   end
-
+ 
   def parallel_reject( n, &block )
     parallel_subsets( n ).map do |slice|
       Thread.new { slice.reject &block }
@@ -46,19 +46,19 @@ module Enumerable #:nodoc:
       a.push *thread.value
     end
   end
-
+ 
   def parallel_max( n )
     parallel_subsets( n ).map do |slice|
       Thread.new { slice.max }
     end.map { |t| t.value }.max
   end
-
+ 
   def parallel_min( n )
     parallel_subsets( n ).map do |slice|
       Thread.new { slice.min }
     end.map { |t| t.value }.min
   end
-
+ 
   def parallel_partition( n, &block )
     parallel_subsets( n ).map do |slice|
       Thread.new { slice.partition &block }
@@ -69,7 +69,7 @@ module Enumerable #:nodoc:
       acc
     end
   end
-
+ 
   def parallel_grep( re, n, &block )
     parallel_subsets( n ).map do |slice|
       Thread.new { slice.grep( re, &block ) }
@@ -77,7 +77,7 @@ module Enumerable #:nodoc:
       acc.push *thread.value
     end
   end
-
+ 
   def parallel_all?( n, &block )
     parallel_subsets( n ).map do |slice|
       Thread.new { slice.all? &block }
@@ -85,7 +85,7 @@ module Enumerable #:nodoc:
       acc && thread.value
     end
   end
-
+ 
   def parallel_any?( n, &block )
     parallel_subsets( n ).map do |slice|
       Thread.new { slice.any? &block }
@@ -93,7 +93,7 @@ module Enumerable #:nodoc:
       acc || thread.value
     end
   end
-
+ 
   def parallel_include?( n, obj )
     parallel_subsets( n ).map do |slice|
       Thread.new { slice.include? obj }
@@ -101,12 +101,12 @@ module Enumerable #:nodoc:
       acc || thread.value
     end
   end
-
+ 
   def parallel_subsets( n )
     to_a.parallel_subsets( n )
   end
 end
-
+ 
 class Array #:nodoc:
   def parallel_subsets( n )
     if n > 1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: benschwarz-flickr-wrapper
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - Ben Schwarz
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-05-10 00:00:00 -07:00
+date: 2008-06-07 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -48,9 +48,7 @@ files:
 - lib/flickr-wrapper/photoset.rb
 - lib/flickr-wrapper/tag.rb
 - lib/flickr-wrapper/user.rb
-- lib/vendor
-- lib/vendor/parallel
-- lib/vendor/parallel/parallel.rb
+- lib/vendor/parallel.rb
 has_rdoc: false
 homepage: http://github.com/benschwarz/flickr-wrapper
 post_install_message: 
@@ -73,7 +71,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.0.1
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: A grassroots wrapper for flickr