rdfa 0.0.7 → 0.0.8

data/History.txt

@@ -1,3 +1,12 @@
++++ 0.0.8 2007-06-19
+	+ added some unit tests
+	+ added the rdfa-generate command
+	+ refactoring, refactoring and again
+	+ added a bin rdfa_vocabulary which takes a namespace as argument and parse and return classes and properties... pretty useful
+	+ the supported vocabularies are now generated
+	+ dealt with class blank nodes using the rel attribute as Ben said on the rdfa mailing list
+	+ took out the proxy properties and classes, and refactored into SHORTCUTS
+	
 +++ 0.0.7 2007-06-03
 	+ added the terminology of scot and foaf.
 	+ registering predicates now adds rdfa_link_tos

data/Manifest.txt

@@ -1,9 +1,8 @@
 lib/rdfa.rb
 lib/rdfa/version.rb
-lib/rdfa/classes.rb
-lib/rdfa/properties.rb
 lib/rdfa/base.rb
-lib/rdfa/partials.rb
+lib/rdfa/supported_vocabularies.rb
+lib/rdfa/shortcuts.rb
 History.txt
 Manifest.txt
 README.txt
@@ -13,6 +12,8 @@ setup.rb
 test/test_helper.rb
 test/test_rdfa.rb
 bin/rdfa-typo
+bin/rdfa-vocabulary
+bin/rdfa-generate
 rdfa-typo/CONTRIBUTORS
 rdfa-typo/about.markdown
 rdfa-typo/images

data/Rakefile

@@ -73,9 +73,10 @@ end
 
 desc 'Generate website files'
 task :website_generate do
