atom 0.2 → 0.3

data/lib/atom.rb

@@ -26,6 +26,74 @@ require 'time'
 
 module Atom
 	NAMESPACE = 'http://www.w3.org/2005/Atom' 
+	XHTML_NAMESPACE = 'http://www.w3.org/1999/xhtml'
+
+	class Text < String
+		attr :mime_type
+
+		def initialize(element)
+			type = element.attribute('type', NAMESPACE)
+			
+			@mime_type = if type.nil?
+				'text/plain'
+			else
+				case type.value
+					when 'text': 'text/plain'
+					when 'html': 'text/html'
+					when 'xhtml': 'text/xhtml'
+					else raise "Unknown type: #{type.value}"
+				end
+			end
+
+			value = case @mime_type
+				when 'text/plain', 'text/html': element.texts.map {|t| t.value }.join
+				when 'text/xhtml' :
+					REXML::XPath.first(element, 'xhtml:div', 'xhtml' => XHTML_NAMESPACE).children.to_s
+					# TODO: resolve relative uris
+			end
+
+			super value
+		end
+	end
+
+	class Content
+		attr :mime_type
+		attr :src
+		attr :value
+
+		def initialize(element)
+			type = element.attribute('type', NAMESPACE)
+			src = element.attribute('src', NAMESPACE)
+			
+			if src.nil?
+				@mime_type = if type.nil?
+					'text/plain'
+				else
+					case type.value
+						when 'text': 'text/plain'
+						when 'html': 'text/html'
+						when 'xhtml': 'text/xhtml'
+						else type.value
+					end
+				end
+			
+				@value = case @mime_type
+					when 'text/plain', 'text/html': element.texts.map { |t| t.value }.join
+					when 'text/xhtml':
+						REXML::XPath.first(element, 'xhtml:div', 'xhtml' => XHTML_NAMESPACE).children.to_s
+					when /\+xml$|\/xml$/: REXML::XPath.first(element).children.to_s
+					else element.texts.join.strip.unpack("m")[0]
+				end
+			else
+				@src = src.value
+				if !type.nil?
+					@mime_type = type.value
+				end
+
+				@value = nil
+			end
+		end
+	end
 
 	class Person
 		include XMLMapping
@@ -37,7 +105,11 @@ module Atom
 		has_one :uri
 
 		def to_s
-			name
+			if !email.nil?
+				"#{name} (#{email})"
+			else
+				name
+			end
 		end
 	end
 
@@ -48,10 +120,10 @@ module Atom
 
 		has_attribute :uri
 		has_attribute :version
-		text :value
+		text :name
 
 		def to_s
-			value
+			name
 		end
 	end
 
@@ -61,7 +133,7 @@ module Atom
 		namespace NAMESPACE
 
 		has_attribute :href
-		has_attribute :rel
+		has_attribute :rel, :default => 'alternate'
 		has_attribute :type
 		has_attribute :hreflang
 		has_attribute :title
@@ -86,35 +158,23 @@ module Atom
 		end
 	end
 
-	class Content
-		include XMLMapping
-
-		namespace NAMESPACE
-
-		has_attribute :type
-		has_attribute :src
-		text :value
-
-		def to_s
-			value || src
-		end
-	end
-
 	class Source
 		include XMLMapping
 
 		namespace NAMESPACE
 
+		has_one :id
 		has_many :authors, :name => 'author', :type => Person
 		has_many :categories, :name => 'category', :type => Category
 		has_one :generator, :type => Generator
 		has_one :icon
 		has_many :links, :name => 'link', :type => Link
 		has_one :logo
-		has_one :rights
-		has_one :subtitle
-		has_one :title
+		has_one :rights, :type => Text
+		has_one :subtitle, :type => Text
+		has_one :title, :type => Text
 		has_one :updated, :transform => lambda { |t| Time.iso8601(t) }
+		has_many :contributors, :name => 'contributor', :type => Person 
 	end
 
 	class Entry
@@ -123,16 +183,17 @@ module Atom
 		namespace NAMESPACE
 
 		has_one :id
-		has_one :title
-		has_one :summary
+		has_one :title, :type => Text
+		has_one :summary, :type => Text
 		has_many :authors, :name => 'author', :type => Person 
 		has_many :contributors, :name => 'contributor', :type => Person 
 		has_one :published, :transform => lambda { |t| Time.iso8601(t) }
 		has_one :updated, :transform => lambda { |t| Time.iso8601(t) }
 		has_many :links, :name => 'link', :type => Link
-		has_many :category, :name => 'category', :type => Category
+		has_many :categories, :name => 'category', :type => Category
 		has_one :content, :type => Content
 		has_one :source, :type => Source
+		has_one :rights, :type => Text
 
 		has_many :extended_elements, :name => :any, :namespace => :any, :type => :raw
 	end
@@ -143,8 +204,8 @@ module Atom
 		namespace NAMESPACE
 
 		has_one :id
-		has_one :title
-		has_one :subtitle
+		has_one :title, :type => Text
+		has_one :subtitle, :type => Text
 		has_many :authors, :name => 'author', :type => Person
 		has_many :contributors, :name => 'contributor', :type => Person
 		has_many :entries, :name => 'entry', :type => Entry
@@ -152,7 +213,7 @@ module Atom
 		has_many :links, :name => 'link', :type => Link
 		has_one :updated, :transform => lambda { |t| Time.iso8601(t) }
 
-		has_one :rights
+		has_one :rights, :type => Text
 		has_one :icon
 		has_one :logo
 		has_many :categories, :name => 'category', :type => Category

data/lib/xmlmapping.rb

@@ -42,6 +42,11 @@ module XMLMapping
 		raw_mappings.values.select { |mapping| mapping[:cardinality] == :many }.each { |m|
 			instance_variable_set("@#{m[:attribute]}", [])
 		}
+		
+		# initialize defaults
+		raw_mappings.values.select { |mapping| mapping.has_key? :default }.each { |m|
+			instance_variable_set("@#{m[:attribute]}", m[:default])
+		}
 
 		root.each_element { |e| 
 			process(e, mappings[:element])
@@ -64,19 +69,18 @@ module XMLMapping
 	def process(e, mappings)
 		mapping = find_mapping(mappings, e.namespace, e.name)
 
-			if !mapping.nil?
-				value = extract_value(e, mapping)
-
-				attribute = mapping[:attribute]
-				previous = instance_variable_get("@#{attribute}")
-				case mapping[:cardinality]
-					when :one 
-						raise "Found more than one #{e.name}" if !previous.nil?
-						instance_variable_set("@#{attribute}", value)
-					when :many 
-						previous << value
-				end		
-			end
+		if !mapping.nil?
+			value = extract_value(e, mapping)
+
+			attribute = mapping[:attribute]
+			previous = instance_variable_get("@#{attribute}")
+			case mapping[:cardinality]
+				when :one 
+					instance_variable_set("@#{attribute}", value)
+				when :many 
+					previous << value
+			end		
+		end
 	end
 
 	def find_mapping(mappings, namespace, name)
@@ -153,6 +157,9 @@ module XMLMapping
 			add(attribute, :text, options)
 		end
 
+		def ensure(message, &block)
+		end
+
 		private 
 		def add(attribute, xml_type, mapping)
 			attr attribute

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: atom
 version: !ruby/object:Gem::Version 
-  version: "0.2"
-date: 2006-04-08 00:00:00 -07:00
+  version: "0.3"
+date: 2006-04-11 00:00:00 -07:00
 summary: Ruby library for working with the Atom syndication format
 require_paths: 
 - lib