rdf_context 0.4.2 → 0.4.3

data/History.txt

@@ -1,3 +1,6 @@
+=== 0.4.3
+* Coverage tests
+
 === 0.4.2
 * Released as RdfContext gem
 

data/VERSION

@@ -1 +1 @@
-0.4.2
+0.4.3

data/lib/rdf_context/conjunctive_graph.rb

@@ -15,7 +15,7 @@ module RdfContext
     # Store for ConjunctiveGraph must support contexts.
     def initialize(options = {})
       unless options[:store] && options[:store].context_aware?
-        raise GraphException.new("Conjuective Graph requires store supporting contexts")
+        raise GraphException.new("ConjunctiveGraph requires store supporting contexts")
       end
     
       super(:identifier => options[:store].identifier, :store => options[:store])

data/lib/rdf_context/graph.rb

@@ -72,8 +72,8 @@ module RdfContext
     #
     # Might be necessary for stores that require opening a connection to a
     # database or acquiring some resource.
-    def open(configuration, create=false)
-      @store.open(configuration, create)
+    def open(configuration = {})
+      @store.open(configuration)
     end
 
     # Close the graph store

data/lib/rdf_context/rdfxmlparser.rb

@@ -149,11 +149,6 @@ module RdfContext
     end
   
     private
-    # Is the node rdf:RDF?
-    def is_rdf_root? (node)
-      node.name == "RDF" && node.namespace.href == RDF_NS.uri.to_s
-    end
-    
     # XML nodeElement production
     #
     # @param [XML Element] el:: XMl Element to parse

data/lib/rdf_context/store/abstract_sql_store.rb

@@ -39,9 +39,6 @@ module RdfContext
       @bnodeCache = {}
       @uriCache = {}
       
-      @context_aware = true
-      @formula_aware = true
-      @transaction_aware = true
       @autocommit_default = true
       
       raise StoreException.new("Identifier must be nil or a URIRef") if identifier && !identifier.is_a?(URIRef)
@@ -51,6 +48,15 @@ module RdfContext
       
       @db = configuration.empty? ? nil : open(configuration)
     end
+
+    # Supports contexts
+    def context_aware?; true; end
+    
+    # Supports formulae
+    def formula_aware?; true; end
+
+    # Supports transactions
+    def transaction_aware?; true; end
     
     def close(commit_pending_transactions = false)
       @db.commit if commit_pending_transactions && @db.transaction_active?
@@ -525,9 +531,9 @@ module RdfContext
 
     # List of namespace bindings, as a hash
     def nsbinding
-      namespaces = []
+      namespaces = {}
       executeSQL("SELECT prefix, uri FROM #{namespace_binds}") do |row|
-        namespaces << Namespace.new(row[1], row[0])
+        namespaces[row[0]] = Namespace.new(row[1], row[0])
       end
       namespaces
     end
@@ -727,11 +733,11 @@ module RdfContext
     end
 
     def buildLitDTypeClause(obj,tableName)
-      "#{tableName}.objDatatype='#{obj.encoding.value}'" if obj.is_a?(Literal) && obj.encoding
+      ["#{tableName}.objDatatype='#{obj.encoding.value}'"] if obj.is_a?(Literal) && obj.encoding
     end
     
     def buildLitLanguageClause(obj,tableName)
-      "#{tableName}.objDatatype='#{obj.lang}'" if obj.is_a?(Literal) && obj.lang
+      ["#{tableName}.objDatatype='#{obj.lang}'"] if obj.is_a?(Literal) && obj.lang
     end
 
     # Stubs for Clause Functions that are overridden by specific implementations (MySQL vs SQLite for instance)

data/lib/rdf_context/store/abstract_store.rb

@@ -11,6 +11,10 @@ module RdfContext
       @identifier = identifier || BNode.new
     end
     
+    def context_aware?; false; end
+    def formula_aware?; false; end
+    def transaction_aware?; false; end
+
     # Interfaces that must be implemented
     def triples(triple, context = nil)  # :yields: triple, context
       raise StoreException, "not implemented"