-  Dir['website/**/*.txt'].each do |txt|
-    sh %{ ruby scripts/txt2html #{txt} > #{txt.gsub(/txt$/,'html')} }
-  end
+  sh %{ cd website; find *.rhtml -exec rdfa-generate '{}' \\;}
+  #Dir['website/*.rhtml'].each do |txt|
+  #  sh %{ ruby scripts/txt2html #{txt} > #{txt.gsub(/txt$/,'html')} }
+  #end
 end
 
 desc 'Upload website files to rubyforge'

data/bin/rdfa-generate

@@ -0,0 +1,22 @@
+require 'rubygems'
+
+require 'action_controller'
+require 'action_view'
+
+renderer = ActionView::Base.new("./")
+require 'rdfa'
+
+if ARGV.size != 1
+  puts "USAGE: rdfa-generate your_template.rhtml"
+  exit
+end
+
+file = ARGV[0].scan(/(.*)\.rhtml/)[0]
+
+template = open("#{file}.rhtml").read.gsub(/<pre>(.*?)<\/pre>/m) { 
+  "<pre>#{$1.gsub(/</,'&lt;').gsub(/>/,'&gt;')}</pre>" 
+}
+
+f = open("#{file}.html",'w')
+f.write(renderer.render(:inline => template))
+f.close

data/bin/rdfa-vocabulary

@@ -0,0 +1,95 @@
+#!/usr/bin/env ruby
+require 'net/http' 
+require 'uri'
+
+BNode = /_:(\S*)/
+Resource = /<([^>]*)>/ 		
+Literal = /"([^"]*)"/ 		
+Node = Regexp.union(/_:\S*/,/<[^>]*>/,/"[^"]*"/)
+
+
+NAME = ARGV[0]
+NAMESPACE = ARGV[1]
+FULLNAME = ARGV[2]
+URL = ARGV[3]
+
+RDF = "http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+RDFS = "http://www.w3.org/2000/01/rdf-schema#"
+OWL = "http://www.w3.org/2002/07/owl#"
+DC = "http://purl.org/dc/elements/1.1/"
+TRIPLR = "http://triplr.org/ntriples/#{NAMESPACE}"
+
+RDFTYPE = Regexp.new("#{RDF}type")
+RDFPROPERTY = Regexp.new("#{RDF}Property")
+RDFSCLASS = Regexp.new("#{RDFS}Class")
+RDFNAMESPACE = Regexp.new("#{NAMESPACE}")
+OWLCLASS = Regexp.new("#{OWL}Class")
+OWLOBJECTPROPERTY = Regexp.new("#{OWL}ObjectProperty") 
+OWLDATAPROPERTY = Regexp.new("#{OWL}DatatypeProperty")
+DESCRIPTION = Regexp.new("#{DC}description")
+COMMENT = Regexp.new("#{RDFS}comment")
+
+PROPERTY = Regexp.union(RDFPROPERTY,OWLOBJECTPROPERTY,OWLDATAPROPERTY)
+CLASS = Regexp.union(RDFSCLASS,OWLCLASS)
+TYPE = RDFTYPE
+
+ntriples = Net::HTTP.get_response(URI.parse(TRIPLR)).body
+
+ntriples = ntriples.select {|t| not t.match /^#/}
+ntriples = ntriples.collect {|t| t.scan(Node)}
+
+triples = ntriples.collect {|s,p,o| {:s => s, :p => p, :o => o}}
+
+classes = (triples.select {|t| t[:s].match(RDFNAMESPACE) and t[:p].match(TYPE) and t[:o].match(CLASS)}).collect {|t| t[:s]}
+properties = (triples.select {|t| t[:s].match(RDFNAMESPACE) and t[:p].match(TYPE) and t[:o].match(PROPERTY)}).collect {|t| t[:s]}
+
+vocabulary = {:classes => {}, :properties => {}}
+
+def strip_quotes(st)
+  return st.gsub(/\"/,'').gsub(/\\n/,'').gsub(/\\t/,'')
+end
+
+def comment(subject, triples)
+  co = (triples.select {|t| (t[:s] == subject) and t[:p].match(COMMENT)}).collect {|t| t[:o]}
+  co = [""] if (not co) or co.empty?
+  co = strip_quotes(co[0])
+  s = subject.scan(Regexp.new("#{NAMESPACE}([^>]*)"))[0][0]
+  return [s,co]
+end
+
+classes.each {|kl| s,c = comment(kl,triples) ; vocabulary[:classes][s] = c }
+properties.each {|pr| s,c = comment(pr,triples) ; vocabulary[:properties][s] = c }
+
+
+description = (triples.select {|t| t[:s].match(NAMESPACE) and t[:p].match(DESCRIPTION)}).collect {|t| t[:o]}
+description = [""] if (not description) or description.empty?
+description = description[0]
+vocabulary[:description] = strip_quotes(description)
+vocabulary[:fullname] = FULLNAME or ""
+vocabulary[:url] = URL or ""
+vocabulary[:name] = NAME
+vocabulary[:namespace] = NAMESPACE
+
+
+def rdfa_vocab(v)
+  puts "  # Vocabulary definition of #{v[:name]}"
+  puts "  #{v[:name].upcase} = {"
+  puts "    :name => :#{v[:name].downcase},"
+  puts "    :fullname => \"#{v[:fullname]}\","
+  puts "    :description => \"#{v[:description]}\","
+  puts "    :url => \"#{v[:url]}\","
+  puts "    :namespace => \"#{v[:namespace]}\","
+  puts "    :classes => #{v[:classes].inspect},"
+  puts "    :properties => #{v[:properties].inspect}"
+  puts "  }"
+end
+
+rdfa_vocab(vocabulary)
+#puts triples
+
+
+
+
+
+
+

data/lib/rdfa.rb

@@ -4,116 +4,22 @@ to the ApplicationHelper of your rails application providing
 developers with abstractions for the publishing of rdfa data.
 
 Here is a simple example of how to use rdfa in your application:
-* require 'rdfa' in your application_helper.rb
+* require 'rdfa' in config/environment.rb
 * in your layout replace <html> by <%= rdfa_html %>
 
 =end
 
-module Rdfa
-  def Rdfa.register_rdfa_namespace name, namespace
-    $rdfa_namespaces = $rdfa_namespaces.merge "xmlns:#{name}" => namespace
-  end
-
-  # register_classes generates helpers for classes passed as arguments,
-  # calling register_classes('sioc', ['Forum','Community']) will generate
-  # the methods rdfa_sioc_forum and rdfa_sioc_community. The namespace must
-  # be registered first using register_namespace
-  def Rdfa.register_rdfa_classes name, classes
-    classes.each do |klass|
-      #puts "adding rdfa_#{name}_#{klass.downcase}"
-      module_eval %{
-        def rdfa_#{name}_#{klass.downcase} uri, &block
-          rdfa_class "#{name}:#{klass}", uri, &block        
-        end
-      }
-    end
-  end
-
-  # register_rdfa_properties generates helpers for properties of the namespace
-  # passed as arguments. Calling register_rdfa_properties('sioc',['author']) will
-  # generate the rdfa_sioc_author method. The namespace must be registered first
-  # using register_namespace
-  def Rdfa.register_rdfa_properties name, properties
-    properties.each do |property|
-      #puts "adding rdfa_#{name}_#{property.downcase}"
-      module_eval %{
-        def rdfa_#{name}_#{property.downcase} object, subject_uri=nil, &block
-          rdfa_triple "#{name}:#{property}", object, subject_uri, &block
-        end
-        def rdfa_link_to_#{name}_#{property.downcase}(name, options = {}, html_options = {}, *parameters_for_method_reference)
-          rdfa_link_to("#{name}:#{property}", name, options, html_options, *parameters_for_method_reference)
-        end
-      }
-    end
-  end
-end
-
-
 require 'rdfa/base'
-require 'rdfa/classes'
-require 'rdfa/properties'
-require 'rdfa/partials'
-
-ActionView::Base.send :include, Rdfa
-ActionView::Base.send :include, Rdfa::Classes
-ActionView::Base.send :include, Rdfa::Properties
-ActionView::Base.send :include, Rdfa::Partials
-
-$rdfa_page_bnode = 0
-$rdfa_namespaces = {}
-
-Rdfa.register_rdfa_namespace :rdfs , 'http://www.w3.org/2000/01/rdf-schema#'
-Rdfa.register_rdfa_namespace :dc , 'http://purl.org/dc/elements/1.1/'
-Rdfa.register_rdfa_namespace :foaf , 'http://xmlns.com/foaf/0.1/'
-Rdfa.register_rdfa_namespace :sioc , 'http://rdfs.org/sioc/ns#'
-Rdfa.register_rdfa_namespace :scot , 'http://scot-project.org/scot/ns#'
-Rdfa.register_rdfa_namespace :cc , 'http://creativecommons.org/licenses/by/2.5/'
-
-
-# Rdfs classes and properties
-Rdfa.register_rdfa_classes :rdfs, ['Resource','Class','Literal','Container',
-  'ContainerMembershipProperty','Datatype']
-Rdfa.register_rdfa_properties :rdfs, ['subClassOf','subPropertyOf','comment',
-  'label','domain','range','seeAlso','isDefinedBy','member']
-
-# DC classes and Properties
-#Rdfa.register_rdfa_classes :dc, ['Forum']
-Rdfa.register_rdfa_properties :dc, ['title','creator','subject','description','publisher','contributor','date','type','format',
-'identifier','source','language','relation','coverage','rights']
-
-# Sioc classes and Properties
-Rdfa.register_rdfa_classes :sioc, ['Community','Container','Forum','Item',
-  'Post','Role','Space','Site','Thread','User','Usergroup']
-Rdfa.register_rdfa_properties :sioc, ['account_of','administrator_of','attachment',
-  'avatar','container_of','content','creator_of','email','email_sha1','feed',
-  'function_of','has_administrator','has_container','has_creator','has_function',
-  'has_host','has_member','has_moderator','has_modifier','has_owner','has_parent',
-  'has_reply','has_scope','has_space','has_subscriber','has_usergroup','host_of','id',
-  'ip_address','link','links_to','member_of','moderator_of','modifier_of','name',
-  'next_by_date','next_version','note','num_replies','num_views','owner_of','parent_of',
-  'previous_by_date','previous_version','related_to','reply_of','scope_of','sibling',
-  'space_of','subscriber_of','topic','usergroup_of']
-
-# SCOT classes and Properties
-Rdfa.register_rdfa_classes :scot, ["Tag", "Tagcloud", "Cooccurrence", "AFrequency", "RFrequency"]
-Rdfa.register_rdfa_properties :scot, ["hasTag", "hasSCOT", "composedOf", "hasLink", 
-  "hasUsergroup", "lastUsedDate", "locatedIn", "name", "frequency", "ownAFrequency", 
-  "ownRFrequency", "cooccurAFrequency", "cooccurRFrequency", "totalTagFrequency", 
-  "totalPosts", "totalTag", "cooccurTag", "cooccurWith", "equivalentTag", "acronym", 
-  "plural", "singular", "synonym", "delimited", "hyphenated", "underscored", "slashed", 
-  "spaced"]
-
-# Foaf classes and Properties
-Rdfa.register_rdfa_classes :foaf, ['Person','Document','Organization','Group','Agent',
-  'Project','Image','PersonalProfileDocument','OnlineAccount','OnlineGamingAccount',
-  'OnlineEcommerceAccount','OnlineChatAccount']
-Rdfa.register_rdfa_properties :foaf, ["mbox", "mbox_sha1sum", "gender", "geekcode", 
-  "dnaChecksum", "sha1", "based_near", "title", "nick", "jabberID", "aimChatID", 
-  "icqChatID", "yahooChatID", "msnChatID", "name", "firstName", "givenname", "surname", 
-  "family_name", "phone", "homepage", "weblog", "tipjar", "plan", "made", "maker", "img", 
-  "depiction", "depicts", "thumbnail", "myersBriggs", "workplaceHomepage", 
-  "workInfoHomepage", "schoolHomepage", "knows", "interest", "topic_interest", 
-  "publications", "currentProject", "pastProject", "fundedBy", "logo", "topic", 
-  "primaryTopic", "isPrimaryTopicOf", "page", "theme", "holdsAccount", 
-  "accountServiceHomepage", "accountName", "member", "membershipClass", "birthday"]
-
+require 'rdfa/supported_vocabularies'
+require 'rdfa/shortcuts'
+
+Rdfa.register_vocabularies
+Rdfa.register_shortcuts
+
+# add the methods to action view if available
+if defined? ActionView
+  ActionView::Base.send :include, Rdfa
+  #ActionView::Base.send :include, Rdfa::Classes
+  #ActionView::Base.send :include, Rdfa::Properties
+  #ActionView::Base.send :include, Rdfa::Partials
+end

data/lib/rdfa/base.rb

@@ -1,13 +1,83 @@
 module Rdfa
-  def rdfa_class klass, subject_uri, &block
-    if not subject_uri
-      $rdfa_page_bnode = $rdfa_page_bnode + 1
-      subject_uri = "#BNode#{$rdfa_page_bnode}"
+  
+  def Rdfa.namespaces
+    return @namespaces
+  end
+  
+  def Rdfa.register_rdfa_namespace name, namespace
+    @namespaces = {} unless defined? @namespaces
+    @namespaces = @namespaces.merge "xmlns:#{name}" => namespace
+  end
+
+  def Rdfa.method_for(namespace, att)
+    return "#{namespace}_#{att.to_s.downcase.gsub(/-/,'_')}"
+  end
+
+  # register_classes generates helpers for classes passed as arguments,
+  # calling register_classes('sioc', ['Forum','Community']) will generate
+  # the methods rdfa_sioc_forum and rdfa_sioc_community. The namespace must
+  # be registered first using register_namespace
+  def Rdfa.register_rdfa_classes name, classes
+    classes.each do |klass|
+      #puts "adding rdfa_#{name}_#{klass.downcase}"
+      module_eval %{
+        def rdfa_#{method_for(name,klass)} uri=nil, &block
+          rdfa_class "#{name}:#{klass}", uri, &block        
+        end
+      }
+    end
+  end
+
+  # register_rdfa_properties generates helpers for properties of the namespace
+  # passed as arguments. Calling register_rdfa_properties('sioc',['author']) will
+  # generate the rdfa_sioc_author method. The namespace must be registered first
+  # using register_namespace
+  def Rdfa.register_rdfa_properties name, properties
+    properties.each do |property|
+      #puts "adding rdfa_#{name}_#{property.downcase}"
+      module_eval %{
+        def rdfa_#{method_for(name,property)} object=nil, subject_uri=nil, &block
+          rdfa_triple "#{name}:#{property}", object, subject_uri, &block
+        end
+        def rdfa_link_to_#{method_for(name,property)}(name, options = {}, html_options = {}, *parameters_for_method_reference)
+          rdfa_link_to("#{name}:#{property}", name, options, html_options, *parameters_for_method_reference)
+        end
+      }
+    end
+  end
+  
+  def Rdfa.register_shortcuts
+    (Rdfa::SHORTCUTS[:classes].merge Rdfa::SHORTCUTS[:properties]).each do |name, map|
+      module_eval "alias rdfa_#{name} rdfa_#{method_for(map[0],map[1])}"
+    end
+    Rdfa::SHORTCUTS[:properties].each do |name, map|
+      module_eval "alias rdfa_link_to_#{name} rdfa_link_to_#{method_for(map[0],map[1])}"
+    end
+  end
+  
+  def Rdfa.register_vocabulary voc
+    Rdfa.register_rdfa_namespace voc[:name], voc[:namespace]
+    Rdfa.register_rdfa_classes voc[:name], voc[:classes].keys
+    Rdfa.register_rdfa_properties voc[:name], voc[:properties].keys
+  end
+  
+  def Rdfa.register_vocabularies
+    Rdfa::VOCABULARIES.each {|voc| Rdfa.register_vocabulary voc}
+  end
+  
+  #following methods are tested
+  
+  def rdfa_class klass, subject_uri=nil, &block
+    rel = nil
+    rel = "rdf:li" unless subject_uri
+    if block_given?
+      rdfa_write_block :span, {:class => klass, :about => subject_uri, :rel => rel} , &block 
+    else
+      rdfa_write :span, '', {:class => klass, :about => subject_uri, :rel => rel}     
     end
-    rdfa_write_block :span, {:class => klass, :about => subject_uri} , &block if block_given?
   end
 
-  def rdfa_triple predicate, object, subject_uri=nil, &block
+  def rdfa_triple predicate, object=nil, subject_uri=nil, &block
     if block_given?
       rdfa_write_block :span, {:property => predicate, :content => object, :about => subject_uri}, &block 
     else
@@ -29,8 +99,7 @@ module Rdfa
   end
 
   def rdfa_html
-    $rdfa_page_bnode = 0
-    tag(:html, options = ($rdfa_namespaces.merge :xmlns =>"http://www.w3.org/1999/xhtml") ,true)
+    tag(:html, options = (Rdfa.namespaces.merge :xmlns =>"http://www.w3.org/1999/xhtml") ,true)
   end
 
 end

data/lib/rdfa/shortcuts.rb

@@ -0,0 +1,38 @@
+module Rdfa
+  SHORTCUTS = {
+    :classes => {
+      :resource     => [:rdfs , :resource],
+      :list         => [:rdf , :list],
+      :event        => [:dctypes , :event],
+      :community    => [:sioc , :community],
+      :post         => [:sioc , :post],
+      :forum        => [:sioc , :forum],
+      :person       => [:foaf , :person],
+      :project      => [:doap , :project],
+    },
+    :properties => {
+      :seealso      => [:rdfs , :seealso],
+      :label        => [:rdfs , :label],    
+      :comment      => [:rdfs , :comment],          
+      :creator      => [:dcel , :creator],    
+      :title        => [:dcel , :title],    
+      :language     => [:dcel , :language],    
+      :date         => [:dcel , :date],    
+      :description  => [:dcel , :description],    
+      :source       => [:dcel , :source],
+      :license      => [:dcterms , :license],
+      :abstract     => [:dcterms , :abstract],
+      :created      => [:dcterms , :created],
+      :abstract     => [:dcterms , :abstract],
+      :content      => [:sioc , :content],
+      :name         => [:foaf , :name],
+      :knows        => [:foaf , :knows],
+      :name         => [:foaf , :name],
+      :weblog       => [:foaf , :weblog],
+      :homepage     => [:foaf , :homepage],
+      :depiction    => [:foaf , :depiction],
+      :mbox         => [:foaf , :mbox],
+      :openid       => [:foaf , :openid],      
+    }
+  }
+end

data/lib/rdfa/supported_vocabularies.rb

@@ -0,0 +1,94 @@
+# Declaration of the lists of classes and properties for each supported vocabulary
+module Rdfa
+  # Vocabulary definition of rdfs
+  RDFS = {
+    :name => :rdfs,
+    :fullname => "Resource Description Framework Schema",
+    :description => "",
+    :url => "http://www.w3.org/TR/rdf-schema/",
+    :namespace => "http://www.w3.org/2000/01/rdf-schema#",
+    :classes => {"Container"=>"The class of RDF containers.", "Literal"=>"The class of literal values, eg. textual strings and integers.", "ContainerMembershipProperty"=>"The class of container membership properties, rdf:_1, rdf:_2, ...,                    all of which are sub-properties of 'member'.", "Class"=>"The class of classes.", "Resource"=>"The class resource, everything.", "Datatype"=>"The class of RDF datatypes."},
+    :properties => {"isDefinedBy"=>"The defininition of the subject resource.", "subPropertyOf"=>"The subject is a subproperty of a property.", "member"=>"A member of the subject resource.", "domain"=>"A domain of the subject property.", "range"=>"A range of the subject property.", "seeAlso"=>"Further information about the subject resource.", "subClassOf"=>"The subject is a subclass of a class.", "label"=>"A human-readable name for the subject.", "comment"=>"A description of the subject resource."}
+  }
+  # Vocabulary definition of rdf
+  RDF = {
+    :name => :rdf,
+    :fullname => "Resource Description Framework",
+    :description => "This is the RDF Schema for the RDF vocabulary defined in the RDF namespace.",
+    :url => "",
+    :namespace => "http://www.w3.org/1999/02/22-rdf-syntax-ns#",
+    :classes => {"Statement"=>"The class of RDF statements.", "List"=>"The class of RDF Lists.", "Bag"=>"The class of unordered containers.", "Alt"=>"The class of containers of alternatives.", "Seq"=>"The class of ordered containers.", "Property"=>"The class of RDF properties."},
+    :properties => {"predicate"=>"The predicate of the subject RDF statement.", "rest"=>"The rest of the subject RDF list after the first item.", "type"=>"The subject is an instance of a class.", "first"=>"The first item in the subject RDF list.", "subject"=>"The subject of the subject RDF statement.", "value"=>"Idiomatic property used for structured values.", "object"=>"The object of the subject RDF statement."}
+  }
+  # Vocabulary definition of dcel
+  DCEL = {
+    :name => :dcel,
+    :fullname => "Dublin Core Metadata Initiative Elements",
+    :description => "The Dublin Core Element Set v1.1 namespace provides URIs for the Dublin Core Elements v1.1. Entries are declared using RDF Schema language to support RDF applications.",
+    :url => "http://dublincore.org/",
+    :namespace => "http://purl.org/dc/elements/1.1/",
+    :classes => {},
+    :properties => {"coverage"=>"The spatial or temporal topic of the resource, the        spatial applicability of the resource, or the         jurisdiction under which the resource is relevant.", "format"=>"The file format, physical medium, or dimensions        of the resource.", "creator"=>"An entity primarily responsible for making         the resource.", "language"=>"A language of the resource.", "title"=>"A name given to the resource.", "date"=>"A point or period of time associated with an         event in the lifecycle of the resource.", "type"=>"The nature or genre of the resource.", "rights"=>"Information about rights held in and         over the resource.", "contributor"=>"An entity responsible for making        contributions to the resource.", "subject"=>"The topic of the resource.", "relation"=>"A related resource.", "publisher"=>"An entity responsible for making the resource         available.", "description"=>"An account of the resource.", "source"=>"The resource from which the described         resource is derived.", "identifier"=>"An unambiguous reference to the resource within        a given context."}
+  }
+  # Vocabulary definition of dcterms
+  DCTERMS = {
+    :name => :dcterms,
+    :fullname => "Dublin Core Metadata Initiative Terms",
+    :description => "The Dublin Core Terms namespace provides URIs for the Dublin Core Element Set Qualifier Vocabulary. Vocabulary terms are declared using RDF Schema language to support RDF applications. The Dublin Core qualifiers form a richer vocabulary, which is intended to facilitate discovery of resources. It will be updated according to dc-usage decisions.",
+    :url => "http://dublincore.org/",
+    :namespace => "http://purl.org/dc/terms/",
+    :classes => {"Box"=>"The DCMI Box identifies a region of space using its geographic limits.", "URI"=>"A URI Uniform Resource Identifier", "LCC"=>"Library of Congress Classification", "MESH"=>"Medical Subject Headings", "SpatialScheme"=>"A set of geographic place encoding schemes and/or formats", "DCMIType"=>"A list of types used to categorize the nature or genre of the content of the resource.", "DDC"=>"Dewey Decimal Classification", "NLM"=>"National Library of Medicine Classification", "W3CDTF"=>"W3C Encoding rules for dates and times - a profile based on ISO 8601", "SourceScheme"=>"A set of source encoding schemes and/or formats", "RFC3066"=>"Internet RFC 3066 'Tags for the Identification of Languages' specifies a primary subtag whichis a two-letter code taken from ISO 639 part1 or a three-letter code taken from ISO 639part 2, followed optionally by a two-lettercountry code taken from ISO 3166.  When alanguage in ISO 639 has both a two-letter andthree-letter code, use the two-letter code;when it has only a three-letter code, use thethree-letter code.  This RFC replaces RFC1766.", "Period"=>"A specification of the limits of a time interval.", "TGN"=>"The Getty Thesaurus of Geographic Names", "IMT"=>"The Internet media type of the resource.", "LCSH"=>"Library of Congress Subject Headings", "RelationScheme"=>"A set of resource relation encoding schemes and/or formats", "ISO639-2"=>"ISO 639-2: Codes for the representation of names of languages.", "FormatScheme"=>"A set of format encoding schemes.", "ISO3166"=>"ISO 3166 Codes for the representation of names of countries", "IdentifierScheme"=>"A set of resource identifier encoding schemes and/or formats", "TemporalScheme"=>"A set of encoding schemes for      the coverage qualifier \\", "LanguageScheme"=>"A set of language encoding schemes and/or formats.", "DateScheme"=>"A set of date encoding schemes and/or formats ", "Point"=>"The DCMI Point identifies a point in space using its geographic coordinates.", "UDC"=>"Universal Decimal Classification", "TypeScheme"=>"A set of resource type encoding schemes and/or formats", "RFC1766"=>"Internet RFC 1766 'Tags for the identification of Language' specifies a two letter code taken from ISO 639, followed optionally by a two letter country code taken from ISO 3166.", "SubjectScheme"=>"A set of subject encoding schemes and/or formats"},
+    :properties => {"isRequiredBy"=>"The described resource is required by the referenced resource, either physically or logically.", "accrualPolicy"=>"The policy governing the addition of items to a collection.", "license"=>"A legal document giving official permission to do something        with the resource.", "references"=>"The described resource references, cites, or otherwise points to the referenced resource.", "bibliographicCitation"=>"A bibliographic reference for the resource.        ", "isPartOf"=>"The described resource is a physical or logical part of the referenced resource.", "modified"=>"Date on which the resource was changed.", "available"=>"Date (often a range) that the resource will become or did become available.", "abstract"=>"A summary of the content of the resource.", "tableOfContents"=>"A list of subunits of the content of the resource.", "dateAccepted"=>"Date of acceptance of the resource (e.g. of thesisby university department, of article by journal, etc.).", "requires"=>"The described resource requires the referenced resource to support its function, delivery, or coherence of content.", "medium"=>"The material or physical carrier of the resource.", "extent"=>"The size or duration of the resource.", "accrualPeriodicity"=>"The frequency with which items are added to a collection.", "issued"=>"Date of formal issuance (e.g., publication) of the resource.", "provenance"=>"A statement of any changes in ownership and custody        of the resource since its creation that are        significant for its authenticity, integrity and        interpretation.        ", "dateSubmitted"=>"Date of submission of the resource (e.g. thesis, articles, etc.).", "dateCopyrighted"=>"Date of a statement of copyright.", "temporal"=>"Temporal characteristics of the intellectual content of the resource.", "hasFormat"=>"The described resource pre-existed the referenced resource, which is essentially the same intellectual content presented in another format.", "isFormatOf"=>"The described resource is the same intellectual content of the referenced resource, but presented in another format.", "hasPart"=>"The described resource includes the referenced resource either physically or logically.", "isReplacedBy"=>"The described resource is supplanted, displaced, or superseded by the referenced resource.", "valid"=>"Date (often a range) of validity of a resource.", "alternative"=>"Any form of the title used as a substitute or alternative to the formal title of the resource.", "rightsHolder"=>"A person or organization owning or managing rights over the resource.        ", "instructionalMethod"=>"A process, used to engender knowledge, attitudes and skills,                    that the resource is designed to support.", "mediator"=>"A class of entity that mediates access to theresource and for whom the resource is intended or useful.", "spatial"=>"Spatial characteristics of the intellectual content of the resource.", "conformsTo"=>"A reference to an established standard to which the resource conforms.", "isReferencedBy"=>"The described resource is referenced, cited, or otherwise pointed to by the referenced resource.", "hasVersion"=>"The described resource has a version, edition, or adaptation, namely, the referenced resource.", "created"=>"Date of creation of the resource.", "audience"=>"A class of entity for whom the resource is intended or useful.", "accrualMethod"=>"The method by which items are added to a collection.", "accessRights"=>"Information about who can access the        resource or an indication of its security status.        ", "replaces"=>"The described resource supplants, displaces, or supersedes the referenced resource.", "isVersionOf"=>"The described resource is a version, edition, or adaptation of the referenced resource. Changes in version imply substantive changes in content rather than differences in format.", "educationLevel"=>"A general statement describing the education or training context.  Alternatively, a more specific statement of the location of the audience in terms of its progression through an education or training context."}
+  }
+  # Vocabulary definition of dctypes
+  DCTYPES = {
+    :name => :dctypes,
+    :fullname => "Dublin Core Metadata Initiative Types",
+    :description => "The Dublin Core Types namespace provides URIs for the entries of the DCMI Type Vocabulary. Entries are declared using RDF Schema language to support RDF applications. The Schema will be updated according to dc-usage decisions.",
+    :url => "http://dublincore.org/",
+    :namespace => "http://purl.org/dc/dcmitype/",
+    :classes => {"MovingImage"=>"A series of visual representations imparting                 an impression of motion when shown in succession.", "Text"=>"A resource consisting primarily of words for reading.", "PhysicalObject"=>"An inanimate, three-dimensional object or substance.", "Sound"=>"A resource primarily intended to be heard.", "InteractiveResource"=>"A resource requiring interaction from the user to                 be understood, executed, or experienced.", "Image"=>"A visual representation other than text.", "Dataset"=>"Data encoded in a defined structure.", "Software"=>"A computer program in source or compiled form.", "StillImage"=>"A static visual representation.", "Event"=>"A non-persistent, time-based occurrence.", "Collection"=>"An aggregation of resources.", "Service"=>"A system that provides one or more functions."},
+    :properties => {}
+  }
+  # Vocabulary definition of sioc
+  SIOC = {
+    :name => :sioc,
+    :fullname => "Semantically Interlinked Online Communities",
+    :description => "SIOC (Semantically-Interlinked Online Communities) is an ontology for describing the information in online communities. This information can be used to export information from online communities and to link them together. The scope of the application areas that SIOC can be used for includes (and is not limited to) weblogs, message boards, mailing lists and chat channels.",
+    :url => "http://sioc-project.org/",
+    :namespace => "http://rdfs.org/sioc/ns#",
+    :classes => {"Role"=>"A Role is a function of a User within a scope of a particular Forum, Site, etc.", "Container"=>"An area in which content Items are contained.", "Usergroup"=>"A set of User accounts whose owners have a common purpose or interest. Can be used for access control purposes.", "Community"=>"Community is a high-level concept that defines an online community and what it consists of.", "Thread"=>"A container for a series of threaded discussion Posts or Items.", "User"=>"A User account in an online community site.", "Post"=>"An article or message that can be posted to a Forum.", "Forum"=>"A discussion area on which Posts or entries are made.", "Site"=>"A Site can be the location of an online community or set of communities, with Users and Usergroups creating Items in a set of Containers. It can be thought of as a web-accessible data Space.", "Item"=>"A content Item that can be posted to or created within a Container.", "Space"=>"A Space is a place where data resides, e.g., on a website, desktop, fileshare, etc."},
+    :properties => {"reference"=>"Links either created explicitly or extracted implicitly on the HTML level from the Post.", "name"=>"The name of a SIOC instance, e.g. a username for a User, group name for a Usergroup, etc.", "has_moderator"=>"A User who is a moderator of this Forum.", "has_creator"=>"This is the User who made this Item.", "next_version"=>"Links to the next revision of this Item or Post.", "has_space"=>"A data Space which this resource is a part of.", "has_administrator"=>"A User who is an administrator of this Site.", "feed"=>"A feed (e.g., RSS, Atom, etc.) pertaining to this resource (e.g., for a Forum, Site, User, etc.).", "usergroup_of"=>"A Space that the Usergroup has access to.", "title"=>"This is the title (subject line) of the Post. Note that for a Post within a threaded discussion that has no parents, it would detail the topic thread.", "sibling"=>"A Post may have a sibling or a twin that exists in a different Forum, but the siblings may differ in some small way (for example, language, category, etc.). The sibling of this Post should be self-describing (that is, it should contain all available information).", "modified_at"=>"When this was modified, in ISO 8601 format.", "has_part"=>"An resource that is a part of this subject.", "subscriber_of"=>"A Container that a User is subscribed to.", "owner_of"=>"A Container owned by a particular User, for example, a weblog or image gallery.", "host_of"=>"A Forum that is hosted on this Site.", "has_owner"=>"A User that this Container is owned by.", "attachment"=>"The URI of a file attached to a Post.", "topic"=>"A topic of interest, linking to the appropriate URI, e.g., in the Open Directory Project or of a SKOS category.", "related_to"=>"Related Posts for this Post, perhaps determined implicitly from topics or references.", "num_replies"=>"The number of replies that this Post has. Useful for when the reply structure is absent.", "has_usergroup"=>"Points to a Usergroup that has certain access to this Space.", "has_parent"=>"A Container or Forum that this Container or Forum is a child of.", "subject"=>"Keyword(s) describing subject of the Post.", "space_of"=>"A resource which belongs to this data Space.", "reply_of"=>"Links to an Item or Post which this Item or Post is a reply to.", "previous_version"=>"Links to a previous revision of this Item or Post.", "parent_of"=>"A child Container or Forum that this Container or Forum is a parent of.", "links_to"=>"Links extracted from hyperlinks within a SIOC concept, e.g., Post or Site.", "id"=>"An identifier of a SIOC concept instance. For example, a user ID. Must be unique for instances of each type of SIOC concept within the same site.", "scope_of"=>"A Role that has a scope of this Forum.", "has_subscriber"=>"A User who is subscribed to this Container.", "has_host"=>"The Site that hosts this Forum.", "has_container"=>"The Container to which this Item belongs.", "description"=>"The content of the Post.", "about"=>"Specifies that this Item is about a particular resource, e.g., a Post describing a book, hotel, etc.", "previous_by_date"=>"Previous Item or Post in a given Container sorted by date.", "part_of"=>"A resource that the subject is a part of.", "note"=>"A note associated with this Post, for example, if it has been edited by a User.", "has_function"=>"A Role that this User has.", "content"=>"The content of the Post in plain text format.", "avatar"=>"An image or depiction used to represent this User.", "link"=>"A URI of a document which contains this SIOC object.", "has_scope"=>"A Forum that this Role applies to.", "function_of"=>"A User who has this Role.", "first_name"=>"First (real) name of this User. Synonyms include given name or christian name.", "email_sha1"=>"An electronic mail address of the User, encoded using SHA1.", "content_encoded"=>"The encoded content of the Post, contained in CDATA areas.", "modifier_of"=>"An Item that this User has modified.", "last_name"=>"Last (real) name of this user. Synonyms include surname or family name.", "has_reply"=>"Points to an Item or Post that is a reply or response to this Item or Post.", "has_member"=>"A User who is a member of this Usergroup.", "administrator_of"=>"A Site that the User is an administrator of.", "account_of"=>"Refers to the foaf:Agent or foaf:Person who owns this sioc:User online account.", "num_views"=>"The number of times this Item, Thread, User profile, etc. has been viewed.", "next_by_date"=>"Next Item or Post in a given Container sorted by date.", "moderator_of"=>"A Forum that User is a moderator of.", "member_of"=>"A Usergroup that this User is a member of.", "ip_address"=>"The IP address used when creating this Item. This can be associated with a creator. Some wiki articles list the IP addresses for the creator or modifiers when the usernames are absent.", "has_modifier"=>"A User who modified this Item.", "email"=>"An electronic mail address of the User.", "creator_of"=>"An Item that the User is a creator of.", "created_at"=>"When this was created, in ISO 8601 format.", "container_of"=>"An Item that this Container contains."}
+  }
+  # Vocabulary definition of foaf
+  FOAF = {
+    :name => :foaf,
+    :fullname => "Friend Of A Friend",
+    :description => "The Friend of a Friend (FOAF) RDF vocabulary, described using W3C RDF Schema and the Web Ontology Language.",
+    :url => "http://www.foaf-project.org/",
+    :namespace => "http://xmlns.com/foaf/0.1/",
+    :classes => {"OnlineEcommerceAccount"=>"An online e-commerce account.", "OnlineGamingAccount"=>"An online gaming account.", "Organization"=>"An organization.", "Group"=>"A class of Agents.", "Person"=>"A person.", "OnlineAccount"=>"An online account.", "Image"=>"An image.", "Agent"=>"An agent (eg. person, group, software or physical artifact).", "OnlineChatAccount"=>"An online chat account.", "Project"=>"A project (a collective endeavour of some kind).", "PersonalProfileDocument"=>"A personal profile RDF document.", "Document"=>"A document."},
+    :properties => {"accountServiceHomepage"=>"Indicates a homepage of the service provide for this online account.", "pastProject"=>"A project this person has previously worked on.", "publications"=>"A link to the publications of this person.", "tipjar"=>"A tipjar document for this agent, describing means for payment and reward.", "name"=>"A name for some thing.", "knows"=>"A person known by this person (indicating some level of reciprocated interaction between the parties).", "thumbnail"=>"A derived thumbnail image.", "givenname"=>"The given name of some person.", "membershipClass"=>"Indicates the class of individuals that are a member of a Group", "accountName"=>"Indicates the name (identifier) associated with this online account.", "theme"=>"A theme.", "primaryTopic"=>"The primary topic of some page or document.", "myersBriggs"=>"A Myers Briggs (MBTI) personality classification.", "plan"=>"A .plan comment, in the tradition of finger and '.plan' files.", "aimChatID"=>"An AIM chat ID", "jabberID"=>"A jabber ID for something.", "title"=>"Title (Mr, Mrs, Ms, Dr. etc)", "based_near"=>"A location that something is based near, for some broadly human notion of near.", "isPrimaryTopicOf"=>"A document that this thing is the primary topic of.", "interest"=>"A page about a topic of interest to this person.", "img"=>"An image that can be used to represent some thing (ie. those depictions which are particularly representative of something, eg. one's photo on a homepage).", "made"=>"Something that was made by this agent.", "nick"=>"A short informal nickname characterising an agent (includes login identifiers, IRC and other chat nicknames).", "member"=>"Indicates a member of a Group", "topic"=>"A topic of some page or document.", "logo"=>"A logo representing some thing.", "currentProject"=>"A current project this person works on.", "workplaceHomepage"=>"A workplace homepage of some person; the homepage of an organization they work for.", "fundedBy"=>"An organization funding a project or person.", "weblog"=>"A weblog of some thing (whether person, group, company etc.).", "firstName"=>"The first name of a person.", "msnChatID"=>"An MSN chat ID", "sha1"=>"A sha1sum hash, in hex.", "gender"=>"The gender of this Agent (typically but not necessarily 'male' or 'female').", "mbox_sha1sum"=>"The sha1sum of the URI of an Internet mailbox associated with exactly one owner, the first owner of the mailbox.", "schoolHomepage"=>"A homepage of a school attended by the person.", "workInfoHomepage"=>"A work info homepage of some person; a page about their work for some organization.", "family_name"=>"The family_name of some person.", "geekcode"=>"A textual geekcode for this person, see http://www.geekcode.com/geek.html", "birthday"=>"The birthday of this Agent, represented in mm-dd string form, eg. '12-31'.", "holdsAccount"=>"Indicates an account held by this agent.", "depiction"=>"A depiction of some thing.", "homepage"=>"A homepage for some thing.", "phone"=>"A phone, specified using fully qualified tel: URI scheme (refs: http://www.w3.org/Addressing/schemes.html#tel).", "page"=>"A page or document about this thing.", "topic_interest"=>"A thing of interest to this person.", "depicts"=>"A thing depicted in this representation.", "maker"=>"An agent that made this thing.", "yahooChatID"=>"A Yahoo chat ID", "dnaChecksum"=>"A checksum for the DNA of some thing. Joke.", "mbox"=>"A personal mailbox, ie. an Internet mailbox associated with exactly one owner, the first owner of this mailbox. This is a 'static inverse functional property', in that there is (across time and change) at most one individual that ever has any particular value for foaf:mbox.", "openid"=>"An OpenID for an Agent.", "surname"=>"The surname of some person.", "icqChatID"=>"An ICQ chat ID"}
+  }
+  # Vocabulary definition of swrc
+  SWRC = {
+    :name => :swrc,
+    :fullname => "Semantic Web for Research Communities",
+    :description => "",
+    :url => "http://ontoware.org/projects/swrc",
+    :namespace => "http://swrc.ontoware.org/ontology#",
+    :classes => {"Workshop"=>"", "Booklet"=>"", "AdministrativeStaff"=>"", "Article"=>"", "FullProfessor"=>"", "SoftwareComponent"=>"", "Department"=>"", "Association"=>"", "Misc"=>"", "Enterprise"=>"", "ResearchProject"=>"", "Lecture"=>"", "DevelopmentProject"=>"", "Thesis"=>"", "Publication"=>"", "Organization"=>"", "Proceedings"=>"", "ResearchTopic"=>"", "Lecturer"=>"", "MasterThesis"=>"", "InCollection"=>"", "Institute"=>"", "Person"=>"", "University"=>"", "Graduate"=>"", "PhDStudent"=>"", "Exhibition"=>"", "Meeting"=>"", "Manager"=>"", "ProjectMeeting"=>"", "PhDThesis"=>"", "TechnicalReport"=>"", "ProjectReport"=>"", "TechnicalStaff"=>"", "Undergraduate"=>"", "AcademicStaff"=>"", "SoftwareProject"=>"", "Employee"=>"", "Project"=>"", "InBook"=>"", "InProceedings"=>"", "ResearchGroup"=>"", "Topic"=>"", "Event"=>"", "Product"=>"", "FacultyMember"=>"", "Book"=>"", "Report"=>"", "Student"=>"", "Unpublished"=>"", "Manual"=>"", "AssistantProfessor"=>"", "Conference"=>"", "AssociateProfessor"=>""},
+    :properties => {"howpublished"=>"", "eventTitle"=>"", "isWorkedOnBy"=>"", "studiesAt"=>"", "financedBy"=>"", "organization"=>"", "carriedOutBy"=>"", "member"=>"", "date"=>"", "title"=>"", "describesProject"=>"", "school"=>"", "chapter"=>"", "email"=>"", "affiliation"=>"", "supervisor"=>"", "edition"=>"", "phone"=>"", "cite"=>"", "RootRelation"=>"", "isAbout"=>"", "institution"=>"", "memberOfPC"=>"", "price"=>"", "dealtWithIn"=>"", "head"=>"", "hasParts"=>"", "organizerOrChairOf"=>"", "pages"=>"", "editor"=>"", "participant"=>"", "isbn"=>"", "technicalReport"=>"", "author"=>"", "develops"=>"", "month"=>"", "name"=>"", "homepage"=>"", "note"=>"", "product"=>"", "number"=>"", "Root"=>"", "cooperateWith"=>"", "student"=>"", "supervises"=>"", "headOf"=>"", "year"=>"", "series"=>"", "carriesOut"=>"", "developedBy"=>"", "photo"=>"", "journal"=>"", "source"=>"", "headOfGroup"=>"", "publication"=>"", "hasPrice"=>"", "address"=>"", "type"=>"", "fax"=>"", "abstract"=>"", "keywords"=>"", "volume"=>"", "booktitle"=>"", "atEvent"=>"", "publisher"=>"", "employs"=>"", "finances"=>"", "publishes"=>"", "hasPartEvent"=>"", "worksAtProject"=>"", "location"=>"", "givenBy"=>"", "projectInfo"=>"", "citedBy"=>""}
+  }
+  # Vocabulary definition of doap
+  DOAP = {
+    :name => :doap,
+    :fullname => "Description Of A Project",
+    :description => "The Description of a Project (DOAP) vocabulary, described using W3C RDF Schema and the Web Ontology Language.",
+    :url => "",
+    :namespace => "http://usefulinc.com/ns/doap#",
+    :classes => {"ArchRepository"=>"GNU Arch source code repository.", "BKRepository"=>"BitKeeper source code repository.", "Version"=>"Version information of a project release.", "CVSRepository"=>"CVS source code repository.", "Project"=>"A project.", "SVNRepository"=>"Subversion source code repository.", "Repository"=>"Source code repository."},
+    :properties => {"file-release"=>"URI of download associated with this release.", "name"=>"A name of something.", "module"=>"Module name of a CVS, BitKeeper or Arch repository.", "license"=>"The URI of an RDF description of the license the software is distributed under.", "category"=>"A category of project.", "tester"=>"A tester or other quality control contributor.", "maintainer"=>"Maintainer of a project, a project leader.", "bug-database"=>"Bug tracker for a project.", "download-page"=>"Web page from which the project software can be downloaded.", "anon-root"=>"Repository for anonymous access.", "repository"=>"Source code repository.", "os"=>"Operating system that a project is limited to.  Omit this property if the project is not OS-specific.", "mailing-list"=>"Mailing list home page or email address.", "programming-language"=>"Programming language a project is implemented in or intended for use with.", "revision"=>"Revision identifier of a software release.", "screenshots"=>"Web page with screenshots of project.", "description"=>"Plain text description of a project, of 2-4 sentences in length.", "shortdesc"=>"Short (8 or 9 words) plain text description of a project.", "helper"=>"Project contributor.", "release"=>"A project release.", "homepage"=>"URL of a project's homepage,associated with exactly one project.", "translator"=>"Contributor of translations to the project.", "documenter"=>"Contributor of documentation to the project.", "download-mirror"=>"Mirror of software download web page.", "created"=>"Date when something was created, in YYYY-MM-DD form. e.g. 2004-04-05", "wiki"=>"URL of Wiki for collaborative discussion of project.", "old-homepage"=>"URL of a project's past homepage,associated with exactly one project.", "developer"=>"Developer of software for the project.", "location"=>"Location of a repository.", "browse"=>"Web browser interface to repository."}
+  }
+	VOCABULARIES = [RDFS,RDF, DCEL, DCTERMS, DCTYPES, SIOC, FOAF, DOAP, SWRC]
+end

data/lib/rdfa/version.rb

@@ -2,7 +2,7 @@ module Rdfa #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 0
-    TINY  = 7
+    TINY  = 8
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/rdfa-typo/stylesheets/content.css

@@ -127,27 +127,25 @@
 	margin: 0 0 3em 0;
 }
 
-#content .article .title {
+#content .article h1 {
 	font-size: 24px;
 	line-height: 94%;
 	letter-spacing: -1.5px; 
 	margin: 0;
 }
 
-#content .article .title a:link,
-#content .article .title a:visited { 
+#content .article h1 a:link,
+#content .article h1 a:visited { 
 	color: #930;
 	text-decoration: none;
 }
 
-#content .article .title a:hover,
-#content .article .title a:active { 
+#content .article h1 a:hover,
+#content .article h1 a:active { 
 	color: #000;
 	background: transparent;
 }
 
-#content .article .title .comment_count { color: #eee; }
-
 #content .article .author {
 	color: #bbb;
 	font: normal 16px/14px "lucidamac bold", "lucida grande", arial, verdana, sans-serif;

data/rdfa-typo/views/articles/_article.rhtml

@@ -1,11 +1,8 @@
-<% rdfa_post article.permalink_url do %>
+<% require 'rdfa' %>
+
 <div class="article" id="article-<%= article.id %>">
-  <h2 class="title">
-	<% rdfa_title(article.title) do %>
-		<%= (controller.action_name.include? 'permalink') ? article.title : link_to(article.title, article.permalink_url) %>
-	<% end %>	
-    <%= content_tag(:span, article.published_comments.size, :class => 'comment_count') if article.published_comments.size > 0 %>
-  </h2>
+<% rdfa_post article.permalink_url do %>
+  <h1><%= rdfa_link_to_dcel_title(article.title,article.permalink_url) %></h1>
 
   <p class="author">
     Posted by <cite><%= rdfa_creator author_link(article) %></cite> the 
