rdf 0.3.10 → 0.3.11

data/README

@@ -355,6 +355,7 @@ see <http://unlicense.org/> or the accompanying {file:UNLICENSE} file.
 [RDF::N3]:          http://ruby-rdf.github.com/rdf-n3
 [RDF::RDFa]:        http://ruby-rdf.github.com/rdf-rdfa
 [RDF::RDFXML]:      http://ruby-rdf.github.com/rdf-rdfxml
+[RDF::TriG]:        http://ruby-rdf.github.com/rdf-trig
 [RDF::TriX]:        http://ruby-rdf.github.com/rdf-trix
 [RDF::Turtle]:      http://ruby-rdf.github.com/rdf-turtle
 [RDF::Raptor]:      http://ruby-rdf.github.com/rdf-raptor

data/VERSION

@@ -1 +1 @@
-0.3.10
+0.3.11

data/lib/rdf.rb

@@ -99,7 +99,7 @@ module RDF
   #   @param  [URI, String, #to_s]    uri
   #
   # @overload URI(options = {})
-  #   @param  [Hash{Symbol => Object} options
+  #   @param  [Hash{Symbol => Object}] options
   #     passed to `Addressable::URI.new`
   #
   # @return [RDF::URI]

data/lib/rdf/cli.rb

@@ -166,8 +166,8 @@ module RDF
     end
 
     ##
-    # Parse each file, STDIN or specified string in options[:evaluate] yielding
-    # a reader
+    # Parse each file, STDIN or specified string in `options[:evaluate]`
+    # yielding a reader
     #
     # @param  [Array<String>] files
     # @yield  [reader]

data/lib/rdf/mixin/enumerable.rb

@@ -75,6 +75,37 @@ module RDF
       false
     end
 
+    ##
+    # Returns `true` if all statements are valid
+    #
+    # @return [Boolean] `true` or `false`
+    # @since  0.3.11
+    def valid?
+      each_statement do |s|
+        return false if s.invalid?
+      end
+      true
+    end
+
+    ##
+    # Returns `true` if value is not valid
+    #
+    # @return [Boolean] `true` or `false`
+    # @since  0.2.1
+    def invalid?
+      !valid?
+    end
+
+    ##
+    # Default validate! implementation, overridden in concrete classes
+    # @return [RDF::Literal] `self`
+    # @raise  [ArgumentError] if the value is invalid
+    # @since  0.3.9
+    def validate!
+      raise ArgumentError if invalid?
+    end
+    alias_method :validate, :validate!
+
     ##
     # Returns all RDF statements.
     #
@@ -124,7 +155,7 @@ module RDF
     end
 
     ##
-    # Returns an enumerator for {#each_statement}.
+    # Returns an enumerator for {RDF::Enumerable#each_statement}.
     # FIXME: enum_for doesn't seem to be working properly
     # in JRuby 1.7, so specs are marked pending
     #
@@ -186,7 +217,7 @@ module RDF
     end
 
     ##
-    # Returns an enumerator for {#each_triple}.
+    # Returns an enumerator for {RDF::Enumerable#each_triple}.
     #
     # @return [Enumerator]
     # @see    #each_triple
@@ -247,7 +278,7 @@ module RDF
     end
 
     ##
-    # Returns an enumerator for {#each_quad}.
+    # Returns an enumerator for {RDF::Enumerable#each_quad}.
     #
     # @return [Enumerator]
     # @see    #each_quad
@@ -315,7 +346,7 @@ module RDF
     end
 
     ##
-    # Returns an enumerator for {#each_subject}.
+    # Returns an enumerator for {RDF::Enumerable#each_subject}.
     #
     # @return [Enumerator]
     # @see    #each_subject
@@ -383,7 +414,7 @@ module RDF
     end
 
     ##
-    # Returns an enumerator for {#each_predicate}.
+    # Returns an enumerator for {RDF::Enumerable#each_predicate}.
     #
     # @return [Enumerator]
     # @see    #each_predicate
@@ -451,7 +482,7 @@ module RDF
     end
 
     ##
-    # Returns an enumerator for {#each_object}.
+    # Returns an enumerator for {RDF::Enumerable#each_object}.
     #
     # @return [Enumerator]
     # @see    #each_object
@@ -519,7 +550,7 @@ module RDF
     end
 
     ##
-    # Returns an enumerator for {#each_context}.
+    # Returns an enumerator for {RDF::Enumerable#each_context}.
     #
     # @return [Enumerator]
     # @see    #each_context
@@ -559,7 +590,7 @@ module RDF
     end
 
     ##