@@ -22,6 +26,11 @@ module RdfContext
     def inspect
       "#{self.class}[identifier=#{identifier.inspect}]"
     end
+    
+    def destroy(configuration = {}); end
+    def open(configuration = {}); end
+    def commit; end
+    def rollback; end
 
     # Bind namespace to store, returns bound namespace
     def bind(namespace)

data/lib/rdf_context/store/list_store.rb

@@ -25,11 +25,7 @@ module RdfContext
     # If the triple does not provide a context attribute, removes the triple
     # from all contexts.
     def remove(triple, context, quoted = false)
-      if triple
-        @triples.delete(triple)
-      else
-        @triples = []
-      end
+      @triples.delete(triple)
     end
 
     # Check to see if this graph contains the specified triple

data/spec/conjunctive_graph_spec.rb

@@ -9,6 +9,12 @@ describe "ConjunctiveGraph" do
   
   subject { ConjunctiveGraph.new(:store => @store)}
   
+  it "should require store supporting contexts" do
+    lambda do
+      ConjunctiveGraph.new(:store => ListStore.new)
+    end.should raise_error(GraphException, "ConjunctiveGraph requires store supporting contexts")
+  end
+  
   it "should should have same identifier as store" do
     subject.identifier.should == @identifier
   end

data/spec/graph_spec.rb

@@ -76,6 +76,11 @@ describe "Graphs" do
     subject.add(Triple.new(@ex.a, @ex.b, @ex.c), Triple.new(@ex.a, @ex.b, @ex.d))
     subject.size.should == 2
   end
+  
+  it "should freeze when destroyed" do
+    subject.destroy
+    subject.frozen?.should be_true
+  end
 
   describe "with identifier" do
     before(:all) { @identifier = URIRef.new("http://foo.bar") }

data/spec/list_store_spec.rb

@@ -3,8 +3,7 @@ require File.join(File.dirname(__FILE__), 'store_helper')
 
 describe "List Store" do
   before(:all) do
-      @identifier = URIRef.new("http://identifier")
-      @ctx = @identifier
+    @identifier = URIRef.new("http://identifier")
   end
   
   subject { ListStore.new(@identifier) }

data/spec/literal_spec.rb

@@ -290,25 +290,22 @@ describe "Literals: " do
     end
   end
   
-#  it "build_from_language" do
-#    english = Literal.build_from_language("Have a nice day")
-#    english.encoding.should == "en"
-#    
-#    french = Literal.build_from_language("Bonjour, madame. Parlez vous francais?")
-#    french.encoding.should == "fr"
-#    
-#    german = Literal.build_from_language("Achtung")
-#    german.encoding.should == "de"
-#  end
-
-  # TODO: refactor based on new interface
-  # describe "Languages" do
-  #   it "should be inspectable" do
-  #     literal = RdfContext::Literal.new("foo", "en")
-  #     lang = literal.lang
-  #     lang.to_s == "en"
-  #     lang.hash.class.should == Fixnum
-  #   end    
-  # end
+  describe "Encodings" do
+    specify "integer" do
+      Literal::Encoding.integer.should == Literal::Encoding.new("http://www.w3.org/2001/XMLSchema#int")
+    end
+    specify "float" do
+      Literal::Encoding.float.should == Literal::Encoding.new("http://www.w3.org/2001/XMLSchema#float")
+    end
+    specify "string" do
+      Literal::Encoding.string.should == Literal::Encoding.new("http://www.w3.org/2001/XMLSchema#string")
+    end
+    specify "xmlliteral" do
+      Literal::Encoding.xmlliteral.should == Literal::XMLLiteral.new("http://www.w3.org/1999/02/22-rdf-syntax-ns#XMLLiteral")
+    end
+    specify "null" do
+      Literal::Encoding.the_null_encoding.should == Literal::Null.new(nil)
+    end
+  end
   
 end

