RubyGems - rdf_context - Versions diffs - 0.5.10 → 0.5.11 - Mend

rdf_context 0.5.10 → 0.5.11

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (134) hide show

data/.yardopts +2 -1
data/History.rdoc +7 -0
data/README.rdoc +14 -14
data/Rakefile +7 -7
data/VERSION +1 -1
data/lib/rdf_context/graph.rb +19 -16
data/lib/rdf_context/rdfaparser.rb +1 -1
data/lib/rdf_context/store/abstract_sql_store.rb +12 -4
data/lib/rdf_context/store/abstract_store.rb +6 -0
data/lib/rdf_context/store/active_record_store.rb +5 -11
data/lib/rdf_context/store/list_store.rb +5 -0
data/lib/rdf_context/store/memory_store.rb +38 -18
data/lib/rdf_context/store/sqlite3_store.rb +0 -7
data/rdf_context.gemspec +11 -122
data/spec/active_record_store_spec.rb +4 -0
data/spec/graph_spec.rb +6 -2
data/spec/matchers.rb +1 -1
data/spec/rdfa_helper.rb +6 -17
data/spec/spec_helper.rb +4 -9
data/spec/sqlite3_store_spec.rb +2 -2
data/spec/store_helper.rb +69 -15
metadata +35 -122
data/spec/rdfa-triples/0001.nt +0 -1
data/spec/rdfa-triples/0006.nt +0 -2
data/spec/rdfa-triples/0007.nt +0 -3
data/spec/rdfa-triples/0008.nt +0 -1
data/spec/rdfa-triples/0009.nt +0 -1
data/spec/rdfa-triples/0010.nt +0 -2
data/spec/rdfa-triples/0011.nt +0 -3
data/spec/rdfa-triples/0012.nt +0 -1
data/spec/rdfa-triples/0013.nt +0 -1
data/spec/rdfa-triples/0014.nt +0 -1
data/spec/rdfa-triples/0015.nt +0 -2
data/spec/rdfa-triples/0017.nt +0 -3
data/spec/rdfa-triples/0018.nt +0 -1
data/spec/rdfa-triples/0019.nt +0 -1
data/spec/rdfa-triples/0020.nt +0 -1
data/spec/rdfa-triples/0021.nt +0 -1
data/spec/rdfa-triples/0023.nt +0 -1
data/spec/rdfa-triples/0025.nt +0 -2
data/spec/rdfa-triples/0026.nt +0 -1
data/spec/rdfa-triples/0027.nt +0 -1
data/spec/rdfa-triples/0029.nt +0 -1
data/spec/rdfa-triples/0030.nt +0 -1
data/spec/rdfa-triples/0031.nt +0 -1
data/spec/rdfa-triples/0032.nt +0 -1
data/spec/rdfa-triples/0033.nt +0 -2
data/spec/rdfa-triples/0034.nt +0 -1
data/spec/rdfa-triples/0035.nt +0 -1
data/spec/rdfa-triples/0036.nt +0 -1
data/spec/rdfa-triples/0037.nt +0 -1
data/spec/rdfa-triples/0038.nt +0 -1
data/spec/rdfa-triples/0039.nt +0 -1
data/spec/rdfa-triples/0040.nt +0 -1
data/spec/rdfa-triples/0041.nt +0 -1
data/spec/rdfa-triples/0042.nt +0 -0
data/spec/rdfa-triples/0046.nt +0 -3
data/spec/rdfa-triples/0047.nt +0 -3
data/spec/rdfa-triples/0048.nt +0 -3
data/spec/rdfa-triples/0049.nt +0 -2
data/spec/rdfa-triples/0050.nt +0 -2
data/spec/rdfa-triples/0051.nt +0 -2
data/spec/rdfa-triples/0052.nt +0 -1
data/spec/rdfa-triples/0053.nt +0 -2
data/spec/rdfa-triples/0054.nt +0 -2
data/spec/rdfa-triples/0055.nt +0 -2
data/spec/rdfa-triples/0056.nt +0 -3
data/spec/rdfa-triples/0057.nt +0 -4
data/spec/rdfa-triples/0058.nt +0 -6
data/spec/rdfa-triples/0059.nt +0 -6
data/spec/rdfa-triples/0060.nt +0 -2
data/spec/rdfa-triples/0061.nt +0 -1
data/spec/rdfa-triples/0062.nt +0 -1
data/spec/rdfa-triples/0063.nt +0 -1
data/spec/rdfa-triples/0064.nt +0 -1
data/spec/rdfa-triples/0065.nt +0 -3
data/spec/rdfa-triples/0066.nt +0 -1
data/spec/rdfa-triples/0067.nt +0 -1
data/spec/rdfa-triples/0068.nt +0 -1
data/spec/rdfa-triples/0069.nt +0 -1
data/spec/rdfa-triples/0070.nt +0 -1
data/spec/rdfa-triples/0071.nt +0 -1
data/spec/rdfa-triples/0072.nt +0 -1
data/spec/rdfa-triples/0073.nt +0 -1
data/spec/rdfa-triples/0074.nt +0 -1
data/spec/rdfa-triples/0075.nt +0 -1
data/spec/rdfa-triples/0076.nt +0 -23
data/spec/rdfa-triples/0077.nt +0 -23
data/spec/rdfa-triples/0078.nt +0 -6
data/spec/rdfa-triples/0079.nt +0 -3
data/spec/rdfa-triples/0080.nt +0 -1
data/spec/rdfa-triples/0081.nt +0 -6
data/spec/rdfa-triples/0082.nt +0 -8
data/spec/rdfa-triples/0083.nt +0 -6
data/spec/rdfa-triples/0084.nt +0 -8
data/spec/rdfa-triples/0085.nt +0 -4
data/spec/rdfa-triples/0086.nt +0 -0
data/spec/rdfa-triples/0087.nt +0 -23
data/spec/rdfa-triples/0088.nt +0 -3
data/spec/rdfa-triples/0089.nt +0 -1
data/spec/rdfa-triples/0090.nt +0 -1
data/spec/rdfa-triples/0091.nt +0 -3
data/spec/rdfa-triples/0092.nt +0 -3
data/spec/rdfa-triples/0093.nt +0 -2
data/spec/rdfa-triples/0094.nt +0 -3
data/spec/rdfa-triples/0099.nt +0 -1
data/spec/rdfa-triples/0100.nt +0 -3
data/spec/rdfa-triples/0101.nt +0 -3
data/spec/rdfa-triples/0102.nt +0 -1
data/spec/rdfa-triples/0103.nt +0 -1
data/spec/rdfa-triples/0104.nt +0 -3
data/spec/rdfa-triples/0105.nt +0 -1
data/spec/rdfa-triples/0106.nt +0 -1
data/spec/rdfa-triples/0107.nt +0 -0
data/spec/rdfa-triples/0108.nt +0 -1
data/spec/rdfa-triples/0109.nt +0 -1
data/spec/rdfa-triples/0110.nt +0 -1
data/spec/rdfa-triples/0111.nt +0 -2
data/spec/rdfa-triples/0112.nt +0 -1
data/spec/rdfa-triples/0113.nt +0 -2
data/spec/rdfa-triples/0114.nt +0 -3
data/spec/rdfa-triples/0115.nt +0 -4
data/spec/rdfa-triples/0116.nt +0 -2
data/spec/rdfa-triples/0117.nt +0 -2
data/spec/rdfa-triples/0118.nt +0 -1
data/spec/rdfa-triples/0119.nt +0 -1
data/spec/rdfa-triples/0120.nt +0 -1
data/spec/rdfa-triples/0121.nt +0 -2
data/spec/rdfa-triples/0122.nt +0 -1
data/spec/rdfa-triples/0123.nt +0 -3
data/spec/rdfa-triples/0124.nt +0 -4
data/spec/rdfa-triples/0125.nt +0 -1
data/spec/rdfa-triples/0126.nt +0 -3
data/spec/rdfa-triples/1001.nt +0 -6

