rdf_context 0.5.7 → 0.5.8.1

data/lib/rdf_context/rdfxmlparser.rb

@@ -83,7 +83,7 @@ module RdfContext
       def extract_from_element(element)
         b = element.attribute_with_ns("base", XML_NS.uri.to_s)
         lang = element.attribute_with_ns("lang", XML_NS.uri.to_s)
-        self.base = URIRef.new(b.to_s.rdf_unescape, self.base, :normalize => false) if b
+        self.base = URIRef.intern(b.to_s.rdf_unescape, self.base, :normalize => false) if b
         self.language = lang if lang
         self.uri_mappings.merge!(extract_mappings(element))
       end
@@ -98,7 +98,7 @@ module RdfContext
         element.namespaces.each do |attr_name,attr_value|
           abbr, suffix = attr_name.to_s.split(":")
           if abbr == "xmlns"
-            attr_value = URIRef.new(attr_value.rdf_unescape, self.base, :normalize => false) if attr_value.match(/^\#/)
+            attr_value = URIRef.intern(attr_value.rdf_unescape, self.base, :normalize => false) if attr_value.match(/^\#/)
             mappings[suffix] = Namespace.new(attr_value, suffix)
             @graph.bind(mappings[suffix])
           end
@@ -113,7 +113,7 @@ module RdfContext
         @li_counter += 1
         predicate = Addressable::URI.parse(predicate.to_s)
         predicate.fragment = "_#{@li_counter}"
-        predicate = URIRef.new(predicate, :normalize => false)
+        predicate = URIRef.intern(predicate, :normalize => false)
       end
 
       # Set XML base. Ignore any fragment
@@ -215,7 +215,7 @@ module RdfContext
           # If there is an attribute a in propertyAttr with a.URI == rdf:type
           # then u:=uri(identifier:=resolve(a.string-value))
           # and the following triple is added to the graph:
-          u = URIRef.new(attr.value.rdf_unescape, ec.base, :normalize => false)
+          u = URIRef.intern(attr.value.rdf_unescape, ec.base, :normalize => false)
           add_triple(attr, subject, RDF_TYPE, u)
         elsif is_propertyAttr?(attr)
           # Attributes not RDF_TYPE
@@ -404,7 +404,7 @@ module RdfContext
             reify(id, child, subject, predicate, literal, child_ec) if id
           else
             if resourceAttr
-              resource = URIRef.new(resourceAttr.rdf_unescape, ec.base, :normalize => false)
+              resource = URIRef.intern(resourceAttr.rdf_unescape, ec.base, :normalize => false)
             elsif nodeID
               resource = BNode.new(nodeID, @named_bnodes)
             else
@@ -442,7 +442,7 @@ module RdfContext
     # Reify subject, predicate, and object given the EvaluationContext (ec) and current XMl element (el)
     def reify(id, el, subject, predicate, object, ec)
       add_debug(el, "reify, id: #{id}")
-      rsubject = URIRef.new("#" + id, ec.base, :normalize => false)
+      rsubject = URIRef.intern("#" + id, ec.base, :normalize => false)
       add_triple(el, rsubject, RDF_NS.subject, subject)
       add_triple(el, rsubject, RDF_NS.predicate, predicate)
       add_triple(el, rsubject, RDF_NS.object, object)
@@ -478,7 +478,7 @@ module RdfContext
       when about
         about = about.value.rdf_unescape
         add_debug(el, "parse_subject, about: '#{about}'")
-        URIRef.new(about, ec.base, :normalize => false)
+        URIRef.intern(about, ec.base, :normalize => false)
       else
         add_debug(el, "parse_subject, BNode")
         BNode.new
@@ -490,7 +490,7 @@ module RdfContext
       if NC_REGEXP.match(id)
         # ID may only be specified once for the same URI
         if base
-          uri = URIRef.new("##{id}", base, :normalize => false)
+          uri = URIRef.intern("##{id}", base, :normalize => false)
           if @id_mapping[id] && @id_mapping[id] == uri
             warn = "ID addtribute '#{id}' may only be defined once for the same URI"
             add_debug(el, warn)

data/lib/rdf_context/serializer/recursive_serializer.rb

@@ -123,7 +123,7 @@ module RdfContext
         prop_list << prop.to_s
       end
       
-      puts "sort_properties: #{prop_list.to_sentence}" if $DEBUG
+      puts "sort_properties: #{prop_list.to_sentence}" if ::RdfContext::debug?
       prop_list
     end
 

data/lib/rdf_context/serializer/turtle_serializer.rb

@@ -13,7 +13,7 @@ module RdfContext
     # @option options [URIRef, String] :base (nil) Base URI of graph, used to shorting URI references
     # @return [void]
     def serialize(stream, options = {})
-      puts "\nserialize: #{@graph.inspect}" if $DEBUG
+      puts "\nserialize: #{@graph.inspect}" if ::RdfContext::debug?
       reset
       @stream = stream
       @base = options[:base]
@@ -84,23 +84,23 @@ module RdfContext
     # Checks if l is a valid RDF list, i.e. no nodes have other properties.
     def is_valid_list(l)
       props = @graph.properties(l)
-      #puts "is_valid_list: #{props.inspect}" if $DEBUG
+      #puts "is_valid_list: #{props.inspect}" if ::RdfContext::debug?
       return false unless props.has_key?(RDF_NS.first.to_s) || l == RDF_NS.nil
       while l && l != RDF_NS.nil do
-        #puts "is_valid_list(length): #{props.length}" if $DEBUG
+        #puts "is_valid_list(length): #{props.length}" if ::RdfContext::debug?
         return false unless props.has_key?(RDF_NS.first.to_s) && props.has_key?(RDF_NS.rest.to_s)
         n = props[RDF_NS.rest.to_s]
-        #puts "is_valid_list(n): #{n.inspect}" if $DEBUG
+        #puts "is_valid_list(n): #{n.inspect}" if ::RdfContext::debug?
         return false unless n.is_a?(Array) && n.length == 1
         l = n.first
         props = @graph.properties(l)
       end
-      #puts "is_valid_list: valid" if $DEBUG
+      #puts "is_valid_list: valid" if ::RdfContext::debug?
       true
     end
     
     def do_list(l)
-      puts "do_list: #{l.inspect}" if $DEBUG
+      puts "do_list: #{l.inspect}" if ::RdfContext::debug?
       position = SUBJECT
       while l do
         p = @graph.properties(l)
@@ -116,7 +116,7 @@ module RdfContext
     
     def p_list(node, position)
       return false if !is_valid_list(node)
-      #puts "p_list: #{node.inspect}, #{position}" if $DEBUG
+      #puts "p_list: #{node.inspect}, #{position}" if ::RdfContext::debug?
 
       write(position == SUBJECT ? "(" : " (")
       @depth += 2
@@ -134,7 +134,7 @@ module RdfContext
     def p_squared(node, position)
       return false unless p_squared?(node, position)
 
-      #puts "p_squared: #{node.inspect}, #{position}" if $DEBUG
+      #puts "p_squared: #{node.inspect}, #{position}" if ::RdfContext::debug?
       subject_done(node)
       write(position == SUBJECT ? '[' : ' [')
       @depth += 2
@@ -146,18 +146,18 @@ module RdfContext
     end
     
     def p_default(node, position)
-      #puts "p_default: #{node.inspect}, #{position}" if $DEBUG
+      #puts "p_default: #{node.inspect}, #{position}" if ::RdfContext::debug?
       l = (position == SUBJECT ? "" : " ") + label(node)
       write(l)
     end
     
     def path(node, position)
-      puts "path: #{node.inspect}, pos: #{position}, []: #{is_valid_list(node)}, p2?: #{p_squared?(node, position)}, rc: #{ref_count(node)}" if $DEBUG
+      puts "path: #{node.inspect}, pos: #{position}, []: #{is_valid_list(node)}, p2?: #{p_squared?(node, position)}, rc: #{ref_count(node)}" if ::RdfContext::debug?
       raise RdfException, "Cannot serialize node '#{node}'" unless p_list(node, position) || p_squared(node, position) || p_default(node, position)
     end
     
     def verb(node)
-      puts "verb: #{node.inspect}" if $DEBUG
+      puts "verb: #{node.inspect}" if ::RdfContext::debug?
       if node == RDF_TYPE
         write(" a")
       else
@@ -166,11 +166,11 @@ module RdfContext
     end
     
     def object_list(objects)
-      puts "object_list: #{objects.inspect}" if $DEBUG
+      puts "object_list: #{objects.inspect}" if ::RdfContext::debug?
       return if objects.empty?
 
       objects.each_with_index do |obj, i|
-        write(",\n#{indent(2)}") if i > 0
+        write(",\n#{indent(4)}") if i > 0
         path(obj, OBJECT)
       end
     end
@@ -178,7 +178,7 @@ module RdfContext
     def predicate_list(subject)
       properties = @graph.properties(subject)
       prop_list = sort_properties(properties) - [RDF_NS.first.to_s, RDF_NS.rest.to_s]
-      puts "predicate_list: #{prop_list.inspect}" if $DEBUG
+      puts "predicate_list: #{prop_list.inspect}" if ::RdfContext::debug?
       return if prop_list.empty?
 
       prop_list.each_with_index do |prop, i|
@@ -212,7 +212,7 @@ module RdfContext
     end
     
     def statement(subject)
-      puts "statement: #{subject.inspect}, s2?: #{s_squared(subject)}" if $DEBUG
+      puts "statement: #{subject.inspect}, s2?: #{s_squared(subject)}" if ::RdfContext::debug?
       subject_done(subject)
       s_squared(subject) || s_default(subject)
     end

data/lib/rdf_context/serializer/xml_serializer.rb

@@ -34,7 +34,7 @@ module RdfContext
       
       doc = Nokogiri::XML::Document.new
 
-      puts "\nserialize: graph namespaces: #{@graph.nsbinding.inspect}" if $DEBUG
+      puts "\nserialize: graph namespaces: #{@graph.nsbinding.inspect}" if ::RdfContext::debug?
 
       preprocess
 
@@ -67,7 +67,7 @@ module RdfContext
       # Add bindings for predicates not already having bindings
       tmp_ns = "ns0"
       required_namespaces.keys.each do |uri|
-        puts "create namespace definition for #{uri}" if $DEBUG
+        puts "create namespace definition for #{uri}" if ::RdfContext::debug?
         add_namespace(Namespace.new(uri, tmp_ns))
         tmp_ns = tmp_ns.succ
       end
@@ -100,7 +100,7 @@ module RdfContext
         subject_done(subject)
         properties = @graph.properties(subject)
         prop_list = sort_properties(properties)
-        puts "subject: #{subject.to_n3}, props: #{properties.inspect}" if $DEBUG
+        puts "subject: #{subject.to_n3}, props: #{properties.inspect}" if ::RdfContext::debug?
 
         rdf_type, *rest = properties.fetch(RDF_TYPE.to_s, [])
         if rdf_type.is_a?(URIRef)
@@ -133,7 +133,7 @@ module RdfContext
           end
         end
       elsif @force_RDF_about.include?(subject)
-        puts "subject: #{subject.to_n3}, force about" if $DEBUG
+        puts "subject: #{subject.to_n3}, force about" if ::RdfContext::debug?
         node = Nokogiri::XML::Element.new("rdf:Description", parent_node.document)
         node["rdf:about"] = relativize(subject)
         @force_RDF_about.delete(subject)
@@ -177,7 +177,7 @@ module RdfContext
         end
       end
 
-      puts "predicate: #{qname}, as_attr: #{as_attr}, object: #{object.inspect}, done: #{is_done?(object)}, sub: #{@subjects.include?(object)}" if $DEBUG
+      puts "predicate: #{qname}, as_attr: #{as_attr}, object: #{object.inspect}, done: #{is_done?(object)}, sub: #{@subjects.include?(object)}" if ::RdfContext::debug?
       qname = "rdf:li" if qname.match(/rdf:_\d+/)
       pred_node = Nokogiri::XML::Element.new(qname, node.document)
       
@@ -185,7 +185,7 @@ module RdfContext
         # Literals or references to objects that aren't subjects, or that have already been serialized
         
         args = object.xml_args
-        puts "predicate: args=#{args.inspect}" if $DEBUG
+        puts "predicate: args=#{args.inspect}" if ::RdfContext::debug?
         attrs = args.pop
         
         if as_attr
@@ -198,10 +198,10 @@ module RdfContext
           attrs.each_pair do |a, av|
             next if a == "xml:lang" && av == @lang # Lang already specified, don't repeat
             av = relativize(object) if a == "#{RDF_NS.prefix}:resource"
-            puts "  elt attr #{a}=#{av}" if $DEBUG
+            puts "  elt attr #{a}=#{av}" if ::RdfContext::debug?
             pred_node[a] = av.to_s
           end
-          puts "  elt #{'xmllit ' if object.is_a?(Literal) && object.xmlliteral?}content=#{args.first}" if $DEBUG && !args.empty?
+          puts "  elt #{'xmllit ' if object.is_a?(Literal) && object.xmlliteral?}content=#{args.first}" if ::RdfContext::debug? && !args.empty?
           if object.is_a?(Literal) && object.xmlliteral?
             pred_node.add_child(Nokogiri::XML::CharacterData.new(args.first, node.document))
           elsif args.first

data/lib/rdf_context/store/memory_store.rb

@@ -87,7 +87,7 @@ module RdfContext
       oi = resource_to_int(triple.object) || gen_key(triple.object)
       ci = resource_to_int(context) || gen_key(context)
     
-      puts "add: #{si}=#{triple.subject}, #{pi}=#{triple.predicate}, #{oi}=#{triple.object}, #{ci}=#{context ? context.identifier : 'none'}" if $DEBUG
+      puts "add: #{si}=#{triple.subject}, #{pi}=#{triple.predicate}, #{oi}=#{triple.object}, #{ci}=#{context ? context.identifier : 'none'}" if ::RdfContext::debug?
       set_nested_index(@cspo, ci, si, pi, oi)
       set_nested_index(@cpos, ci, pi, oi, si)
       set_nested_index(@cosp, ci, oi, si, pi)
@@ -97,7 +97,7 @@ module RdfContext
         set_nested_index(@pos, pi, oi, si, ci)
         set_nested_index(@osp, oi, si, pi, ci)
       end
-      #dump if $DEBUG
+      #dump if ::RdfContext::debug?
     end
   
     # Remove a triple from the context and store
@@ -155,7 +155,7 @@ module RdfContext
     
       results = []
       si, pi, oi = triple_to_int(triple)
-      puts "triples? #{si}=#{triple.subject}, #{pi}=#{triple.predicate}, #{oi}=#{triple.object}, #{ci}=#{context ? context.identifier : 'none'}" if $DEBUG
+      puts "triples? #{si}=#{triple.subject}, #{pi}=#{triple.predicate}, #{oi}=#{triple.object}, #{ci}=#{context ? context.identifier : 'none'}" if ::RdfContext::debug?
 
       def result(v, si, pi, oi, ctx)
         triple = int_to_triple(si, pi, oi)
@@ -164,22 +164,22 @@ module RdfContext
             # keys are contexts
             v.keys.each do |ci|
               context = int_to_resource(ci)
-              puts "triples= #{si}=#{triple.subject}, #{pi}=#{triple.predicate}, #{oi}=#{triple.object}, #{ci}=#{context ? context.identifier : 'none'}" if $DEBUG
+              puts "triples= #{si}=#{triple.subject}, #{pi}=#{triple.predicate}, #{oi}=#{triple.object}, #{ci}=#{context ? context.identifier : 'none'}" if ::RdfContext::debug?
               yield triple, context
             end
           else
-            puts "triples= #{si}=#{triple.subject}, #{pi}=#{triple.predicate}, #{oi}=#{triple.object}, #{ctx ? ctx.identifier : 'none'}" if $DEBUG
+            puts "triples= #{si}=#{triple.subject}, #{pi}=#{triple.predicate}, #{oi}=#{triple.object}, #{ctx ? ctx.identifier : 'none'}" if ::RdfContext::debug?
             yield triple, ctx
           end
         else
-          puts "triples= #{si}=#{triple.subject}, #{pi}=#{triple.predicate}, #{oi}=#{triple.object}, #{ctx ? ctx.identifier : 'none'}" if $DEBUG
+          puts "triples= #{si}=#{triple.subject}, #{pi}=#{triple.predicate}, #{oi}=#{triple.object}, #{ctx ? ctx.identifier : 'none'}" if ::RdfContext::debug?
         end
         triple
       end
     
       if si # subject is given
         if spo.has_key?(si)
-          #puts "spo[#{si}] = #{spo[si].inspect}" if $DEBUG
+          #puts "spo[#{si}] = #{spo[si].inspect}" if ::RdfContext::debug?
           if pi # subject+predicate is given
             if spo[si].has_key?(pi)
               if oi # subject+predicate+object is given
@@ -194,13 +194,13 @@ module RdfContext
             end
           elsif triple.predicate.nil? # subject given, predicate unbound
             spo[si].keys.each do |pi|
-              #puts "spo[#{si}][#{pi}] = #{spo[si][pi].inspect}" if $DEBUG
+              #puts "spo[#{si}][#{pi}] = #{spo[si][pi].inspect}" if ::RdfContext::debug?
               if oi # object is given
                 results << result(spo[si][pi][oi], si, pi, oi, context, &block) if spo[si][pi].has_key?(oi)
               else # object unbound
                 #puts "spo[#{si}][#{pi}] = #{spo[si][pi].inspect}"
                 spo[si][pi].each_pair do |oi, value|
-                  #puts "spo[#{si}][#{pi}][#{oi}] = #{spo[si][pi][oi].inspect}" if $DEBUG
+                  #puts "spo[#{si}][#{pi}][#{oi}] = #{spo[si][pi][oi].inspect}" if ::RdfContext::debug?
                   results << result(value, si, pi, oi, context, &block)
                 end
                 oi = nil
@@ -240,13 +240,13 @@ module RdfContext
       elsif !triple.object.nil?
         # Subject+predicate unspecified, object specified but not found, skip
       else # subject+predicate+object unbound
-        #puts "spo = #{spo.inspect}" if $DEBUG
+        #puts "spo = #{spo.inspect}" if ::RdfContext::debug?
         spo.keys.each do |si|
-          #puts "spo[#{si}] = #{spo[si].inspect}" if $DEBUG
+          #puts "spo[#{si}] = #{spo[si].inspect}" if ::RdfContext::debug?
           spo[si].keys.each do |pi|
-            #puts "spo[#{si}][#{pi}] = #{spo[si][pi].inspect}" if $DEBUG
+            #puts "spo[#{si}][#{pi}] = #{spo[si][pi].inspect}" if ::RdfContext::debug?
             spo[si][pi].each_pair do |oi, value|
-              #puts "spo[#{si}][#{pi}][#{oi}] = #{spo[si][pi][oi].inspect}" if $DEBUG
+              #puts "spo[#{si}][#{pi}][#{oi}] = #{spo[si][pi][oi].inspect}" if ::RdfContext::debug?
               results << result(value, si, pi, oi, context, &block)
             end
           end
@@ -317,7 +317,7 @@ module RdfContext
         ndx = ndx[key]
       end
     
-      #puts("set_nested_index: #{index.inspect}, keys: #{keys.inspect}") if $DEBUG
+      #puts("set_nested_index: #{index.inspect}, keys: #{keys.inspect}") if ::RdfContext::debug?
     end
   
     # Remove context from the list of contexts in a nested index.

data/lib/rdf_context/store/sqlite3_store.rb

@@ -167,18 +167,18 @@ module RdfContext
       #@statement_cache[qStr] ||= @db.prepare(qStr)
       @statement_cache[qStr] ||= qStr
 
-      puts "executeSQL: '#{qStr}', '#{params.join("', '")}'" if $DEBUG
+      puts "executeSQL: '#{qStr}', '#{params.join("', '")}'" if ::RdfContext::debug?
       if block_given?
         @db.execute(@statement_cache[qStr], *params) do |row|
-          puts "executeSQL res: #{row.inspect}" if $DEBUG
+          puts "executeSQL res: #{row.inspect}" if ::RdfContext::debug?
           yield(row)
         end
       else
-        puts "executeSQL no block given" if $DEBUG
+        puts "executeSQL no block given" if ::RdfContext::debug?
         @db.execute(@statement_cache[qStr], *params)
       end
     rescue SQLite3::SQLException => e
-      puts "SQL Exception (ignored): #{e.message}" if $DEBUG
+      puts "SQL Exception (ignored): #{e.message}" if ::RdfContext::debug?
     end
 
     CREATE_ASSERTED_STATEMENTS_TABLE = %(

data/lib/rdf_context/uriref.rb

@@ -24,7 +24,7 @@ module RdfContext
       if args.size == 1
         uri = Addressable::URI.parse(args[0].to_s.rdf_unescape.rdf_escape)
       else
-        uri = Addressable::URI.join(*args.map{|s| s.to_s.rdf_unescape.rdf_escape}.reverse)
+        uri = Addressable::URI.join(*args.compact.map{|s| s.to_s.rdf_unescape.rdf_escape}.reverse)
       end
 
       raise ParserException, "<" + uri.to_s + "> is a relative URI" if uri.relative?
@@ -33,18 +33,25 @@ module RdfContext
       @@uri_hash ||= {}
       @uri = @@uri_hash["#{uri}#{@normalize}"] ||= begin
         # Special case if URI has no path, and the authority ends with a '#'
-        uri = Addressable::URI.parse($1) if @normalize && uri.to_s.match(/^(.*)\#$/)
+        #uri = Addressable::URI.parse($1) if @normalize && uri.to_s.match(/^(.*)\#$/)
 
-        @normalize ? uri.normalize : uri
+        #@normalize ? uri.normalize : uri
+        uri
       end.freeze
     end
     
+    # Internalized version of URIRef
+    def self.intern(*args)
+      @@uri_hash ||= {}
+      @@uri_hash[args.to_s] ||= URIRef.new(*args)
+    end
+    
     # Create a URI, either by appending a fragment, or using the input URI
     # @param [#to_s] input
     # @return [URIRef]
     def + (input)
       input_uri = Addressable::URI.parse(input.to_s)
-      return URIRef.new(input_uri, self.to_s)
+      return URIRef.intern(input_uri, self.to_s)
     end
     
     # short_name of URI for creating QNames.

data/script/console

@@ -3,8 +3,6 @@
 irb = RUBY_PLATFORM =~ /(:?mswin|mingw)/ ? 'irb.bat' : 'irb'
 
 libs =  " -r irb/completion"
-# Perhaps use a console_lib to store any extra methods I may want available in the cosole
-# libs << " -r #{File.dirname(__FILE__) + '/../lib/console_lib/console_logger.rb'}"
-libs <<  " -r #{File.dirname(__FILE__) + '/../lib/rdf_context.rb'}"
+libs << " -r #{File.join(File.expand_path(File.dirname(__FILE__)), "..", "lib", "rdf_context.rb")}"
 puts "Loading rdf_context gem"
 exec "#{irb} #{libs} --simple-prompt"

data/script/tc

@@ -0,0 +1,44 @@
+#!/usr/bin/env ruby -s
+require 'rubygems'
+$:.unshift(File.join(File.expand_path(File.dirname(__FILE__)), "..", 'lib'))
+require 'rdf_context'
+require 'spec/rdfa_helper'
+require 'getoptlong'
+
+def run_tc(tc)
+  puts "run #{tc.name}"
+  graph = RdfContext::RdfaParser.parse(tc.input, tc.informationResourceInput, :strict => $strict, :version => tc.version)
+  puts graph.serialize(:format => $format.to_sym, :base => tc.informationResourceInput) unless $quiet
+end
+
+$verbose = false
+$format = :ntriples
+$strict = false
+suite = "xhtml"
+opts = GetoptLong.new(
+  ["--debug", GetoptLong::NO_ARGUMENT],
+  ["--verbose", GetoptLong::NO_ARGUMENT],
+  ["--quiet", GetoptLong::NO_ARGUMENT],
+  ["--suite", GetoptLong::OPTIONAL_ARGUMENT],
+  ["--strict", GetoptLong::NO_ARGUMENT],
+  ["--format", GetoptLong::REQUIRED_ARGUMENT]
+)
+opts.each do |opt, arg|
+  case opt
+  when '--verbose' then $verbose = true
+  when '--quiet' then $quiet = true
+  when '--debug' then ::RdfContext::debug = true
+  when '--format' then $format = arg
+  when '--suite' then suite = arg
+  when '--strict' then $strict = true
+  end
+end
+
+test_cases = RdfaHelper::TestCase.test_cases(suite)
+
+puts test_cases.length
+
+test_cases = test_cases.detect do |tc|
+  next unless ARGV.empty? || ARGV.any? {|n| tc.name.match(/#{n}/)}
+  run_tc(tc)
+end