flickraw 0.8.1 → 0.8.2

data/README.rdoc

@@ -25,6 +25,7 @@ This will recreate the documentation by fetching the methods descriptions from f
 * Photo upload
 * Proxy support
 * Delayed library loading (for rails users)
+* Flickr URLs helpers
 
 = Usage
 
@@ -115,9 +116,56 @@ You can pass some options to modify flickraw behavior:
 
   require 'flickraw'
 
+== Flickr URL Helpers
+
+There are some helpers to build flickr urls :
+
+=== url, url_m, url_s, url_t, url_b, url_o
+
+  info = flickr.photos.getInfo(:photo_id => "3839885270")
+  FlickRaw.url_b(info) # => "http://farm3.static.flickr.com/2485/3839885270_6fb8b54e06_b.jpg"
+
+=== url_profile
+
+  info = flickr.photos.getInfo(:photo_id => "3839885270")
+  FlickRaw.url_profile(info) # => "http://www.flickr.com/people/41650587@N02/"
+
+=== url_photopage
+
+  info = flickr.photos.getInfo(:photo_id => "3839885270")
+  FlickRaw.url_photopage(photo) # => "http://www.flickr.com/photos/41650587@N02/3839885270"
+
+=== url_photoset, url_photosets
+
+  info = flickr.photos.getInfo(:photo_id => "3839885270")
+  FlickRaw.url_photosets(photo) # => "http://www.flickr.com/photos/41650587@N02/sets/"
+
+=== url_short
+
+  info = flickr.photos.getInfo(:photo_id => "3839885270")
+  FlickRaw.url_short(photo) # => "http://flic.kr/p/6Rjq7s"
+
+=== url_photostream
+
+  info = flickr.photos.getInfo(:photo_id => "3839885270")
+  FlickRaw.url_photostream(photo) # => "http://flic.kr/p/6Rjq7s"
+
 
 See the _examples_ directory to find more examples.
 
+== Cached version
+
+You can use
+
+  require 'flickraw-cached'
+
+instead of
+
+   require 'flickraw'
+
+This way it it doesn't fetch available flickr methods each time it is loaded.
+The flickraw-cached gem is on rubyforge and should be up-to-date with regard to flickr api most of the time.
+
 = Notes
 If you want to use the api authenticated with several user at the same time, you must pass the authentication token explicitely each time.
 This is because it is keeping the authentication token internally.

data/flickraw_rdoc.rb

@@ -23,6 +23,7 @@ module RDoc
 
     private
     def add_flickr_methods(obj, doc)