data/.yardopts CHANGED

@@ -1,4 +1,4 @@
---title "RDF::RDFa - XHTML+RDFa Support for RDF.rb"
+--title "RdfContext is an RDF library for Ruby"
 --output-dir doc/yard
 --protected
 --no-private
@@ -6,5 +6,6 @@
 --markup rdoc
 --readme README.rdoc
 -
+README.rdoc
 History.rdoc
 VERSION

data/History.rdoc CHANGED

@@ -1,3 +1,10 @@
+=== 0.5.11
+* AbstractSQLStore was incorrectly putting Literal::Language representation rather than value in database.
+* Changed Graph#eql? and Graph#== to do simple equality check.
+* Added Graph#isomorphic? which does more exhaustive equivalence check.
+* Fixed bug in MemoryStore where a frozen resource could be returned.
+* AbstractStore#destroy either removes all triples from store, or specified context. No longer removes the DB file.
 === 0.5.10
 * N3 Parser
   * Allow mixed case literal languages.

data/README.rdoc CHANGED

@@ -3,32 +3,32 @@
 Context-sensitive RDF Graphs, including a ConjunctiveGraph.
 A set of compliant RDF parsers:
-* N3-rdf
+* Notation3
 * RDF/XML
 * RDFa
-Multiple data-stores may be attached to a Graph, including Memory, List and SQLite3
+Multiple data-stores may be attached to a Graph, including Memory, List, ActiveRecord and SQLite3
-== DESCRIPTION:
+== DESCRIPTION
 RdfContext is an RDF library for Ruby.
