flickraw 0.5.1 → 0.6

data/{README → README.rdoc}

@@ -2,13 +2,13 @@
 
 Flickraw is a library to access flickr[http://flickr.com] api in a simple way.
 It maps exactly the methods described in {the official api documentation}[http://www.flickr.com/services/api].
-It also try to present the data returned in a simple and intuitive way.
+It also tries to present the data returned in a simple and intuitive way.
 The methods are fetched from flickr when loading the library by using introspection capabilities. So it is always up-to-date with regards to new methods added by flickr.
 
-You can read the class documentation here : FlickRaw.
-
 The rubyforge project : http://rubyforge.org/projects/flickraw
 
+The github repository: http://github.com/hanklords/flickraw/tree/master
+
 = Installation
 Type this in a console (you might need to be superuser)
  gem install flickraw

data/flickraw_rdoc.rb

@@ -1,13 +1,12 @@
-require "rdoc/parsers/parserfactory"
-require "rdoc/parsers/parse_rb"
+require "rdoc/parser/ruby"
+require "cgi"
 
 FLICKR_API_URL='http://www.flickr.com/services/api'
 
 FakedToken = Struct.new :text
 
 module RDoc
-  class FlickrawParser < RubyParser
-    extend ParserFactory
+  class FlickrawParser < Parser::Ruby
     parse_files_matching(/flickraw\.rb$/)
 
     def scan
@@ -16,7 +15,7 @@ module RDoc
       fr = @top_level.find_module_named 'FlickRaw'
       k = fr.add_class NormalClass, 'Flickr', 'FlickRaw::Request'
       k.record_location @top_level
-      @stats.num_classes += 1
+      @stats.add_class 'Flickr'
 
       add_flickr_methods(FlickRaw::Flickr, k)
       @top_level
@@ -30,16 +29,14 @@ module RDoc
           name = const.name.sub(/.*::/, '')
           k = doc.add_class NormalClass, name, 'FlickRaw::Request'
           k.record_location @top_level
-          @stats.num_classes += 1
+          @stats.add_class name
 
           m = AnyMethod.new nil, name.downcase
           m.comment = "Returns a #{name} object."
           m.params = ''
           m.singleton = false
           doc.add_method m
-
-          progress("c")
-          @stats.num_methods += 1
+          @stats.add_method m
 
           add_flickr_methods(const, k)
         end
@@ -62,13 +59,12 @@ module RDoc
   end
 } )
         doc.add_method m
-        progress(".")
-        @stats.num_methods += 1
+         @stats.add_method m
       }
     end
 
     def flickr_method_comment(info)
-      description = unescapeHTML(info.method.description.to_s)
+      description = CGI.unescapeHTML(info.method.description.to_s)
 #       description.gsub!( /<\/?(\w+)>/ ) {|b|
 #         return b if ['em', 'b', 'tt'].include? $1
 #         return ''
@@ -83,7 +79,7 @@ module RDoc
             arguments << "[#{arg.name} "
             arguments << "<em>(required)</em> " if arg.optional == '0'
             arguments << "] "
-            arguments << "#{unescapeHTML(arg.to_s)}\n"
+            arguments << "#{CGI.unescapeHTML(arg.to_s)}\n"
           }
         end
       end
@@ -92,14 +88,14 @@ module RDoc
         errors = "<b>Error codes</b>\n"
         info.errors.each {|e|
           errors << "* #{e.code}: <em>#{e.message}</em>\n\n"
-          errors << "  #{unescapeHTML e.to_s}\n"
+          errors << "  #{CGI.unescapeHTML e.to_s}\n"
         }
       end
 
       if info.method.respond_to? :response
         response = "<b>Returns</b>\n"
-        raw = unescapeHTML(info.method.response.to_s)
-        response << raw.collect { |line| line.insert(0, ' ') }.join
+        raw = CGI.unescapeHTML(info.method.response.to_s)
+        response << raw.lines.collect { |line| line.insert(0, ' ') }.join
       else
         response = ''
       end
