rdf 1.1.0.p0 → 1.1.0.p1

data/lib/rdf/model/value.rb

@@ -103,7 +103,7 @@ module RDF
     end
 
     ##
-    # Returns `true` if `self` is a {RDF::Query::Variable}.
+    # Returns `true` this value is a {RDF::Query::Variable}, or is contains a variable.
     #
     # @return [Boolean]
     # @since  0.1.7
@@ -111,6 +111,15 @@ module RDF
       false
     end
 
+    ##
+    # Returns `true` if this value is constant.
+    #
+    # @return [Boolean] `true` or `false`
+    # @see    #variable?
+    def constant?
+      !(variable?)
+    end
+
     ##
     # Is this an anonymous value?
     #

data/lib/rdf/ntriples/format.rb

@@ -15,6 +15,7 @@ module RDF::NTriples
   #   RDF::Format.for(:content_type   => "text/plain")
   #
   # @see http://www.w3.org/TR/rdf-testcases/#ntriples
+  # @see http://www.w3.org/TR/n-triples/
   class Format < RDF::Format
     content_type     'application/n-triples', :extension => :nt, :alias => ['text/plain']
     content_encoding 'utf-8'

data/lib/rdf/ntriples/reader.rb

@@ -25,6 +25,7 @@ module RDF::NTriples
   #   end
   #
   # @see http://www.w3.org/TR/rdf-testcases/#ntriples
+  # @see http://www.w3.org/TR/n-triples/
   class Reader < RDF::Reader
     format RDF::NTriples::Format
 
@@ -239,6 +240,8 @@ module RDF::NTriples
         uri.canonicalize! if canonicalize?
         uri
       end
+    rescue ArgumentError => e
+      raise RDF::ReaderError, "invalid URI"
     end
 
     ##

data/lib/rdf/ntriples/writer.rb

@@ -35,6 +35,7 @@ module RDF::NTriples
   #   end
   #
   # @see http://www.w3.org/TR/rdf-testcases/#ntriples
+  # @see http://www.w3.org/TR/n-triples/
   class Writer < RDF::Writer
     format RDF::NTriples::Format
 
@@ -43,6 +44,10 @@ module RDF::NTriples
     ESCAPE_ASCII = /\A[\x00-\x7F]*\z/m.freeze
 
     ##
+    # Escape Literal and URI content. If encoding is ASCII, all unicode
+    # is escaped, otherwise only ASCII characters that must be escaped are
+    # escaped.
+    #
     # @param  [String] string
     # @param  [Encoding] encoding
     # @return [String]
@@ -53,7 +58,7 @@ module RDF::NTriples
           string
         when string.ascii_only?
           StringIO.open do |buffer|
-            string.each_byte { |u| buffer << escape_ascii(u) }
+            string.each_byte { |u| buffer << escape_ascii(u, encoding) }
             buffer.string
           end
         when encoding && encoding != Encoding::ASCII
@@ -62,7 +67,7 @@ module RDF::NTriples
             string.each_char do |u|
               buffer << case u.ord
               when (0x00..0x7F)
-                escape_ascii(u)
+                escape_ascii(u, encoding)
               else
                 u
               end
@@ -70,6 +75,7 @@ module RDF::NTriples
             buffer.string
           end
         else
+          # Encode ASCII && UTF-8 characters
           StringIO.open do |buffer|
             string.each_codepoint { |u| buffer << escape_unicode(u, encoding) }
             buffer.string
@@ -89,7 +95,7 @@ module RDF::NTriples
     def self.escape_unicode(u, encoding)
       case (u = u.ord)
         when (0x00..0x7F)        # ASCII 7-bit
-          escape_ascii(u)
+          escape_ascii(u, encoding)
         when (0x80..0xFFFF)      # Unicode BMP
           escape_utf16(u)
         when (0x10000..0x10FFFF) # Unicode
@@ -100,15 +106,22 @@ module RDF::NTriples
     end
 
     ##
