rdf 0.3.3 → 0.3.4

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

@@ -14,9 +14,9 @@ module RDF; class Literal
     # @param  [Boolean] value
     # @option options [String] :lexical (nil)
     def initialize(value, options = {})
-      @datatype = RDF::URI(options[:datatype] || DATATYPE)
+      @datatype = RDF::URI(options[:datatype] || self.class.const_get(:DATATYPE))
       @string   = options[:lexical] if options.has_key?(:lexical)
-      @string   = value if !defined?(@string) && value.is_a?(String)
+      @string   ||= value if value.is_a?(String)
       @object   = case
         when true.equal?(value)  then true
         when false.equal?(value) then false
@@ -59,10 +59,20 @@ module RDF; class Literal
     # @return [Boolean] `true` or `false`
     # @since  0.3.0
     def ==(other)
-      (cmp = (self <=> other)) ? cmp.zero? : false
-    end
-    alias_method :===, :==
+      # If lexically invalid, use regular literal testing
+      return super unless self.valid?
+
+      other = Literal::Boolean.new(other) if other.class == TrueClass || other.class == FalseClass
 
+      case other
+      when Literal::Boolean
+        return super unless other.valid?
+        (cmp = (self <=> other)) ? cmp.zero? : false
+      else
+        super
+      end
+    end
+    
     ##
     # Returns the value as a string.
     #

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

@@ -7,19 +7,20 @@ module RDF; class Literal
   class Date < Literal
     DATATYPE = XSD.date
     GRAMMAR  = %r(\A-?\d{4}-\d{2}-\d{2}(([\+\-]\d{2}:\d{2})|UTC|Z)?\Z).freeze
+    FORMAT   = '%Y-%m-%d%Z'.freeze
 
     ##
     # @param  [Date] value
     # @option options [String] :lexical (nil)
     def initialize(value, options = {})
-      @datatype = RDF::URI(options[:datatype] || DATATYPE)
+      @datatype = RDF::URI(options[:datatype] || self.class.const_get(:DATATYPE))
       @string   = options[:lexical] if options.has_key?(:lexical)
-      @string   = value if !defined?(@string) && value.is_a?(String)
+      @string   ||= value if value.is_a?(String)
       @object   = case
         when value.is_a?(::Date)         then value
         when value.respond_to?(:to_date) then value.to_date # Ruby 1.9+
         else ::Date.parse(value.to_s)
-      end
+      end rescue nil
     end
 
     ##
@@ -28,7 +29,7 @@ module RDF; class Literal
     # @return [RDF::Literal] `self`
     # @see    http://www.w3.org/TR/xmlschema-2/#date
     def canonicalize!
-      @string = @object.strftime('%Y-%m-%d%Z').sub(/\+00:00|UTC/, 'Z')
+      @string = @object.strftime(FORMAT).sub(/\+00:00|UTC/, 'Z')
       self
     end
 
@@ -41,7 +42,7 @@ module RDF; class Literal
     # @return [Boolean]
     # @since  0.2.1
     def valid?
-      !!(value =~ GRAMMAR) && value !~ %r(\A0000)
+      super && value !~ %r(\A0000)
     end
 
     ##
@@ -49,7 +50,24 @@ module RDF; class Literal
     #
     # @return [String]
     def to_s
-      @string || @object.strftime('%Y-%m-%d%Z').sub(/\+00:00|UTC/, 'Z')
+      @string || @object.strftime(FORMAT).sub(/\+00:00|UTC/, 'Z')
+    end
+
+    ##
+    # Equal compares as Date objects
+    def ==(other)
+      # If lexically invalid, use regular literal testing
+      return super unless self.valid?
+
+      case other
+      when Literal::Date
+        return super unless other.valid?
+        self.object == other.object
+      when Literal::Time, Literal::DateTime
+        false
+      else
+        super
+      end
     end
   end # Date
 end; end # RDF::Literal

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

@@ -12,14 +12,14 @@ module RDF; class Literal
     # @param  [DateTime] value
     # @option options [String] :lexical (nil)
     def initialize(value, options = {})
-      @datatype = RDF::URI(options[:datatype] || DATATYPE)
+      @datatype = RDF::URI(options[:datatype] || self.class.const_get(:DATATYPE))
       @string   = options[:lexical] if options.has_key?(:lexical)
-      @string   = value if !defined?(@string) && value.is_a?(String)
+      @string   ||= value if value.is_a?(String)
       @object   = case
         when value.is_a?(::DateTime)         then value
         when value.respond_to?(:to_datetime) then value.to_datetime # Ruby 1.9+
         else ::DateTime.parse(value.to_s)
-      end
+      end rescue nil
     end
 
     ##
@@ -41,7 +41,7 @@ module RDF; class Literal
     # @return [Boolean]
     # @since  0.2.1
     def valid?
-      !!(value =~ GRAMMAR) && value !~ %r(\A0000)
+      super && value !~ %r(\A0000)
     end
 
     ##
