rdf_context 0.4.6 → 0.4.7

data/History.txt

@@ -1,3 +1,10 @@
+=== 0.4.7
+* Graph identifiers only URIRef or BNode; Literal not supported by SQL Store.
+* Namespace#+ updated to not use URIRef logic for creating URIs, as this removes part of the URI in the case that the URI does not end with / or #.
+* Incorporated pdlug's changes:
+  * Support using trailing underscores to work around generating URI's with Namespace that use methods that are on core ruby classes or reserved words (like Nokogiri Builder does). For example dc.type_ to generate the dc:type URI.
+  * Tests for Date/DateTime literals, added support for detecting them and generating the right literals in Triple.
+
 === 0.4.6
 * Added Graph#uri_mapping and AbstractStore#uri_mapping for uri => Namespace mappings in graph
 * Fix BNode creation from existing identifier (named or un-named)

data/VERSION

@@ -1 +1 @@
-0.4.6
+0.4.7

data/lib/rdf_context/graph.rb

@@ -29,7 +29,7 @@ module RdfContext
     #
     # @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, Literal, BNode or URIRef
+    # <em>options[:identifier]</em>:: Identifier for this graph, BNode or URIRef
     def initialize(options = {})
       @nsbinding = {}
 

data/lib/rdf_context/literal.rb

@@ -1,3 +1,9 @@
+begin
+  require 'xml'
+  $libxml_enabled = true
+rescue LoadError
+end
+
 module RdfContext
   # An RDF Literal, with value, encoding and language elements.
   class Literal
@@ -23,7 +29,17 @@ module RdfContext
       def self.string
         @string ||= coerce "http://www.w3.org/2001/XMLSchema#string"
       end
-
+      
+      # Shortcut for <tt>Literal::Encoding.new("http://www.w3.org/2001/XMLSchema#date")</tt>
+      def self.date
+        @date ||= coerce "http://www.w3.org/2001/XMLSchema#date"
+      end
+      
+      # Shortcut for <tt>Literal::Encoding.new("http://www.w3.org/2001/XMLSchema#dateTime")</tt>
+      def self.datetime
+        @datetime ||= coerce "http://www.w3.org/2001/XMLSchema#dateTime"
+      end
+      
       # Create from URI, empty or nil string
       def self.coerce(string_or_nil)
         if string_or_nil.nil? || string_or_nil == ''
@@ -179,7 +195,9 @@ module RdfContext
 
         # Add already mapped namespaces and language
         @contents = contents.map do |c|
-          c = Nokogiri::XML.parse(c.copy(true).to_s) if c.is_a?(LibXML::XML::Node)
+          if $libxml_enabled
+            c = Nokogiri::XML.parse(c.copy(true).to_s) if c.is_a?(LibXML::XML::Node)
+          end
           if c.is_a?(Nokogiri::XML::Element)
             # Gather namespaces from self and decendant nodes
             c.traverse do |n|

data/lib/rdf_context/namespace.rb

@@ -36,6 +36,8 @@ module RdfContext
     #   foaf = Namespace.new("http://xmlns.com/foaf/0.1/", "foaf"); foaf.knows # => returns a new URIRef with URI "http://xmlns.com/foaf/0.1/knows"
     #   foaf = Namespace.new("http://xmlns.com/foaf/0.1/", "foaf", true); foaf.knows # => returns a new URIRef with URI "http://xmlns.com/foaf/0.1/#knows"
     #
+    # To avoid naming problems, a suffix may have an appended '_', which will be removed when the URI is generated.
+    #
     # @return [URIRef]:: The newly created URIRegerence.
     # @raise [Error]:: Checks validity of the desired prefix and raises if it is incorrect.
     # @author Tom Morris, Pius Uzamere
@@ -45,7 +47,10 @@ module RdfContext
 
     # Construct a URIRef from a namespace as in method_missing, but without method collision issues
     def +(suffix)
-      URIRef.new((fragment ? "##{suffix}" : suffix.to_s), @uri)
+      prefix = @uri.to_s
+      prefix += '#' if fragment && !prefix.match(/\#$/)
+      suffix = suffix.to_s.sub(/_$/, '')
+      URIRef.new(prefix + suffix)
     end
 
     # Bind this namespace to a Graph

data/lib/rdf_context/rdfxmlparser.rb

@@ -1,4 +1,3 @@
-require 'xml'
 require File.join(File.dirname(__FILE__), 'parser')
 
 module RdfContext

data/lib/rdf_context/store/memory_store.rb

@@ -74,7 +74,7 @@ module RdfContext
       oi = resource_to_int(triple.object) || gen_key(triple.object)
       ci = resource_to_int(context) || gen_key(context)
     
-      puts "add: #{si}, #{pi}, #{oi}, #{ci}" if $DEBUG
+      puts "add: #{si}=#{triple.subject}, #{pi}=#{triple.predicate}, #{oi}=#{triple.object}, #{ci}=#{context ? context.identifier : 'none'}" if $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)
@@ -132,7 +132,7 @@ module RdfContext
     
       results = []
       si, pi, oi = triple_to_int(triple)
