atomutil 0.0.3 → 0.0.4

data/History.txt

@@ -1,4 +1,13 @@
 
+== 0.0.4 2008-02-12
+
+* bugfix: SimpleCache - fixed typo
+          CacheResource - fixed type
+          ServiceInfoStorage#clone_collection now returns new collections correctly.
+          ServiceInfo#accepts_media_type? works as expected now.
+          added credential control on Atompub::Client#delete_resource
+          approved error messages.
+
 == 0.0.3 2008-02-12
 
 * bugfix: now this handle URL which has query correctly.

data/README.txt

@@ -551,8 +551,8 @@ Then feed includes
 At first, construct appropriate authorizer
 At this time, let's assume that we're requried WSSE Authentication.
 Of cource, you can choose other authorizer, 
-for example, Atom::Auth::Basic(Basic authentication),
-and in future, Atom::Auth::OAuth, Atom::Auth::OpenID, and etc.
+for example, Atompub::Auth::Basic(Basic authentication),
+and in future, Atompub::Auth::OAuth, Atompub::Auth::OpenID, and etc.
 
   auth = Atompub::Auth::Wsse.new :username => 'myname', :password => 'mypass'
 
@@ -612,6 +612,23 @@ and in future, Atom::Auth::OAuth, Atom::Auth::OpenID, and etc.
 
   feed_contains_media_entreis = client.get_feed( media_collection_uri )
 
+== CONTROL CACHING
+
+To handle data for controlling cache, for example, ETag or If-Modified-Since,
+Set Atompub::SimpleCache class's object for client initialization.
+If you don't pass, Atompub::AbstractCache is set by default.
+
+SimpleCache provides a simple on-memory caching, merely using hash to
+store Etag and If-Modified-Since data.
+
+Define new class inheriting AbstractCache,
+if you need more flexible cache controller, for example,
+using file, database, or memcached, etc.
+
+  cache = Atompub::SimpleCache.new
+  auth  = Atompub::Auth::Wsse.new :username => 'username', :password => 'password'
+  client = Atompub::Client.new :auth => auth, :cache => cache
+
 = TO DO
 
 * More document

data/lib/atomutil.rb

@@ -55,7 +55,7 @@ module AtomUtil
   module VERSION#:nodoc:
     MAJOR = 0
     MINOR = 0
-    TINY  = 3
+    TINY  = 4
     STRING = [MAJOR, MINOR, TINY].join('.')
   end
 end
@@ -1129,7 +1129,7 @@ module Atompub
     attr_accessor :etag, :last_modified, :resource
     def initialize(params)
       @etag          = params[:etag]
-      @last_modified = parmas[:last_modified]
+      @last_modified = params[:last_modified]
       @resource      = params[:rc]
     end
   end
@@ -1177,7 +1177,7 @@ module Atompub
     end
     # Pick cache resource from hash for indicated uri.
     def get(uri)
-      @cache.has_key?(url) ? @cache[uri] : nil
+      @cache.has_key?(uri) ? @cache[uri] : nil
     end
     # Set cache resource into hash.
     def put(uri, params)
@@ -1217,7 +1217,7 @@ module Atompub
       return true if @collection.nil?
       if @accepts.nil?
         @accepts = @collection.accepts.collect do |accept|
-          accept.split(/[\s,]+/) 
+          accept.text.split(/[\s,]+/) 
         end.flatten
         @accepts << Atom::MediaType::ENTRY if @accepts.empty?
       end
@@ -1245,8 +1245,8 @@ module Atompub
     end
 
     def put(uri, collection, client=nil)
-      collection = clone_collection(collection, client)
-      @info[uri] = ServiceInfo.new(:collection => collection)
+      new_collection = clone_collection(collection, client)
+      @info[uri] = ServiceInfo.new(:collection => new_collection)
     end
 
     private
@@ -1254,13 +1254,14 @@ module Atompub
       coll = Atom::Collection.new
       coll.title = collection.title
       coll.href  = collection.href
-      collection.accepts.each { |a| coll.add_accept a }
+      collection.accepts.each { |a| coll.add_accept a.text }
       collection.categories_list.each do |cats|
         unless cats.nil?
           new_cats = cats.href.nil?? clone_categories(cats) : get_categories(cats.href, client) 
           coll.categories = new_cats unless new_cats.nil?
         end
       end
+      coll
     end
 
     def get_categories(uri, client=nil)
@@ -1305,7 +1306,7 @@ module Atompub
         throw ArgumentError.new("Atompub::Client needs :auth as argument for constructor.")
       end
       @auth  = params[:auth]
-      @cache = params.has_key?(:cache) && params[:info].kind_of?(AbstractCache) ? params[:cache] : AbstractCache.instance
+      @cache = params.has_key?(:cache) && params[:cache].kind_of?(AbstractCache) ? params[:cache] : AbstractCache.instance
       @service_info = params.has_key?(:info) && params[:info].kind_of?(ServiceInfoStorage) ? params[:info] : ServiceInfoStorage.instance
       @http_class = Net::HTTP
       @agent = "Atompub::Client/#{AtomUtil::VERSION}"
@@ -1434,7 +1435,10 @@ module Atompub
       file_path = Pathname.new(file_path) unless file_path.is_a?(Pathname)
       stream = file_path.open { |f| f.binmode; f.read }
       service = @service_info.get(media_uri)
-      unless service.accept_media_type?(content_type)
+      if service.nil?
+        raise RequestError, "Service information not found. Get service document before you do create_media."
+      end
+      unless service.accepts_media_type?(content_type)
         raise RequestError, "Unsupported Media Type: #{content_type}"
       end
       create_resource(media_uri, stream, content_type, slug)
@@ -1574,7 +1578,8 @@ module Atompub
               }
             end
           else
-            raise RequestError, "Failed to create resource. #{@res.code}"
+            error_message = @res.body.nil?? "#{@res.code}" : "#{@res.code} / #{@res.body}"
+            raise RequestError, "Failed to create resource. #{error_message}"
         end
       end
     end
@@ -1595,7 +1600,7 @@ module Atompub
         @res = http.request(@req)
         case @res
           when Net::HTTPSuccess
-            warn "Bad Status Code" unless @res.class == Net::HTTPOK
+            warn "Bad Status Code: #{@res.code}" unless @res.class == Net::HTTPOK || @res.class == Net::HTTPNoContent
             unless @res.body.nil?
               @rc = Atom::MediaType::ENTRY.is_a?(@res['Content-Type']) ? Atom::Entry.new(:stream => @res.body) : @res.body
               @cache.put uri.to_s, {
@@ -1613,11 +1618,12 @@ module Atompub
       clear
       uri = URI.parse(uri)
       @req = Net::HTTP::Delete.new uri.request_uri
+      set_common_info(@req)
       @http_class.start(uri.host, uri.port) do |http|
         @res = http.request(@req)
         case @res
           when Net::HTTPSuccess
-            warn "Bad Status Code" unless @res.class == Net::HTTPOK
+            warn "Bad Status Code: #{@res.code}" unless @res.class == Net::HTTPOK || @res.class == Net::HTTPNoContent
           else
             raise RequestError, "Failed to delete resource. #{@res.code}"
           end

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: atomutil
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 date: 2008-02-12 00:00:00 +09:00
 summary: Utilities for AtomPub / Atom Syndication Format
 require_paths: