flickraw 0.8.2 → 0.8.3

data/README.rdoc

@@ -120,7 +120,7 @@ You can pass some options to modify flickraw behavior:
 
 There are some helpers to build flickr urls :
 
-=== url, url_m, url_s, url_t, url_b, url_o
+=== url, url_m, url_s, url_t, url_b, url_z, url_o
 
   info = flickr.photos.getInfo(:photo_id => "3839885270")
   FlickRaw.url_b(info) # => "http://farm3.static.flickr.com/2485/3839885270_6fb8b54e06_b.jpg"

data/lib/flickraw.rb

@@ -26,14 +26,13 @@ require 'digest/md5'
 require 'json'
 
 FlickRawOptions = {} if not Object.const_defined? :FlickRawOptions # :nodoc:
-FlickRawOptions['api_key'] ||= '7b124df89b638e545e3165293883ef62'
 if ENV['http_proxy'] and not FlickRawOptions['proxy_host']
   proxy = URI.parse ENV['http_proxy']
   FlickRawOptions.update('proxy_host' => proxy.host, 'proxy_port' => proxy.port, 'proxy_user' => proxy.user, 'proxy_password' => proxy.password)
 end
 
 module FlickRaw
-  VERSION='0.8.2'
+  VERSION='0.8.3'
 
   FLICKR_HOST='api.flickr.com'.freeze
   REST_PATH='/services/rest/?'.freeze
@@ -157,6 +156,7 @@ module FlickRaw
     #
     # Raises FailedResponse if the response status is _failed_.
     def call(req, args={})
+      @token = nil if req == "flickr.auth.getFrob"
       http_response = open_flickr do |http|
         request = Net::HTTP::Post.new(REST_PATH, 'User-Agent' => "Flickraw/#{VERSION}")
         request.set_form_data(build_args(args, req))
@@ -207,7 +207,7 @@ module FlickRaw
     end
 
     def upload_flickr(method, file, args={})
-      photo = File.open(file, 'rb') { |f| f.read }
+      photo = open(file, 'rb') { |f| f.read }
       boundary = Digest::MD5.hexdigest(photo)
 
       header = {'Content-type' => "multipart/form-data, boundary=#{boundary} ", 'User-Agent' => "Flickraw/#{VERSION}"}
@@ -286,6 +286,7 @@ module FlickRaw
     def url_s(r); PHOTO_SOURCE_URL % [r.farm, r.server, r.id, r.secret, "_s", "jpg"] end
     def url_t(r); PHOTO_SOURCE_URL % [r.farm, r.server, r.id, r.secret, "_t", "jpg"] end
     def url_b(r); PHOTO_SOURCE_URL % [r.farm, r.server, r.id, r.secret, "_b", "jpg"] end
+    def url_z(r); PHOTO_SOURCE_URL % [r.farm, r.server, r.id, r.secret, "_z", "jpg"] end
     def url_o(r); PHOTO_SOURCE_URL % [r.farm, r.server, r.id, r.originalsecret, "_o", r.originalformat] end
     def url_profile(r); URL_PROFILE + (r.owner.respond_to?(:nsid) ? r.owner.nsid : r.owner) + "/" end
     def url_photopage(r); url_photostream(r) + r.id end

data/rakefile

@@ -66,7 +66,7 @@ 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 }
+  open("flickraw-cached.gemspec", "w") {|g| g.puts spec_cached.to_ruby }
 end
 task :gem => ["flickraw-cached.gemspec"]
 CLOBBER.add "flickraw-cached.gemspec"
@@ -101,6 +101,6 @@ New Flickr API methods :
 
     # Update cache and clean gem files
     open(FREEZED_CACHE_FILE, 'w') {|f| remote_list.each {|m| f.puts m} }
-    Rake.application[:clobber_package].invoke
+    Rake.application[:clobber].invoke
   end
 end

data/test/test.rb