-    # Returns an enumerator for {#each_graph}.
+    # Returns an enumerator for {RDF::Enumerable#each_graph}.
     #
     # @return [Enumerator]
     # @see    #each_graph
@@ -597,14 +628,12 @@ module RDF
     # terms.
     #
     # The return value is a `Hash` instance that has the structure:
-    #     {subject => {predicate => [*objects]}`.
+    # `{subject => {predicate => [*objects]}}`.
     #
     # @return [Hash]
     def to_hash
       result = {}
       each_statement do |statement|
-        next if statement.invalid? # skip any incomplete statements
-
         result[statement.subject] ||= {}
         values = (result[statement.subject][statement.predicate] ||= [])
         values << statement.object unless values.include?(statement.object)

data/lib/rdf/mixin/mutable.rb

@@ -157,7 +157,7 @@ module RDF
     ##
     # Deletes the given RDF statements from the underlying storage.
     #
-    # Defaults to invoking {#delete_statement} for each given statement.
+    # Defaults to invoking {RDF::Mutable#delete_statement} for each given statement.
     #
     # Subclasses of {RDF::Repository} may wish to override this method if
     # they are capable of more efficiently deleting multiple statements at

data/lib/rdf/mixin/queryable.rb

@@ -14,7 +14,7 @@ module RDF
     ##
     # Queries `self` for RDF statements matching the given `pattern`.
     #
-    # This method delegates to the protected {#query_pattern} method for the
+    # This method delegates to the protected {RDF::Queryable#query_pattern} method for the
     # actual lower-level query pattern matching implementation.
     #
     # @example

data/lib/rdf/mixin/writable.rb

@@ -54,7 +54,7 @@ module RDF
           when value.respond_to?(:each_statement)
             insert_statements(value)
             nil
-          when (statement = Statement.from(value)).valid?
+          when (statement = Statement.from(value))
             statement
           else
             raise ArgumentError.new("not a valid statement: #{value.inspect}")
@@ -73,7 +73,7 @@ module RDF
     # Inserts statements from the given RDF reader into the underlying
     # storage or output stream.
     #
-    # Defaults to passing the reader to the {#insert_statements} method.
+    # Defaults to passing the reader to the {RDF::Writable#insert_statements} method.
     #
     # Subclasses of {RDF::Repository} may wish to override this method in
     # case their underlying storage can efficiently import RDF data directly
@@ -91,7 +91,7 @@ module RDF
     # Inserts the given RDF graph into the underlying storage or output
     # stream.
     #
-    # Defaults to passing the graph to the {#insert_statements} method.
+    # Defaults to passing the graph to the {RDF::Writable#insert_statements} method.
     #
     # Subclasses of {RDF::Repository} may wish to override this method in
     # case their underlying storage architecture is graph-centric rather
@@ -112,7 +112,7 @@ module RDF
     # Inserts the given RDF statements into the underlying storage or output
     # stream.
     #
-    # Defaults to invoking {#insert_statement} for each given statement.
+    # Defaults to invoking {RDF::Writable#insert_statement} for each given statement.
     #
     # Subclasses of {RDF::Repository} may wish to override this method if
     # they are capable of more efficiently inserting multiple statements at

data/lib/rdf/model/literal.rb

@@ -279,7 +279,7 @@ module RDF
     end
 
     ##
-    # Validates the value using {#valid?}, raising an error if the value is
+    # Validates the value using {RDF::Value#valid?}, raising an error if the value is
     # invalid.
     #
     # @return [RDF::Literal] `self`

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

@@ -0,0 +1,38 @@
+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/statement.rb

@@ -115,7 +115,8 @@ module RDF
     def valid?
       has_subject?    && subject.valid? && 
       has_predicate?  && predicate.valid? &&
-      has_object?     && object.valid?
+      has_object?     && object.valid? &&
+      (has_context?    ? context.valid? : true )
     end
 
     ##

data/lib/rdf/model/uri.rb

@@ -122,7 +122,7 @@ module RDF
     ##
     # Creates a new `RDF::URI` instance based on the given `uri` string.
     #
-    # This is just an alias for {#initialize RDF::URI.new} for compatibity
+    # This is just an alias for {RDF::URI#initialize} for compatibity
     # with `Addressable::URI.parse`.
     #
     # @param  [String, #to_s] str
@@ -136,7 +136,7 @@ module RDF
     #   @param  [RDF::URI, String, #to_s] uri
     #
     # @overload URI.new(options = {})
-    #   @param  [Hash{Symbol => Object} options
+    #   @param  [Hash{Symbol => Object}] options
     def initialize(uri_or_options)
       case uri_or_options
         when Hash
@@ -509,7 +509,7 @@ module RDF
     alias_method :ends_with?, :end_with?
 
     ##
