RubyGems - rdf_context - Versions diffs - 0.5.6 → 0.5.7 - Mend

rdf_context 0.5.6 → 0.5.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (44) hide show

data/.yardopts +10 -0
data/{History.txt → History.rdoc} +8 -1
data/Rakefile +9 -2
data/VERSION +1 -1
data/bin/rdf_context +5 -2
data/lib/rdf_context/aggregate_graph.rb +31 -2
data/lib/rdf_context/array_hacks.rb +3 -3
data/lib/rdf_context/bnode.rb +3 -3
data/lib/rdf_context/conjunctive_graph.rb +8 -8
data/lib/rdf_context/duration.rb +17 -4
data/lib/rdf_context/graph.rb +84 -46
data/lib/rdf_context/literal.rb +36 -3
data/lib/rdf_context/n3parser.rb +4 -4
data/lib/rdf_context/namespace.rb +21 -8
data/lib/rdf_context/parser.rb +31 -16
data/lib/rdf_context/quoted_graph.rb +5 -4
data/lib/rdf_context/rdfaparser.rb +176 -91
data/lib/rdf_context/rdfxmlparser.rb +50 -13
data/lib/rdf_context/serializer/abstract_serializer.rb +14 -4
data/lib/rdf_context/serializer/nt_serializer.rb +5 -0
data/lib/rdf_context/serializer/recursive_serializer.rb +4 -0
data/lib/rdf_context/serializer/turtle_serializer.rb +28 -27
data/lib/rdf_context/serializer/xml_serializer.rb +11 -9
data/lib/rdf_context/store/abstract_sql_store.rb +47 -4
data/lib/rdf_context/store/abstract_store.rb +73 -1
data/lib/rdf_context/store/list_store.rb +25 -6
data/lib/rdf_context/store/memory_store.rb +33 -1
data/lib/rdf_context/store/sqlite3_store.rb +7 -4
data/lib/rdf_context/term_utils.rb +6 -0
data/lib/rdf_context/triple.rb +17 -6
data/lib/rdf_context/uriref.rb +19 -3
data/spec/html4-manifest.yml +176 -176
data/spec/html5-manifest.yml +176 -176
data/spec/rdfa_helper.rb +8 -2
data/spec/rdfa_parser_spec.rb +1 -1
data/spec/rdfcore/Manifest.yml +1561 -2626
data/spec/swap_test/n3parser.yml +134 -279
data/spec/swap_test/regression.yml +140 -305
data/spec/turtle/manifest-bad.yml +155 -310
data/spec/turtle/manifest.yml +155 -310
data/spec/xhtml-manifest.yml +139 -587
data/spec/xhtml11-manifest.yml +4405 -0
metadata +21 -7
data/.gitmodules +0 -3

data/.yardopts ADDED Viewed

@@ -0,0 +1,10 @@
+--title "RDF::RDFa - XHTML+RDFa Support for RDF.rb"
+--output-dir doc/yard
+--protected
+--no-private
+--hide-void-return
+--markup rdoc
+--readme README.rdoc
+-
+History.rdoc
+VERSION

data/{History.txt → History.rdoc} RENAMED Viewed

@@ -1,3 +1,10 @@
+=== 0.5.7
+* Add back support for RDFa 1.0 as well as RDFa 1.1. Parser checks @version to determine which
+* Remove specs for html4 and html5 until sorted out.
+* Don't allow _ as a prefix name.
+* Don't emit non-URI predicate values
+* Use sqlite3-ruby version 1.2.5, as 1.3.1 breaks multiple argument execs.
 === 0.5.6
 * Remove trailing ' in #encoding for treetop grammer, which caused problems installing rdoc in ruby 1.9.
 * Fixed corner case in RDFa parser where document doesn't exist, which was raising an error.
@@ -45,7 +52,7 @@
 === 0.5.0
 * Support for Ruby 1.9, 1.8.7 and 1.8.6.
   * Unicode escapes and URIRefs only work properly in Ruby 1.9
-  * Replaced some (&:meth) spells with {|c| c.meth} for Ruby 1.8.6 compatibility
+  * Replaced some <code>(&:meth)</code> spells with <code>{|c| c.meth}</code> for Ruby 1.8.6 compatibility
 * Fully compliant N3 parser (n3-rdf level) with extnensive tests, including SWAP, CWM and Turtle test suites.
   * Supports paths, keywords, all semantic expressions.
   * No support yet for Formulae, variables, rules or automatic reification