+    # Standard ASCII escape sequences. If encoding is ASCII, use Test-Cases
+    # sequences, otherwise, assume the test-cases escape sequences. Otherwise,
+    # the N-Triples recommendation includes `\b` and `\f` escape sequences.
+    #
     # @param  [Integer, #ord] u
     # @return [String]
     # @see    http://www.w3.org/TR/rdf-testcases/#ntrip_strings
-    def self.escape_ascii(u)
+    # @see    http://www.w3.org/TR/n-triples/
+    def self.escape_ascii(u, encoding)
       case (u = u.ord)
-        when (0x00..0x08) then escape_utf16(u)
+        when (0x00..0x07) then escape_utf16(u)
+        when (0x08)       then (encoding && encoding == Encoding::ASCII ? escape_utf16(u) : "\\b")
         when (0x09)       then "\\t"
         when (0x0A)       then "\\n"
-        when (0x0B..0x0C) then escape_utf16(u)
+        when (0x0B)       then escape_utf16(u)
+        when (0x0C)       then (encoding && encoding == Encoding::ASCII ? escape_utf16(u) : "\\f")
         when (0x0D)       then "\\r"
         when (0x0E..0x1F) then escape_utf16(u)
         when (0x22)       then "\\\""

data/lib/rdf/query/pattern.rb

@@ -67,29 +67,6 @@ module RDF; class Query
       subject.nil? && predicate.nil? && object.nil? && context.nil?
     end
 
-    ##
-    # Returns `true` if this is a constant pattern, with all terms being
-    # either URIs, blank nodes, or literals.
-    #
-    # A constant pattern is structurally and functionally equivalent to an
-    # RDF statement.
-    #
-    # @return [Boolean] `true` or `false`
-    # @since  0.3.0
-    def constant?
-      !(variable?)
-    end
-
-    ##
-    # Returns `true` if this is a variable pattern, with any term being
-    # `nil` or a variable.
-    #
-    # @return [Boolean] `true` or `false`
-    # @since  0.3.0
-    def variable?
-      subject.nil? || predicate.nil? || object.nil? || context.nil? || has_variables?
-    end
-
     ##
     # Returns `true` if this pattern contains any variables.
     #

data/lib/rdf/reader.rb

@@ -189,6 +189,7 @@ module RDF
       @options[:canonicalize] ||= false
       @options[:intern]       ||= true
       @options[:prefixes]     ||= Hash.new
+      @options[:base_uri]     ||= input.base_uri if input.respond_to?(:base_uri)
 
       @input = case input
         when String then StringIO.new(input)
@@ -362,6 +363,13 @@ module RDF
     end
     alias_method :close!, :close
 
+    ##
+    # Current line number being processed. For formats that can associate generated {Statement} with a particular line number from input, this value reflects that line number.
+    # @return [Integer]
+    def lineno
+      @input.lineno
+    end
+
   protected
 
     ##
@@ -465,12 +473,6 @@ module RDF
       super
     end
 
-    ##
-    # @return [Integer]
-    def lineno
-      @input.lineno
-    end
-
     ##
     # @private
     # @return [String] The most recently read line of the input

data/lib/rdf/writer.rb

@@ -105,13 +105,18 @@ module RDF
     ##
     # @param  [RDF::Enumerable, #each] data
     #   the graph or repository to dump
-    # @param  [IO, File] io
+    # @param  [IO, File, String] io
     #   the output stream or file to write to
     # @param  [Hash{Symbol => Object}] options
     #   passed to {RDF::Writer#initialize} or {RDF::Writer.buffer}
     # @return [void]
     def self.dump(data, io = nil, options = {})
-      io = File.open(io, 'w') if io.is_a?(String)
+      if io.is_a?(String)
+        io = File.open(io, 'w')
+      elsif io.respond_to?(:external_encoding) && io.external_encoding
+        options = {:encoding => io.external_encoding}.merge(options)
+      end
+      io.set_encoding(options[:encoding]) if io.respond_to?(:set_encoding) && options[:encoding]
       method = data.respond_to?(:each_statement) ? :each_statement : :each
       if io
         new(io, options) do |writer|
@@ -138,9 +143,11 @@ module RDF
     # @return [String]
     # @raise [ArgumentError] if no block is provided
     def self.buffer(*args, &block)
