benschwarz-flickr-wrapper 0.1.1 → 0.1.2

data/flickr-wrapper.gemspec

@@ -1,15 +1,16 @@
 Gem::Specification.new do |s|
   s.name = "flickr-wrapper"
-  s.version = "0.1.1"
+  s.version = "0.1.2"
   s.date = "2008-05-10"
   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"]
+  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.require_path = "lib"
   
   # Deps
   s.add_dependency("flickr-rest", ">= 0.0.1")
+  s.add_dependency("validatable", ">= 1.6.7")
 end

data/lib/flickr-wrapper.rb

@@ -4,8 +4,13 @@ require 'flickr-rest'
 require 'time'
 require 'validatable'
 
+# Concurrency
+require File.join(File.dirname(__FILE__), 'vendor', 'parallel', 'parallel.rb')
+
 # Namespace junkie
-module Flickr; end
+module Flickr
+  MAX_THREADS = 5
+end
 
 # Classes
 %w(base photoset photo tag machine_tag user).each {|r| require File.join(File.dirname(__FILE__), 'flickr-wrapper', r)}

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).map do |photo|
+    (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

@@ -14,6 +14,11 @@ class Flickr::User < Flickr::Base
     return Flickr::User.new(result.at(:username).inner_text, result.at(:user)['nsid'])
   end
   
+  def self.find_by_username username
+    result = Flickr::Query.new('').execute('flickr.people.findByUsername', :username => username)
+    return Flickr::User.new(result.at(:username).inner_text, result.at(:user)['nsid'])
+  end
+  
   #
   # ==== Instance methods
   #
@@ -27,6 +32,11 @@ class Flickr::User < Flickr::Base
     get_info.at(:location).inner_text || "Unknown"
   end
   
+  # has the user shelled out for flickr-pro account?
+  def pro?
+    (get_info.at(:person)["ispro"] == "1") ? true : false 
+  end
+  
   #
   # ==== Private methods
   #

data/lib/vendor/parallel/parallel.rb

@@ -0,0 +1,121 @@
+# Stolen from http://rubyforge.org/projects/concurrent
+
+#
+# concurrent/parallel - data-parallel programming for Ruby
+#
+# Copyright (C) 2007  MenTaLguY <mental@rydia.net>
+#
+# 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|
+      Thread.new { slice.each &block }
+    end.each do |thread|
+      thread.join
+    end
+    self
+  end
+
+  def parallel_map( n, &block )
+    parallel_subsets( n ).map do |slice|
+      Thread.new { slice.map &block }
+    end.inject( [] ) do |a, thread|
+      a.push *thread.value
+    end
+  end
+
+  def parallel_select( n, &block )
+    parallel_subsets( n ).map do |slice|
+      Thread.new { slice.select &block }
+    end.inject( [] ) do |a, results|
+      a.push *thread.value
+    end
+  end
+
+  def parallel_reject( n, &block )
+    parallel_subsets( n ).map do |slice|
+      Thread.new { slice.reject &block }
+    end.inject( [] ) do |a, thread|
+      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 }
+    end.inject( [ [], [] ] ) do |acc, thread|
+      pair = thread.value
+      acc[0].push *pair[0]
+      acc[1].push *pair[1]
+      acc
+    end
+  end
+
+  def parallel_grep( re, n, &block )
+    parallel_subsets( n ).map do |slice|
+      Thread.new { slice.grep( re, &block ) }
+    end.inject( [] ) do |acc, thread|
+      acc.push *thread.value
+    end
+  end
+
+  def parallel_all?( n, &block )
+    parallel_subsets( n ).map do |slice|
+      Thread.new { slice.all? &block }
+    end.inject( true ) do |acc, thread|
+      acc && thread.value
+    end
+  end
+
+  def parallel_any?( n, &block )
+    parallel_subsets( n ).map do |slice|
+      Thread.new { slice.any? &block }
+    end.inject( false ) do |acc, thread|
+      acc || thread.value
+    end
+  end
+
+  def parallel_include?( n, obj )
+    parallel_subsets( n ).map do |slice|
+      Thread.new { slice.include? obj }
+    end.inject( false ) do |acc, thread|
+      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
+      slice_size = (size.to_f / n.to_f).ceil
+      (0...(size.to_f / slice_size)).map do |i|
+        self[i*slice_size, slice_size.ceil]
+      end
+    else
+      [ self ]
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: benschwarz-flickr-wrapper
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Ben Schwarz
@@ -21,6 +21,15 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.0.1
     version: 
+- !ruby/object:Gem::Dependency 
+  name: validatable
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.6.7
+    version: 
 description: A grassroots wrapper around flickr - Strictly for convenience
 email: ben@germanforblack.com
 executables: []
@@ -39,6 +48,9 @@ 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
 has_rdoc: false
 homepage: http://github.com/benschwarz/flickr-wrapper
 post_install_message: