rdf 0.2.2 → 0.2.3

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

@@ -0,0 +1,47 @@
+module RDF; class Literal
+  ##
+  # A token literal.
+  #
+  # @see   http://www.w3.org/TR/xmlschema-2/#token
+  # @since 0.2.3
+  class Token < Literal
+    DATATYPE = XSD.token
+    GRAMMAR  = /\A[^\x0D\x0A\x09]+\z/i.freeze # FIXME
+
+    ##
+    # @param  [Symbol, #to_s]  value
+    # @option options [String] :lexical (nil)
+    def initialize(value, options = {})
+      @datatype = RDF::URI(options[:datatype] || DATATYPE)
+      @string   = options[:lexical] if options.has_key?(:lexical)
+      @string   = value if !defined?(@string) && value.is_a?(String)
+      @object   = value.is_a?(Symbol) ? value : value.to_s
+    end
+
+    ##
+    # Converts the literal into its canonical lexical representation.
+    #
+    # @return [Literal]
+    # @see    http://www.w3.org/TR/xmlschema-2/#boolean
+    def canonicalize
+      @string = @object.to_s if @object
+      self
+    end
+
+    ##
+    # Returns the value as a symbol.
+    #
+    # @return [Symbol]
+    def to_sym
+      @object.to_sym
+    end
+
+    ##
+    # Returns the value as a string.
+    #
+    # @return [String]
+    def to_s
+      @string || @object.to_s
+    end
+  end # class Token
+end; end # class RDF::Literal

data/lib/rdf/model/statement.rb

@@ -246,7 +246,6 @@ module RDF
     #
     # @return [String]
     def to_s
-      require 'stringio' unless defined?(StringIO)
       StringIO.open do |buffer|
         buffer << case subject
           when RDF::Node    then subject.to_s

data/lib/rdf/query/pattern.rb

@@ -153,7 +153,6 @@ module RDF; class Query
     #
     # @return [String]
     def to_s
-      require 'stringio' unless defined?(StringIO)
       StringIO.open do |buffer| # FIXME in RDF::Statement
         buffer << (subject.is_a?(Variable)   ? subject.to_s :   "<#{subject}>") << ' '
         buffer << (predicate.is_a?(Variable) ? predicate.to_s : "<#{predicate}>") << ' '

data/lib/rdf/query/variable.rb

@@ -2,11 +2,15 @@ class RDF::Query
   ##
   # An RDF query variable.
   #
-  # @example Creating an unbound variable
+  # @example Creating a named unbound variable
   #   var = RDF::Query::Variable.new(:x)
   #   var.unbound?   #=> true
   #   var.value      #=> nil
   #
+  # @example Creating an anonymous unbound variable
+  #   var = RDF::Query::Variable.new
+  #   var.name       #=> :g2166151240
+  #
   # @example Unbound variables match any value
   #   var === 42     #=> true
   #
@@ -52,8 +56,9 @@ class RDF::Query
     ##
     # @param  [Symbol] name
     # @param  [Value]  value
-    def initialize(name, value = nil)
-      @name, @value = name.to_sym, value
+    def initialize(name = nil, value = nil)
+      @name  = (name || "g#{__id__.to_i.abs}").to_sym
+      @value = value
     end
 
     ##

data/lib/rdf/reader.rb

@@ -159,8 +159,22 @@ module RDF
     end
 
     ##
+    # Rewinds the input stream to the beginning of input.
+    #
+    # @return [void]
+    # @since  0.2.3
+    # @see    http://ruby-doc.org/core-1.9/classes/IO.html#M001692
+    def rewind
+      @input.rewind
+    end
+
+    ##
+    # Closes the input stream. An `IOError` is raised for further read
+    # attempts.
+    #
     # @return [void]
     # @since  0.2.2
+    # @see    http://ruby-doc.org/core-1.9/classes/IO.html#M001699
     def close
       @input.close unless @input.closed?
     end

data/lib/rdf/util/cache.rb

@@ -73,7 +73,7 @@ module RDF; module Util
       # @return [Object]
       def [](key)
         if value_id = @cache[key]
-          value = ObjectSpace._id2ref(value_id)
+          value = ObjectSpace._id2ref(value_id) rescue nil
         end
       end
 
@@ -110,7 +110,7 @@ module RDF; module Util
       # @return [Object]
       def [](key)
         if (ref = @cache[key]) && ref.weakref_alive?
