ratom 0.6.5 → 0.6.6

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
-:patch: 5
+:patch: 6
 :major: 0
 :build: 
 :minor: 6

data/lib/atom/pub.rb

@@ -60,7 +60,8 @@ module Atom
     class Categories < DelegateClass(Array)
       include Atom::Xml::Parseable
       elements :categories, :class => Atom::Category
-      attribute :href, :fixed
+      attribute :fixed
+      uri_attribute :href
       
       def initialize(o)
         super([])
@@ -102,7 +103,7 @@ module Atom
     
     class Collection
       include Atom::Xml::Parseable
-      attribute :href
+      uri_attribute :href
       element :title, :class => Content, :namespace => Atom::NAMESPACE
       element :categories, :class => Categories
       elements :accepts, :content_only => true

data/lib/atom/xml/parser.rb

@@ -79,11 +79,20 @@ module Atom
           when XML::Reader::TYPE_ELEMENT
             if element_specs.include?(xml.local_name) && (self.class.known_namespaces + [Atom::NAMESPACE, Atom::Pub::NAMESPACE]).include?(xml.namespace_uri)
               element_specs[xml.local_name].parse(self, xml)
-            elsif attributes.any?
+            elsif attributes.any? || uri_attributes.any?
               while (xml.move_to_next_attribute == 1)
                 if attributes.include?(xml.name)
                   # Support attribute names with namespace prefixes
-                  self.send("#{xml.name.sub(/:/, '_')}=", xml.value)
+                  self.send("#{accessor_name(xml.name)}=", xml.value)
+                elsif uri_attributes.include?(xml.name)
+                  value = if xml.base_uri
+                    @base_uri = xml.base_uri
+                    raw_uri = URI.parse(xml.value)
+                    (raw_uri.relative? ? URI.parse(xml.base_uri) + raw_uri : raw_uri).to_s
+                  else
+                    xml.value
+                  end
+                  self.send("#{accessor_name(xml.name)}=", value)
                 elsif self.respond_to?(:simple_extensions)
                   self[xml.namespace_uri, xml.local_name].as_attribute = true
                   self[xml.namespace_uri, xml.local_name] << xml.value
@@ -106,15 +115,21 @@ module Atom
       def current_node_is?(xml, element, ns = nil)
         xml.node_type == XML::Reader::TYPE_ELEMENT && xml.local_name == element && (ns.nil? || ns == xml.namespace_uri)
       end
+
+      def accessor_name(name)
+        name.to_s.sub(/:/, '_').to_sym
+      end
   
       def Parseable.included(o)
         o.class_eval do
           def o.ordered_element_specs;  @ordered_element_specs ||= []; end
           def o.element_specs;  @element_specs ||= {}; end
           def o.attributes; @attributes ||= []; end
+          def o.uri_attributes; @uri_attributes ||= []; end
           def element_specs; self.class.element_specs; end
           def ordered_element_specs; self.class.ordered_element_specs; end
           def attributes; self.class.attributes; end
+          def uri_attributes; self.class.uri_attributes; end
           def o.namespace(ns = @namespace); @namespace = ns; end
           def o.add_extension_namespace(ns, url); self.extensions_namespaces[ns.to_s] = url; end
           def o.extensions_namespaces; @extensions_namespaces ||= {} end
@@ -173,8 +188,8 @@ module Atom
           end
         end
         
-        self.class.attributes.each do |attribute|
-          if value = self.send("#{attribute.sub(/:/, '_')}")
+        (self.class.attributes + self.class.uri_attributes).each do |attribute|
+          if value = self.send(accessor_name(attribute))
             if value != 0
               node[attribute] = value.to_s
             end
@@ -249,6 +264,14 @@ module Atom
             self.attributes << name.to_s
           end
         end
+
+        def uri_attribute(*names)
+          attr_accessor :base_uri
+          names.each do |name|
+            attr_accessor name.to_s.sub(/:/, '_').to_sym
+            self.uri_attributes << name.to_s
+          end
+        end
       
         def loadable!(&error_handler)
           class_name = self.name

data/lib/atom.rb

@@ -713,7 +713,8 @@ module Atom # :nodoc:
     end    
     
     include Xml::Parseable