+      flickr # Force loading of methods if lazyloaded
       obj.constants.each { |const_name|
         const = obj.const_get const_name
         if const.is_a?(Class) && const < FlickRaw::Request

data/lib/flickraw.rb

@@ -33,7 +33,7 @@ if ENV['http_proxy'] and not FlickRawOptions['proxy_host']
 end
 
 module FlickRaw
-  VERSION='0.8.1'
+  VERSION='0.8.2'
 
   FLICKR_HOST='api.flickr.com'.freeze
   REST_PATH='/services/rest/?'.freeze
@@ -44,7 +44,7 @@ module FlickRaw
   PHOTO_SOURCE_URL='http://farm%s.static.flickr.com/%s/%s_%s%s.%s'.freeze
   URL_PROFILE='http://www.flickr.com/people/'.freeze
   URL_PHOTOSTREAM='http://www.flickr.com/photos/'.freeze
-  URL_SHORT="http://flic.kr/p/".freeze
+  URL_SHORT='http://flic.kr/p/'.freeze
 
   class Response
     def self.build(h, type) # :nodoc:
@@ -292,6 +292,9 @@ module FlickRaw
     def url_photosets(r); url_photostream(r) + "sets/" end
     def url_photoset(r); url_photosets(r) + r.id end
     def url_short(r); URL_SHORT + base58(r.id) end
+    def url_short_m(r); URL_SHORT + "img/" + base58(r.id) + "_m.jpg" end
+    def url_short_s(r); URL_SHORT + "img/" + base58(r.id) + ".jpg" end
+    def url_short_t(r); URL_SHORT + "img/" + base58(r.id) + "_t.jpg" end
     def url_photostream(r)
       URL_PHOTOSTREAM +
         if r.respond_to?(:pathalias) and r.pathalias
@@ -313,4 +316,7 @@ end
 def flickr; $flickraw ||= FlickRaw::Flickr.new end
 
 # Load the methods if the option lazyload is not specified
-flickr if not FlickRawOptions['lazyload']
+begin
+flickr
+rescue
+end if not FlickRawOptions['lazyload']

data/rakefile

@@ -1,8 +1,10 @@
+require 'rake/clean'
 require 'rake/rdoctask'
 require 'rake/packagetask'
 require 'rake/gempackagetask'
 require 'rake/testtask'
 
+FlickRawOptions = {'lazyload' => true}
 require 'lib/flickraw'
 require 'flickraw_rdoc' if RUBY_VERSION >= "1.9"
 
@@ -14,27 +16,91 @@ spec = Gem::Specification.new do |s|
   s.author = "Mael Clerambault"
   s.email =  "maelclerambault@yahoo.fr"
   s.homepage = "http://hanklords.github.com/flickraw/"
-  s.rubyforge_project = "flickraw"
   s.version = FlickRaw::VERSION
   s.files = PKG_FILES
-  s.test_files = FileList["test/*.rb"].to_a
   s.add_dependency 'json', '>= 1.1.1'
 end
 
+Rake::GemPackageTask.new(spec).define
+
+desc "Create default gemspec file"
+file "flickraw.gemspec" do
+  open("flickraw.gemspec", "w") {|g| g.puts spec.to_ruby }
+end
+task :gem => ["flickraw.gemspec"]
+CLOBBER.add "flickraw.gemspec"
+
 Rake::RDocTask.new do |rd|
   rd.rdoc_files.include "README.rdoc", "lib/flickraw.rb"
   rd.options << "--inline-source"
 end
 
-Rake::GemPackageTask.new spec do |p|
-  p.need_tar_gz = true
+Rake::TestTask.new
+
+
+# Freezed version tasks
+file "flickraw-cached.rb" do |t|
+  open(t.name, "w") {|f|
+    f.puts %{FlickRawOptions = {'lazyload' => true}}
+    f.puts %{require 'flickraw'}
+    f.puts %{FlickRaw::VERSION << '.#{Time.now.strftime("%Y%m%d")}-cached'} 
+    f.puts 'ms = %w{' + flickr.reflection.getMethods.to_a.join(' ') + '}'
+    f.puts %{FlickRaw::Flickr.build(ms)}
+  }
 end
+CLOBBER.add "flickraw-cached.rb"
 
-Rake::TestTask.new
+spec_cached = Gem::Specification.new do |s|
+  s.name = 'flickraw-cached'
+  s.summary = "Cached version of Flickraw"
+  s.author = "Mael Clerambault"
+  s.email =  "maelclerambault@yahoo.fr"
+  s.homepage = "http://hanklords.github.com/flickraw/"
+  s.version = Time.now.strftime("%Y%m%d")
+  s.files = ["flickraw-cached.rb"]
+  s.require_path = '.'
+  s.add_dependency 'flickraw'
+end
+Rake::GemPackageTask.new(spec_cached).define
+task :gem => ["flickraw-cached.rb"]
+
+desc "Create cached gemspec file"
+file "flickraw-cached.gemspec" do
+  open("flickraw-cached.gemspec", "w") {|g| g.puts spec.to_ruby }
+end
+task :gem => ["flickraw-cached.gemspec"]
+CLOBBER.add "flickraw-cached.gemspec"
+
+FREEZED_CACHE_FILE = ENV['HOME'] + '/.flickraw_cached'
+task :sync_cached do
+  require 'mail'
+  Mail.defaults {delivery_method :sendmail}
+
+  local_list = File.read(FREEZED_CACHE_FILE).split.sort
+  remote_list = flickr.reflection.getMethods.to_a.sort
+
+  if remote_list != local_list
+    # Flickr API has been updated
+    Mail.deliver do
+      from 'flickraw-cached-updater'
+      to ENV['MAILTO'] || ENV['LOGNAME']
+      subject "[flickraw-cached-updater'] flickraw-cached.gem updated"
+      body %|
+flickraw-cached.gem has been updated.
+
+New Flickr API methods :
+- #{(remote_list-local_list).join("\n- ")}
+|
+    end
+
+    # Build gem
+    Rake.application[:gem].invoke
+
+    # Upload gem
+    sh "gem push pkg/flickraw-cached-*.gem"
 
-desc "Create a gemspec file"
-task :spec do
-  spec_clone = spec.clone
-  spec_clone.test_files = nil
-  open("flickraw.gemspec", "w") {|g| g.puts spec_clone.to_ruby }
+    # Update cache and clean gem files
+    open(FREEZED_CACHE_FILE, 'w') {|f| remote_list.each {|m| f.puts m} }
+    Rake.application[:clobber_package].invoke
+  end
 end

data/test/test.rb

@@ -61,6 +61,7 @@ class Basic < Test::Unit::TestCase
       flickr.people.findByEmail
       flickr.people.findByUsername
       flickr.people.getInfo
+      flickr.people.getPhotosOf
       flickr.people.getPublicGroups
       flickr.people.getPublicPhotos
       flickr.people.getUploadStatus
@@ -100,6 +101,11 @@ class Basic < Test::Unit::TestCase
       flickr.photos.notes.add
       flickr.photos.notes.delete
       flickr.photos.notes.edit
+      flickr.photos.people.add
+      flickr.photos.people.delete
+      flickr.photos.people.deleteCoords
+      flickr.photos.people.editCoords
+      flickr.photos.people.getList
       flickr.photos.recentlyUpdated
       flickr.photos.removeTag
       flickr.photos.search

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: flickraw
 version: !ruby/object:Gem::Version 
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors: 
 - Mael Clerambault
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-11 00:00:00 +01:00
+date: 2010-05-05 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -65,7 +65,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: flickraw
+rubyforge_project: 
 rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3