data/spec/memory_store_spec.rb

@@ -3,21 +3,10 @@ require File.join(File.dirname(__FILE__), 'store_helper')
 
 describe "Memory Store" do
   before(:all) do
-      @identifier = URIRef.new("http://identifier")
-      @ctx = @identifier
+    @identifier = URIRef.new("http://identifier")
   end
   
   subject { MemoryStore.new(@identifier) }
   it_should_behave_like "Store"
   it_should_behave_like "Context Aware Store"
-
-
-  describe "with context" do
-    before(:all) do
-        @ctx = URIRef.new("http://context")
-    end
-
-    it_should_behave_like "Store"
-    it_should_behave_like "Context Aware Store"
-  end
 end

data/spec/rdfxml_spec.rb

@@ -321,11 +321,11 @@ EOF
     include RdfXMLHelper
     
     def self.positive_tests
-      RdfCoreHelper::TestCase.positive_parser_tests rescue []
+      RdfXMLHelper::TestCase.positive_parser_tests rescue []
     end
 
     def self.negative_tests
-      []#RdfCoreHelper::TestCase.negative_parser_tests rescue []
+      RdfXMLHelper::TestCase.negative_parser_tests rescue []
     end
     
     # Negative parser tests should raise errors.

data/spec/sqlite3_store_spec.rb

@@ -6,7 +6,6 @@ describe "SQLite3 Store" do
     Dir.mkdir(File.dirname(__FILE__) + "/tmp")
     @dbfile = File.join(File.dirname(__FILE__), "tmp", "sqlite3.db")
     @identifier = URIRef.new("http://identifier")
-    @ctx = @identifier
   end
   
   before(:each) do
@@ -30,12 +29,31 @@ describe "SQLite3 Store" do
     File.exists?(@dbfile).should be_false
   end
 
-  describe "with context" do
-    before(:all) do
-        @ctx = URIRef.new("http://context")
-    end
-
-    it_should_behave_like "Store"
-    it_should_behave_like "Context Aware Store"
+  it "should close db" do
+    subject.close
+  end
+  
+  it "should find contexts with type" do
+    triple = Triple.new("http://foo", RDF_TYPE, "http://baz")
+    subject.add(triple, nil)
+    subject.contexts(triple).length.should == 1
+  end
+  
+  it "should find triples with typed literal" do
+    triple = Triple.new("http://foo", RDF_TYPE, Literal.build_from(1.1))
+    subject.add(triple, nil)
+    subject.contexts(triple).length.should == 1
+  end
+  
+  it "should find triples with untyped literal and lang" do
+    triple = Triple.new("http://foo", RDF_TYPE, Literal.untyped("foo", "en-US"))
+    subject.add(triple, nil)
+    subject.contexts(triple).length.should == 1
+  end
+  
+  it "should find contexts patern triple" do
+    triple = Triple.new("http://foo", RDF_TYPE, "http://baz")
+    subject.add(triple, nil)
+    subject.contexts(Triple.new(nil, nil, nil)).length.should == 1
   end
 end

data/spec/store_helper.rb

@@ -9,8 +9,8 @@ shared_examples_for "Store" do
   end
 
   it "should allow you to add a triple" do
-    subject.add(Triple.new(@ex.a, @ex.b, @ex.c), @ctx)
-    subject.add(Triple.new(@ex.a, @ex.b, @ex.d), @ctx)
+    subject.add(Triple.new(@ex.a, @ex.b, @ex.c), nil)
+    subject.add(Triple.new(@ex.a, @ex.b, @ex.d), nil)
     subject.size.should == 2
   end
   
@@ -23,16 +23,38 @@ shared_examples_for "Store" do
     subject.identifier.should == @identifier
   end
   