-          value = ref.__getobj__
+          value = ref.__getobj__ rescue nil
         end
       end
 

data/lib/rdf/version.rb

@@ -2,7 +2,7 @@ module RDF
   module VERSION
     MAJOR = 0
     MINOR = 2
-    TINY  = 2
+    TINY  = 3
     EXTRA = nil
 
     STRING = [MAJOR, MINOR, TINY, EXTRA].compact.join('.')

data/lib/rdf/writer.rb

@@ -33,6 +33,7 @@ module RDF
   # @see RDF::Format
   # @see RDF::Reader
   class Writer
+    extend RDF::Util::Aliasing::LateBound
     extend  ::Enumerable
     include RDF::Writable
 
@@ -125,8 +126,6 @@ module RDF
     # @yieldparam [Writer] writer
     # @return [String]
     def self.buffer(*args, &block)
-      require 'stringio' unless defined?(StringIO)
-
       StringIO.open do |buffer|
         self.new(buffer, *args) { |writer| block.call(writer) }
         buffer.string
@@ -270,7 +269,8 @@ module RDF
     # @return [String]
     def format_value(value, options = {})
       case value
-        when String       then format_literal(value, options) # FIXME
+        when String       then format_literal(RDF::Literal.new(value, options), options)
+        when RDF::List    then format_list(value, options)
         when RDF::Literal then format_literal(value, options)
         when RDF::URI     then format_uri(value, options)
         when RDF::Node    then format_node(value, options)
@@ -279,23 +279,23 @@ module RDF
     end
 
     ##
-    # @param  [URI]                    value
+    # @param  [Node]                   value
     # @param  [Hash{Symbol => Object}] options
     # @return [String]
     # @raise  [NotImplementedError] unless implemented in subclass
     # @abstract
-    def format_uri(value, options = {})
-      raise NotImplementedError.new("#{self.class}#format_uri") # override in subclasses
+    def format_node(value, options = {})
+      raise NotImplementedError.new("#{self.class}#format_node") # override in subclasses
     end
 
     ##
-    # @param  [Node]                   value
+    # @param  [URI]                    value
     # @param  [Hash{Symbol => Object}] options
     # @return [String]
     # @raise  [NotImplementedError] unless implemented in subclass
     # @abstract
-    def format_node(value, options = {})
-      raise NotImplementedError.new("#{self.class}#format_node") # override in subclasses
+    def format_uri(value, options = {})
+      raise NotImplementedError.new("#{self.class}#format_uri") # override in subclasses
     end
 
     ##
@@ -308,6 +308,16 @@ module RDF
       raise NotImplementedError.new("#{self.class}#format_literal") # override in subclasses
     end
 
+    ##
+    # @param  [List] value
+    # @param  [Hash{Symbol => Object}] options
+    # @return [String]
+    # @abstract
+    # @since  0.2.3
+    def format_list(value, options = {})
+      format_value(value.subject, options)
+    end
+
   protected
 
     ##

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - Arto Bendiken
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-06 00:00:00 +02:00
+date: 2010-08-26 00:00:00 +02:00
 default_executable: rdf
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,9 +27,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 2
-        - 1
         - 2
-        version: 2.1.2
+        - 0
+        version: 2.2.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -70,8 +70,8 @@ dependencies:
         segments: 
         - 0
         - 2
-        - 2
-        version: 0.2.2
+        - 3
+        version: 0.2.3
   type: :development
   version_requirements: *id004
 description: RDF.rb is a pure-Ruby library for working with Resource Description Framework (RDF) data.
@@ -102,6 +102,7 @@ files:
 - lib/rdf/mixin/readable.rb
 - lib/rdf/mixin/writable.rb
 - lib/rdf/model/graph.rb
+- lib/rdf/model/list.rb
 - lib/rdf/model/literal/boolean.rb
 - lib/rdf/model/literal/date.rb
 - lib/rdf/model/literal/datetime.rb
@@ -109,6 +110,7 @@ files:
 - lib/rdf/model/literal/double.rb
 - lib/rdf/model/literal/integer.rb
 - lib/rdf/model/literal/time.rb
+- lib/rdf/model/literal/token.rb
 - lib/rdf/model/literal/xml.rb
 - lib/rdf/model/literal.rb
 - lib/rdf/model/node.rb