@@ -129,19 +125,5 @@ module RDoc
       str
     end
 
-    def unescapeHTML(string)
-      string.gsub!('\/', '/')
-      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 '<'
-        when /\Anbsp\z/ni  then ' '
-        else                    "&#{match};"
-        end
-      end
-    end
   end
 end

data/lib/flickraw.rb

@@ -21,12 +21,12 @@
 
 
 require 'net/http'
-require 'md5'
+require 'digest/md5'
 require 'json'
 require 'cgi'
 
 module FlickRaw
-  VERSION='0.5.1'
+  VERSION='0.6'
 
   FLICKR_HOST='api.flickr.com'.freeze
 
@@ -103,8 +103,8 @@ module FlickRaw
       if method_nesting.size > 1
         name = method_nesting.first
         class_name = name.capitalize
-        if const_defined? class_name
-          klass = const_get( class_name)
+        if const_defined?(class_name, false)
+          klass = const_get(class_name)
         else
           klass = Class.new Request
           const_set(class_name, klass)

data/rakefile

@@ -6,23 +6,24 @@ require 'rake/testtask'
 require 'lib/flickraw'
 require 'flickraw_rdoc'
 
-PKG_FILES = FileList["lib/flickraw.rb", "flickraw_rdoc.rb", "copying.txt", "README", "rakefile", "examples/*.rb", "test/*.rb"].to_a
+PKG_FILES = FileList["lib/flickraw.rb", "flickraw_rdoc.rb", "LICENSE", "README.rdoc", "rakefile", "examples/*.rb", "test/*.rb"].to_a
 
 spec = Gem::Specification.new do |s|
   s.summary = "Flickr library with a syntax close to the syntax described on http://www.flickr.com/services/api"
   s.name = "flickraw"
   s.author = "Mael Clerambault"
   s.email =  "maelclerambault@yahoo.fr"
-  s.homepage = "http://flickraw.rubyforge.org"
+  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'
+  s.required_ruby_version = '>= 1.9'
 end
 
 Rake::RDocTask.new do |rd|
-  rd.rdoc_files.include "README", "lib/flickraw.rb"
+  rd.rdoc_files.include "README.rdoc", "lib/flickraw.rb"
   rd.options << "--inline-source"
 end
 
@@ -31,3 +32,9 @@ Rake::GemPackageTask.new spec do |p|
 end
 
 Rake::TestTask.new
+
+task :spec do
+  spec_clone = spec.clone
+  spec_clone.test_files = nil
+  open("flickraw.gemspec", "w") {|g| g.puts spec_clone.to_ruby }
+end

data/test/test.rb

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 require 'test/unit'
 require 'lib/flickraw'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: flickraw
 version: !ruby/object:Gem::Version 
-  version: 0.5.1
+  version: "0.6"
 platform: ruby
 authors: 
 - Mael Clerambault
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-23 00:00:00 +01:00
+date: 2009-06-08 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -33,8 +33,8 @@ extra_rdoc_files: []
 files: 
 - lib/flickraw.rb
 - flickraw_rdoc.rb
-- copying.txt
-- README
+- LICENSE
+- README.rdoc
 - rakefile
 - examples/flickr_KDE.rb
 - examples/upload.rb
@@ -42,7 +42,7 @@ files:
 - examples/interestingness.rb
 - test/test.rb
 has_rdoc: false
-homepage: http://flickraw.rubyforge.org
+homepage: http://hanklords.github.com/flickraw/
 post_install_message: 
 rdoc_options: []
 
@@ -52,7 +52,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      version: "0"
+      version: "1.9"
   version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
@@ -63,7 +63,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: flickraw
-rubygems_version: 1.2.0
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: Flickr library with a syntax close to the syntax described on http://www.flickr.com/services/api