@@ -13,7 +10,7 @@
   </p>
 
   <div class="content">
-    <%= rdfa_post_content article.html(:body) %>
+    <%= rdfa_sioc_content article.html(:body) %>
 
     <% if article.extended? -%>
       <div class="extended">
@@ -31,7 +28,7 @@
  	<!-- content_tag(:li, tag_links(article), :class => 'tags') unless article.tags.empty? -->
 	<li class=tags>Tags
 	<% for tag in article.tags %>
-		<%= rdfa_link_to_tag tag.display_name, tag.permalink_url %>
+		<%= link_to tag.display_name, tag.permalink_url %>
 	<% end %>
 	<li>
     <li>Meta

data/test/test_helper.rb

@@ -1,2 +1,16 @@
+require 'rubygems'
+
+require 'action_controller'
+require 'action_view'
+
 require 'test/unit'
 require File.dirname(__FILE__) + '/../lib/rdfa'
+
+
+def render(code)
+  @renderer.render(:inline => code)
+end
+
+def assert_render(code,test)
+  assert_equal render(code), test
+end

data/test/test_rdfa.rb

@@ -1,11 +1,116 @@
 require File.dirname(__FILE__) + '/test_helper.rb'
 
+
 class TestRdfa < Test::Unit::TestCase
 
   def setup
