rdf 0.0.9 → 0.1.0

data/README

@@ -18,7 +18,7 @@ Examples
 
 ### Creating an RDF statement
 
-    s = RDF::URI.parse("http://gemcutter.org/gems/rdf")
+    s = RDF::URI.parse("http://rubygems.org/gems/rdf")
     p = RDF::DC.creator
     o = RDF::URI.parse("http://ar.to/#self")
     
@@ -55,7 +55,7 @@ Documentation
 
 * <http://rdf.rubyforge.org/>
 
-### RDF Objects
+### RDF Object Model
 
 * {RDF::Graph}
 * {RDF::Literal}
@@ -74,17 +74,20 @@ Documentation
 ### RDF Serialization Formats
 
 * {RDF::NTriples}
+* [RDF::JSON](http://rdf.rubyforge.org/json/) (plugin)
+* [RDF::Trix](http://rdf.rubyforge.org/trix/) (plugin)
 
 ### RDF Storage
 
 * {RDF::Repository}
+* [RDF::Sesame](http://rdf.rubyforge.org/sesame/) (plugin)
 
 ### RDF Querying
 
 * {RDF::Query}
-* {RDF::Query::Pattern}
-* {RDF::Query::Solution}
-* {RDF::Query::Variable}
+  * {RDF::Query::Pattern}
+  * {RDF::Query::Solution}
+  * {RDF::Query::Variable}
 
 ### RDF Vocabularies
 
@@ -112,7 +115,7 @@ Installation
 ------------
 
 The recommended installation method is via RubyGems. To install the latest
-official release from Gemcutter, do:
+official release from [RubyGems](http://rubygems.org/), do:
 
     % [sudo] gem install rdf
 
@@ -133,7 +136,7 @@ Resources
 
 * <http://rdf.rubyforge.org/>
 * <http://github.com/bendiken/rdf>
-* <http://gemcutter.org/gems/rdf>
+* <http://rubygems.org/gems/rdf>
 * <http://rubyforge.org/projects/rdf/>
 * <http://raa.ruby-lang.org/project/rdf/>
 * <http://www.ohloh.net/p/rdf>

data/VERSION

@@ -1 +1 @@
-0.0.9
+0.1.0

data/etc/doap.nt

@@ -1,24 +1,24 @@
 <http://ar.to/#self> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
-<http://ar.to/#self> <http://xmlns.com/foaf/0.1/made> <http://gemcutter.org/gems/rdf> .
+<http://ar.to/#self> <http://xmlns.com/foaf/0.1/made> <http://rubygems.org/gems/rdf> .
 <http://ar.to/#self> <http://xmlns.com/foaf/0.1/mbox> <mailto:arto.bendiken@gmail.com> .
 <http://ar.to/#self> <http://xmlns.com/foaf/0.1/name> "Arto Bendiken" .
 <http://bhuga.net/#ben> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
 <http://bhuga.net/#ben> <http://xmlns.com/foaf/0.1/mbox> <mailto:blavender@gmail.com> .
 <http://bhuga.net/#ben> <http://xmlns.com/foaf/0.1/name> "Ben Lavender" .
-<http://gemcutter.org/gems/rdf> <http://purl.org/dc/terms/creator> <http://ar.to/#self> .
-<http://gemcutter.org/gems/rdf> <http://usefulinc.com/ns/doap#blog> <http://ar.to/> .
-<http://gemcutter.org/gems/rdf> <http://usefulinc.com/ns/doap#bug-database> <http://github.com/bendiken/rdf/issues> .
-<http://gemcutter.org/gems/rdf> <http://usefulinc.com/ns/doap#created> "2007-10-23" .
-<http://gemcutter.org/gems/rdf> <http://usefulinc.com/ns/doap#description> "RDF.rb is a pure-Ruby library for working with Resource Description Framework (RDF) data."@en .
-<http://gemcutter.org/gems/rdf> <http://usefulinc.com/ns/doap#developer> <http://ar.to/#self> .
-<http://gemcutter.org/gems/rdf> <http://usefulinc.com/ns/doap#developer> <http://bhuga.net/#ben> .
-<http://gemcutter.org/gems/rdf> <http://usefulinc.com/ns/doap#documenter> <http://ar.to/#self> .
-<http://gemcutter.org/gems/rdf> <http://usefulinc.com/ns/doap#download-page> <http://rubyforge.org/projects/rdf/> .
-<http://gemcutter.org/gems/rdf> <http://usefulinc.com/ns/doap#homepage> <http://rdf.rubyforge.org/> .
-<http://gemcutter.org/gems/rdf> <http://usefulinc.com/ns/doap#license> <http://creativecommons.org/licenses/publicdomain/> .
-<http://gemcutter.org/gems/rdf> <http://usefulinc.com/ns/doap#maintainer> <http://ar.to/#self> .
-<http://gemcutter.org/gems/rdf> <http://usefulinc.com/ns/doap#name> "RDF.rb" .
-<http://gemcutter.org/gems/rdf> <http://usefulinc.com/ns/doap#platform> "Ruby" .
-<http://gemcutter.org/gems/rdf> <http://usefulinc.com/ns/doap#shortdesc> "A Ruby library for working with Resource Description Framework (RDF) data."@en .
-<http://gemcutter.org/gems/rdf> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://usefulinc.com/ns/doap#Project> .
-<http://gemcutter.org/gems/rdf> <http://xmlns.com/foaf/0.1/maker> <http://ar.to/#self> .
+<http://rubygems.org/gems/rdf> <http://purl.org/dc/terms/creator> <http://ar.to/#self> .
+<http://rubygems.org/gems/rdf> <http://usefulinc.com/ns/doap#blog> <http://ar.to/> .
+<http://rubygems.org/gems/rdf> <http://usefulinc.com/ns/doap#bug-database> <http://github.com/bendiken/rdf/issues> .
+<http://rubygems.org/gems/rdf> <http://usefulinc.com/ns/doap#created> "2007-10-23" .
+<http://rubygems.org/gems/rdf> <http://usefulinc.com/ns/doap#description> "RDF.rb is a pure-Ruby library for working with Resource Description Framework (RDF) data."@en .
+<http://rubygems.org/gems/rdf> <http://usefulinc.com/ns/doap#developer> <http://ar.to/#self> .
+<http://rubygems.org/gems/rdf> <http://usefulinc.com/ns/doap#developer> <http://bhuga.net/#ben> .
+<http://rubygems.org/gems/rdf> <http://usefulinc.com/ns/doap#documenter> <http://ar.to/#self> .
+<http://rubygems.org/gems/rdf> <http://usefulinc.com/ns/doap#download-page> <http://rubyforge.org/projects/rdf/> .
+<http://rubygems.org/gems/rdf> <http://usefulinc.com/ns/doap#homepage> <http://rdf.rubyforge.org/> .
+<http://rubygems.org/gems/rdf> <http://usefulinc.com/ns/doap#license> <http://creativecommons.org/licenses/publicdomain/> .
+<http://rubygems.org/gems/rdf> <http://usefulinc.com/ns/doap#maintainer> <http://ar.to/#self> .
+<http://rubygems.org/gems/rdf> <http://usefulinc.com/ns/doap#name> "RDF.rb" .
+<http://rubygems.org/gems/rdf> <http://usefulinc.com/ns/doap#platform> "Ruby" .
+<http://rubygems.org/gems/rdf> <http://usefulinc.com/ns/doap#shortdesc> "A Ruby library for working with Resource Description Framework (RDF) data."@en .
+<http://rubygems.org/gems/rdf> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://usefulinc.com/ns/doap#Project> .
+<http://rubygems.org/gems/rdf> <http://xmlns.com/foaf/0.1/maker> <http://ar.to/#self> .

data/lib/rdf.rb

@@ -39,6 +39,7 @@ module RDF
   autoload :Vocabulary, 'rdf/vocab'
   autoload :CC,         'rdf/vocab/cc'
   autoload :DC,         'rdf/vocab/dc'
+  autoload :DC11,       'rdf/vocab/dc11'
   autoload :DOAP,       'rdf/vocab/doap'
   autoload :EXIF,       'rdf/vocab/exif'
   autoload :FOAF,       'rdf/vocab/foaf'

data/lib/rdf/mixin/mutable.rb

@@ -1,7 +1,7 @@
 module RDF
   ##
   # Classes that include this module must implement the methods
-  # {#insert_statement}, {#delete_statement} and {#each_statement}.
+  # `#insert_statement`, `#delete_statement` and `#each_statement`.
   #
   # @see RDF::Graph
   # @see RDF::Repository

data/lib/rdf/model/graph.rb

@@ -3,21 +3,31 @@ module RDF
   # An RDF graph.
   class Graph < Resource
     include RDF::Enumerable
+    include RDF::Mutable
     include RDF::Queryable
 
-    # @return [URI]
-    attr_accessor :uri
+    ##
+    # @return [Resource]
+    attr_accessor :context
 
+    ##
     # @return [Array<Statement>]
     attr_accessor :data
 
     ##
-    # @param  [URI] uri
+    # @param  [Resource]               context
+    # @param  [Hash{Symbol => Object}] options
     # @yield  [graph]
     # @yieldparam [Graph]
-    def initialize(uri = nil, options = {}, &block)
-      @uri, @options = uri, options
-      @data = []
+    def initialize(context = nil, options = {}, &block)
+      @context = case context
+        when nil then nil
+        when RDF::Resource then context
+        else RDF::URI.new(context)
+      end
+
+      @data    = options.delete(:data) || []
+      @options = options
 
       if block_given?
         case block.arity
@@ -28,7 +38,7 @@ module RDF
     end
 
     ##
-    # Returns `true`.
+    # Returns `true` to indicate that this is a graph.
     #
     # @return [Boolean]
     def graph?
@@ -36,57 +46,121 @@ module RDF
     end
 
     ##
+    # Returns `true` if this is a named graph.
+    #
     # @return [Boolean]
-    def named?()   !unnamed? end
+    def named?
+      !unnamed?
+    end
 
     ##
+    # Returns `true` if this is a unnamed graph.
+    #
     # @return [Boolean]
-    def unnamed?() uri.nil? end
+    def unnamed?
+      context.nil?
+    end
 
     ##
-    # @return [Integer]
-    def size() @data.size end
+    # Returns all unique RDF contexts for this graph.
+    #
+    # @return [Array<Resource>]
+    def contexts
+      named? ? [context] : []
+    end
 
     ##
-    # @yield [statement]
-    # @yieldparam [Array<Statement>]
-    # @return [Graph]
-    def each(&block)
-      @data.each(&block)
+    # Returns the URI representation of this graph.
+    #
+    # @return [URI]
+    def to_uri
+      context
     end
 
     ##
-    # @return [Resource]
-    def context
-      uri
+    # Returns a string representation of this graph.
+    #
+    # @return [String]
+    def to_s
+      named? ? context.to_s : "<>"
     end
 
     ##
-    # @return [Array<Resource>]
-    def contexts
-      named? ? [uri] : []
+    # Returns `true` if this graph contains no RDF statements.
+    #
+    # @return [Boolean]
+    # @see    RDF::Enumerable#empty?
+    def empty?
+      @data.empty?
     end
 
     ##
-    # @param  [Statement, Array(Value)]
-    # @return [Graph]
-    def <<(statement)
-      @data << case statement
-        when Array     then Statement.new(*statement)
-        when Statement then statement
-        else statement
-      end
-      self
+    # Returns the number of RDF statements in this graph.
+    #
+    # @return [Integer]
+    # @see    RDF::Enumerable#count
+    def count
+      @data.size
     end
 
     ##
-    # @return [URI]
-    def to_uri() uri end
+    # Returns `true` if this graph contains the given RDF statement.
+    #
+    # @param  [Statement] statement
+    # @return [Boolean]
+    # @see    RDF::Enumerable#has_statement?
+    def has_statement?(statement)
+      statement = statement.dup
+      statement.context = context
+      @data.include?(statement)
+    end
 
     ##
-    # @return [String]
-    def to_s
-      named? ? uri.to_s : "<>"
+    # Enumerates each RDF statement in this graph.
+    #
+    # @yield  [statement]
+    # @yieldparam [Statement] statement
+    # @return [Enumerator]
+    # @see    RDF::Enumerable#each_statement
+    def each(&block)
+      @data.each(&block)
     end
+
+    ##
+    # Inserts the given RDF statement into the graph.
+    #
+    # @param  [RDF::Statement] statement
+    # @return [void]
+    # @see    RDF::Mutable#insert
+    def insert_statement(statement)
+      statement = statement.dup
+      statement.context = context
+      @data.push(statement.dup) unless @data.include?(statement)
+    end
+
+    ##
+    # Deletes the given RDF statement from the graph.
+    #
+    # @param  [RDF::Statement] statement
+    # @return [void]
+    # @see    RDF::Mutable#delete
+    def delete_statement(statement)
+      statement = statement.dup
+      statement.context = context
+      @data.delete(statement)
+    end
+
+    ##
+    # Deletes all RDF statements from this graph.
+    #
+    # @return [void]
+    # @see    RDF::Mutable#clear
+    def clear_statements
+      @data.clear
+    end
+
+    protected :insert_statement
+    protected :delete_statement
+    protected :clear_statements
   end
 end

data/lib/rdf/model/literal.rb

@@ -8,7 +8,7 @@ module RDF
   #
   # @example Creating a language-tagged literal (1)
   #   value = RDF::Literal.new("Hello!", :language => :en)
-  #   value.language?                                #=> true
+  #   value.has_language?                            #=> true
   #   value.language                                 #=> :en
   #
   # @example Creating a language-tagged literal (2)
@@ -18,12 +18,12 @@ module RDF
   #
   # @example Creating an explicitly datatyped literal
   #   value = RDF::Literal.new("2009-12-31", :datatype => RDF::XSD.date)
-  #   value.datatype?                                #=> true
+  #   value.has_datatype?                            #=> true
   #   value.datatype                                 #=> RDF::XSD.date
   #
   # @example Creating an implicitly datatyped literal
   #   value = RDF::Literal.new(Date.today)
-  #   value.datatype?                                #=> true
+  #   value.has_datatype?                            #=> true
   #   value.datatype                                 #=> RDF::XSD.date
   #
   # @example Creating implicitly datatyped literals
@@ -173,21 +173,24 @@ module RDF
     #
     # @return [Boolean]
     # @see http://www.w3.org/TR/rdf-concepts/#dfn-plain-literal
-    def language?
+    def has_language?
       !language.nil?
     end
 
+    alias_method :language?, :has_language?
+
     ##
     # Returns `true` if this is a datatyped literal.
     #
     # @return [Boolean]
     # @see http://www.w3.org/TR/rdf-concepts/#dfn-typed-literal
-    def datatype?
+    def has_datatype?
       !datatype.nil?
     end
 
-    alias_method :typed?,     :datatype?
-    alias_method :datatyped?, :datatype?
+    alias_method :datatype?,  :has_datatype?
+    alias_method :typed?,     :has_datatype?
+    alias_method :datatyped?, :has_datatype?
 
     ##
     # Returns a string representation of this literal.

data/lib/rdf/model/node.rb

@@ -1,21 +1,35 @@
 module RDF
   ##
-  # An RDF blank node, also known as an unlabeled node.
+  # An RDF blank node, also known as an anonymous or unlabeled node.
   #
   # @example Creating a blank node with an implicit identifier
   #   bnode = RDF::Node.new
   #
-  # @example Creating a blank node with an UUID identifier (1)
-  #   require 'uuid'
-  #   bnode = RDF::Node.new(UUID.generate)
+  # @example Creating a blank node with an UUID identifier
+  #   bnode = RDF::Node.uuid
+  #   bnode.to_s #=> "_:504c0a30-0d11-012d-3f50-001b63cac539"
   #
-  # @example Creating a blank node with an UUID identifier (2)
-  #   require 'uuidtools'
-  #   bnode = RDF::Node.new(UUIDTools::UUID.random_create)
-  #
-  # @see http://github.com/assaf/uuid
-  # @see http://uuidtools.rubyforge.org/
+  # @see http://rubygems.org/gems/uuid
+  # @see http://rubygems.org/gems/uuidtools
   class Node < Resource
+    ##
+    # Returns a blank node with a random UUID-based identifier.
+    #
+    # @return [RDF::Node]
+    def self.uuid
+      begin
+        require 'uuid'
+        self.new(UUID.generate)
+      rescue LoadError => e
+        begin
+          require 'uuidtools'
+          self.new(UUIDTools::UUID.random_create)
+        rescue LoadError => e
+          raise LoadError.new("no such file to load -- uuid or uuidtools")
+        end
+      end
+    end
+
     # @return [String]
     attr_accessor :id
 

data/lib/rdf/model/statement.rb

@@ -3,7 +3,7 @@ module RDF
   # An RDF statement.
   #
   # @example Creating an RDF statement
-  #   s = RDF::URI.new("http://gemcutter.org/gems/rdf")
+  #   s = RDF::URI.new("http://rubygems.org/gems/rdf")
   #   p = RDF::DC.creator
   #   o = RDF::URI.new("http://ar.to/#self")
   #   RDF::Statement.new(s, p, o)
@@ -13,7 +13,7 @@ module RDF
   #
   # @example Creating an RDF statement from a `Hash`
   #   RDF::Statement.new({
-  #     :subject   => RDF::URI.new("http://gemcutter.org/gems/rdf"),
+  #     :subject   => RDF::URI.new("http://rubygems.org/gems/rdf"),
   #     :predicate => RDF::DC.creator,
   #     :object    => RDF::URI.new("http://ar.to/#self"),
   #   })
@@ -62,7 +62,11 @@ module RDF
           @options   = options
           @subject   = subject
           @predicate = predicate
-          @object    = object
+          @object    = case object
+            when nil        then nil
+            when RDF::Value then object
+            else RDF::Literal.new(object)
+          end
       end
     end
 
@@ -206,13 +210,25 @@ module RDF
     end
 
     ##
+    # Returns a string representation of this statement.
+    #
     # @return [String]
     def to_s
       require 'stringio' unless defined?(StringIO)
       StringIO.open do |buffer|
-        buffer << "<#{subject}> "
-        buffer << "<#{predicate}> "
-        buffer << "<#{object}> ."
+        buffer << case subject
+          when RDF::Node    then subject.to_s
+          when RDF::URI     then "<#{subject}>"
+          else subject.inspect
+        end
+        buffer << " <#{predicate}> "
+        buffer << case object
+          when RDF::Literal then object.to_s
+          when RDF::Node    then object.to_s
+          when RDF::URI     then "<#{object}>"
+          else object.inspect
+        end
+        buffer << " ."
         buffer.string
       end
     end