+      options = args.last.is_a?(Hash) ? args.last : {}
       raise ArgumentError, "block expected" unless block_given?
 
       StringIO.open do |buffer|
+        buffer.set_encoding(options[:encoding]) if options[:encoding]
         self.new(buffer, *args) { |writer| block.call(writer) }
         buffer.string
       end
@@ -156,6 +163,7 @@ module RDF
     # @return [RDF::Writer]
     def self.open(filename, options = {}, &block)
       File.open(filename, 'wb') do |file|
+        file.set_encoding(options[:encoding]) if options[:encoding]
         format_options = options.dup
         format_options[:file_name] ||= filename
         self.for(options[:format] || format_options).new(file, options, &block)
@@ -436,7 +444,7 @@ module RDF
     ##
     # @return [void]
     def puts(*args)
-      @output.puts(*args)
+      @output.puts(*args.map {|s| s.force_encoding(encoding)})
     end
 
     ##

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdf
 version: !ruby/object:Gem::Version
-  version: 1.1.0.p0
+  version: 1.1.0.p1
 platform: ruby
 authors:
 - Arto Bendiken
@@ -10,36 +10,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-23 00:00:00.000000000 Z
+date: 2013-04-13 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: addressable
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '2.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: rdf-spec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0.p
+        version: 1.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0.p
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -105,10 +91,8 @@ files:
 - lib/rdf/model/literal/double.rb
 - lib/rdf/model/literal/integer.rb
 - lib/rdf/model/literal/numeric.rb
-- lib/rdf/model/literal/string.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
 - lib/rdf/model/resource.rb
@@ -170,7 +154,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>'

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

@@ -1,38 +0,0 @@
-module RDF; class Literal
-  ##
-  # A String literal.
-  #
-  # @see   http://www.w3.org/TR/xmlschema-2/#string
-  # @since 0.3.11
-  class String < Literal
-    DATATYPE = XSD.string
-    GRAMMAR  = nil
-
-    ##
-    # @param  [Object] value
-    # @option options [String] :lexical (nil)
-    def initialize(value, options = {})
-      @datatype = options[:datatype] || self.class.const_get(:DATATYPE)
-      @string   = options[:lexical] if options.has_key?(:lexical)
-      @string   ||= value if value.is_a?(String)
-      @object   = value.to_s
-    end
-
-    ##
-    # Converts this literal into its canonical lexical representation.
-    #
-    # @return [RDF::Literal] `self`
-    # @see    http://www.w3.org/TR/xml-exc-c14n/
-    def canonicalize!
-      self
-    end
-
-    ##
-    # Returns the value as a string.
-    #
-    # @return [String]
-    def to_s
-      @string || @object
-    end
-  end # XML
-end; end # RDF::Literal

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

@@ -1,41 +0,0 @@
-module RDF; class Literal
-  ##
-  # An XML literal.
-  #
-  # This class exists mostly as a stub. See RDF::XSD gem for full support.
-  
-  # @see   https://github.com/ruby-rdf/rdf-xsd/blob/master/lib/rdf/xsd/xml.rb
-  # @see   http://www.w3.org/TR/rdf-concepts/#section-XMLLiteral
-  # @see   http://www.w3.org/TR/rdfa-core/#s_xml_literals
-  # @since 0.2.1
-  class XML < Literal
-    DATATYPE = RDF.XMLLiteral
-    GRAMMAR  = nil
-
-    ##
-    # @param  [Object] value
-    # @option options [String] :lexical (nil)
-    def initialize(value, options = {})
-      @datatype = options[:datatype] || self.class.const_get(:DATATYPE)
-      @string   = options[:lexical] if options.has_key?(:lexical)
-      @object   = value # TODO: parse XML string using REXML
-    end
-
-    ##
-    # Converts this literal into its canonical lexical representation.
-    #
-    # @return [RDF::Literal] `self`
-    # @see    http://www.w3.org/TR/xml-exc-c14n/
-    def canonicalize!
-      self
-    end
-
-    ##
-    # Returns the value as a string.
-    #
-    # @return [String]
-    def to_s
-      @string || @object.to_s
-    end
-  end # XML
-end; end # RDF::Literal