rdf 0.3.0.pre → 0.3.0

data/README

@@ -30,8 +30,9 @@ Features
 Examples
 --------
 
-    require 'rubygems'
     require 'rdf'
+    
+    include RDF
 
 ### Writing RDF data using the N-Triples format
 
@@ -53,10 +54,25 @@ Examples
       end
     end
 
-### Using pre-defined RDF vocabularies
+### Querying RDF data using basic graph patterns (BGPs)
 
-    include RDF
+    require 'rdf/ntriples'
     
+    graph = RDF::Graph.load("http://rdf.rubyforge.org/doap.nt")
+    query = RDF::Query.new({
+      :person => {
+        RDF.type  => FOAF.Person,
+        FOAF.name => :name,
+        FOAF.mbox => :email,
+      }
+    })
+    
+    query.execute(graph).each do |solution|
+      puts "name=#{solution.name} email=#{solution.email}"
+    end
+
+### Using pre-defined RDF vocabularies
+
     DC.title      #=> RDF::URI("http://purl.org/dc/terms/title")
     FOAF.knows    #=> RDF::URI("http://xmlns.com/foaf/0.1/knows")
     RDF.type      #=> RDF::URI("http://www.w3.org/1999/02/22-rdf-syntax-ns#type")
@@ -82,11 +98,12 @@ Documentation
 <http://blog.datagraph.org/2010/03/rdf-for-ruby>
 
 * {RDF::Value}
-  * {RDF::Literal}
-  * {RDF::Resource}
-    * {RDF::Node}
-    * {RDF::URI}
-    * {RDF::Graph}
+  * {RDF::Term}
+    * {RDF::Literal}
+    * {RDF::Resource}
+      * {RDF::Node}
+      * {RDF::URI}
+      * {RDF::Graph}
   * {RDF::Statement}
 
 ### RDF Serialization
@@ -100,10 +117,13 @@ Documentation
 ### RDF Serialization Formats
 
 * {RDF::NTriples}