+    @renderer = ActionView::Base.new("./")
   end
   
   def test_truth
     assert true
   end
+
+  def test_name
+    assert_render(%{<%= rdfa_name "cedric" %>},%{<span property="foaf:name">cedric</span>})
+  end
+
+  def test_rdfa_write
+    assert_render(%{<%= rdfa_write :tag, :content, :option => :option %>},%{<tag option="option">content</tag>})
+  end
+
+  def test_rdfa_write_block
+    assert_render(%{<% rdfa_write_block :tag, :option => :option do %>content<%end%>} , %{<tag option="option">content</tag>})
+  end
+
+  def test_rdfa_link_to
+    code = %{<%= rdfa_link_to 'dcel:title', "title", "http://uri.org" %>}
+    test = %{<a href="http://uri.org" rel="dcel:title">title</a>}
+    #puts render(code)
+    assert_render(code,test)
+  end
+
+  def test_rdfa_triple
+    # rdfa_triple predicate, object=nil, subject_uri=nil, &block
+    code = %{<%= rdfa_triple 'dcel:title' %>}
+    test = %{<span property="dcel:title"></span>}
+    #puts render(code)
+    assert_render(code,test)
+  end
+
+  def test_rdfa_triple_object
+    # rdfa_triple predicate, object=nil, subject_uri=nil, &block
+    code = %{<%= rdfa_triple 'dcel:title', "title" %>}
+    test = %{<span property="dcel:title">title</span>}
+    #puts render(code)
+    assert_render(code,test)
+  end
+
+  def test_rdfa_triple_object_subject
+    # rdfa_triple predicate, object=nil, subject_uri=nil, &block
+    code = %{<%= rdfa_triple 'dcel:title', "title", "http://uri.org" %>}
+    test = %{<span about="http://uri.org" property="dcel:title">title</span>}
+    #puts render(code)
+    assert_render(code,test)
+  end
+
+  def test_rdfa_triple_block
+    # rdfa_triple predicate, object=nil, subject_uri=nil, &block
+    code = %{<% rdfa_triple 'dcel:title' do %>content<%end%>}
+    test = %{<span property="dcel:title">content</span>}
+    #puts render(code)
+    assert_render(code,test)
+  end
+
+  def test_rdfa_triple_object_block
+    # rdfa_triple predicate, object=nil, subject_uri=nil, &block
+    code = %{<% rdfa_triple 'dcel:title', 'title' do %>content<%end%>}
+    test = %{<span content="title" property="dcel:title">content</span>}
+    #puts render(code)
+    assert_render(code,test)
+  end
+
+  def test_rdfa_triple_object_subject_block
+    # rdfa_triple predicate, object=nil, subject_uri=nil, &block
+    code = %{<% rdfa_triple 'dcel:title', 'title', "http://uri.org" do %>content<%end%>}
+    test = %{<span about="http://uri.org" content="title" property="dcel:title">content</span>}
+    #puts render(code)
+    assert_render(code,test)
+  end
+
+  def test_rdfa_class
+    #rdfa_class klass, subject_uri=nil, &block
+    code = %{<%= rdfa_class 'rdfs:Resource' %>}
+    test = %{<span class="rdfs:Resource" rel="rdf:li"></span>}
+    #puts render(code)
+    assert_render(code,test)  
+  end
+
+  def test_rdfa_class_subject
+    #rdfa_class klass, subject_uri=nil, &block
+    code = %{<%= rdfa_class 'rdfs:Resource', "http://uri.org" %>}
+    test = %{<span about="http://uri.org" class="rdfs:Resource"></span>}
+    #puts render(code)
+    assert_render(code,test)  
+  end
+
+  def test_rdfa_class_block
+    #rdfa_class klass, subject_uri=nil, &block
+    code = %{<% rdfa_class 'rdfs:Resource' do %>content<%end%>}
+    test = %{<span class="rdfs:Resource" rel="rdf:li">content</span>}
+    #puts render(code)
+    assert_render(code,test)  
+  end
+
+  def test_rdfa_class_subject_block
+    #rdfa_class klass, subject_uri=nil, &block
+    code = %{<% rdfa_class 'rdfs:Resource', "http://uri.org" do %>content<%end%>}
+    test = %{<span about="http://uri.org" class="rdfs:Resource">content</span>}
+    #puts render(code)
+    assert_render(code,test)  
+  end
+
+  def test_name
+    assert_render(%{<%= rdfa_name "cedric" %>},%{<span property="foaf:name">cedric</span>})
+  end
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: rdfa
 version: !ruby/object:Gem::Version 