@@ -7,7 +7,7 @@ class Basic < Test::Unit::TestCase
   def test_request
     flickr_objects = %w{activity auth blogs collections commons contacts
        favorites galleries groups interestingness machinetags panda
-       people photos photosets places prefs reflection tags
+       people photos photosets places prefs reflection stats tags
        test urls
     }
     assert_equal FlickRaw::Flickr.flickr_objects, flickr_objects
@@ -39,8 +39,14 @@ class Basic < Test::Unit::TestCase
       flickr.favorites.getPublicList
       flickr.favorites.remove
       flickr.galleries.addPhoto
+      flickr.galleries.create
+      flickr.galleries.editMeta
+      flickr.galleries.editPhoto
+      flickr.galleries.editPhotos
+      flickr.galleries.getInfo
       flickr.galleries.getList
       flickr.galleries.getListForPhoto
+      flickr.galleries.getPhotos
       flickr.groups.browse
       flickr.groups.getInfo
       flickr.groups.members.getList
@@ -61,6 +67,7 @@ class Basic < Test::Unit::TestCase
       flickr.people.findByEmail
       flickr.people.findByUsername
       flickr.people.getInfo
+      flickr.people.getPhotos
       flickr.people.getPhotosOf
       flickr.people.getPublicGroups
       flickr.people.getPublicPhotos
@@ -132,6 +139,9 @@ class Basic < Test::Unit::TestCase
       flickr.photosets.getPhotos
       flickr.photosets.orderSets
       flickr.photosets.removePhoto
+      flickr.photosets.removePhotos
+      flickr.photosets.reorderPhotos
+      flickr.photosets.setPrimaryPhoto
       flickr.places.find
       flickr.places.findByLatLon
       flickr.places.getChildrenWithPhotosPublic
@@ -154,6 +164,21 @@ class Basic < Test::Unit::TestCase
       flickr.prefs.getSafetyLevel
       flickr.reflection.getMethodInfo
       flickr.reflection.getMethods
+      flickr.stats.getCollectionDomains
+      flickr.stats.getCollectionReferrers
+      flickr.stats.getCollectionStats
+      flickr.stats.getCSVFiles
+      flickr.stats.getPhotoDomains
+      flickr.stats.getPhotoReferrers
+      flickr.stats.getPhotosetDomains
+      flickr.stats.getPhotosetReferrers
+      flickr.stats.getPhotosetStats
+      flickr.stats.getPhotoStats
+      flickr.stats.getPhotostreamDomains
+      flickr.stats.getPhotostreamReferrers
+      flickr.stats.getPhotostreamStats
+      flickr.stats.getPopularPhotos
+      flickr.stats.getTotalViews
       flickr.tags.getClusterPhotos
       flickr.tags.getClusters
       flickr.tags.getHotList
@@ -168,6 +193,7 @@ class Basic < Test::Unit::TestCase
       flickr.urls.getGroup
       flickr.urls.getUserPhotos
       flickr.urls.getUserProfile
+      flickr.urls.lookupGallery
       flickr.urls.lookupGroup
       flickr.urls.lookupUser
     }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: flickraw
 version: !ruby/object:Gem::Version 
-  version: 0.8.2
+  version: 0.8.3
 platform: ruby
 authors: 
 - Mael Clerambault
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-05 00:00:00 +02:00
+date: 2010-08-06 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -36,16 +36,14 @@ files:
 - LICENSE
 - README.rdoc
 - rakefile
-- examples/auth.rb
 - examples/flickr_KDE.rb
+- examples/auth.rb
 - examples/interestingness.rb
 - examples/upload.rb
-- test/test.rb
 - test/test_upload.rb
-has_rdoc: true
+- test/test.rb
+has_rdoc: false
 homepage: http://hanklords.github.com/flickraw/
-licenses: []
-
 post_install_message: 
 rdoc_options: []
 
@@ -66,9 +64,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.1
 signing_key: 
-specification_version: 3
+specification_version: 2
 summary: Flickr library with a syntax close to the syntax described on http://www.flickr.com/services/api
 test_files: []