-== FEATURES:
+== FEATURES
 RdfContext parses RDF/XML, RDFa and N3-rdf into a Graph object. It also serializes RDF/XML and N-Triples from the Graph.
 * Fully compliant RDF/XML parser.
 * Fully compliant XHTML/RDFa 1.0 parser.
-* Fully compliant N3-rdf parser (N3-rdf level)
+* Fully compliant Notation3 parser (N3-rdf level)
 * Turtle, N-Triples and RDF/XML serializer
 * RDFa tests use SPARQL for most tests due to Rasqal limitations. Other tests compare directly against N-triples.
-* Graph serializes into RDF/XML and N-Triples.
+* Graph serializes into RDF/XML, Turtle and N-Triples.
 * ConjunctiveGraph, named Graphs and contextual storage modules.
 RdfContext is based, in part, on Tom Morris' Reddy gem.
 Install with 'gem install rdf_context'
-== Usage:
+== Usage
 === Graphs
 Instantiate a graph using Graph.new. A Graph may take an :identifier (defaults to a BNode) and
 a :store (defaults to :list_store)
@@ -168,7 +168,7 @@ An RDF store could provide a standard set of interfaces for the manipulation, ma
 These interfaces work on contexts and formulae (for stores that are formula-aware) interchangeably.
 *contexts*:: Closure or list over all contexts in the graph. If triple is specified, it returns all contexts the triple is in.
-== Dependencies:
+== Dependencies
 * Addressable
 * Treetop
