atomutil 0.0.2 → 0.0.3

data/History.txt

@@ -1,4 +1,9 @@
 
+== 0.0.3 2008-02-12
+
+* bugfix: now this handle URL which has query correctly.
+  approved error messages.
+
 == 0.0.2 2007-12-05
 
 * documentation improvement:

data/lib/atomutil.rb

@@ -55,7 +55,7 @@ module AtomUtil
   module VERSION#:nodoc:
     MAJOR = 0
     MINOR = 0
-    TINY  = 2
+    TINY  = 3
     STRING = [MAJOR, MINOR, TINY].join('.')
   end
 end
@@ -604,10 +604,10 @@ module Atom
     def child_xpath(ns, element_name, attributes=nil)
       ns_uri = ns.is_a?(Namespace) ? ns.uri : ns
       unless !attributes.nil? && attributes.is_a?(Hash)
-        "descendant-or-self::*[local-name()='#{element_name}' and namespace-uri()='#{ns_uri}']"
+        "child::*[local-name()='#{element_name}' and namespace-uri()='#{ns_uri}']"
       else
         attr_str = attributes.collect{|key, val| "@#{key.to_s}='#{val}'"}.join(' and ')
-        "descendant-or-self::*[local-name()='#{element_name}' and namespace-uri()='#{ns_uri}' and #{attr_str}]"
+        "child::*[local-name()='#{element_name}' and namespace-uri()='#{ns_uri}' and #{attr_str}]"
       end
     end
   end
@@ -1435,7 +1435,7 @@ module Atompub
       stream = file_path.open { |f| f.binmode; f.read }
       service = @service_info.get(media_uri)
       unless service.accept_media_type?(content_type)
-        raise RequestError, "Unsupported Media Type"
+        raise RequestError, "Unsupported Media Type: #{content_type}"
       end
       create_resource(media_uri, stream, content_type, slug)
       @res['Location']
@@ -1496,7 +1496,7 @@ module Atompub
     def get_contents_except_resources(uri, &block)
       clear
       uri = URI.parse(uri)
-      @req = Net::HTTP::Get.new uri.path
+      @req = Net::HTTP::Get.new uri.request_uri
       set_common_info(@req)
       @http_class.start(uri.host, uri.port) do |http|
         @res = http.request(@req)
@@ -1512,7 +1512,7 @@ module Atompub
     def get_resource(uri)
       clear
       uri = URI.parse(uri)
-      @req = Net::HTTP::Get.new uri.path
+      @req = Net::HTTP::Get.new uri.request_uri
       set_common_info(@req)
       cache = @cache.get(uri.to_s)
       unless cache.nil?
@@ -1547,11 +1547,11 @@ module Atompub
     def create_resource(uri, r, content_type, slug=nil)
       clear
       uri = URI.parse(uri)
-      service = @service_info.get(uri.to_s)
+      #service = @service_info.get(uri.to_s)
       #unless service.accepts_media_type(content_type)
       #  raise UnsupportedMediaTypeError, "Unsupported media type: #{content_type}."
       #end
-      @req = Net::HTTP::Post.new uri.path
+      @req = Net::HTTP::Post.new uri.request_uri
       @req['Content-Type'] = content_type
       @req['Slug'] = URI.encode(URI.decode(slug)) unless slug.nil?
       set_common_info(@req)
@@ -1560,8 +1560,8 @@ module Atompub
         @res = http.request(@req)
         case @res
           when Net::HTTPSuccess
-            warn "Bad Status Code" unless @res.class == Net::HTTPCreated
-            warn "Bad Content Type" unless Atom::MediaType::ENTRY.is_a?(@res['Content-Type'])
+            warn "Bad Status Code: #{@res.code}" unless @res.class == Net::HTTPCreated
+            warn "Bad Content Type: #{@res['Content-Type']}" unless Atom::MediaType::ENTRY.is_a?(@res['Content-Type'])
             if @res['Location'].nil?
               raise ResponseError, "No Location"
             end
@@ -1574,7 +1574,7 @@ module Atompub
               }
             end
           else
-            raise RequestError, "Failed to create resource."
+            raise RequestError, "Failed to create resource. #{@res.code}"
         end
       end
     end
@@ -1582,7 +1582,7 @@ module Atompub
     def update_resource(uri, r, content_type)
       clear
       uri = URI.parse(uri)
-      @req = Net::HTTP::Put.new uri.path
+      @req = Net::HTTP::Put.new uri.request_uri
       @req['Content-Type'] = content_type
       cache = @cache.get(uri.to_s)
       unless cache.nil?
@@ -1612,7 +1612,7 @@ module Atompub
     def delete_resource(uri)
       clear
       uri = URI.parse(uri)
-      @req = Net::HTTP::Delete.new uri.path
+      @req = Net::HTTP::Delete.new uri.request_uri
       @http_class.start(uri.host, uri.port) do |http|
         @res = http.request(@req)
         case @res
@@ -1661,7 +1661,7 @@ module Atompub
       #
       # Usaage:
       #
-      #   req = Net::HTTP::Get.new uri.path
+      #   req = Net::HTTP::Get.new uri.request_uri
       #   auth.authorize(req)
       #
       def authorize(req)
@@ -1704,7 +1704,7 @@ module Atompub
       #
       # Usage:
       #
-      #   req = Net::HTTP::Get.new uri.path
+      #   req = Net::HTTP::Get.new uri.request_uri
       #   auth.authorize(req)
       #
       def authorize(req)

data/spec/feed_spec.rb

@@ -12,6 +12,7 @@ describe Atom::Feed, "feed object" do
     feed.self_link.should == 'http://example.org/feed.atom'
     feed.rights.should == 'Copyright (c) 2003, Mark Pilgrim'
     feed.generator.name.gsub(/^[\s\n]*(.+)[\s\n]*$/, '\1').should == 'Example Toolkit'
+    feed.links.length.should == 2
     entry = feed.entries[0]
     entry.title.should == 'Atom draft-07 snapshot'
     entry.id.should == 'tag:example.org,2003:3.2397'

data/website/index.html

@@ -1,11 +0,0 @@
-<html>
-	<head>
-		<meta http-equiv="Content-type" content="text/html; charset=utf-8">
-		<title>atomutil</title>
-		
-	</head>
-	<body id="body">
-		<p>This page has not yet been created for RubyGem <code>atomutil</code></p>
-		<p>To the developer: To generate it, update website/index.txt and run the rake task <code>website</code> to generate this <code>index.html</code> file.</p>
-	</body>
-</html>

metadata

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