data/Rakefile CHANGED Viewed

@@ -1,4 +1,6 @@
 require 'rubygems'
+require 'yard'
 begin
   gem 'jeweler'
   require 'jeweler'
@@ -28,6 +30,7 @@ begin
     gemspec.add_dependency('patron', '>= 0.4.6')
     gemspec.add_development_dependency('rspec')
     gemspec.add_development_dependency('activesupport', '>= 2.3.0')
+    gemspec.add_development_dependency('yard')
     gemspec.extra_rdoc_files     = %w(README.rdoc History.txt)
   end
   Jeweler::GemcutterTasks.new
@@ -78,10 +81,14 @@ Rake::RDocTask.new("doc:rdoc") do |rdoc|
   rdoc.rdoc_dir = 'doc/rdoc'
   rdoc.title = "rdf_context #{version}"
-  rdoc.rdoc_files.include('README*', "History.txt")
+  rdoc.rdoc_files.include('README*', "History.rdoc")
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
+YARD::Rake::YardocTask.new do |t|
+  t.files   = %w(lib/**/*.rb README.rdoc History.rdoc)   # optional
+end
 desc "Generate RDF Core Manifest.yml"
 namespace :spec do
   task :prepare do
@@ -91,7 +98,7 @@ namespace :spec do
     require 'spec/rdf_helper'
     require 'fileutils'
-    %w(xhtml html4 html5).each do |suite|
+    %w(xhtml xhtml11 html4 html5).each do |suite|
       yaml = manifest_file = File.join(File.dirname(__FILE__), "spec", "#{suite}-manifest.yml")
       FileUtils.rm_f(yaml)
       RdfaHelper::TestCase.to_yaml(suite, yaml)

data/VERSION CHANGED Viewed

	@@ -1 +1 @@
1	- 0.5.6
1	+ 0.5.7

data/bin/rdf_context CHANGED Viewed

@@ -50,7 +50,7 @@ def rdfa_tc(number, parse, store)
   head = "" +
   %(<?xml version="1.0" encoding="UTF-8"?>\n) +
   %(<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.0//EN" "http://www.w3.org/MarkUp/DTD/xhtml-rdfa-1.dtd">\n) +
-  %(<html xmlns="http://www.w3.org/1999/xhtml" version="XHTML+RDFa 1.1"\n)
+  %(<html xmlns="http://www.w3.org/1999/xhtml" version="XHTML+RDFa #{$rdfa_version}"\n)
   tc = head + "#{namespaces}>\n#{body.gsub(/\$TCPATH/, tcpath)}\n</html>"
   puts "Input file: #{tc}" if $DEBUG || $verbose
@@ -62,6 +62,7 @@ raise "Mode must be one of 'parse'" unless mode == "parse"
 $verbose = false
 $format = "ttl"
+$rdfa_version = "1.1"
 base_uri  = "http://example.com"
 store = :list_store
 opts = GetoptLong.new(
@@ -71,7 +72,8 @@ opts = GetoptLong.new(
   ["--format", GetoptLong::REQUIRED_ARGUMENT],
   ["--store", GetoptLong::REQUIRED_ARGUMENT],
   ["--uri", GetoptLong::REQUIRED_ARGUMENT],
-  ["--rdfa", GetoptLong::NO_ARGUMENT]
+  ["--rdfa", GetoptLong::NO_ARGUMENT],
+  ["--1_0", GetoptLong::NO_ARGUMENT]
 )
 opts.each do |opt, arg|
   case opt
@@ -81,6 +83,7 @@ opts.each do |opt, arg|
   when '--format' then $format = arg
   when '--uri' then base_uri = arg
   when '--rdfa' then $rdfa = true
+  when '--1_0' then $rdfa_version = "1.0"
   when '--store'
     case arg
     when /list/

data/lib/rdf_context/aggregate_graph.rb CHANGED Viewed

@@ -5,48 +5,68 @@ module RdfContext
   #
   # Essentially a ConjunctiveGraph over an explicit subset of the entire store.
   class AggregateGraph < Graph
+    # List of constituent graphs
+    # @return [Array<Graph>]
     attr_reader :graphs
     # List of graphs to aggregate
+    # @param [Array<Graph>] graph List of constituent graphs
     def initialize(*graph)
       @graphs = graph
     end
+    # @raise [ReadOnlyGraphException]
     def destroy(configuration = nil); raise ReadOnlyGraphException; end
+    # @raise [ReadOnlyGraphException]
     def commit; raise ReadOnlyGraphException; end
+    # @raise [ReadOnlyGraphException]
     def rollback; raise ReadOnlyGraphException; end
+    # @raise [ReadOnlyGraphException]
     def add; raise ReadOnlyGraphException; end
+    # @raise [ReadOnlyGraphException]
     def remove; raise ReadOnlyGraphException; end
+    # @param [Namespace] namespace
+    # @raise [ReadOnlyGraphException]
     def bind(namespace); raise ReadOnlyGraphException; end
+    # @param [#read, #to_s] stream
+    # @param [URIRef, String] uri
+    # @raise [ReadOnlyGraphException]
     def parse(stream, uri, options = {}); raise ReadOnlyGraphException; end
+    # @raise [ReadOnlyGraphException]
     def n3; raise ReadOnlyGraphException; end
     # Open the graphs
+    # @return [void]
     def open(configuration = {})
       @graphs.each {|g| g.open(configuration)}
     end
     # Close the graphs
+    # @return [void]
     def close(configuration = {})
       @graphs.each {|g| g.close(configuration)}
     end
     # Number of Triples in the graph
+    # @return [Integer]
     def size
       @graphs.inject(0) {|memo, g| memo += g.size}
     end
     # List of distinct subjects in graph
+    # @return [Array<Resource>]
     def subjects
       @graphs.inject([]) {|memo, g| memo += g.subjects}
     end
     # List of distinct predicates in graph
+    # @return [Array<Resource>]
     def predicates
       @graphs.inject([]) {|memo, g| memo += g.predicates}
     end
     # List of distinct objects in graph
+    # @return [Array<Resource>]
     def objects
       @graphs.inject([]) {|memo, g| memo += g.objects}
     end
@@ -54,31 +74,40 @@ module RdfContext
     # Triples from graph, optionally matching subject, predicate, or object.
     # Delegates to Store#triples.
     #
-    # @param [Triple, nil] triple:: Triple to match, may be a pattern triple or nil
-    # @return [Array]:: List of matched triples
+    # @param [Triple] triple (Triple.new) Triple to match, may be a pattern triple or nil
+    # @yield [triple, context]
+    # @yieldparam [Triple] triple
+    # @yieldparam [Resource] context
+    # @return [Array<Triple>] List of matched triples
     def triples(triple = Triple.new(nil, nil, nil), &block) # :yields: triple, context
       @graphs.inject([]) {|memo, g| memo += g.triples(triple, &block)}
     end
     # Check to see if this graph contains the specified triple
+    # @param [Triple] triple Triple to match, may be a pattern triple or nil
     def contains?(triple)
       @graphs.any? {|g| g.contains?(triple) }
     end
     # Get all BNodes with usage count used within graph
+    # @return [Array<BNode>]
     def bnodes
       @graphs.inject([]) {|memo, g| memo += g.bnodes}
     end
     # Only compares to another AggregateGraph. Compares each sub-graph
+    # @param [AggregateGraph, Object] other Graph to compare with
+    # @return [Boolean]
     def eql?(other)
       other.is_a?(AggregateGraph) ? super : false
     end
+    # @return [Hash{String => Namespace}]
     def nsbinding
       @graphs.inject({}) {|memo, g| memo.merge(g.nsbinding)}
     end
+    # @return [Hash{URIRef => Namespace}]
     def uri_binding
       @graphs.inject({}) {|memo, g| memo.merge(g.uri_binding)}
     end

data/lib/rdf_context/array_hacks.rb CHANGED Viewed

@@ -15,9 +15,9 @@ class Array
   end
   # Converts the array to a comma-separated sentence where the last element is joined by the connector word. Options:
-  # * <tt>:words_connector</tt> - The sign or word used to join the elements in arrays with two or more elements (default: ", ")
-  # * <tt>:two_words_connector</tt> - The sign or word used to join the elements in arrays with two elements (default: " and ")
-  # * <tt>:last_word_connector</tt> - The sign or word used to join the last element in arrays with three or more elements (default: ", and ")
+  # @option [String] :words_connector (", ") The sign or word used to join the elements in arrays with two or more elements
+  # @option [String] :two_words_connector (" and ") The sign or word used to join the elements in arrays with two elements
+  # @option [String] :last_word_connector (", ") The sign or word used to join the elements in arrays with two or more elements
   def to_sentence(options = {})
     default_words_connector     = ", "
     default_two_words_connector = " and "

data/lib/rdf_context/bnode.rb CHANGED Viewed

@@ -13,8 +13,8 @@ module RdfContext
     # to lookup previoiusly defined BNodes using the same identifier. Names are *not* preserved
     # within the underlying storage model.
     #
-    # @param [String] identifier:: Legal NCName or nil for a named BNode
-    # @param [Hash] context:: Context used to store named BNodes
+    # @param [String] identifier (nil) Legal NCName or nil for a named BNode
+    # @param [Hash] context ({}) Context used to store named BNodes
     def initialize(identifier = nil, context = {})
       if identifier.nil?
         @identifier = generate_bn_identifier
@@ -38,7 +38,7 @@ module RdfContext
     # ==== Example
     #   b = BNode.new; b.to_n3  # => returns a string of the BNode in n3 form
     #
-    # @return [String]:: The BNode in n3.
+    # @return [String] The BNode in n3.
     #
     # @author Tom Morris
     def to_n3

data/lib/rdf_context/conjunctive_graph.rb CHANGED Viewed

@@ -36,8 +36,8 @@ module RdfContext
     # Triples across all contexts in store, optionally matching subject, predicate, or object.
     # Delegates to Store#triples.
     #
-    # @param [Triple, nil] triple:: Triple to match, may be a pattern triple or nil
-    # @return [Array]:: List of matched triples
+    # @param [Triple] triple (nil) Triple to match, may be a pattern triple or nil
+    # @return [Array] List of matched triples
     def triples(triple = Triple.new(nil, nil, nil), &block) # :yields: triple, context
       @store.triples(triple, nil, &block) || []
     end
@@ -46,13 +46,13 @@ module RdfContext
     #
     # Create a new context (Graph) and parse into that.
     #
-    # @param  [IO, String] stream:: the RDF IO stream, string, Nokogiri::HTML::Document or Nokogiri::XML::Document
-    # @param [String] uri:: the URI of the document
+    # @param  [IO, String] stream the RDF IO stream, string, Nokogiri::HTML::Document or Nokogiri::XML::Document
+    # @param [URIRef, String] uri the URI of the document
     # @param [Hash] options:: Options from
-    # <em>options[:debug]</em>:: Array to place debug messages
-    # <em>options[:type]</em>:: One of _rdfxml_, _html_, or _n3_
-    # <em>options[:strict]</em>:: Raise Error if true, continue with lax parsing, otherwise
-    # @return [Graph]:: Returns the graph containing parsed triples
+    # @option options [Array] :debug (nil) Array to place debug messages
+    # @option options [:rdfxml, :html, :n3] :type (nil)
+    # @option options [Boolean] :strict (false) Raise Error if true, continue with lax parsing, otherwise
+    # @return [Graph] Returns the graph containing parsed triples
     def parse(stream, uri, options = {}, &block) # :yields: triple
       graph = Graph.new(:identifier => uri, :store => self.store)
       Parser.parse(stream, uri, options.merge(:graph => graph), &block)

data/lib/rdf_context/duration.rb CHANGED Viewed

@@ -7,6 +7,8 @@ module RdfContext
     # * Given a time, extract second
     # * Given a Flaat, use value direcly
     # * Given a String, parse as xsd:duration
+    # @param [Integer, Time, Float, String] value (#to_i)
+    # @return [Duration]
     def initialize(value)
       case value
       when Hash
@@ -28,11 +30,15 @@ module RdfContext
       self.normalize
     end
+    # Reverse convert from XSD version of duration
+    # XSD allows -P1111Y22M33DT44H55M66.666S with any combination in regular order
+    # We assume 1M == 30D, but are out of spec in this regard
+    # We only output up to hours
+    #
+    # @param [String] value XSD formatted duration
+    # @return [Duration]
     def self.parse(value)
-      # Reverse convert from XSD version of duration
-      # XSD allows -P1111Y22M33DT44H55M66.666S with any combination in regular order
-      # We assume 1M == 30D, but are out of spec in this regard
-      # We only output up to hours
       if value.to_s.match(/^(-?)P(\d+Y)?(\d+M)?(\d+D)?T?(\d+H)?(\d+M)?([\d\.]+S)?$/)
         hash = {}
         hash[:ne] = $1 == "-" ? -1 : 1
@@ -48,11 +54,16 @@ module RdfContext
       self.new(value)
     end
+    # @return [Float]
     def to_f
       (((((@yr.to_i * 12 + @mo.to_i) * 30 + @da.to_i) * 24 + @hr.to_i) * 60 + @mi.to_i) * 60 + @se.to_f) * (@ne || 1)
     end
+    # @return [Integer]
     def to_i; Integer(self.to_f); end
+    # @param [Duration, String, Numeric] something (false)
+    # @return [Boolean]
     def eql?(something)
       case something
       when Duration
@@ -67,6 +78,8 @@ module RdfContext
     end
     alias_method :==, :eql?
+    # @param [Symbol] format Output format, :xml outputs in xmlschema mode, otherwise in Human form
+    # @return [String]
     def to_s(format = nil)
       usec = (@se * 1000).to_i % 1000
       sec_str = usec > 0 ? "%2.3f" % @se : @se.to_i.to_s

data/lib/rdf_context/graph.rb CHANGED Viewed

@@ -31,10 +31,9 @@ module RdfContext
     # by name.  If none is given, the graph is assigned a BNode for it's identifier.
     # For more on named graphs, see: http://en.wikipedia.org/wiki/RDFLib
     #
-    # @param [Hash] options:: Options
-    # <em>options[:store]</em>:: storage, defaults to a new ListStore instance. May be symbol :list_store or :memory_store
-    # <em>options[:identifier]</em>:: Identifier for this graph, BNode or URIRef
-    # <em>options[:allow_n3]</em>:: Allow N3-specific triples: Literals as subject, BNodes as predicate
+    # @option options [AbstractStore, Symbol] :store defaults to a new ListStore instance. May be symbol :list_store or :memory_store
+    # @option options[Resource] :identifier Identifier for this graph, BNode or URIRef
+    # @option options[Boolean] :allow_n3 Allow N3-specific triples: Literals as subject, BNodes as predicate
     def initialize(options = {})
       # Instantiate triple store
       @store = case options[:store]
@@ -54,14 +53,17 @@ module RdfContext
     end
     # Hash of graph, based on graph type and identifier
+    # @return [String]
     def hash
       [self.class.to_s, self.identifier].hash
     end
+    # @return [Boolean]
     def context_aware?; @store.context_aware?; end
     # Destroy the store identified by _configuration_ if supported
     # If configuration is nil, remove the graph context
+    # @return [void]
     def destroy(configuration = nil)
       if configuration
         @store.destroy(configuration)
@@ -73,15 +75,18 @@ module RdfContext
     end
     # Commit changes to graph
+    # @return [void]
     def commit; @store.commit; end
     # Rollback active transactions
+    # @return [void]
     def rollback; @store.rollback; end
     # Open the graph store
     #
     # Might be necessary for stores that require opening a connection to a
     # database or acquiring some resource.
+    # @return [void]
     def open(configuration = {})
       @store.open(configuration)
     end
@@ -90,20 +95,21 @@ module RdfContext
     #
     # Might be necessary for stores that require closing a connection to a
     # database or releasing some resource.
+    # @param [Boolean] commit_pending_transaction (false)
+    # @return [void]
     def close(commit_pending_transaction=false)
       @store.close(commit_pending_transaction)
     end
     # Serialize graph using specified serializer class.
     #
-    # @param [Hash] options:: Options
-    # <em>options[:format]</em>:: serializer, defaults to a new NTSerializer instance. Otherwise may be a symbol from :nt, :turtle, :xml
-    # <em>options[:io]</em>:: IO (or StringIO) object, otherwise serializes to a string
-    # <em>options[:base]</em>:: Base URI for output
+    # @option options [#to_sym] :format serializer, defaults to a new NTSerializer instance. Otherwise may be a symbol from :nt, :turtle, :xml
+    # @option options [#read, #to_s] :io IO (or StringIO) object, otherwise serializes to a string
+    # @option options [URIRef] :base serializer, defaults to a new NTSerializer instance. Otherwise may be a symbol from :nt, :turtle, :xml
     #
     # Other options are parser specific.
     #
-    # @returns [IO, String]:: Passed IO/StringIO object or a string
+    # @return [IO, String]:: Passed IO/StringIO object or a string
     def serialize(options)
       serializer = case options[:format].to_sym
       when AbstractSerializer   then options[:serializer]
@@ -122,10 +128,10 @@ module RdfContext
     ##
     # Exports the graph to RDF in N-Triples form.
     #
-    # ==== Example
+    # @example
     #   g = Graph.new; g.add_triple(BNode.new, URIRef.new("http://xmlns.com/foaf/0.1/knows"), BNode.new); g.to_ntriples  # => returns a string of the graph in N-Triples form
     #
-    # @return [String]:: The graph in N-Triples.
+    # @return [String] The serialized graph in N-Triples.
     #
     # @author Tom Morris
     def to_ntriples
@@ -133,12 +139,13 @@ module RdfContext
     end
     # Output graph using to_ntriples
+    # @return [String] The serialized graph in N-Triples.
     def to_s; self.to_ntriples; end
     ##
     # Exports the graph to RDF in RDF/XML form.
     #
-    # @return [String]:: The RDF/XML graph
+    # @return [String] The serialized RDF/XML graph
     def to_rdfxml
       serialize(:format => :rdfxml)
     end
@@ -146,24 +153,26 @@ module RdfContext
     ##
     # Bind a namespace to the graph.
     #
-    # ==== Example
+    # @example
     #   g = Graph.new; g.bind(Namespace.new("http://xmlns.com/foaf/0.1/", "foaf")) # => binds the Foaf namespace to g
     #
-    # @param [String] namespace:: the namespace to bind
-    # @return [Namespace]:: The newly bound or pre-existing namespace.
+    # @param [Nameespace] namespace the namespace to bind
+    # @return [Namespace] The newly bound or pre-existing namespace.
     def bind(namespace)
       raise GraphException, "Can't bind #{namespace.inspect} as namespace" unless namespace.is_a?(Namespace)
       @store.bind(namespace)
     end
-    # Hash of prefix => Namespace bindings
+    # @return [Hash{String => Namespace}]
     def nsbinding; @store.nsbinding; end
-    # Hash of uri => Namespace bindings
+    # @return [Hash{URIRef => Namespace}]
     def uri_binding; @store.uri_binding; end
     # QName for a URI
     # Try bound namespaces, and if not found, try well-known namespaces
+    # @param [URIRef] uri
+    # @return [String]
     def qname(uri)
       uri.to_qname(self.uri_binding) || begin
         qn = uri.to_qname(WELLKNOWN_NAMESPACES)
@@ -173,36 +182,45 @@ module RdfContext
     end
     # Namespace for prefix
+    # @param [String] prefix
+    # @return [Namespace]
     def namespace(prefix); @store.namespace(prefix); end
     # Prefix for namespace
+    # @param [Namespace] namespcae
+    # @return [String]
     def prefix(namespace); @store.prefix(namespace); end
     # Number of Triples in the graph
+    # @return [Integer]
     def size; @store.size(self); end
     # List of distinct subjects in graph
+    # @return [Array<Resource>]
     def subjects; @store.subjects(self); end
     # List of distinct predicates in graph
+    # @return [Array<Resource>]
     def predicates; @store.predicates(self); end
     # List of distinct objects in graph
+    # @return [Array<Resource>]
     def objects; @store.objects(self); end
     # Indexed statement in serialized graph triples. Equivalent to graph.triples[item]
+    # @return [Triple]
     def [] (item); @store.item(item, self); end
     # Adds a triple to a graph directly from the intended subject, predicate, and object.
     #
-    # ==== Example
+    # @example
     #   g = Graph.new; g.add_triple(BNode.new, URIRef.new("http://xmlns.com/foaf/0.1/knows"), BNode.new) # => results in the triple being added to g; returns an array of g's triples
     #
-    # @param [URIRef, BNode] subject:: the subject of the triple
-    # @param [URIRef] predicate:: the predicate of the triple
-    # @param [URIRef, BNode, Literal] object:: the object of the triple
-    # @return [Graph]:: Returns the graph
-    # @raise [Error]:: Checks parameter types and raises if they are incorrect.
+    # @param [URIRef, BNode] subject the subject of the triple
+    # @param [URIRef] predicate the predicate of the triple
+    # @param [URIRef, BNode, Literal] object the object of the triple
+    # @return [Graph] Returns the graph
+    # @raise [Error] Checks parameter types and raises if they are incorrect.
     def add_triple(subject, predicate, object)
       self.add(Triple.new(subject, predicate, object))
       self
@@ -211,13 +229,13 @@ module RdfContext
     ##
     # Adds an more extant triples to a graph. Delegates to Store.
     #
-    # ==== Example
+    # @example
     #   g = Graph.new;
     #   t = Triple.new(BNode.new, URIRef.new("http://xmlns.com/foaf/0.1/knows"), BNode.new);
     #   g << t
     #
-    # @param [Triple] t:: the triple to be added to the graph
-    # @return [Graph]:: Returns the graph
+    # @param [Triple] triple the triple to be added to the graph
+    # @return [Graph] Returns the graph
     def << (triple)
       triple.validate_rdf unless @allow_n3 # Only add triples if n3-mode is set
       @store.add(triple, self)
@@ -227,15 +245,15 @@ module RdfContext
     ##
     # Adds one or more extant triples to a graph. Delegates to Store.
     #
-    # ==== Example
+    # @example
     #   g = Graph.new;
     #   t1 = Triple.new(BNode.new, URIRef.new("http://xmlns.com/foaf/0.1/knows"), BNode.new);
     #   t2 = Triple.new(BNode.new, URIRef.new("http://xmlns.com/foaf/0.1/knows"), BNode.new);
     #   g.add(t1, t2, ...)
     #
-    # @param [Triple] triples:: one or more triples. Last element may be a hash for options
-    # <em>options[:context]</em>:: Graph context in which to deposit triples, defaults to default_context or self
-    # @return [Graph]:: Returns the graph
+    # @param [Array<Triple>] triples one or more triples. Last element may be a hash for options
+    # @option [Resource] :context Graph context in which to deposit triples, defaults to default_context or self
+    # @return [Graph] Returns the graph
     def add(*triples)
       options = triples.last.is_a?(Hash) ? triples.pop : {}
       ctx = options[:context] || @default_context || self
@@ -249,11 +267,11 @@ module RdfContext
     ##
     # Adds a list of resources as an RDF list by creating bnodes and first/rest triples
-    # @param [URIRef, BNode] subject:: the subject of the triple
-    # @param [URIRef] predicate:: the predicate of the triple
-    # @param [Array] objects:: List of objects to serialize
-    # @return [Graph]:: Returns the graph
-    # @raise [Error]:: Checks parameter types and raises if they are incorrect.
+    # @param [URIRef, BNode] subject the subject of the triple
+    # @param [URIRef] predicate the predicate of the triple
+    # @param [Array] objects List of objects to serialize
+    # @return [Graph] Returns the graph
+    # @raise [Error] Checks parameter types and raises if they are incorrect.
     def add_seq(subject, predicate, objects)
       if objects.empty?
         add_triple(subject, predicate, RDF_NS.nil)
@@ -282,19 +300,23 @@ module RdfContext
     # Remove a triple from the graph. Delegates to store.
     # Nil matches all triples and thus empties the graph
+    # @param [Triple] triple
+    # @return [void]
     def remove(triple); @store.remove(triple, self); end
     # Triples from graph, optionally matching subject, predicate, or object.
     # Delegates to Store#triples.
     #
-    # @param [Triple, nil] triple:: Triple to match, may be a pattern triple or nil
-    # @return [Array]:: List of matched triples
+    # @param [Triple] triple (nil) Triple to match, may be a pattern triple or nil
+    # @return [Array<Triple>] List of matched triples
     def triples(triple = Triple.new(nil, nil, nil), &block) # :yields: triple, context
       @store.triples(triple, self, &block) || []
     end
     alias_method :find, :triples
     # Returns ordered rdf:_n objects or rdf:first, rdf:rest for a given subject
+    # @param [Resource] subject
+    # @return [Array<Resource>]
     def seq(subject)
       props = properties(subject)
       rdf_type = (props[RDF_TYPE.to_s] || []).map {|t| t.to_s}
@@ -328,13 +350,17 @@ module RdfContext
     #
     # Properties arranged as a hash with the predicate Term as index to an array of resources or literals
     #
-    # Example:
+    # @example
     #   graph.parse(':foo a :bar; rdfs:label "An example" .', "http://example.com/")
     #   graph.resources("http://example.com/subject") =>
     #   {
     #     "http://www.w3.org/1999/02/22-rdf-syntax-ns#type" => [<http://example.com/#bar>],
     #     "http://example.com/#label"                       => ["An example"]
     #   }
+    #
+    # @param [Resource] subject
+    # @param [Boolean] recalc Refresh cache of property values
+    # @return [Hash{String => Resource}]
     def properties(subject, recalc = false)
       @properties ||= {}
       @properties.delete(subject.to_s) if recalc
@@ -352,6 +378,8 @@ module RdfContext
     # Synchronize properties to graph
+    # @param [Resource] subject
+    # @return [void]
     def sync_properties(subject)
       props = properties(subject)
@@ -369,14 +397,15 @@ module RdfContext
     end
     # Return an n3 identifier for the Graph
+    # @return [String]
     def n3
       "[#{self.identifier.to_n3}]"
     end
     # Detect the presence of a BNode in the graph, either as a subject or an object
     #
-    # @param [BNode] bn:: BNode to find
-    #
+    # @param [BNode] bn BNode to find
+    # @return [Boolean]
     def has_bnode_identifier?(bn)
       self.triples do |triple, context|
         return true if triple.subject.eql?(bn) || triple.object.eql?(bn)
@@ -385,11 +414,14 @@ module RdfContext
     end
     # Check to see if this graph contains the specified triple
+    # @param [Triple] triple
+    # @return [Boolean]
     def contains?(triple)
       @store.contains?(triple, self)
     end
     # Get all BNodes with usage count used within graph
+    # @return [Array<BNode>]
     def bnodes
       @store.bnodes(self)
     end
@@ -397,16 +429,21 @@ module RdfContext
     # Get list of subjects having rdf:type == object
     #
     # @param [Resource, Regexp, String] object:: Type resource
+    # @return [Array<Triple>]
     def get_by_type(object)
       triples(Triple.new(nil, RDF_TYPE, object)).map {|t, ctx| t.subject}
     end
     # Get type(s) of subject, returns a list of symbols
+    # @param [Resource] subject
+    # @return [URIRef]
     def type_of(subject)
       triples(Triple.new(subject, RDF_TYPE, nil)).map {|t, ctx| t.object}
     end
     # Merge a graph into this graph
+    # @param [Graph] graph
+    # @return [void]
     def merge!(graph)
       raise GraphException.new("merge without a graph") unless graph.is_a?(Graph)
@@ -432,6 +469,8 @@ module RdfContext
     # after sorting each graph.
     #
     # We just follow Python RDFlib's lead and do a simple comparison
+    # @param [Graph] graph
+    # @return [Boolean]
     def eql?(other)
       #puts "eql? size #{self.size} vs #{other.size}" if $DEBUG
       return false if !other.is_a?(Graph) || self.size != other.size
@@ -486,12 +525,11 @@ module RdfContext
     #
     # @param  [IO, String] stream:: the RDF IO stream, string, Nokogiri::HTML::Document or Nokogiri::XML::Document
     # @param [String] uri:: the URI of the document
-    # @param [Hash] options:: Options from
-    # <em>options[:debug]</em>:: Array to place debug messages
-    # <em>options[:type]</em>:: One of _rdfxml_, _html_, or _n3_
-    # <em>options[:strict]</em>:: Raise Error if true, continue with lax parsing, otherwise
-    # <em>options[:allow_n3]</em>:: Allow N3-specific triples: Literals as subject, BNodes as predicate
-    # @return [Graph]:: Returns the graph containing parsed triples
+    # @option options [Array] :debug (nil) Array to place debug messages
+    # @option options [:rdfxml, :html, :n3] :type (nil)
+    # @option options [Boolean] :strict (false) Raise Error if true, continue with lax parsing, otherwise
+    # @option options [Boolean] :allow_n3 (false) Allow N3-specific triples: Literals as subject, BNodes as predicate
+    # @return [Graph] Returns the graph containing parsed triples
     def parse(stream, uri = nil, options = {}, &block) # :yields: triple
       @allow_n3 ||= options[:allow_n3]
       Parser.parse(stream, uri, options.merge(:graph => self), &block)