+  describe "namespaces" do
+    before(:each) do
+      subject.bind(@ex)
+    end
+    
+    it "should return namespace by prefix" do
+      subject.namespace(@ex.prefix).should == @ex
+    end
+    
+    it "should return prefix by uri" do
+      subject.prefix(@ex.uri).should == @ex.prefix
+    end
+    
+    it "should bind namespace" do
+      subject.bind(@foaf).should == @foaf
+    end
+    
+    it "should return all namespaces" do
+      subject.nsbinding.should == { @ex.prefix => @ex}
+    end
+  end
+
   describe "with triples" do
     before(:each) do
-      subject.add(Triple.new(@ex.john, @foaf.knows, @ex.jane), @ctx)
-      subject.add(Triple.new(@ex.john, @foaf.knows, @ex.rick), @ctx)
-      subject.add(Triple.new(@ex.jane, @foaf.knows, @ex.rick), @ctx)
+      subject.add(Triple.new(@ex.john, @foaf.knows, @ex.jane), nil)
+      subject.add(Triple.new(@ex.john, @foaf.knows, @ex.rick), nil)
+      subject.add(Triple.new(@ex.jane, @foaf.knows, @ex.rick), nil)
       subject.bind(@foaf)
     end
     
     it "should detect included triple" do
-      subject.contains?(Triple.new(@ex.john, @foaf.knows, @ex.jane), @ctx).should be_true
+      subject.contains?(Triple.new(@ex.john, @foaf.knows, @ex.jane), nil).should be_true
     end
     
     it "should contain different triple paterns" do
@@ -46,8 +68,8 @@ shared_examples_for "Store" do
         Triple.new(URIRef.new("http://foo"),URIRef.new("http://bar"),Literal.typed("gregg", "http://www.w3.org/2001/XMLSchema#string")),
         Triple.new(URIRef.new("http://foo"),URIRef.new("http://bar"),"gregg"),
       ].each do |t|
-        subject.add(t, @ctx)
-        subject.contains?(t, @ctx)
+        subject.add(t, nil)
+        subject.contains?(t, nil)
       end
     end
     
@@ -56,12 +78,12 @@ shared_examples_for "Store" do
     end
     
     it "should allow you to select resources" do
-      subject.triples(Triple.new(@ex.john, nil, nil), @ctx).size.should == 2
+      subject.triples(Triple.new(@ex.john, nil, nil), nil).size.should == 2
     end
     
     it "should allow iteration" do
       count = 0
-      subject.triples(Triple.new(nil, nil, nil), @ctx) do |t, context|
+      subject.triples(Triple.new(nil, nil, nil), nil) do |t, context|
         count = count + 1
         t.class.should == Triple
       end
@@ -70,7 +92,7 @@ shared_examples_for "Store" do
     
     it "should allow iteration over a particular subject" do
       count = 0
-      subject.triples(Triple.new(@ex.john, nil, nil), @ctx) do |t, context|
+      subject.triples(Triple.new(@ex.john, nil, nil), nil) do |t, context|
         count = count + 1
         t.class.should == Triple
       end
@@ -79,7 +101,7 @@ shared_examples_for "Store" do
     
     it "should allow iteration over a particular predicate" do
       count = 0
-      subject.triples(Triple.new(nil, @foaf.knows, nil), @ctx) do |t, context|
+      subject.triples(Triple.new(nil, @foaf.knows, nil), nil) do |t, context|
         count = count + 1
         t.class.should == Triple
       end
@@ -88,7 +110,7 @@ shared_examples_for "Store" do
     
     it "should allow iteration over a particular object" do
       count = 0
-      subject.triples(Triple.new(nil, nil, @ex.jane), @ctx) do |t, context|
+      subject.triples(Triple.new(nil, nil, @ex.jane), nil) do |t, context|
         count = count + 1
         t.class.should == Triple
       end
@@ -96,9 +118,9 @@ shared_examples_for "Store" do
     end
     
     it "should find combinations" do
