flickraw 0.3 → 0.3.1

data/flickraw_rdoc.rb

@@ -1,6 +1,5 @@
 require "rdoc/parsers/parserfactory"
 require "rdoc/parsers/parse_rb"
-require "cgi"
 
 FLICKR_API_URL='http://www.flickr.com/services/api'
 
@@ -71,7 +70,7 @@ END
     end
 
     def flickr_method_comment(info)
-      description = CGI.unescapeHTML(info.method.description.to_s)
+      description = unescapeHTML(info.method.description.to_s)
 #       description.gsub!( /<\/?(\w+)>/ ) {|b|
 #         return b if ['em', 'b', 'tt'].include? $1
 #         return ''
@@ -131,5 +130,18 @@ END
       end
       str
     end
+
+    def unescapeHTML(string)
+      string.gsub(/&(.*?);/n) do
+        match = $1.dup
+        case match
+        when /\Aamp\z/ni           then '&'
+        when /\Aquot\z/ni          then '"'
+        when /\Agt\z/ni            then '>'
+        when /\Alt\z/ni            then '<'
+        else                            "&#{match};"
+        end
+      end
+    end
   end
 end

data/lib/flickraw.rb

@@ -25,16 +25,17 @@ require 'open-uri'
 require 'md5'
 
 module FlickRaw
-  VERSION='0.3'
+  VERSION='0.3.1'
 
   FLICKR_HOST='api.flickr.com'.freeze
 
-  # Path of the flickr REST api
+  # Path of flickr REST API
   REST_PATH='/services/rest/?'.freeze
 
-  # Path of the flickr auth page
+  # Path of flickr auth page
   AUTH_PATH='/services/auth/?'.freeze
 
+  # Path of flickr upload
   UPLOAD_PATH='/services/upload/'.freeze
 
   @api_key = '7b124df89b638e545e3165293883ef62'
@@ -217,7 +218,7 @@ module FlickRaw
     end
 
     def lookup_token(req, res)
-      token_reqs = ['flickr.auth.getToken', 'flickr.auth.getFullToken']
+      token_reqs = ['flickr.auth.getToken', 'flickr.auth.getFullToken', 'flickr.auth.checkToken']
       @token = res.token if token_reqs.include?(req) and res.respond_to?( :token)
     end
   end

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: flickraw
 version: !ruby/object:Gem::Version 
-  version: "0.3"
+  version: 0.3.1
 date: 2006-09-02 00:00:00 +02:00
 summary: Flickr library with a syntax close to the syntax described on http://www.flickr.com/services/api
 require_paths: