rdf_context 0.5.9.1 → 0.5.10

data/.gitignore

@@ -7,4 +7,3 @@ rdoc/*
 pkg/*
 rena_new_spec.html
 rena-*.gem
-/*.gemspec

data/History.rdoc

@@ -1,3 +1,24 @@
+=== 0.5.10
+* N3 Parser
+  * Allow mixed case literal languages.
+  * Unescape literals
+* Rspec 2.1.0
+* Added Resource class, a common super-class of BNode, Graph, Literal and URIRef.
+* Implemented Resource.parse and variations for sub-classes to parse N3-coded resources.
+* Literal#typed
+  * Namespaces option now is {prefix => href} rather than {prefix => Namespace}.
+  * Add all in-scope namespaces, not just those that seem to be used.
+* RDFa Parser
+  * Upgrade for changes to RDFa 1.1 test suite
+  * For non-XHTML, allow use of xml:base for non-HTML languages
+  * XHTML has no default vocabulary.
+  * No longer pass vocabularies, prefixes or terms when creating XMLLiterals. Only namespaces derived via xmlns are passed to Literal#typed.
+* SQLite3Store
+  * Basic support for using with ActiveRecord: #initialize _configuration_ can take a _connection_ option, using ActiveRecord::Base.connection.raw_connection
+  * If result set is returned as a hash, change back to an array (needed, as rails sets results_as_hash attribute on DB)
+* Added ActiveRecordStore
+  * Uses ActiveRecord connection to store graph information, not an ActiveRecord::Base model
+
 === 0.5.9.1
 * Fix minor graph property caching bug relating to manipulation of sequences.
 
@@ -10,7 +31,7 @@
 === 0.5.8.2
 * Don't create unnecessary namespaces when serializing RDF/XML.
 * Don't use regexp to substitute base URI in URI serialization.
-* Added :profile_graph option to RdfaParser#parse. This MUST be a ConjunctiveGraph and will be used to save profiles that are encountered.
+* Added profile_graph option to RdfaParser#parse. This MUST be a ConjunctiveGraph and will be used to save profiles that are encountered.
   * Fixme, for now, retrieval should include HTTP headers and perform appropriate HTTP cache control and check for potential updates.
 * Added ConjunctiveGraph#add_quad. Adds a quad from the intended subject, predicate, object, and context.
     @example
@@ -137,7 +158,7 @@
 * Add Graph#contents as alias to store
 * Add ConjunctiveGraph#triples to return all triples from store, not just default context
 * Add Graph#nsbinding to retreive Store#nsbinding
-* Fix numerious SQLite3Store and AbstractSQLStore bugs. Add round-trip tests to Graph spec.
+* Fix numerous SQLite3Store and AbstractSQLStore bugs. Add round-trip tests to Graph spec.
 
 === 0.4.4
 * Namespace usage cleanup

data/Rakefile

@@ -26,7 +26,7 @@ begin
     gemspec.add_dependency('treetop',  '>= 1.4.0')
     gemspec.add_dependency('nokogiri', '>= 1.4.3')
     gemspec.add_dependency('builder', '>= 2.1.2')
-    gemspec.add_development_dependency('rspec')
+    gemspec.add_development_dependency('rspec', '>= 2.1.0')
     gemspec.add_development_dependency('activesupport', '>= 2.3.0')
     gemspec.add_development_dependency('yard')
     gemspec.extra_rdoc_files     = %w(README.rdoc History.txt)
@@ -45,30 +45,29 @@ task :push do
   sh "growlnotify -m \"Updates pushed\" \"Git\""
 end
 
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/*_spec.rb']
-end
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec)
 
 desc "Run specs through RCov"
-Spec::Rake::SpecTask.new("spec:rcov") do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.pattern = 'spec/*_spec.rb'
+RSpec::Core::RakeTask.new("spec:rcov") do |spec|
   spec.rcov = true
+  spec.rcov_opts =  %q[--exclude "spec"]
 end
 
 desc "Generate HTML report specs"
-Spec::Rake::SpecTask.new("doc:spec") do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/*_spec.rb']
-  spec.spec_opts = ["--format", "html:doc/spec.html"]
+RSpec::Core::RakeTask.new("spec") do |spec|
+  spec.rspec_opts = ["--format", "html:doc/spec.html"]
 end
 
 task :spec => :check_dependencies
 
 task :default => :spec
 
+desc "Update N3 grammar"
+task :grammar do
+  sh "tt -o lib/rdf_context/n3_grammar.rb lib/rdf_context/n3_grammar.treetop"
+end
+
 namespace :doc do
   require 'rake/rdoctask'
   Rake::RDocTask.new("rdoc") do |rdoc|
@@ -93,12 +92,13 @@ desc "Generate RDF Core Manifest.yml"
 namespace :spec do
   task :prepare do
     $:.unshift(File.join(File.dirname(__FILE__), 'lib'))
+    $:.unshift(File.join(File.dirname(__FILE__), 'spec'))
     require 'rdf_context'
-    require 'spec/rdfa_helper'
-    require 'spec/rdf_helper'
+    require 'rdfa_helper'
+    require 'rdf_helper'
     require 'fileutils'
 
-    %w(xhtml xhtml11 html4 html5).each do |suite|
+    %w(xhtml html4 html5 svgtiny).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)
@@ -122,7 +122,7 @@ namespace :spec do
     
     yaml = File.join(TURTLE_DIR, "manifest-bad.yml")
     FileUtils.rm_f(yaml)
-    RdfHelper::TestCase.to_yaml(TURTLE_TEST, TURTLE_DIR, yaml)
+    RdfHelper::TestCase.to_yaml(TURTLE_BAD_TEST, TURTLE_DIR, yaml)
   end
 end
 

data/VERSION

@@ -1 +1 @@
-0.5.9.1
+0.5.10

data/bin/rdf_context

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby -s
+#!/usr/bin/env ruby
 require 'rubygems'
 require File.expand_path(File.dirname(__FILE__) + "/../lib/rdf_context")
 require 'getoptlong'
@@ -28,9 +28,6 @@ class Parse
   end
 end
 
-mode = ARGV.shift
-raise "Mode must be one of 'parse'" unless mode == "parse"
-
 $verbose = false
 $quiet = false
 $format = "ttl"

data/lib/rdf_context.rb

@@ -16,27 +16,59 @@ rescue LoadError
   require 'treetop'
 end
 
-Dir.glob(File.join(File.dirname(__FILE__), 'rdf_context/*.rb')).sort.each { |f| require f }
-
-# Include Storage types, but be tollerant of failure to load as dependencies might not be available
-Dir.glob(File.join(File.dirname(__FILE__), "rdf_context/store/*.rb")).each do |f|
-  begin
-    require f
-  rescue LoadError
-    puts "Error loading #{f}: #{$!}"
-  end
-end
-
-# Include Serializer types, but be tollerant of failure to load as dependencies might not be available
-Dir.glob(File.join(File.dirname(__FILE__), "rdf_context/serializer/*.rb")).each do |f|
-  begin
-    require f
-  rescue LoadError
-    puts "Error loading #{f}: #{$!}"
-  end
-end
+require 'rdf_context/array_hacks'
+require 'rdf_context/string_hacks'
 
 module RdfContext
+  # Primary model classes
+  autoload :BNode,                  "rdf_context/bnode"
+  autoload :Duration,               "rdf_context/duration"
+  autoload :Literal,                "rdf_context/literal"
+  autoload :Namespace,              "rdf_context/namespace"
+  autoload :Resource,               "rdf_context/resource"
+  autoload :Triple,                 "rdf_context/triple"
+  autoload :URIRef,                 "rdf_context/uriref"
+  autoload :TermUtils,              "rdf_context/term_utils"
+  
+  # Graphs
+  autoload :Graph,                  "rdf_context/graph"
+  autoload :ConjunctiveGraph,       "rdf_context/conjunctive_graph"
+  autoload :AggregateGraph,         "rdf_context/aggregate_graph"
+  autoload :QuotedGraph,            "rdf_context/quoted_graph"
+  
+  # Stores
+  autoload :AbstractStore,          "rdf_context/store/abstract_store"
+  autoload :AbstractSQLStore,       "rdf_context/store/abstract_sql_store"
+  autoload :ActiveRecordStore,      "rdf_context/store/active_record_store"
+  autoload :ListStore,              "rdf_context/store/list_store"
+  autoload :MemoryStore,            "rdf_context/store/memory_store"
+  autoload :SQLite3Store,           "rdf_context/store/sqlite3_store"
+  
+  # Parsers
+  autoload :Parser,                 "rdf_context/parser"
+  autoload :N3Parser,               "rdf_context/n3parser"
+  autoload :RdfaParser,             "rdf_context/rdfaparser"
+  autoload :RdfXmlParser,           "rdf_context/rdfxmlparser"
+  
+  # Serializers
+  autoload :AbstractSerializer,     "rdf_context/serializer/abstract_serializer"
+  autoload :NTSerializer,           "rdf_context/serializer/nt_serializer"
+  autoload :RecursiveSerializer,    "rdf_context/serializer/recursive_serializer"
+  autoload :TurtleSerializer,       "rdf_context/serializer/turtle_serializer"
+  autoload :XmlSerializer,          "rdf_context/serializer/xml_serializer"
+  
+  # Exceptions
+  autoload :BNodeException,         "rdf_context/exceptions"
+  autoload :GraphException,         "rdf_context/exceptions"
+  autoload :InvalidNode,            "rdf_context/exceptions"
+  autoload :InvalidPredicate,       "rdf_context/exceptions"
+  autoload :ParserException,        "rdf_context/exceptions"
+  autoload :RdfException,           "rdf_context/exceptions"
+  autoload :ReadOnlyGraphException, "rdf_context/exceptions"
+  autoload :SparqlException,        "rdf_context/exceptions"
+  autoload :StoreException,         "rdf_context/exceptions"
+  autoload :TypeError,              "rdf_context/exceptions"
+  
   VERSION = File.read(File.join(File.dirname(__FILE__), "..", "VERSION")).chop  # Version in parent directory
   
   LINK_TYPES = %w(
@@ -58,6 +90,10 @@ module RdfContext
     $},
     Regexp::EXTENDED)
 
+  LITERAL_PLAIN         = /^"((?:\\"|[^"])*)"/.freeze
+  LITERAL_WITH_LANGUAGE = /^"((?:\\"|[^"])*)"@([a-z]+[\-A-Za-z0-9]*)/.freeze
+  LITERAL_WITH_DATATYPE = /^"((?:\\"|[^"])*)"\^\^<([^>]+)>/.freeze
+
   RDF_TYPE    = URIRef.new("http://www.w3.org/1999/02/22-rdf-syntax-ns#type")
   XML_LITERAL = Literal::Encoding.xmlliteral
 

data/lib/rdf_context/aggregate_graph.rb

@@ -1,5 +1,3 @@
-require File.join(File.dirname(__FILE__), "graph")
-
 module RdfContext
   # AggregateGraph - A read-only graph composed of multiple other graphs.
   #

data/lib/rdf_context/bnode.rb

@@ -1,6 +1,6 @@
 module RdfContext
   # The BNode class creates RDF blank nodes.
-  class BNode
+  class BNode < Resource
     attr_accessor :identifier
     
     # Create a new BNode, optionally accept a identifier for the BNode.
@@ -27,6 +27,19 @@ module RdfContext
       end
     end
 
+    # Parse a BNode
+    def self.parse(str)
+      BNode.new($1) if str =~ /^_:(.*)$/
+    end
+    
+    ##
+    # Returns `true`
+    #
+    # @return [Boolean]
+    def bnode?
+      true
+    end
+
     # Return BNode identifier
     def to_s
       return self.identifier.to_s

data/lib/rdf_context/conjunctive_graph.rb

@@ -1,5 +1,3 @@
-require File.join(File.dirname(__FILE__), "graph")
-
 module RdfContext
   # ConjunctiveGraph - The top level container for all named Graphs sharing a _Store_
   #

data/lib/rdf_context/graph.rb

@@ -1,17 +1,8 @@
-require File.join(File.dirname(__FILE__), 'namespace')
-require File.join(File.dirname(__FILE__), 'triple')
-require File.join(File.dirname(__FILE__), 'array_hacks')
-require File.join(File.dirname(__FILE__), 'store', 'list_store')
-require File.join(File.dirname(__FILE__), 'store', 'memory_store')
-require File.join(File.dirname(__FILE__), 'serializer', 'nt_serializer')
-require File.join(File.dirname(__FILE__), 'serializer', 'turtle_serializer')
-require File.join(File.dirname(__FILE__), 'serializer', 'xml_serializer')
-
 module RdfContext
   # A simple graph to hold triples.
   #
   # Graphs store triples, and the namespaces associated with those triples, where defined
-  class Graph
+  class Graph < Resource
     attr_reader :triples
     attr_reader :identifier
     attr_reader :store
@@ -48,6 +39,14 @@ module RdfContext
       @identifier = Triple.coerce_node(options[:identifier]) || BNode.new
     end
 
+    ##
+    # Returns `false`, overridden in BNode
+    #
+    # @return [Boolean]
+    def graph?
+      true
+    end
+    
     def inspect
       "#{self.class}[id=#{identifier},store=#{store.inspect}]"
     end

data/lib/rdf_context/literal.rb

@@ -4,11 +4,12 @@ begin
 rescue LoadError
 end
 
-require File.join(File.dirname(__FILE__), 'duration')
+require 'date'
+require 'time'
 
 module RdfContext
   # An RDF Literal, with value, encoding and language elements.
-  class Literal
+  class Literal < Resource
     class Encoding
       attr_reader :value
 
@@ -244,14 +245,15 @@ module RdfContext
       # @param  [Object] contents
       # @option options [Hash] :namespaces ({}) Use :__default__ or "" to declare default namespace
       # @option options [String] :language (nil)
-      # @option options [Array<URIRef>] :profiles ([]) Profiles to add to elements
-      # @option options [Hash] :prefixes (nil) Prefixes to add to elements
-      # @option options [String] :default_vocabulary (nil) Default vocabulary to add to elements
       def encode_contents(contents, options)
         #puts "encode_contents: '#{contents}'"
+        ns_hash = {}
+        (options[:namespaces] || {}).each_pair do |pfx, href|
+          href = href.uri.to_s if href.is_a?(Namespace)
+          ns_hash[pfx.to_s.empty? ? "xmlns" : "xmlns:#{pfx}"] = href.to_s
+        end
         
         if contents.is_a?(String)
-          ns_hash = options[:namespaces].values.inject({}) {|h, ns| h.merge(ns.xmlns_hash)}
           ns_strs = []
           ns_hash.each_pair {|a, u| ns_strs << "#{a}=\"#{u}\""}
 
@@ -265,59 +267,20 @@ module RdfContext
             c = Nokogiri::XML.parse(c.copy(true).to_s) if c.is_a?(LibXML::XML::Node)
           end
           if c.is_a?(Nokogiri::XML::Element)
+            # For real XML C14N recursive processing is required. However, as a first step,
+            # we can just be sure that top-level attributes and namespace declarations are properly
+            # and relatively ordered
+            # From http://www.w3.org/TR/2000/WD-xml-c14n-20001011#Example-SETags
+            #   * Relative order of namespace and attribute axes
+            #   * Lexicographic ordering of namespace and attribute axes
             c = Nokogiri::XML.parse(c.dup.to_xml(:save_with => Nokogiri::XML::Node::SaveOptions::NO_EMPTY_TAGS)).root
-            # Gather namespaces from self and decendant nodes
-            #
-            # prefix mappings
-            # Look for @xmlns and @prefix mappings. Add any other mappings from options[:prefixes]
-            # that aren't already defined on this node
-            defined_mappings = {}
-            prefix_mappings = {}
-            
-            c.traverse do |n|
-              ns = n.namespace
-              next unless ns
-              prefix = ns.prefix ? "xmlns:#{ns.prefix}" : "xmlns"
-              defined_mappings[ns.prefix.to_s] = ns.href.to_s
-              c[prefix] = ns.href unless c.namespaces[prefix]
-            end
-            
-            mappings = c["prefix"].to_s.split(/\s+/)
-            while mappings.length > 0 do
-              prefix, uri = mappings.shift.downcase, mappings.shift
-              #puts "uri_mappings prefix #{prefix} <#{uri}>"
-              next unless prefix.match(/:$/)
-              prefix.chop!
-
-              # A Conforming RDFa Processor must ignore any definition of a mapping for the '_' prefix.
-              next if prefix == "_"
-
-              defined_mappings[prefix] = uri
-              prefix_mappings[prefix] = uri
-            end
 
-            # Add prefixes, being careful to honor mappings defined on the element
-            if options[:prefixes]
-              options[:prefixes].each_pair do |p, ns|
-                prefix_mappings[p] = ns.uri unless defined_mappings.has_key?(p)
-              end
-              if prefix_mappings.length
-                c["prefix"] = prefix_mappings.keys.sort.map {|p| "#{p}: #{prefix_mappings[p]}"}.join(" ")
-              end
-            end
-            
-            # Add profiles, being careful to honor profiles defined on the element
-            if options[:profiles].is_a?(Array) && options[:profiles].length > 0
-              profiles = c["profile"].to_s.split(" ")
-              profiles += options[:profiles]
-              c["profile"] = profiles.join(" ")
-            end
-            
-            # Add default vocabulary, being careful to honor any defined on the element
-            if options[:default_vocabulary] && !c["vocab"]
-              c["vocab"] = options[:default_vocabulary].to_s
+            # Apply defined namespaces
+            ns_hash.each_pair do |prefix, href|
+              c[prefix] = href unless c.namespaces[prefix]
             end
             
+            # Add language
             if options[:language] && c["lang"].to_s.empty?
               c["xml:lang"] = options[:language]
             end
@@ -400,6 +363,18 @@ module RdfContext
       new(contents, encoding, options)
     end
     
+    # Parse a Literal in NTriples format
+    def self.parse(str)
+      case str
+        when LITERAL_WITH_LANGUAGE
+          Literal.n3_encoded($1, $2)
+        when LITERAL_WITH_DATATYPE
+          Literal.n3_encoded($1, nil, $2)
+        when LITERAL_PLAIN
+          Literal.n3_encoded($1, nil)
+      end
+    end
+    
     # Create an un-typed literal with a language
     # @param [Object] contents
     # @param [String] language (nil)
@@ -447,7 +422,7 @@ module RdfContext
       end
     end
 
-   class << self
+    class << self
       protected :new
     end
 
@@ -514,6 +489,14 @@ module RdfContext
       encoding.xml_args(@contents, @lang)
     end
 
+    ##
+    # Returns `true`
+    #
+    # @return [Boolean]
+    def literal?
+      true
+    end
+
     def untyped?; encoding == Encoding.the_null_encoding; end
     def typed?; encoding != Encoding.the_null_encoding; end