-      puts "triples: si=#{si}, pi=#{pi}, oi=#{oi}, ci=#{ci}" if $DEBUG
+      puts "triples? #{si}=#{triple.subject}, #{pi}=#{triple.predicate}, #{oi}=#{triple.object}, #{ci}=#{context ? context.identifier : 'none'}" if $DEBUG
 
       def result(v, si, pi, oi, ctx)
         triple = int_to_triple(si, pi, oi)
@@ -141,12 +141,15 @@ 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
               yield triple, context
             end
           else
-            #puts "ctx: #{ctx}"
+            puts "triples= #{si}=#{triple.subject}, #{pi}=#{triple.predicate}, #{oi}=#{triple.object}, #{ctx ? ctx.identifier : 'none'}" if $DEBUG
             yield triple, ctx
           end
+        else
+          puts "triples= #{si}=#{triple.subject}, #{pi}=#{triple.predicate}, #{oi}=#{triple.object}, #{ctx ? ctx.identifier : 'none'}" if $DEBUG
         end
         triple
       end
@@ -214,13 +217,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 $DEBUG
         spo.keys.each do |si|
-          puts "spo[#{si}] = #{spo[si].inspect}" if $DEBUG
+          #puts "spo[#{si}] = #{spo[si].inspect}" if $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 $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 $DEBUG
               results << result(value, si, pi, oi, context, &block)
             end
           end

data/lib/rdf_context/triple.rb

@@ -102,8 +102,8 @@ module RdfContext
 
     # Coerce a predicate to the appropriate RdfContext type.
     # 
-    # @param[URI, URIRef, String] subject:: If a String looks like a URI, a URI is created
-    # @raise[InvalidSubject]:: If subject can't be predicate.
+    # @param[URI, URIRef, String] predicate:: If a String looks like a URI, a URI is created
+    # @raise[InvalidPredicate]:: If predicate can't be predicate.
     def self.coerce_predicate(predicate)
       case predicate
       when Addressable::URI
@@ -124,7 +124,7 @@ module RdfContext
     # Coerce a object to the appropriate RdfContext type.
     # 
     # @param[URI, URIRef, String, Integer, Float, BNode, Literal] object:: If a String looks like a URI, a URI is created, otherwise an untyped Literal.
-    # @raise[InvalidSubject]:: If subject can't be predicate.
+    # @raise[InvalidObject]:: If object can't be predicate.
     def self.coerce_object(object)
       case object
       when Addressable::URI
@@ -135,11 +135,11 @@ module RdfContext
         else
           Literal.untyped(object)
         end
-      when Integer, Float
+      when Integer, Float, Date
         Literal.build_from(object)
       when URIRef, BNode, Literal
         object
-      when nil, regexp
+      when nil
         object
       else
         raise InvalidObject, "#{object.class}: #{object.inspect} is not a valid object"

data/spec/literal_spec.rb

@@ -132,7 +132,37 @@ describe "Literals: " do
       float.encoding.should == "http://www.w3.org/2001/XMLSchema#float"
     end
   end
+
+  describe "a date" do
+    describe "encodings" do
+      subject { Literal.typed("2010-01-02", "http://www.w3.org/2001/XMLSchema#date") }
+      it "should return n3" do subject.to_n3.should == "\"2010-01-02\"^^<http://www.w3.org/2001/XMLSchema#date>" end
+      it "should return ntriples" do subject.to_ntriples.should == subject.to_n3 end
+      it "should return xml_args" do subject.xml_args.should == ["2010-01-02", {"rdf:datatype" => "http://www.w3.org/2001/XMLSchema#date"}] end
+      it "should return TriX" do subject.to_trix.should == "<typedLiteral datatype=\"http://www.w3.org/2001/XMLSchema#date\">2010-01-02</typedLiteral>" end
+    end
+
+    it "should infer type" do
+      int = Literal.build_from(Date::civil(2010, 1, 2))
+      int.encoding.should == "http://www.w3.org/2001/XMLSchema#date"
+    end
+  end
+  
+  describe "a date time" do
+    describe "encodings" do
+      subject { Literal.typed("2010-01-03T01:02:03", "http://www.w3.org/2001/XMLSchema#dateTime") }
+      it "should return n3" do subject.to_n3.should == "\"2010-01-03T01:02:03\"^^<http://www.w3.org/2001/XMLSchema#dateTime>" end
+      it "should return ntriples" do subject.to_ntriples.should == subject.to_n3 end
+      it "should return xml_args" do subject.xml_args.should == ["2010-01-03T01:02:03", {"rdf:datatype" => "http://www.w3.org/2001/XMLSchema#dateTime"}] end
+      it "should return TriX" do subject.to_trix.should == "<typedLiteral datatype=\"http://www.w3.org/2001/XMLSchema#dateTime\">2010-01-03T01:02:03</typedLiteral>" end
+    end
     