-  version: 0.0.7
-date: 2007-06-03 00:00:00 +02:00
+  version: 0.0.8
+date: 2007-06-19 00:00:00 +02:00
 summary: description of gem
 require_paths: 
 - lib
@@ -31,10 +31,9 @@ authors:
 files: 
 - lib/rdfa.rb
 - lib/rdfa/version.rb
-- lib/rdfa/classes.rb
-- lib/rdfa/properties.rb
 - lib/rdfa/base.rb
-- lib/rdfa/partials.rb
+- lib/rdfa/supported_vocabularies.rb
+- lib/rdfa/shortcuts.rb
 - History.txt
 - Manifest.txt
 - README.txt
@@ -44,6 +43,8 @@ files:
 - test/test_helper.rb
 - test/test_rdfa.rb
 - bin/rdfa-typo
+- bin/rdfa-vocabulary
+- bin/rdfa-generate
 - rdfa-typo/CONTRIBUTORS
 - rdfa-typo/about.markdown
 - rdfa-typo/images
@@ -82,6 +83,8 @@ extra_rdoc_files:
 - README.txt
 executables: 
 - rdfa-typo
+- rdfa-vocabulary
+- rdfa-generate
 extensions: []
 
 requirements: []

data/lib/rdfa/classes.rb

@@ -1,20 +0,0 @@
-module Rdfa
-  module Classes
-    def rdfa_resource resource_url=nil, &block
-      rdfa_rdfs_resource resource_url, &block
-      #rdfa_class "rdfs:Resource", resource_url, &block
-    end
-
-    def rdfa_post post_url=nil, &block
-      rdfa_sioc_post post_url, &block
-    end
-
-    def rdfa_person person_url=nil, &block
-      rdfa_class("foaf:Person", person_url, &block)
-    end
-
-    def rdfa_tag tag_url=nil, &block
-      rdfa_class("scot:Tag", tag_url, &block)
-    end    
-  end
-end