-    # Checks whether this URI the same term as `other'.
+    # Checks whether this URI the same term as `other`.
     #
     # @example
     #   RDF::URI('http://t.co/').eql?(RDF::URI('http://t.co/')) #=> true

data/lib/rdf/model/value.rb

@@ -69,7 +69,7 @@ module RDF
     ##
     # Returns `true` if `self` is an IRI reference.
     #
-    # By default this is simply an alias for {#uri?}.
+    # By default this is simply an alias for {RDF::Value#uri?}.
     #
     # @return [Boolean]
     def iri?

data/lib/rdf/ntriples/writer.rb

@@ -4,7 +4,7 @@ module RDF::NTriples
   #
   # Output is serialized for UTF-8, to serialize as ASCII
   # (with) unicode escapes, set :encoding => Encoding::ASCII as
-  # an option to {#initialize}.
+  # an option to {RDF::NTriples::Writer#initialize}.
   #
   # @example Obtaining an NTriples writer class
   #   RDF::Writer.for(:ntriples)     #=> RDF::NTriples::Writer

data/lib/rdf/query.rb

@@ -6,7 +6,7 @@ module RDF
   # contexts if the name is an RDF::Term or bound RDF::Query::Variable.
   # Names that are against unbound variables match either default
   # or named contexts.
-  # The name of `false' will only match against the default context.
+  # The name of `false` will only match against the default context.
   #
   # Variable names cause the variable to be added to the solution set
   # elements.
@@ -131,7 +131,7 @@ module RDF
     #     contexts if the name is an RDF::Term or bound RDF::Query::Variable.
     #     Names that are against unbound variables match either detault
     #     or named contexts.
-    #     The name of `false' will only match against the default context.
+    #     The name of `false` will only match against the default context.
     #   @yield  [query]
     #   @yieldparam  [RDF::Query] query
     #   @yieldreturn [void] ignored
@@ -234,7 +234,7 @@ module RDF
     # contexts if the name is an RDF::Term or bound RDF::Query::Variable.
     # Names that are against unbound variables match either detault
     # or named contexts.
-    # The name of `false' will only match against the default context.
+    # The name of `false` will only match against the default context.
     #
     # @param  [RDF::Queryable] queryable
     #   the graph or repository to query

data/lib/rdf/query/pattern.rb

@@ -124,7 +124,7 @@ module RDF; class Query
     # If the optional `bindings` are given, variables will be substituted with their values
     # when executing the query.
     #
-    # To match triples only in the default context, set context to `false'.
+    # To match triples only in the default context, set context to `false`.
     #
     # @example
     #   Pattern.new(:s, :p, :o).execute(RDF::Repository.load('data.nt'))

data/lib/rdf/query/solutions.rb

@@ -106,7 +106,7 @@ module RDF; class Query
     # Reorders this solution sequence by the given `variables`.
     #
     # Variables may be symbols or {Query::Variable} instances.
-    # A variable may also be a Procedure/Lambda, compatible with {::Enumerable#sort}.
+    # A variable may also be a Procedure/Lambda, compatible with `::Enumerable#sort`.
     # This takes two arguments (solutions) and returns -1, 0, or 1 equivalently to <=>.
     #
     # If called with a block, variables are ignored, and the block is invoked with

data/lib/rdf/transaction.rb

@@ -83,7 +83,7 @@ module RDF
     #
     # Transactions do not support the `RDF::Enumerable` protocol directly.
     # To enumerate the RDF statements to be inserted or deleted, use the
-    # {#inserts} and {#deletes} accessors.
+    # {RDF::Transaction#inserts} and {RDF::Transaction#deletes} accessors.
     #
     # @return [Boolean]
     # @see    RDF::Readable#readable?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdf
 version: !ruby/object:Gem::Version
-  version: 0.3.10
+  version: 0.3.11
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-22 00:00:00.000000000 Z
+date: 2012-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -36,7 +36,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.7.5
+        version: 0.8.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -44,7 +44,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.7.5
+        version: 0.8.3
 - !ruby/object:Gem::Dependency
   name: rdf-spec
   requirement: !ruby/object:Gem::Requirement
@@ -52,7 +52,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.10
+        version: 0.3.11
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -60,7 +60,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.10
+        version: 0.3.11
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -68,7 +68,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 2.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -76,7 +76,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 2.12.0
 description: RDF.rb is a pure-Ruby library for working with Resource Description Framework
   (RDF) data.
 email: public-rdf-ruby@w3.org
@@ -114,6 +114,7 @@ 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
@@ -183,9 +184,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3969937466314581252
 requirements: []
 rubyforge_project: rdf
 rubygems_version: 1.8.24