flickraw 0.8.3 → 0.8.4

data/README.rdoc

@@ -33,6 +33,9 @@ This will recreate the documentation by fetching the methods descriptions from f
 
  require 'flickraw'
 
+ FlickRaw.api_key="... Your API key ..."
+ FlickRaw.shared_secret="... Your shared secret ..."
+
  list   = flickr.photos.getRecent
 
  id     = list[0].id

data/flickraw_rdoc.rb

@@ -1,3 +1,4 @@
+require "rdoc"
 require "rdoc/parser/ruby"
 require "cgi"
 

data/lib/flickraw.rb

@@ -32,7 +32,7 @@ if ENV['http_proxy'] and not FlickRawOptions['proxy_host']
 end
 
 module FlickRaw
-  VERSION='0.8.3'
+  VERSION='0.8.4'
 
   FLICKR_HOST='api.flickr.com'.freeze
   REST_PATH='/services/rest/?'.freeze
@@ -47,7 +47,9 @@ module FlickRaw
 
   class Response
     def self.build(h, type) # :nodoc:
-      if type =~ /s$/ and (a = h[$`]).is_a? Array
+      if h.is_a? Response
+        h
+      elsif type =~ /s$/ and (a = h[$`]).is_a? Array
         ResponseList.new(h, type, a.collect {|e| Response.build(e, $`)})
       elsif h.keys == ["_content"]
         h["_content"]
@@ -74,6 +76,8 @@ module FlickRaw
     def to_s; @h["_content"] || super end
     def inspect; @h.inspect end
     def to_hash; @h end
+    def marshal_dump; [@h, @flickr_type] end
+    def marshal_load(data); initialize(*data) end
   end
 
   class ResponseList < Response
@@ -84,6 +88,7 @@ module FlickRaw
     def to_a; @a end
     def inspect; @a.inspect end
     def size; @a.size end
+    def marshal_dump; [@h, @flickr_type, @a] end
   end
 
   class FailedResponse < StandardError
@@ -124,9 +129,10 @@ module FlickRaw
         klass.build_request method_nesting.join('.')
       else
         req = method_nesting.first
-        define_method(req) { |*args|
-          class_req = self.class.request_name
-          @flickr.call class_req + '.' + req, *args
+        module_eval %{
+          def #{req}(*args, &block)
+            @flickr.call("#{request_name}.#{req}", *args, &block)
+          end
         }
         flickr_methods << req
       end
@@ -155,21 +161,14 @@ module FlickRaw
     # This is the central method. It does the actual request to the flickr server.
     #
     # Raises FailedResponse if the response status is _failed_.
-    def call(req, args={})
+    def call(req, args={}, &block)
       @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))
         http.request(request)
       end
-
-      json = JSON.load(http_response.body.empty? ? "{}" : http_response.body)
-      raise FailedResponse.new(json['message'], json['code'], req) if json.delete('stat') == 'fail'
-      type, json = json.to_a.first if json.size == 1 and json.all? {|k,v| v.is_a? Hash}
-
-      res = Response.build json, type
-      @token = res.token if res.respond_to? :flickr_type and res.flickr_type == "auth"
-      res
+      process_response(req, http_response)
     end
 
     # Use this to upload the photo in _file_.
@@ -199,9 +198,19 @@ module FlickRaw
       full_args
     end
 
+    def process_response(req, http_response)
+      json = JSON.load(http_response.body.empty? ? "{}" : http_response.body)
+      raise FailedResponse.new(json['message'], json['code'], req) if json.delete('stat') == 'fail'
+      type, json = json.to_a.first if json.size == 1 and json.all? {|k,v| v.is_a? Hash}
+
+      res = Response.build json, type
+      @token = res.token if res.respond_to? :flickr_type and res.flickr_type == "auth"
+      res
+    end
+
     def open_flickr
       Net::HTTP::Proxy(FlickRawOptions['proxy_host'], FlickRawOptions['proxy_port'], FlickRawOptions['proxy_user'], FlickRawOptions['proxy_password']).start(FLICKR_HOST) {|http|
-        http.read_timeout = FlickRawOptions['timeout'] if FlickRawOptions['timeout']
+        http.read_timeout = FlickRawOptions['timeout'] if FlickRawOptions.key?('timeout')
         yield http
       }
     end

data/rakefile

@@ -5,8 +5,8 @@ require 'rake/gempackagetask'
 require 'rake/testtask'
 
 FlickRawOptions = {'lazyload' => true}
-require 'lib/flickraw'
-require 'flickraw_rdoc' if RUBY_VERSION >= "1.9"
+require './lib/flickraw'
+require './flickraw_rdoc' if RUBY_VERSION >= "1.9"
 
 PKG_FILES = FileList["lib/flickraw.rb", "flickraw_rdoc.rb", "LICENSE", "README.rdoc", "rakefile", "examples/*.rb", "test/*.rb"].to_a
 
@@ -32,75 +32,6 @@ CLOBBER.add "flickraw.gemspec"
 
 Rake::RDocTask.new do |rd|
   rd.rdoc_files.include "README.rdoc", "lib/flickraw.rb"
-  rd.options << "--inline-source"
 end
 
 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"
-
-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_cached.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"
-
-    # Update cache and clean gem files
-    open(FREEZED_CACHE_FILE, 'w') {|f| remote_list.each {|m| f.puts m} }
-    Rake.application[:clobber].invoke
-  end
-end

data/test/test.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 require 'test/unit'
-require 'lib/flickraw'
+require 'flickraw'
 
 class Basic < Test::Unit::TestCase
   def test_request
@@ -316,8 +316,8 @@ class Basic < Test::Unit::TestCase
     assert_equal "Canon DIGITAL IXUS 55", info.exif.find {|f| f.tag == "Model"}.raw
     assert_equal "1/60", info.exif.find {|f| f.tag == "ExposureTime"}.raw
     assert_equal "4.9", info.exif.find {|f| f.tag == "FNumber"}.raw
-    assert_equal "1600", info.exif.find {|f| f.tag == "ImageWidth"}.raw
-    assert_equal "1200", info.exif.find {|f| f.tag == "ImageHeight"}.raw
+    assert_equal "1600", info.exif.find {|f| f.tag == "RelatedImageWidth"}.raw
+    assert_equal "1200", info.exif.find {|f| f.tag == "RelatedImageHeight"}.raw
   end
   
   def test_photos_getSizes

data/test/test_upload.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 require 'test/unit'
-require 'lib/flickraw'
+require 'flickraw'
 
 # FlickRaw.shared_secret = # Shared secret
 # flickr.auth.checkToken :auth_token => # Auth token

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: flickraw
 version: !ruby/object:Gem::Version 
-  version: 0.8.3
+  prerelease: false
+  segments: 
+  - 0
+  - 8
+  - 4
+  version: 0.8.4
 platform: ruby
 authors: 
 - Mael Clerambault
@@ -9,19 +14,24 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-06 00:00:00 +02:00
+date: 2011-02-09 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 1
+        - 1
         version: 1.1.1
-    version: 
+  type: :runtime
+  version_requirements: *id001
 description: 
 email: maelclerambault@yahoo.fr
 executables: []
@@ -42,31 +52,37 @@ files:
 - examples/upload.rb
 - test/test_upload.rb
 - test/test.rb
-has_rdoc: false
+has_rdoc: true
 homepage: http://hanklords.github.com/flickraw/
+licenses: []
+
 post_install_message: 
 rdoc_options: []
 
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.1
+rubygems_version: 1.3.7
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Flickr library with a syntax close to the syntax described on http://www.flickr.com/services/api
 test_files: []