@@ -51,5 +51,22 @@ module RDF; class Literal
     def to_s
       @string || @object.strftime('%Y-%m-%dT%H:%M:%S%Z').sub(/\+00:00|UTC/, 'Z')
     end
+
+    ##
+    # Equal compares as DateTime objects
+    def ==(other)
+      # If lexically invalid, use regular literal testing
+      return super unless self.valid?
+
+      case other
+      when Literal::DateTime
+        return super unless other.valid?
+        self.object == other.object
+      when Literal::Time, Literal::Date
+        false
+      else
+        super
+      end
+    end
   end # DateTime
 end; end # RDF::Literal

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

@@ -10,19 +10,17 @@ module RDF; class Literal
   #
   # @see   http://www.w3.org/TR/xmlschema-2/#decimal
   # @since 0.2.1
-  class Decimal < Literal
+  class Decimal < Numeric
     DATATYPE = XSD.decimal
     GRAMMAR  = /^[\+\-]?\d+(\.\d*)?$/.freeze
 
-    include RDF::Literal::Numeric
-
     ##
     # @param  [BigDecimal] value
     # @option options [String] :lexical (nil)
     def initialize(value, options = {})
-      @datatype = RDF::URI(options[:datatype] || DATATYPE)
+      @datatype = RDF::URI(options[:datatype] || self.class.const_get(:DATATYPE))
       @string   = options[:lexical] if options.has_key?(:lexical)
-      @string   = value if !defined?(@string) && value.is_a?(String)
+      @string   ||= value if value.is_a?(String)
       @object   = case
         when value.is_a?(BigDecimal) then value
         else BigDecimal(value.to_s)
@@ -49,33 +47,6 @@ module RDF; class Literal
       self
     end
 
-    ##
-    # Compares this literal to `other` for sorting purposes.
-    #
-    # @param  [Object] other
-    # @return [Integer] `-1`, `0`, or `1`
-    # @since  0.3.0
-    def <=>(other)
-      case other
-        when ::Numeric
-          to_d <=> other
-        when RDF::Literal::Decimal, RDF::Literal::Double
-          to_d <=> other.to_d
-        else super
-      end
-    end
-
-    ##
-    # Returns `true` if this literal is equivalent to `other`.
-    #
-    # @param  [Object] other
-    # @return [Boolean] `true` or `false`
-    # @since  0.3.0
-    def ==(other)
-      (cmp = (self <=> other)) ? cmp.zero? : false
-    end
-    alias_method :===, :==
-
     ##
     # Returns the absolute value of `self`.
     #
@@ -103,64 +74,6 @@ module RDF; class Literal
       to_d.nonzero? ? self : nil
     end
 
-    ##
-    # Returns `self`.
-    #
-    # @return [RDF::Literal]
-    # @since  0.2.3
-    def +@
-      self # unary plus
-    end
-
-    ##
-    # Returns `self` negated.
-    #
-    # @return [RDF::Literal]
-    # @since  0.2.3
-    def -@
-      RDF::Literal(-to_d) # unary minus
-    end
-
-    ##
-    # Returns the sum of `self` plus `other`.
-    #
-    # @param  [#to_d] other
-    # @return [RDF::Literal]
-    # @since  0.2.3
-    def +(other)
-      RDF::Literal(to_d + (other.respond_to?(:to_d) ? other.to_d : BigDecimal(other.to_s)))
-    end
-
-    ##
-    # Returns the difference of `self` minus `other`.
-    #
-    # @param  [#to_d] other
-    # @return [RDF::Literal]
-    # @since  0.2.3
-    def -(other)
-      RDF::Literal(to_d - (other.respond_to?(:to_d) ? other.to_d : BigDecimal(other.to_s)))
-    end
-
-    ##
-    # Returns the product of `self` times `other`.
-    #
-    # @param  [#to_d] other
-    # @return [RDF::Literal]
-    # @since  0.2.3
-    def *(other)
-      RDF::Literal(to_d * (other.respond_to?(:to_d) ? other.to_d : BigDecimal(other.to_s)))
-    end
-
-    ##
-    # Returns the quotient of `self` divided by `other`.
-    #
-    # @param  [#to_d] other
-    # @return [RDF::Literal]
-    # @since  0.2.3
-    def /(other)
-      RDF::Literal(to_d / (other.respond_to?(:to_d) ? other.to_d : BigDecimal(other.to_s)))
-    end
-
     ##
     # Returns the value as a string.
     #
@@ -169,43 +82,5 @@ module RDF; class Literal
     def to_s
       @string || @object.to_s('F')
     end