-      subject.triples(Triple.new(@ex.john, @foaf.knows, nil), @ctx).length.should == 2
-      subject.triples(Triple.new(@ex.john, nil, @ex.jane), @ctx).length.should == 1
-      subject.triples(Triple.new(nil, @foaf.knows, @ex.jane), @ctx).length.should == 1
+      subject.triples(Triple.new(@ex.john, @foaf.knows, nil), nil).length.should == 2
+      subject.triples(Triple.new(@ex.john, nil, @ex.jane), nil).length.should == 1
+      subject.triples(Triple.new(nil, @foaf.knows, @ex.jane), nil).length.should == 1
     end
     
     it "should retrieve indexed item" do
@@ -113,20 +135,19 @@ shared_examples_for "Store" do
 
   describe "with typed triples" do
     before(:each) do
-      subject.add(Triple.new(@ex.john, RDF_TYPE, @foaf.Person), @ctx)
-      subject.add(Triple.new(@ex.jane, RDF_TYPE, @foaf.Person), @ctx)
-      subject.add(Triple.new(@ex.rick, RDF_TYPE, @foaf.Person), @ctx)
-      subject.add(Triple.new(@ex.john, @foaf.knows, @ex.jane), @ctx)
-      subject.add(Triple.new(@ex.john, @foaf.knows, @ex.jane), @ctx)
-      subject.add(Triple.new(@ex.john, @foaf.knows, @ex.rick), @ctx)
-      subject.add(Triple.new(@ex.jane, @foaf.knows, @ex.rick), @ctx)
+      subject.add(Triple.new(@ex.john, RDF_TYPE, @foaf.Person), nil)
+      subject.add(Triple.new(@ex.jane, RDF_TYPE, @foaf.Person), nil)
+      subject.add(Triple.new(@ex.rick, RDF_TYPE, @foaf.Person), nil)
+      subject.add(Triple.new(@ex.john, @foaf.knows, @ex.jane), nil)
+      subject.add(Triple.new(@ex.john, @foaf.knows, @ex.rick), nil)
+      subject.add(Triple.new(@ex.jane, @foaf.knows, @ex.rick), nil)
       subject.bind(@foaf)
       subject.bind(@ex)
     end
     
     it "should find subjects by type" do
       count = 0
-      subject.triples(Triple.new(nil, RDF_TYPE, nil), @ctx) do |triple, ctx|
+      subject.triples(Triple.new(nil, RDF_TYPE, nil), nil) do |triple, ctx|
         count += 1
         [@ex.john, @ex.jane, @ex.rick].should include(triple.subject)
         triple.predicate.should == RDF_TYPE
@@ -134,15 +155,19 @@ shared_examples_for "Store" do
       end
       count.should == 3
     end
+    
+    it "should remove types" do
+      subject.remove(Triple.new(nil, RDF_TYPE, nil), nil)
+      subject.size.should == 3
+    end
   end
   
   it "should remove a triple" do
-    subject.add(Triple.new(@ex.john, RDF_TYPE, @foaf.Person), @ctx)
-    subject.size(@ctx).should == 1
-    subject.remove(Triple.new(@ex.john, RDF_TYPE, @foaf.Person), @ctx)
-    subject.size(@ctx).should == 0
+    subject.add(Triple.new(@ex.john, RDF_TYPE, @foaf.Person), nil)
+    subject.size.should == 1
+    subject.remove(Triple.new(@ex.john, RDF_TYPE, @foaf.Person), nil)
+    subject.size.should == 0
   end
-
 end
 
 shared_examples_for "Context Aware Store" do
@@ -189,6 +214,11 @@ shared_examples_for "Context Aware Store" do
       subject.contexts.length.should == 2
     end
     
+    it "should find contexts containing triple" do
+      subject.add(@triple, @ctx1)
+      subject.contexts(@triple).should == [@ctx1]
+    end
+    
     it "should remove from specific context" do
       subject.add(@triple, @ctx1)
       subject.add(@triple, @ctx2)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rdf_context
 version: !ruby/object:Gem::Version 
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors: 
 - Gregg Kellogg