-    attribute :href, :rel, :type, :length, :hreflang, :title
+    attribute :rel, :type, :length, :hreflang, :title
+    uri_attribute :href
         
     # Create a link.
     #

data/spec/app/service.xml

@@ -7,7 +7,7 @@
         href="http://example.org/blog/main" >
       <atom:title>My Blog Entries</atom:title>
       <categories
-         href="http://example.com/cats/forMain.cats" />
+         href="http://example.org/cats/forMain.cats" />
     </collection>
     <collection
         href="http://example.org/blog/pic" >

data/spec/app/service_xml_base.xml

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding='utf-8'?>
+<service xmlns="http://www.w3.org/2007/app"
+         xmlns:atom="http://www.w3.org/2005/Atom"
+         xml:base="http://example.org/">
+  <workspace>
+    <atom:title>Main Site</atom:title>
+    <collection
+        href="/blog/main" >
+      <atom:title>My Blog Entries</atom:title>
+      <categories
+         href="/cats/forMain.cats" />
+    </collection>
+    <collection
+        href="http://example.org/blog/pic" >
+      <atom:title>Pictures</atom:title>
+      <accept>image/png</accept>
+      <accept>image/jpeg</accept>
+      <accept>image/gif</accept>
+    </collection>
+  </workspace>
+  <workspace>
+    <atom:title>Sidebar Blog</atom:title>
+    <collection
+        href="http://example.org/sidebar/list" >
+      <atom:title>Remaindered Links</atom:title>
+      <accept>application/atom+xml;type=entry</accept>
+      <categories fixed="yes">
+        <atom:category
+          scheme="http://example.org/extra-cats/"
+          term="joke" />
+        <atom:category
+          scheme="http://example.org/extra-cats/"
+          term="serious" />
+      </categories>
+    </collection>
+  </workspace>
+</service>

data/spec/atom/pub_spec.rb

@@ -34,7 +34,7 @@ shared_examples_for 'parser of spec/app/service.xml' do
   end
   
   it "should have a href on categories" do 
-    @collection1.categories.href.should == "http://example.com/cats/forMain.cats"
+    @collection1.categories.href.should == "http://example.org/cats/forMain.cats"
     @collection1.categories.fixed?.should be_false
   end
   
@@ -152,6 +152,19 @@ describe Atom::Pub do
       
       it_should_behave_like 'parser of spec/app/service.xml'
     end
+
+    describe "load service with xml:base" do
+      before(:all) do
+        @service = Atom::Pub::Service.load_service(File.open('spec/app/service_xml_base.xml'))
+        @workspace = @service.workspaces.first
+        @workspace2 = @service.workspaces[1]
+        @collection1 = @workspace.collections.first
+        @collection2 = @workspace.collections[1]
+        @collection3 = @workspace2.collections.first
+      end
+
+      it_should_behave_like 'parser of spec/app/service.xml'
+    end
     
     describe "load_service with authentication" do
       it "should pass credentials to the server" do

data/spec/atom_spec.rb

@@ -265,7 +265,28 @@ describe Atom do
         @feed.should have(1).categories
       end
     end
-    
+
+    describe "FeedWithXmlBase" do
+      before(:all) do
+        @feed = Atom::Feed.load_feed(File.open('spec/conformance/xmlbase.atom'))
+      end
+
+      subject { @feed }
+
+      its(:title) { should == "xml:base support tests" }
+      it { should have(16).entries }
+
+      it "should resolve all alternate links to the same location" do
+        @feed.entries.each do |entry|
+          entry.links.first.href.should == "http://example.org/tests/base/result.html"
+        end
+      end
+
+      it "should resolve all links in content to what their label says" do
+        pending "support xml:base in content XHTML"
+      end
+    end
+
     describe Atom::Entry do
       before(:each) do
         @entry = @feed.entries.first

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 6
-  - 5
-  version: 0.6.5
+  - 6
+  version: 0.6.6
 platform: ruby
 authors: 
 - Peerworks
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-07 00:00:00 +09:30
+date: 2010-04-22 00:00:00 +09:30
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -67,6 +67,7 @@ files:
 - lib/atom/xml/parser.rb
 - spec/app/member_entry.atom
 - spec/app/service.xml
+- spec/app/service_xml_base.xml
 - spec/atom/pub_spec.rb
 - spec/atom_spec.rb
 - spec/conformance/baseuri.atom