rdf_context 0.5.10 → 0.5.11

data/spec/active_record_store_spec.rb

@@ -1,7 +1,11 @@
 $:.unshift "."
+gem "activerecord", "~> 2.3.8"
+require 'active_record'
+
 require File.join(File.dirname(__FILE__), 'spec_helper')
 require File.join(File.dirname(__FILE__), 'store_helper')
 
+
 describe ActiveRecordStore do
   before(:all) do
     FileUtils.rm_rf(TMP_DIR)

data/spec/graph_spec.rb

@@ -262,7 +262,9 @@ HERE
     end
   
     it "should return unique subjects" do
-      subject.subjects.should == [@ex.john.uri.to_s, @ex.jane.uri.to_s]
+      subject.subjects.length.should == 2
+      subject.subjects.should include(@ex.john.uri.to_s)
+      subject.subjects.should include(@ex.jane.uri.to_s)
     end
     
     it "should return unique predicates" do
@@ -270,7 +272,9 @@ HERE
     end
     
     it "should return unique objects" do
-      subject.objects.should == [@ex.jane.uri.to_s, @ex.rick.uri.to_s]
+      subject.objects.length.should == 2
+      subject.objects.should include(@ex.jane.uri.to_s)
+      subject.objects.should include(@ex.rick.uri.to_s)
     end
     
     it "should allow you to select resources" do

data/spec/matchers.rb

@@ -64,7 +64,7 @@ module Matchers
 
     def matches?(actual)
       @actual = normalize(actual)
-      @actual == @expected
+      @actual.is_a?(Graph) ? @actual.isomorphic?(@expected) : @actual == @expected
     end
 
     def failure_message_for_should

data/spec/rdfa_helper.rb

@@ -2,7 +2,6 @@ autoload :YAML, "yaml"
 autoload :CGI, 'cgi'
 
 RDFA_DIR = File.join(File.dirname(__FILE__), 'rdfa-test-suite')
-RDFA_NT_DIR = File.join(File.dirname(__FILE__), 'rdfa-triples')
 RDFA_MANIFEST_URL = "http://rdfa.digitalbazaar.com/test-suite/"
 RDFA_TEST_CASE_URL = "#{RDFA_MANIFEST_URL}test-cases/"
 
@@ -138,16 +137,6 @@ module RdfaHelper
       end
     end
     
-    def triples
-      f = self.name + ".nt"
-      body = File.read(File.join(RDFA_NT_DIR, f)).gsub(TCPATHRE, tcpath)
-      case suite
-      when /xhtml/  then body
-      when /svg/    then body.gsub(HTMLRE, '\1.svg')
-      else               body.gsub(HTMLRE, '\1.html')
-      end
-    end
-    
     def inputDocument; self.name + ".txt"; end
     def outputDocument; self.name + ".sparql"; end
 
@@ -165,12 +154,7 @@ module RdfaHelper
 
       query_string = results
 
-      triples = self.triples rescue nil
-      
-      if (query_string.match(/UNION|OPTIONAL/) || title.match(/XML/)) && triples
-        # Check triples, as Rasql doesn't implement UNION
-        @parser.graph.should be_equivalent_graph(triples, self)
-      elsif $redland_enabled
+      if $redland_enabled
         # Run SPARQL query
         @parser.graph.should pass_query(query_string, self)
       else
@@ -246,7 +230,12 @@ end
 module OpenURI
   #alias_method :open_uri_orig, :open_uri
   def self.open_uri(uri)
+    uri = Addressable::URI.parse(uri).normalize.to_s
     case uri