+    it "should infer type" do
+      int = Literal.build_from(DateTime.parse('2010-01-03T01:02:03'))
+      int.encoding.should == "http://www.w3.org/2001/XMLSchema#dateTime"
+    end
+  end
+  
   describe "XML Literal" do
     describe "with no namespace" do
       subject { Literal.typed("foo <sup>bar</sup> baz!", "http://www.w3.org/1999/02/22-rdf-syntax-ns#XMLLiteral") }
@@ -300,6 +330,12 @@ describe "Literals: " do
     specify "string" do
       Literal::Encoding.string.should == Literal::Encoding.new("http://www.w3.org/2001/XMLSchema#string")
     end
+    specify "date" do
+      Literal::Encoding.date.should == Literal::Encoding.new("http://www.w3.org/2001/XMLSchema#date")
+    end
+    specify "date time" do
+      Literal::Encoding.datetime.should == Literal::Encoding.new("http://www.w3.org/2001/XMLSchema#dateTime")
+    end
     specify "xmlliteral" do
       Literal::Encoding.xmlliteral.should == Literal::XMLLiteral.new("http://www.w3.org/1999/02/22-rdf-syntax-ns#XMLLiteral")
     end

data/spec/namespaces_spec.rb

@@ -50,14 +50,20 @@ describe "Namespace" do
     subject.foo.should == "http://xmlns.com/foaf/0.1/foo"
   end
   
-  it "should construct URI with +" do
-    (subject + "foo").class.should == URIRef
-    (subject + "foo").should == "http://xmlns.com/foaf/0.1/foo"
-  end
-  
-  it "will cause method conflict" do
-    (subject + "class").should == "http://xmlns.com/foaf/0.1/class"
-    subject.class.should ==  Namespace
+  describe '#+' do
+    it "should construct URI with +" do
+      (subject + "foo").class.should == URIRef
+      (subject + "foo").should == "http://xmlns.com/foaf/0.1/foo"
+    end
+    
+    it "should strip trailing _ (used to work around reserved method names)" do
+      (subject + "type_").should == "http://xmlns.com/foaf/0.1/type"
+    end
+    
+    it "will cause method conflict" do
+      (subject + "class").should == "http://xmlns.com/foaf/0.1/class"
+      subject.class.should ==  Namespace
+    end
   end
   
   it "should be be equivalent" do

data/spec/rdfxml_spec.rb

@@ -20,10 +20,8 @@ EOF
   end
   
   it "should parse simple doc without a base URI" do
-        sampledoc = <<-EOF;
-    <?xml version="1.0" ?>
-    <NotRDF />
-    EOF
+        sampledoc = %(<?xml version="1.0" ?>
+    <NotRDF />)
         graph = @parser.parse(sampledoc, nil, :strict => true)
         graph.size.should == 1
         statement = graph[0]

data/spec/triple_spec.rb

@@ -61,7 +61,7 @@ describe "Triples" do
     it "should accept a uri string and make URIRef" do
       Triple.coerce_subject('http://localhost/').should == URIRef.new('http://localhost/')
     end
-    
+
     it "should accept an Addressable::URI object and make URIRef" do
       Triple.coerce_subject(Addressable::URI.parse("http://localhost/")).should == URIRef.new("http://localhost/")
     end
@@ -91,6 +91,26 @@ describe "Triples" do
   end
 
   describe "with coerced object" do
+    it 'should make a literal for Integer types' do
+      ref = 5
+      Triple.coerce_object(ref).should == Literal.build_from(ref)
+    end
+    
+    it 'should make a literal for Float types' do
+      ref = 15.4
+      Triple.coerce_object(ref).should == Literal.build_from(ref)
+    end
+    
+    it 'should make a literal for Date types' do
+      ref = Date::civil(2010, 1, 2)
+      Triple.coerce_object(ref).should == Literal.build_from(ref)
+    end
+    
+    it 'should make a literal for DateTime types' do
+      ref = DateTime.parse('2010-01-03T01:02:03')
+      Triple.coerce_object(ref).should == Literal.build_from(ref)
+    end
+    
     it "should leave URIRefs alone" do
       ref = URIRef.new("http://localhost/")
       Triple.coerce_object(ref).should == ref

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rdf_context
 version: !ruby/object:Gem::Version 
-  version: 0.4.6
+  version: 0.4.7
 platform: ruby
 authors: 
 - Gregg Kellogg
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-15 00:00:00 -08:00
+date: 2010-01-16 00:00:00 -08:00
 default_executable: rdf_context
 dependencies: 
 - !ruby/object:Gem::Dependency