data/lib/rdfa/partials.rb

@@ -1,15 +0,0 @@
-module Rdfa
-  module Partials
-def rdfa_link_to_tag term, tag_url, rdfa_options = {}
-  render(:inline => %{
-    <% rdfa_has_tag "#{tag_url}" do %>
-      <% rdfa_tag "#{tag_url}" do %>
-        <% rdfa_label("#{term}") do %>
-          <%= link_to("#{term}", "#{tag_url}") %>
-          <%end%>
-          <% end %>
-          <% end %>
-          })
-        end
-      end
-    end

data/lib/rdfa/properties.rb

@@ -1,51 +0,0 @@
-module Rdfa
-  module Properties
-    def rdfa_post_content content, subject_uri=nil, &block
-      rdfa_sioc_content content, subject_uri, &block
-    end
-
-    def rdfa_title title, subject_uri=nil, &block
-      rdfa_dc_title title, subject_uri, &block
-    end
-
-    def rdfa_creator creator, subject_uri=nil, &block
-      rdfa_dc_creator creator, subject_uri, &block
-    end
-
-    def rdfa_label label, subject_uri=nil, &block
-      rdfa_rdfs_label label, subject_uri, &block
-    end
-
-    def rdfa_description description, subject_uri=nil, &block
-      rdfa_rdfs_description description, subject_uri, &block
-    end
-
-    def rdfa_date date, subject_uri=nil, &block
-      rdfa_dc_date date, subject_uri, &block
-    end
-
-    def rdfa_name name, subject_uri=nil, &block
-      rdfa_foaf_name name, subject_uri, &block
-    end  
-
-    def rdfa_address address, subject_uri=nil, &block
-      rdfa_foaf_address address, subject_uri, &block
-    end  
-
-    def rdfa_email email, subject_uri=nil, &block
-      rdfa_foaf_mbox email, subject_uri, &block
-    end  
-
-    def rdfa_knows person_url, subject_uri=nil, &block
-      rdfa_foaf_knows person_url, subject_uri, &block
-    end  
-
-    def rdfa_has_tag tag_url, subject_uri=nil, &block
-      rdfa_scot_hastag tag_url, subject_uri, &block
-    end
-
-    def rdfa_license license_url, subject_uri=nil, &block
-      rdfa_triple "cc:license", license_url, subject_uri, &block
-    end
-  end
-end