-* [`RDF::JSON`](http://rdf.rubyforge.org/json/) (plugin)
-* [`RDF::Trix`](http://rdf.rubyforge.org/trix/) (plugin)
-* [`RDF::Raptor::RDFXML`](http://rdf.rubyforge.org/raptor/) (plugin)
-* [`RDF::Raptor::Turtle`](http://rdf.rubyforge.org/raptor/) (plugin)
+* [RDF::JSON](http://rdf.rubyforge.org/json/) (plugin)
+* [RDF::N3](http://rdf.rubyforge.org/n3/) (plugin)
+* [RDF::Raptor::RDFXML](http://rdf.rubyforge.org/raptor/) (plugin)
+* [RDF::Raptor::Turtle](http://rdf.rubyforge.org/raptor/) (plugin)
+* [RDF::RDFa](http://rdf.rubyforge.org/rdfa/) (plugin)
+* [RDF::RDFXML](http://rdf.rubyforge.org/rdfxml/) (plugin)
+* [RDF::Trix](http://rdf.rubyforge.org/trix/) (plugin)
 
 ### RDF Storage
 
@@ -117,8 +137,9 @@ Documentation
   * {RDF::Queryable}
   * {RDF::Mutable}
   * {RDF::Durable}
-* [`RDF::DataObjects`](http://rdf.rubyforge.org/do/) (plugin)
-* [`RDF::Sesame`](http://rdf.rubyforge.org/sesame/) (plugin)
+* {RDF::Transaction}
+* [RDF::DataObjects](http://rdf.rubyforge.org/do/) (plugin)
+* [RDF::Sesame](http://rdf.rubyforge.org/sesame/) (plugin)
 
 ### RDF Querying
 
@@ -172,8 +193,8 @@ To get a local working copy of the development repository, do:
 
     % git clone git://github.com/bendiken/rdf.git
 
-Alternatively, you can download the latest development version as a tarball
-as follows:
+Alternatively, download the latest development version as a tarball as
+follows:
 
     % wget http://github.com/bendiken/rdf/tarball/master
 
@@ -230,11 +251,11 @@ Contributing
 License
 -------
 
-RDF.rb is free and unencumbered public domain software. For more
-information, see <http://unlicense.org/> or the accompanying UNLICENSE file.
+This is free and unencumbered public domain software. For more information,
+see <http://unlicense.org/> or the accompanying {file:UNLICENSE} file.
 
 [RDF]:       http://www.w3.org/RDF/
 [YARD]:      http://yardoc.org/
-[YARD-GS]:   http://yardoc.org/docs/yard/file:docs/GettingStarted.md
+[YARD-GS]:   http://rubydoc.info/docs/yard/file/docs/GettingStarted.md
 [PDD]:       http://lists.w3.org/Archives/Public/public-rdf-ruby/2010May/0013.html
 [Backports]: http://rubygems.org/gems/backports

data/VERSION

@@ -1 +1 @@
-0.3.0.pre
+0.3.0

data/lib/rdf/mixin/enumerable.rb

@@ -37,11 +37,11 @@ module RDF
   #     puts [subject, predicate, object, context].inspect
   #   end
   #
-  # @example Enumerating all values
-  #   enumerable.each_subject   { |value| puts value.inspect }
-  #   enumerable.each_predicate { |value| puts value.inspect }
-  #   enumerable.each_object    { |value| puts value.inspect }
-  #   enumerable.each_context   { |value| puts value.inspect }
+  # @example Enumerating all terms
+  #   enumerable.each_subject   { |term| puts term.inspect }
+  #   enumerable.each_predicate { |term| puts term.inspect }
+  #   enumerable.each_object    { |term| puts term.inspect }
+  #   enumerable.each_context   { |term| puts term.inspect }
   #
   # @example Obtaining all statements
   #   enumerable.statements  #=> [RDF::Statement(subject1, predicate1, object1), ...]
@@ -58,8 +58,8 @@ module RDF
   # @see RDF::Repository
   module Enumerable
     extend  RDF::Util::Aliasing::LateBound
-    include RDF::Countable
     include ::Enumerable
+    include RDF::Countable # NOTE: must come after ::Enumerable
 
     ##
     # Returns all RDF statements.
@@ -123,7 +123,7 @@ module RDF
     # Returns all RDF triples.
     #
     # @param  [Hash{Symbol => Boolean}] options
-    # @return [Enumerator<Array(RDF::Resource, RDF::URI, RDF::Value)>]
+    # @return [Enumerator<Array(RDF::Resource, RDF::URI, RDF::Term)>]
     # @see    #each_triple
     # @see    #enum_triple
     def triples(options = {})
@@ -133,7 +133,7 @@ module RDF
     ##
     # Returns `true` if `self` contains the given RDF triple.
     #
-    # @param  [Array(RDF::Resource, RDF::URI, RDF::Value)] triple
+    # @param  [Array(RDF::Resource, RDF::URI, RDF::Term)] triple
     # @return [Boolean]
     def has_triple?(triple)
       enum_triple.include?(triple)
@@ -151,7 +151,7 @@ module RDF
     #     each triple
     #   @yieldparam  [RDF::Resource] subject
     #   @yieldparam  [RDF::URI]      predicate
-    #   @yieldparam  [RDF::Value]    object
+    #   @yieldparam  [RDF::Term]     object
     #   @yieldreturn [void] ignored
     #   @return [void]
     #
@@ -183,7 +183,7 @@ module RDF
     # Returns all RDF quads.
     #
     # @param  [Hash{Symbol => Boolean}] options
-    # @return [Enumerator<Array(RDF::Resource, RDF::URI, RDF::Value, RDF::Resource)>]
+    # @return [Enumerator<Array(RDF::Resource, RDF::URI, RDF::Term, RDF::Resource)>]
     # @see    #each_quad
     # @see    #enum_quad
     def quads(options = {})
@@ -193,7 +193,7 @@ module RDF
     ##
     # Returns `true` if `self` contains the given RDF quad.
     #
-    # @param  [Array(RDF::Resource, RDF::URI, RDF::Value, RDF::Resource)] quad
+    # @param  [Array(RDF::Resource, RDF::URI, RDF::Term, RDF::Resource)] quad
     # @return [Boolean]
     def has_quad?(quad)
       enum_quad.include?(quad)
@@ -211,7 +211,7 @@ module RDF
     #     each quad
     #   @yieldparam [RDF::Resource] subject
     #   @yieldparam [RDF::URI]      predicate
-    #   @yieldparam [RDF::Value]    object
+    #   @yieldparam [RDF::Term]     object
     #   @yieldparam [RDF::Resource] context
     #   @yieldreturn [void] ignored
     #   @return [void]
@@ -381,7 +381,7 @@ module RDF
     #
     # @param  [Hash{Symbol => Boolean}] options
     # @option options [Boolean] :unique (true)
-    # @return [Enumerator<RDF::Value>]
+    # @return [Enumerator<RDF::Term>]
     # @see    #each_object
     # @see    #enum_object
     def objects(options = {})
@@ -395,7 +395,7 @@ module RDF
     ##
     # Returns `true` if `self` contains the given RDF object term.
     #
-    # @param  [RDF::Value] value
+    # @param  [RDF::Term] value
     # @return [Boolean]
     def has_object?(value)
       enum_object.include?(value)
@@ -411,7 +411,7 @@ module RDF
     # @overload each_object
     #   @yield  [object]
     #     each object term
-    #   @yieldparam  [RDF::Value] object
+    #   @yieldparam  [RDF::Term] object
     #   @yieldreturn [void] ignored
     #   @return [void]
     #

data/lib/rdf/mixin/queryable.rb

@@ -20,9 +20,11 @@ module RDF
     #     queryable.query([nil, RDF::DOAP.developer, nil])
     #     queryable.query(:predicate => RDF::DOAP.developer)
     #
-    # @param  [Query, Statement, Array(Value), Hash] pattern
+    # @param  [RDF::Query, RDF::Statement, Array(RDF::Term), Hash] pattern
     # @yield  [statement]
-    # @yieldparam [RDF::Statement] statement
+    #   each matching statement
+    # @yieldparam  [RDF::Statement] statement
+    # @yieldreturn [void] ignored
     # @return [Enumerator]
     # @see    RDF::Queryable#query_pattern
     def query(pattern, &block)
@@ -32,26 +34,43 @@ module RDF
         # A basic graph pattern (BGP) query:
         when Query
           if block_given?
+            before_query(pattern) if respond_to?(:before_query)
             query_execute(pattern, &block)
-            return self
-          else
-            return enum_for(:query_execute, pattern)
+            after_query(pattern) if respond_to?(:after_query)
           end
+          enum_for(:query_execute, pattern)
 
-        # A simple triple pattern query:
+        # A simple triple/quad pattern query:
         else
           pattern = Query::Pattern.from(pattern)
-          if block_given?
-            query_pattern(pattern, &block)
-            return self
-          else
-            enum = enum_for(:query_pattern, pattern)
-            enum.extend(RDF::Queryable, RDF::Enumerable, RDF::Countable)
-            def enum.to_a
-              super.extend(RDF::Queryable, RDF::Enumerable, RDF::Countable)
-            end
-            return enum
+          before_query(pattern) if block_given? && respond_to?(:before_query)
+          enum = case
+            # Blank triple/quad patterns are equivalent to iterating over
+            # every statement, so as a minor optimization we'll just do that
+            # directly instead of bothering with `#query_pattern`:
+            when pattern.blank?
+              each(&block) if block_given?
+              enum_for(:each)
+
+            # Constant triple/quad patterns are equivalent to looking up a
+            # particular statement, so as a minor optimization we'll just do
+            # that directly instead of bothering with `#query_pattern`:
+            when pattern.constant?
+              statement = Statement.from(pattern)
+              block.call(statement) if block_given? && include?(statement)
+              enum_for(:query, pattern)
+
+            # Otherwise, we delegate to `#query_pattern`:
+            else # pattern.variable?
+              query_pattern(pattern, &block) if block_given?
+              enum_for(:query_pattern, pattern)
+          end
+          after_query(pattern) if block_given? && respond_to?(:after_query)
+          enum.extend(RDF::Queryable, RDF::Enumerable, RDF::Countable)
+          def enum.to_a
+            super.extend(RDF::Queryable, RDF::Enumerable, RDF::Countable)
           end
+          enum
       end
     end
 
@@ -77,7 +96,7 @@ module RDF
       # query execution by breaking down the query into its constituent
       # triple patterns and invoking `RDF::Query::Pattern#execute` on each
       # pattern.
-      query.execute(self, &block)
+      query.execute(self).each(&block)
     end
     protected :query_execute
 
@@ -117,7 +136,7 @@ module RDF
     #   @return [RDF::Statement]
     #
     # @overload first(pattern)
-    #   @param  [Query, Statement, Array(Value), Hash] pattern
+    #   @param  [RDF::Query, RDF::Statement, Array(RDF::Term), Hash] pattern
     #   @return [RDF::Statement]
     #
     # @return [RDF::Statement]
@@ -143,7 +162,7 @@ module RDF
     #   @return [RDF::Resource]
     #
     # @overload first_subject(pattern)
-    #   @param  [Query, Statement, Array(Value), Hash] pattern
+    #   @param  [RDF::Query, RDF::Statement, Array(RDF::Term), Hash] pattern
     #   @return [RDF::Resource]
     #
     # @return [RDF::Resource]
@@ -165,7 +184,7 @@ module RDF
     #   @return [RDF::URI]
     #
     # @overload first_predicate(pattern)
-    #   @param  [Query, Statement, Array(Value), Hash] pattern
+    #   @param  [RDF::Query, RDF::Statement, Array(RDF::Term), Hash] pattern
     #   @return [RDF::URI]
     #
     # @return [RDF::URI]
@@ -184,13 +203,13 @@ module RDF
     # Returns `nil` if no statements match `pattern`.
     #
     # @overload first_object
-    #   @return [RDF::Value]
+    #   @return [RDF::Term]
     #
     # @overload first_object(pattern)
-    #   @param  [Query, Statement, Array(Value), Hash] pattern
-    #   @return [RDF::Value]
+    #   @param  [RDF::Query, RDF::Statement, Array(RDF::Term), Hash] pattern
+    #   @return [RDF::Term]
     #
-    # @return [RDF::Value]
+    # @return [RDF::Term]
     # @since  0.1.9
     def first_object(pattern = nil)
       __send__(*(pattern ? [:query, pattern] : [:each])) do |statement|
@@ -210,7 +229,7 @@ module RDF
     #   @return [RDF::Literal]
     #
     # @overload first_literal(pattern)
-    #   @param  [Query, Statement, Array(Value), Hash] pattern
+    #   @param  [RDF::Query, RDF::Statement, Array(RDF::Term), Hash] pattern
     #   @return [RDF::Literal]
     #
     # @return [RDF::Literal]
@@ -233,7 +252,7 @@ module RDF
     #   @return [Object]
     #
     # @overload first_value(pattern)
-    #   @param  [Query, Statement, Array(Value), Hash] pattern
+    #   @param  [RDF::Query, RDF::Statement, Array(RDF::Term), Hash] pattern
     #   @return [Object]
     #
     # @return [Object]
@@ -241,5 +260,5 @@ module RDF
     def first_value(pattern = nil)
       (literal = first_literal(pattern)) ? literal.value : nil
     end
-  end
-end
+  end # Queryable
+end # RDF

data/lib/rdf/model/list.rb

@@ -23,7 +23,7 @@ module RDF
     #   RDF::List["foo", "bar"]
     #   RDF::List["a", 1, "b", 2, "c", 3]
     #
-    # @param  [Array<RDF::Value>] values
+    # @param  [Array<RDF::Term>] values
     # @return [RDF::List]
     def self.[](*values)
       self.new(nil, nil, values)
@@ -34,7 +34,7 @@ module RDF
     #
     # @param  [RDF::Resource]     subject
     # @param  [RDF::Graph]        graph
-    # @param  [Array<RDF::Value>] values
+    # @param  [Array<RDF::Term>] values
     # @yield  [list]
     # @yieldparam [RDF::List] list
     def initialize(subject = nil, graph = nil, values = nil, &block)
@@ -171,7 +171,7 @@ module RDF
     #   RDF::List[1, 2, 3][0]                   #=> 1
     #
     # @param  [Integer] index
-    # @return [RDF::Value]
+    # @return [RDF::Term]
     # @see    http://ruby-doc.org/core-1.9/classes/Array.html#M000417
     def [](index)
       at(index)
@@ -183,14 +183,14 @@ module RDF
     # @example
     #   RDF::List[] << 1 << 2 << 3              #=> RDF::List[1, 2, 3]
     #
-    # @param  [RDF::Value] value
+    # @param  [RDF::Term] value
     # @return [RDF::List]
     # @see    http://ruby-doc.org/core-1.9/classes/Array.html#M000424
     def <<(value)
       value = case value
-        when nil        then RDF.nil
-        when RDF::Value then value
-        when Array      then RDF::List.new(nil, graph, value)
+        when nil         then RDF.nil
+        when RDF::Value  then value
+        when Array       then RDF::List.new(nil, graph, value)
         else value
       end
 
@@ -260,7 +260,7 @@ module RDF
     #   RDF::List['a', 'b', 'c'].index('a')     #=> 0
     #   RDF::List['a', 'b', 'c'].index('d')     #=> nil
     #
-    # @param  [RDF::Value] value
+    # @param  [RDF::Term] value
     # @return [Integer]
     # @see    http://ruby-doc.org/core-1.9/classes/Array.html#M000436
     def index(value)
@@ -276,7 +276,7 @@ module RDF
     # @example
     #   RDF::List[1, 2, 3].at(0)                #=> 1
     #
-    # @return [RDF::Value]
+    # @return [RDF::Term]
     # @see    http://ruby-doc.org/core-1.9/classes/Array.html#M000462
     def slice(*args)
       case argc = args.size
@@ -311,7 +311,7 @@ module RDF
     #   RDF::List[1, 2, 3].fetch(4, nil)        #=> nil
     #   RDF::List[1, 2, 3].fetch(4) { |n| n*n } #=> 16
     #
-    # @return [RDF::Value]
+    # @return [RDF::Term]
     # @see    http://ruby-doc.org/core-1.9/classes/Array.html#M000420
     def fetch(index, default = UNSET, &block)
       each.with_index do |v, i|
@@ -331,7 +331,7 @@ module RDF
     # @example
     #   RDF::List[1, 2, 3].at(0)                #=> 1
     #
-    # @return [RDF::Value]
+    # @return [RDF::Term]
     # @see    http://ruby-doc.org/core-1.9/classes/Array.html#M000419
     def at(index)
       each.with_index do |v, i|
@@ -348,7 +348,7 @@ module RDF
     # @example
     #   RDF::List[*(1..10)].first               #=> 1
     #
-    # @return [RDF::Value]
+    # @return [RDF::Term]
     def first
       graph.first_object(:subject => first_subject, :predicate => RDF.first)
     end
@@ -359,7 +359,7 @@ module RDF
     # @example
     #   RDF::List[*(1..10)].second              #=> 2
     #
-    # @return [RDF::Value]
+    # @return [RDF::Term]
     def second
       at(1)
     end
@@ -370,7 +370,7 @@ module RDF
     # @example
     #   RDF::List[*(1..10)].third               #=> 3
     #
-    # @return [RDF::Value]
+    # @return [RDF::Term]
     def third
       at(2)
     end
@@ -381,7 +381,7 @@ module RDF
     # @example
     #   RDF::List[*(1..10)].fourth              #=> 4
     #
-    # @return [RDF::Value]
+    # @return [RDF::Term]
     def fourth
       at(3)
     end
@@ -392,7 +392,7 @@ module RDF
     # @example
     #   RDF::List[*(1..10)].fifth               #=> 5
     #
-    # @return [RDF::Value]
+    # @return [RDF::Term]
     def fifth
       at(4)
     end
@@ -403,7 +403,7 @@ module RDF
     # @example
     #   RDF::List[*(1..10)].sixth               #=> 6
     #
-    # @return [RDF::Value]
+    # @return [RDF::Term]
     def sixth
       at(5)
     end
@@ -414,7 +414,7 @@ module RDF
     # @example
     #   RDF::List[*(1..10)].seventh             #=> 7
     #
-    # @return [RDF::Value]
+    # @return [RDF::Term]
     def seventh
       at(6)
     end
@@ -425,7 +425,7 @@ module RDF
     # @example
     #   RDF::List[*(1..10)].eighth              #=> 8
     #
-    # @return [RDF::Value]
+    # @return [RDF::Term]
     def eighth
       at(7)
     end
@@ -436,7 +436,7 @@ module RDF
     # @example
     #   RDF::List[*(1..10)].ninth               #=> 9
     #
-    # @return [RDF::Value]
+    # @return [RDF::Term]
     def ninth
       at(8)
     end
@@ -447,7 +447,7 @@ module RDF
     # @example
     #   RDF::List[*(1..10)].tenth               #=> 10
     #
-    # @return [RDF::Value]
+    # @return [RDF::Term]
     def tenth
       at(9)
     end
@@ -458,7 +458,7 @@ module RDF
     # @example
     #   RDF::List[1, 2, 3].last                 #=> 3
     #
-    # @return [RDF::Value]
+    # @return [RDF::Term]
     # @see    http://ruby-doc.org/core-1.9/classes/Array.html#M000422
     def last
       graph.first_object(:subject => last_subject, :predicate => RDF.first)

data/lib/rdf/model/literal/boolean.rb

@@ -59,7 +59,7 @@ module RDF; class Literal
     # @return [Boolean] `true` or `false`
     # @since  0.3.0
     def ==(other)
-      (self <=> other).zero?
+      (cmp = (self <=> other)) ? cmp.zero? : false
     end
     alias_method :===, :==
 
@@ -95,5 +95,17 @@ module RDF; class Literal
     def false?
       @object.equal?(false)
     end
+
+    ##
+    # Returns a developer-friendly representation of `self`.
+    #
+    # @return [String]
+    def inspect
+      case
+        when self.equal?(RDF::Literal::TRUE)  then 'RDF::Literal::TRUE'
+        when self.equal?(RDF::Literal::FALSE) then 'RDF::Literal::FALSE'
+        else super
+      end
+    end
   end # Boolean
 end; end # RDF::Literal

data/lib/rdf/model/literal/decimal.rb

@@ -14,6 +14,8 @@ module RDF; class Literal
     DATATYPE = XSD.decimal
     GRAMMAR  = /^[\+\-]?\d+(\.\d*)?$/.freeze
 
+    include RDF::Literal::Numeric
+
     ##
     # @param  [BigDecimal] value
     # @option options [String] :lexical (nil)
@@ -43,6 +45,7 @@ module RDF; class Literal
         f = '0' if f.empty?         # ...but there must be a digit to the right of the decimal point
         "#{i}.#{f}"
       end
+      @object = BigDecimal(@string) unless @object.nil?
       self
     end
 
@@ -54,7 +57,7 @@ module RDF; class Literal
     # @since  0.3.0
     def <=>(other)
       case other
-        when Numeric
+        when ::Numeric
           to_d <=> other
         when RDF::Literal::Decimal, RDF::Literal::Double
           to_d <=> other.to_d
@@ -69,7 +72,7 @@ module RDF; class Literal
     # @return [Boolean] `true` or `false`
     # @since  0.3.0
     def ==(other)
-      (self <=> other).zero?
+      (cmp = (self <=> other)) ? cmp.zero? : false
     end
     alias_method :===, :==
 

data/lib/rdf/model/literal/double.rb

@@ -14,6 +14,8 @@ module RDF; class Literal
     DATATYPE = XSD.double
     GRAMMAR  = /^[\+\-]?\d+(\.\d*([eE][\+\-]?\d+)?)?$/.freeze # FIXME: support 'INF', '-INF' and 'NaN'
 
+    include RDF::Literal::Numeric
+
     ##
     # @param  [Float, #to_f] value
     # @option options [String] :lexical (nil)
@@ -22,10 +24,15 @@ module RDF; class Literal
       @string   = options[:lexical] if options.has_key?(:lexical)
       @string   = value if !defined?(@string) && value.is_a?(String)
       @object   = case
-        when value.is_a?(::String)    then Float(value) rescue nil
+        when value.is_a?(::String) then case value
+          when 'INF'  then 1/0.0
+          when '-INF' then -1/0.0
+          when 'NaN'  then 0/0.0
+          else Float(value) rescue nil
+        end
         when value.is_a?(::Float)     then value
         when value.respond_to?(:to_f) then value.to_f
-        else Float(value.to_s) rescue nil
+        else Float(value.to_s) rescue nil # FIXME
       end
     end
 
@@ -47,7 +54,8 @@ module RDF; class Literal
           f = '0' if f.empty?         # ...but there must be a digit to the right of the decimal point
           e.sub!(/^\+?0+(\d)$/, '\1') # remove the optional leading '+' sign and any extra leading zeroes
           "#{i}.#{f}E#{e}"
-      end unless @object.nil?
+      end
+      @object = Float(@string) unless @object.nil?
       self
     end
 
@@ -59,7 +67,7 @@ module RDF; class Literal
     # @since  0.3.0
     def <=>(other)
       case other
-        when Numeric
+        when ::Numeric
           to_d <=> other
         when RDF::Literal::Decimal, RDF::Literal::Double
           to_d <=> other.to_d
@@ -74,7 +82,7 @@ module RDF; class Literal
     # @return [Boolean] `true` or `false`
     # @since  0.3.0
     def ==(other)
-      (self <=> other).zero?
+      (cmp = (self <=> other)) ? cmp.zero? : false
     end
     alias_method :===, :==
 
@@ -194,7 +202,7 @@ module RDF; class Literal
     # @return [RDF::Literal]
     # @since  0.2.3
     def -@
-      RDF::Literal(-to_f) # unary minus
+      RDF::Literal(-to_f, :datatype => datatype) # unary minus
     end
 
     ##

data/lib/rdf/model/literal/integer.rb

@@ -14,6 +14,8 @@ module RDF; class Literal
     DATATYPE = XSD.integer
     GRAMMAR  = /^[\+\-]?\d+$/.freeze
 
+    include RDF::Literal::Numeric
+
     ##
     # @param  [Integer, #to_i] value
     # @option options [String] :lexical (nil)

data/lib/rdf/model/literal/numeric.rb

@@ -0,0 +1,9 @@
+module RDF; class Literal
+  ##
+  # Shared methods for numeric literal classes.
+  #
+  # @since 0.3.0
+  module Numeric
+    # TODO
+  end # Numeric
+end; end # RDF::Literal