+    when %r(http://rdfa.digitalbazaar.com/test-suite/profiles/(.*)$)
+      file = File.join(File.expand_path(File.dirname(__FILE__)), 'rdfa-test-suite', 'profiles', $1)
+      #puts "file: #{file}"
+      File.open(file)
     when %r(http://rdfa.digitalbazaar.com/test-suite/test-cases/\w+)
       file = uri.to_s.sub(%r(http://rdfa.digitalbazaar.com/test-suite/test-cases/\w+),
         File.join(File.expand_path(File.dirname(__FILE__)), 'rdfa-test-suite', 'tests'))

data/spec/spec_helper.rb

@@ -1,13 +1,8 @@
 # coding: utf-8
-begin
-  require 'rspec'
-  require 'active_support'
-rescue LoadError
-  require 'rubygems' unless ENV['NO_RUBYGEMS']
-  require 'rspec'
-  gem 'activesupport'
-  require 'active_support'
-end
+require 'rubygems' unless ENV['NO_RUBYGEMS']
+require 'rspec'
+gem 'activesupport', "~> 2.3.8"
+require 'active_support'
 
 begin
   require 'rdf/redland'

data/spec/sqlite3_store_spec.rb

@@ -26,9 +26,9 @@ describe SQLite3Store do
   it_should_behave_like "Store"
   it_should_behave_like "Context Aware Store"
 
-  it "should destroy DB file" do
+  it "should not destroy DB file" do
     subject.destroy
-    File.exists?(@dbfile).should be_false
+    File.exists?(@dbfile).should be_true
   end
 
   it "should close db" do

data/spec/store_helper.rb

@@ -9,24 +9,21 @@ shared_examples_for "Store" do
     subject.should be_a(AbstractStore)
   end
 
-  it "should allow you to add a triple" do
-    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
+  describe "#add" do
+    it "adds URIRefs" do
+      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
   
-  it "should allow you to add triples with bnodes" do
-    subject.add(Triple.new(BNode.new, @ex.b, @ex.c), nil)
-    subject.add(Triple.new(@ex.a, BNode.new, @ex.c), nil)
-    subject.add(Triple.new(@ex.a, @ex.b, BNode.new), nil)
-    subject.size.should == 3
+    it "adds BNodes" do
+      subject.add(Triple.new(BNode.new, @ex.b, @ex.c), nil)
+      subject.add(Triple.new(@ex.a, BNode.new, @ex.c), nil)
+      subject.add(Triple.new(@ex.a, @ex.b, BNode.new), nil)
+      subject.size.should == 3
+    end
   end
   
-  it "should allow you to create and bind Namespace objects" do
-    foaf = Namespace.new("http://xmlns.com/foaf/0.1/", "foaf")
-    subject.bind(foaf).should == foaf
-  end
-
   it "should retrieve identifier" do
     subject.identifier.should == @identifier
   end
@@ -36,6 +33,11 @@ shared_examples_for "Store" do
       subject.bind(@ex)
     end
     
+    it "should allow you to create and bind Namespace objects" do
+      foaf = Namespace.new("http://xmlns.com/foaf/0.1/", "foaf")
+      subject.bind(foaf).should == foaf
+    end
+
     it "should return namespace by prefix" do
       subject.namespace(@ex.prefix).should == @ex
     end
@@ -139,6 +141,11 @@ shared_examples_for "Store" do
       t = subject.item(0)
       subject.contains?(t).should be_true
     end
+    
+    it "destroys triples" do
+      subject.destroy
+      subject.size.should == 0
+    end
   end
 
   describe "with typed triples" do
@@ -266,8 +273,40 @@ shared_examples_for "Context Aware Store" do
         found += 1
       end
       found.should == 1
+      subject.contexts.length.should == 1
+      subject.contexts.should include(@ctx2)
     end
     
+    it "should destroy from specific context" do
+      subject.add(@triple, @ctx1)
+      subject.add(@triple, @ctx2)
+      subject.destroy(:context => @ctx1)
+      subject.triples(@triple, @ctx1).length.should == 0
+      subject.triples(@triple, @ctx2).length.should == 1
+      found = 0
+      subject.triples(@triple, nil) do |triple, context|
+        found += 1
+      end
+      found.should == 1
+      subject.contexts.length.should == 1
+      subject.contexts.should include(@ctx2)
+    end
+
+    it "should remove context when graph destroyed" do
+      subject.add(@triple, @ctx1)
+      subject.add(@triple, @ctx2)
+      @ctx1.destroy
+      subject.triples(@triple, @ctx1).length.should == 0
+      subject.triples(@triple, @ctx2).length.should == 1
+      found = 0
+      subject.triples(@triple, nil) do |triple, context|
+        found += 1
+      end
+      found.should == 1
+      subject.contexts.length.should == 1
+      subject.contexts.should include(@ctx2)
+    end
+
     it "should remove from multiple contexts" do
       subject.add(@triple, @ctx1)
       subject.add(@triple, @ctx2)
@@ -279,6 +318,7 @@ shared_examples_for "Context Aware Store" do
         found += 1
       end
       found.should == 0
+      subject.contexts.length.should == 0
     end
 
     it "should remove context" do
@@ -293,5 +333,19 @@ shared_examples_for "Context Aware Store" do
       subject.triples(@triple, @ctx2).length.should == 0
     end
 
+    it "should return new context after equivalent context destroyed" do
+      ctx1 = Graph.new(:identifier => URIRef.new("http://new1.ctx"), :store => subject)
+      subject.add(@triple, ctx1)
+      subject.contexts.length.should == 1
+      subject.contexts.should include(ctx1)
+      
+      ctx1.destroy
+      subject.contexts.should be_empty
+
+      ctx1 = Graph.new(:identifier => URIRef.new("http://new1.ctx"), :store => subject)
+      subject.add(@triple, ctx1)
+      subject.contexts.length.should == 1
+      subject.contexts.should include(ctx1)
+    end
   end
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rdf_context
 version: !ruby/object:Gem::Version 
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 5
-  - 10
-  version: 0.5.10
+  - 11
+  version: 0.5.11
 platform: ruby
 authors: 
 - Gregg Kellogg
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-19 00:00:00 -08:00
+date: 2011-01-07 00:00:00 -08:00
 default_executable: rdf_context
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,6 +26,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 2
         - 2
@@ -40,6 +42,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 1
         - 4
@@ -55,6 +58,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 1
         segments: 
         - 1
         - 4
@@ -70,6 +74,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
         - 2
         - 1
@@ -85,6 +90,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 11
         segments: 
         - 2
         - 1
@@ -98,29 +104,47 @@ dependencies:
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
+        hash: 19
         segments: 
         - 2
         - 3
-        - 0
-        version: 2.3.0
+        - 8
+        version: 2.3.8
   type: :development
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: yard
+  name: activerecord
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 2
+        - 3
+        - 8
+        version: 2.3.8
+  type: :development
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: yard
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   type: :development
-  version_requirements: *id007
-description: "    RdfContext parses RDF/XML, RDFa and N3-rdf into a Graph object. It also serializes RDF/XML and N-Triples from the Graph.\n\n      * Fully compliant RDF/XML parser.\n      * Fully compliant XHTML/RDFa 1.0 parser.\n      * N3-rdf parser\n      * N-Triples and RDF/XML serializer\n      * Graph serializes into RDF/XML and N-Triples.\n      * ConjunctiveGraph, named Graphs and contextual storage modules.\n    \n    Install with 'gem install rdf_context'\n"
+  version_requirements: *id008
+description: "    RdfContext parses RDF/XML, RDFa and N3 into a Graph object. It also serializes RDF/XML, Turtle and N-Triples from the Graph.\n\n      * Fully compliant RDF/XML parser.\n      * Fully compliant XHTML/RDFa 1.0 parser.\n      * Notation3 parser (N3-rdf level)\n      * N-Triples, Turtle and RDF/XML serializer\n      * ConjunctiveGraph, named Graphs and contextual storage modules.\n    \n    Install with 'gem install rdf_context'\n"
 email: gregg@kellogg-assoc.com
 executables: 
 - rdf_context
@@ -131,7 +155,6 @@ extra_rdoc_files:
 files: 
 - .autotest
 - .gitignore
-- .yardoc
 - .yardopts
 - History.rdoc
 - README.rdoc
@@ -192,118 +215,6 @@ files:
 - spec/parser_spec.rb
 - spec/quoted_graph_spec.rb
 - spec/rdf_helper.rb
-- spec/rdfa-triples/0001.nt
-- spec/rdfa-triples/0006.nt
-- spec/rdfa-triples/0007.nt
-- spec/rdfa-triples/0008.nt
-- spec/rdfa-triples/0009.nt
-- spec/rdfa-triples/0010.nt
-- spec/rdfa-triples/0011.nt
-- spec/rdfa-triples/0012.nt
-- spec/rdfa-triples/0013.nt
-- spec/rdfa-triples/0014.nt
-- spec/rdfa-triples/0015.nt
-- spec/rdfa-triples/0017.nt
-- spec/rdfa-triples/0018.nt
-- spec/rdfa-triples/0019.nt
-- spec/rdfa-triples/0020.nt
-- spec/rdfa-triples/0021.nt
-- spec/rdfa-triples/0023.nt
-- spec/rdfa-triples/0025.nt
-- spec/rdfa-triples/0026.nt
-- spec/rdfa-triples/0027.nt
-- spec/rdfa-triples/0029.nt
-- spec/rdfa-triples/0030.nt
-- spec/rdfa-triples/0031.nt
-- spec/rdfa-triples/0032.nt
-- spec/rdfa-triples/0033.nt
-- spec/rdfa-triples/0034.nt
-- spec/rdfa-triples/0035.nt
-- spec/rdfa-triples/0036.nt
-- spec/rdfa-triples/0037.nt
-- spec/rdfa-triples/0038.nt
-- spec/rdfa-triples/0039.nt
-- spec/rdfa-triples/0040.nt
-- spec/rdfa-triples/0041.nt
-- spec/rdfa-triples/0042.nt
-- spec/rdfa-triples/0046.nt
-- spec/rdfa-triples/0047.nt
-- spec/rdfa-triples/0048.nt
-- spec/rdfa-triples/0049.nt
-- spec/rdfa-triples/0050.nt
-- spec/rdfa-triples/0051.nt
-- spec/rdfa-triples/0052.nt
-- spec/rdfa-triples/0053.nt
-- spec/rdfa-triples/0054.nt
-- spec/rdfa-triples/0055.nt
-- spec/rdfa-triples/0056.nt
-- spec/rdfa-triples/0057.nt
-- spec/rdfa-triples/0058.nt
-- spec/rdfa-triples/0059.nt
-- spec/rdfa-triples/0060.nt
-- spec/rdfa-triples/0061.nt
-- spec/rdfa-triples/0062.nt
-- spec/rdfa-triples/0063.nt
-- spec/rdfa-triples/0064.nt
-- spec/rdfa-triples/0065.nt
-- spec/rdfa-triples/0066.nt
-- spec/rdfa-triples/0067.nt
-- spec/rdfa-triples/0068.nt
-- spec/rdfa-triples/0069.nt
-- spec/rdfa-triples/0070.nt
-- spec/rdfa-triples/0071.nt
-- spec/rdfa-triples/0072.nt
-- spec/rdfa-triples/0073.nt
-- spec/rdfa-triples/0074.nt
-- spec/rdfa-triples/0075.nt
-- spec/rdfa-triples/0076.nt
-- spec/rdfa-triples/0077.nt
-- spec/rdfa-triples/0078.nt
-- spec/rdfa-triples/0079.nt
-- spec/rdfa-triples/0080.nt
-- spec/rdfa-triples/0081.nt
-- spec/rdfa-triples/0082.nt
-- spec/rdfa-triples/0083.nt
-- spec/rdfa-triples/0084.nt
-- spec/rdfa-triples/0085.nt
-- spec/rdfa-triples/0086.nt
-- spec/rdfa-triples/0087.nt
-- spec/rdfa-triples/0088.nt
-- spec/rdfa-triples/0089.nt
-- spec/rdfa-triples/0090.nt
-- spec/rdfa-triples/0091.nt
-- spec/rdfa-triples/0092.nt
-- spec/rdfa-triples/0093.nt
-- spec/rdfa-triples/0094.nt
-- spec/rdfa-triples/0099.nt
-- spec/rdfa-triples/0100.nt
-- spec/rdfa-triples/0101.nt
-- spec/rdfa-triples/0102.nt
-- spec/rdfa-triples/0103.nt
-- spec/rdfa-triples/0104.nt
-- spec/rdfa-triples/0105.nt
-- spec/rdfa-triples/0106.nt
-- spec/rdfa-triples/0107.nt
-- spec/rdfa-triples/0108.nt
-- spec/rdfa-triples/0109.nt
-- spec/rdfa-triples/0110.nt
-- spec/rdfa-triples/0111.nt
-- spec/rdfa-triples/0112.nt
-- spec/rdfa-triples/0113.nt
-- spec/rdfa-triples/0114.nt
-- spec/rdfa-triples/0115.nt
-- spec/rdfa-triples/0116.nt
-- spec/rdfa-triples/0117.nt
-- spec/rdfa-triples/0118.nt
-- spec/rdfa-triples/0119.nt
-- spec/rdfa-triples/0120.nt
-- spec/rdfa-triples/0121.nt
-- spec/rdfa-triples/0122.nt
-- spec/rdfa-triples/0123.nt
-- spec/rdfa-triples/0124.nt
-- spec/rdfa-triples/0125.nt
-- spec/rdfa-triples/0126.nt
-- spec/rdfa-triples/1001.nt
 - spec/rdfa_helper.rb
 - spec/rdfa_parser_spec.rb
 - spec/rdfcore/.gitignore
@@ -914,6 +825,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -922,6 +834,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"