-
-    ##
-    # Returns the value as an integer.
-    #
-    # @return [Integer]
-    # @see    BigDecimal#to_i
-    def to_i
-      @object.to_i
-    end
-
-    ##
-    # Returns the value as a floating point number.
-    #
-    # The usual accuracy limits and errors of binary float arithmetic apply.
-    #
-    # @return [Float]
-    # @see    BigDecimal#to_f
-    def to_f
-      @object.to_f
-    end
-
-    ##
-    # Returns the value as a decimal number.
-    #
-    # @return [BigDecimal]
-    # @see    BigDecimal#to_d
-    def to_d
-      @object.respond_to?(:to_d) ? @object.to_d : BigDecimal(@object.to_s)
-    end
-
-    ##
-    # Returns the value as a rational number.
-    #
-    # @return [Rational]
-    # @see    BigDecimal#to_r
-    def to_r
-      @object.to_r # only available on Ruby 1.9+
-    end
   end # Decimal
 end; end # RDF::Literal

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

@@ -10,19 +10,17 @@ module RDF; class Literal
   #
   # @see   http://www.w3.org/TR/xmlschema-2/#double
   # @since 0.2.1
-  class Double < Literal
+  class Double < Numeric
     DATATYPE = XSD.double
-    GRAMMAR  = /^[\+\-]?\d+(\.\d*([eE][\+\-]?\d+)?)?$/.freeze # FIXME: support 'INF', '-INF' and 'NaN'
-
-    include RDF::Literal::Numeric
+    GRAMMAR  = /^NaN|(?:[\+\-]?(?:INF|(?:\d+(\.\d*)?([eE][\+\-]?\d+)?)))$/.freeze
 
     ##
     # @param  [Float, #to_f] value
     # @option options [String] :lexical (nil)
     def initialize(value, options = {})
-      @datatype = RDF::URI(options[:datatype] || DATATYPE)
+      @datatype = RDF::URI(options[:datatype] || self.class.const_get(:DATATYPE))
       @string   = options[:lexical] if options.has_key?(:lexical)
-      @string   = value if !defined?(@string) && value.is_a?(String)
+      @string   ||= value if value.is_a?(String)
       @object   = case
         when value.is_a?(::String) then case value
           when 'INF'  then 1/0.0
@@ -75,17 +73,6 @@ module RDF; class Literal
       end
     end
 
-    ##
-    # Returns `true` if this literal is equivalent to `other`.
-    #
-    # @param  [Object] other
-    # @return [Boolean] `true` or `false`
-    # @since  0.3.0
-    def ==(other)
-      (cmp = (self <=> other)) ? cmp.zero? : false
-    end
-    alias_method :===, :==
-
     ##
     # Returns `true` if the value is an invalid IEEE floating point number.
     #
@@ -187,64 +174,6 @@ module RDF; class Literal
       to_f.nonzero? ? self : nil
     end
 
-    ##
-    # Returns `self`.
-    #
-    # @return [RDF::Literal]
-    # @since  0.2.3
-    def +@
-      self # unary plus
-    end
-
-    ##
-    # Returns `self` negated.
-    #
-    # @return [RDF::Literal]
-    # @since  0.2.3
-    def -@
-      RDF::Literal(-to_f, :datatype => datatype) # unary minus
-    end
-
-    ##
-    # Returns the sum of `self` plus `other`.
-    #
-    # @param  [#to_f] other
-    # @return [RDF::Literal]
-    # @since  0.2.3
-    def +(other)
-      RDF::Literal(to_f + other.to_f)
-    end
-
-    ##
-    # Returns the difference of `self` minus `other`.
-    #
-    # @param  [#to_f] other
-    # @return [RDF::Literal]
-    # @since  0.2.3
-    def -(other)
-      RDF::Literal(to_f - other.to_f)
-    end
-
-    ##
-    # Returns the product of `self` times `other`.
-    #
-    # @param  [#to_f] other
-    # @return [RDF::Literal]
-    # @since  0.2.3
-    def *(other)
-      RDF::Literal(to_f * other.to_f)
-    end
-
-    ##
-    # Returns the quotient of `self` divided by `other`.
-    #
-    # @param  [#to_f] other
-    # @return [RDF::Literal]
-    # @since  0.2.3
-    def /(other)
-      RDF::Literal(to_f / other.to_f)
-    end
-
     ##
     # Returns the value as a string.
     #
@@ -256,37 +185,5 @@ module RDF; class Literal
         else @object.to_s
       end
     end
-
-    ##
-    # Returns the value as an integer.
-    #
-    # @return [Integer]
-    def to_i
-      @object.to_i
-    end
-
-    ##
-    # Returns the value as a floating point number.
-    #
-    # @return [Float]
-    def to_f
-      @object.to_f
-    end
-
-    ##
-    # Returns the value as a decimal number.
-    #
-    # @return [BigDecimal]
-    def to_d
-      @object.respond_to?(:to_d) ? @object.to_d : BigDecimal(@object.to_s)
-    end
-
-    ##
-    # Returns the value as a rational number.
-    #
-    # @return [Rational]
-    def to_r
-      @object.to_r # only available on Ruby 1.9+
-    end
   end # Double
 end; end # RDF::Literal