@@ -180,11 +180,11 @@ These interfaces work on contexts and formulae (for stores that are formula-awar
 * Redland/Rasqal
 * ActiveSupport
-== INSTALL:
+== INSTALL
 * sudo gem install rdf_context
-== TODO:
+== TODO
 * Testing
   * RDFa updates for new tests and non XHTML representations.
 * Graphs
@@ -200,7 +200,7 @@ These interfaces work on contexts and formulae (for stores that are formula-awar
 * RDoc[http://rdoc.info/projects/gkellogg/rdf_context]
 * History[http://github.com/gkellogg/rdf_context/blob/master/History.txt]
-== LICENSE:
+== LICENSE
 (The MIT License)
@@ -230,7 +230,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 == FEEDBACK
 * [email protected]
-* gemcutter.org/rdf_context
-* github.com/gkellogg/rdf_context
-* gkellogg.lighthouseapp.com for bug reports
+* http://rubygems.org/rdf_context
+* http://github.com/gkellogg/rdf_context
+* http://rdoc.info/github/gkellogg/rdf_context
 * public-rdf-ruby mailing list on w3.org

data/Rakefile CHANGED

@@ -8,13 +8,12 @@ begin
     gemspec.name = "rdf_context"
     gemspec.summary = "RdfContext is an RDF library for Ruby supporting contextual graphs, multiple datastores and compliant RDF/XML, RDFa and N3 parsers."
     gemspec.description = <<-DESCRIPTION
-    RdfContext parses RDF/XML, RDFa and N3-rdf into a Graph object. It also serializes RDF/XML and N-Triples from the Graph.
+    RdfContext parses RDF/XML, RDFa and N3 into a Graph object. It also serializes RDF/XML, Turtle and N-Triples from the Graph.
       * Fully compliant RDF/XML parser.
       * Fully compliant XHTML/RDFa 1.0 parser.
-      * N3-rdf parser
-      * N-Triples and RDF/XML serializer
-      * Graph serializes into RDF/XML and N-Triples.
+      * Notation3 parser (N3-rdf level)
+      * N-Triples, Turtle and RDF/XML serializer
       * ConjunctiveGraph, named Graphs and contextual storage modules.
     Install with 'gem install rdf_context'
@@ -27,7 +26,8 @@ begin
     gemspec.add_dependency('nokogiri', '>= 1.4.3')
     gemspec.add_dependency('builder', '>= 2.1.2')
     gemspec.add_development_dependency('rspec', '>= 2.1.0')
-    gemspec.add_development_dependency('activesupport', '>= 2.3.0')
+    gemspec.add_development_dependency('activesupport', '~> 2.3.8')
+    gemspec.add_development_dependency('activerecord', '~> 2.3.8')
     gemspec.add_development_dependency('yard')
     gemspec.extra_rdoc_files     = %w(README.rdoc History.txt)
   end
@@ -55,8 +55,8 @@ RSpec::Core::RakeTask.new("spec:rcov") do |spec|
 end
 desc "Generate HTML report specs"
-RSpec::Core::RakeTask.new("spec") do |spec|
-  spec.rspec_opts = ["--format", "html:doc/spec.html"]
+RSpec::Core::RakeTask.new("doc:spec") do |spec|
+  spec.rspec_opts = ["--format", "html", "-o", "doc/spec.html"]
 end
 task :spec => :check_dependencies

data/VERSION CHANGED

	@@ -1 +1 @@
1	- 0.5.10
1	+ 0.5.11

data/lib/rdf_context/graph.rb CHANGED

@@ -64,12 +64,7 @@ module RdfContext
     # If configuration is nil, remove the graph context
     # @return [void]
     def destroy(configuration = nil)
-      if configuration
-        @store.destroy(configuration)
-      else
-        @store.remove(Triple.new(nil, nil, nil), self)
-      end
+      @store.destroy(configuration ? configuration : {:context => self})
       self.freeze
     end
@@ -488,7 +483,19 @@ module RdfContext
       end
     end
-    # Two graphs are equal if each is an instance of the other, considering BNode equivalence.
+    # Two graphs are equal (==) if each other if they are both graphs have the same identifiers and the same size.
+    #
+    # If each graph has a BNode identifier, they are considered to be equal if the have the same size
+    #
+    # @param [Graph] graph
+    # @return [Boolean]
+    def ==(other)
+      #puts "== size #{self.size} vs #{other.size}" if ::RdfContext::debug?
+      other.is_a?(Graph) && self.size == other.size &&
+        ((other.identifier.is_a?(BNode) && identifier.is_a?(BNode)) || (other.identifier.to_s == identifier.to_s))
+    end
+    # Two graphs are isomorphic if each is an instance of the other, considering BNode equivalence.
     # This may be done by creating a new graph an substituting each permutation of BNode identifiers
     # from self to other until every permutation is exhausted, or a textual equivalence is found
     # after sorting each graph.
@@ -496,20 +503,18 @@ module RdfContext
     # We just follow Python RDFlib's lead and do a simple comparison
     # @param [Graph] graph
     # @return [Boolean]
-    def eql?(other)
-      #puts "eql? size #{self.size} vs #{other.size}" if ::RdfContext::debug?
-      return false if !other.is_a?(Graph) || self.size != other.size
-      return false unless other.identifier.to_s == identifier.to_s unless other.identifier.is_a?(BNode) && identifier.is_a?(BNode)
+    def isomorphic?(other)
+      return false unless self == other
       bn_self = bnodes.values.sort
       bn_other = other.bnodes.values.sort
-      puts "eql? bnodes '#{bn_self.to_sentence}' vs '#{bn_other.to_sentence}'" if ::RdfContext::debug?
+      puts "isomorphic? bnodes '#{bn_self.to_sentence}' vs '#{bn_other.to_sentence}'" if ::RdfContext::debug?
       return false unless bn_self == bn_other
       # Check each triple to see if it's contained in the other graph
       triples do |t, ctx|
         next if t.subject.is_a?(BNode) || t.predicate.is_a?(BNode) || t.object.is_a?(BNode)
-        puts "eql? contains '#{t.to_ntriples}: #{other.contains?(t)}'" if ::RdfContext::debug?
+        puts "isomorphic? contains '#{t.to_ntriples}: #{other.contains?(t)}'" if ::RdfContext::debug?
         return false unless other.contains?(t)
       end
@@ -525,7 +530,7 @@ module RdfContext
             predicate = bn_map[predicate] if bn_map.has_key?(predicate)
             object = bn_map[object] if bn_map.has_key?(object)
             tn = Triple.new(subject, predicate, object)
-            puts "  eql? contains '#{tn.inspect}': #{other.contains?(tn)}" if ::RdfContext::debug?
+            puts "  isomorphic? contains '#{tn.inspect}': #{other.contains?(tn)}" if ::RdfContext::debug?
             next if other.contains?(tn)
             puts "  no, next permutation" if ::RdfContext::debug?
@@ -541,8 +546,6 @@ module RdfContext
       # Exhausted all permutations, unless there were no bnodes
       bn_self.length == 0
     end
-    alias_method :==, :eql?
     # Parse source into Graph.
     #

data/lib/rdf_context/rdfaparser.rb CHANGED

@@ -450,7 +450,7 @@ module RdfContext
         :base => xml_base,
         :property => property,
         :typeof => typeof,
-        :daetatype => datatype,
+        :datatype => datatype,
         :rel => rel,
         :rev => rev,
         :profiles => (profiles.empty? ? nil : profiles),

data/lib/rdf_context/store/abstract_sql_store.rb CHANGED

@@ -72,6 +72,14 @@ module RdfContext
       @db.close
     end
+    # Destroy store or context
+    # If context is specified remove that context, otherwise, remove all triples
+    #
+    # @option configuration [Graph] :context  Remove the specified context
+    def destroy(configuration = {})
+      remove(Triple.new(nil, nil, nil), configuration[:context])
+    end
     # Add a triple to the store
     # Add to default context, if context is nil
     #
@@ -691,8 +699,8 @@ module RdfContext
         normalizeTerm(triple.object),
         normalizeTerm(context),
         triplePattern,
-        (triple.object.is_a?(Literal) ? triple.object.lang : NULL),
-        (triple.object.is_a?(Literal) ? triple.object.encoding.value.to_s : NULL),
+        (triple.object.is_a?(Literal) && triple.object.lang ? triple.object.lang.to_s : nil),
+        (triple.object.is_a?(Literal) && triple.object.encoding ? triple.object.encoding.value.to_s : nil),
       ]
     end
@@ -709,8 +717,8 @@ module RdfContext
           normalizeTerm(triple.object),
           normalizeTerm(context),
           triplePattern,
-          (triple.object.is_a?(Literal) ? triple.object.lang : NULL),
-          (triple.object.is_a?(Literal) ? triple.object.encoding.value.to_s : NULL),
+          (triple.object.is_a?(Literal) && triple.object.lang ? triple.object.lang.to_s : nil),
+          (triple.object.is_a?(Literal) && triple.object.encoding ? triple.object.encoding.value.to_s : nil),
         ]
       else
         [

data/lib/rdf_context/store/abstract_store.rb CHANGED

@@ -62,6 +62,12 @@ module RdfContext
     # @raise [StoreException] Not Implemented
     # @return [Boolean]
     def contains?(triple, context = nil); raise StoreException, "not implemented"; end
+    # Return contexts in the store (optionally matching triple), or empty if not context aware
+    # @return [Array<Graph>]
+    def contexts(triple = nil)
+      return []
+    end
     # Default (sub-optimal) implemenations of interfaces
     def inspect

data/lib/rdf_context/store/active_record_store.rb CHANGED

@@ -1,4 +1,4 @@
-gem 'activerecord'
+gem 'activerecord', "~> 2.3.8"
 require 'active_record'
 module RdfContext
@@ -38,7 +38,7 @@ module RdfContext
       executeSQL(CREATE_QUOTED_STATEMENTS_TABLE % @internedId)
       executeSQL(CREATE_NS_BINDS_TABLE % @internedId)
       executeSQL(CREATE_LITERAL_STATEMENTS_TABLE % @internedId)
       # Create indicies
       {
         asserted_table => {
@@ -76,7 +76,7 @@ module RdfContext
         end
       end
     end
     # Teardown DB files
     def teardown
       # Drop indicies
@@ -116,7 +116,7 @@ module RdfContext
           executeSQL("DROP INDEX #{index} ON #{tn}")
         end
       end
       # Drop tables
       executeSQL("DROP TABLE #{namespace_binds}")
       executeSQL("DROP TABLE #{quoted_table}")
@@ -124,12 +124,6 @@ module RdfContext
       executeSQL("DROP TABLE #{asserted_type_table}")
       executeSQL("DROP TABLE #{asserted_table}")
     end
-    # Destroy database
-    #
-    # @option options[String] :path Path to database file defaults to a file in the current directory based on a hash of the store identifier
-    def destroy(options = {})
-    end
     protected
@@ -204,7 +198,7 @@ module RdfContext
     # Yields each row
     def executeSQL(qStr, *params, &block)
       conn = ActiveRecord::Base.connection
       puts "executeSQL: params=#{params.flatten.inspect}" if ::RdfContext::debug?
       puts "executeSQL: '#{params.dup.unshift(qStr).join("', '")}'" if ::RdfContext::debug?
       qStr = ActiveRecord::Base.send(:replace_bind_variables, qStr, params.flatten)

data/lib/rdf_context/store/list_store.rb CHANGED

@@ -16,6 +16,11 @@ module RdfContext
       "ListStore[id=#{identifier}, size=#{@triples.length}]"
     end
+    # Destroy the store, as it can contain only one context
+    def destroy(configuration = {})
+      @triples = []
+    end
     # Add triple to store
     # @param [Triple] triple
     # @param [Graph] context (nil) ignored

data/lib/rdf_context/store/memory_store.rb CHANGED

@@ -36,22 +36,7 @@ module RdfContext
     # @return [MemoryStore]
     def initialize(identifier = nil, configuration = {})
       super
-      # indexed by [context][subject][predicate][object] = 1
-      @cspo = {}
-      # indexed by [context][predicate][object][subject] = 1
-      @cpos = {}
-      # indexed by [context][object][subject][predicate] = 1
-      @cosp = {}
-      # indexed by [subject][predicate][object] = [context]
-      @spo = {}
-      # indexed by [predicate][object][subject] = [context]
-      @pos = {}
-      # indexed by [object][subject][predicate] = [context]
-      @osp = {}
-      # indexes integer keys to identifiers
-      @forward = {}
-      # reverse index of forward
-      @reverse = {}
+      destroy({})
     end
     def inspect
@@ -70,6 +55,39 @@ module RdfContext
         "  reverse: #{@reverse.inspect}\n"
     end
+    # Destroy store or context
+    # If context is specified remove that context, otherwise, re-initialize the store
+    #
+    # @option configuration [Graph] :context  Remove the specified context
+    def destroy(configuration = {})
+      if ctx = configuration[:context]
+        remove(Triple.new(nil, nil, nil), ctx)
+        ci = resource_to_int(ctx)
+        if ci
+          @reverse.delete(ctx.hash)
+          @forward.delete(ci)
+        end
+      else
+        # indexed by [context][subject][predicate][object] = 1
+        @cspo = {}
+        # indexed by [context][predicate][object][subject] = 1
+        @cpos = {}
+        # indexed by [context][object][subject][predicate] = 1
+        @cosp = {}
+        # indexed by [subject][predicate][object] = [context]
+        @spo = {}
+        # indexed by [predicate][object][subject] = [context]
+        @pos = {}
+        # indexed by [object][subject][predicate] = [context]
+        @osp = {}
+        # indexes integer keys to identifiers
+        @forward = {}
+        # reverse index of forward
+        @reverse = {}
+      end
+    end
     # Add a triple to the store
     # Add to default context, if context is nil
     #
@@ -145,7 +163,7 @@ module RdfContext
         osp = @osp
       else
         ci = resource_to_int(context)
-        return [] unless ci
+        return [] if context.frozen? || !ci
         spo = @cspo[ci]
         pos = @cpos[ci]
         osp = @cosp[ci]
@@ -354,6 +372,8 @@ module RdfContext
     def triple_to_int(triple)
       [@reverse[triple.subject.hash], @reverse[triple.predicate.hash], @reverse[triple.object.hash]]
     end
-    def resource_to_int(resource); @reverse[resource.hash]; end
+    def resource_to_int(resource);
+      @reverse[resource.hash]
+    end
   end
 end

data/lib/rdf_context/store/sqlite3_store.rb CHANGED

@@ -142,13 +142,6 @@ module RdfContext
       executeSQL("DROP TABLE #{asserted_table}")
     end
-    # Destroy database
-    #
-    # @option options[String] :path Path to database file defaults to a file in the current directory based on a hash of the store identifier
-    def destroy(options = {})
-      File.delete(@path)
-    end
     protected
     # Where clase utility functions

data/rdf_context.gemspec CHANGED

@@ -5,19 +5,18 @@
 Gem::Specification.new do |s|
   s.name = %q{rdf_context}
-  s.version = "0.5.10"
+  s.version = "0.5.11"
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gregg Kellogg"]
-  s.date = %q{2010-12-19}
+  s.date = %q{2011-01-07}
   s.default_executable = %q{rdf_context}
-  s.description = %q{    RdfContext parses RDF/XML, RDFa and N3-rdf into a Graph object. It also serializes RDF/XML and N-Triples from the Graph.
+  s.description = %q{    RdfContext parses RDF/XML, RDFa and N3 into a Graph object. It also serializes RDF/XML, Turtle and N-Triples from the Graph.
       * Fully compliant RDF/XML parser.
       * Fully compliant XHTML/RDFa 1.0 parser.
-      * N3-rdf parser
-      * N-Triples and RDF/XML serializer
-      * Graph serializes into RDF/XML and N-Triples.
+      * Notation3 parser (N3-rdf level)
+      * N-Triples, Turtle and RDF/XML serializer
       * ConjunctiveGraph, named Graphs and contextual storage modules.
     Install with 'gem install rdf_context'
@@ -30,7 +29,6 @@ Gem::Specification.new do |s|
   s.files = [
     ".autotest",
      ".gitignore",
-     ".yardoc",
      ".yardopts",
      "History.rdoc",
      "README.rdoc",
@@ -91,118 +89,6 @@ Gem::Specification.new do |s|
      "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",
@@ -848,7 +734,8 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<nokogiri>, [">= 1.4.3"])
       s.add_runtime_dependency(%q<builder>, [">= 2.1.2"])
       s.add_development_dependency(%q<rspec>, [">= 2.1.0"])
-      s.add_development_dependency(%q<activesupport>, [">= 2.3.0"])
+      s.add_development_dependency(%q<activesupport>, ["~> 2.3.8"])
+      s.add_development_dependency(%q<activerecord>, ["~> 2.3.8"])
       s.add_development_dependency(%q<yard>, [">= 0"])
     else
       s.add_dependency(%q<addressable>, [">= 2.2.0"])
@@ -856,7 +743,8 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<nokogiri>, [">= 1.4.3"])
       s.add_dependency(%q<builder>, [">= 2.1.2"])
       s.add_dependency(%q<rspec>, [">= 2.1.0"])
-      s.add_dependency(%q<activesupport>, [">= 2.3.0"])
+      s.add_dependency(%q<activesupport>, ["~> 2.3.8"])
+      s.add_dependency(%q<activerecord>, ["~> 2.3.8"])
       s.add_dependency(%q<yard>, [">= 0"])
     end
   else
@@ -865,7 +753,8 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<nokogiri>, [">= 1.4.3"])
     s.add_dependency(%q<builder>, [">= 2.1.2"])
     s.add_dependency(%q<rspec>, [">= 2.1.0"])
-    s.add_dependency(%q<activesupport>, [">= 2.3.0"])
+    s.add_dependency(%q<activesupport>, ["~> 2.3.8"])
+    s.add_dependency(%q<activerecord>, ["~> 2.3.8"])
     s.add_dependency(%q<yard>, [">= 0"])
   end
 end