rdf-do 0.2.1 → 0.3.0

data/README

@@ -1,23 +1,28 @@
 # RDF::DataObjects
 
 DataObjects-backed RDF.rb repository, aiming for a simple use case and
-currently targeting SQLite and Postgres.  It passes its specs with Heroku's
-database.
+currently targeting SQLite and Postgres.
 
-This was written for a tutorial, and is thus a pretty naive implementation:
+ * <http://github.com/bhuga/rdf-do>
+ * <http://lists.w3.org/Archives/Public/public-rdf-ruby>
+
+This was written for a tutorial, and is thus a pretty naive implementation so far.
 RDF::DataObjects stores triples in a simple subject, predicate, object, context
-table.  Don't try to back a big website with it yet.  Nonetheless, it works.
+table.  Don't try to back a big website with it yet.  Nonetheless, it works,
+and it passes all its tests on Heroku as well.
 
 Example:
+
     repository = RDF::DataObjects::Repository.new "sqlite3:test.db"
     repository.insert(statement)
     repository.count              #=> 1
     repository.delete(statement)
 
-You can use any DataObjects compatible connection options, but only SQLite3 and
-Postgres are implemented for now.  The different databases are *just* different
-enough with their handling of unique constraints that some database-specific
-work is required, but it's not much.
+You can use any DataObjects compatible connection options to create a new
+repository, but only SQLite3 and Postgres are implemented for now.  The
+different databases are *just* different enough with their handling of unique
+constraints that some database-specific work is required for a new adapter, but
+it's not much.
 
 ## Installation:
 
@@ -28,7 +33,8 @@ The greatly preferred installation method is via RubyGems:
 Manual downloads are available at <http://github.com/bhuga/rdf-do/downloads>
 
 ## Connecting:
-  
+    require 'do_postgres'
+    require 'do_sqlite3'
     repo = RDF::DataObjects::Repository.new "postgres://localhost/database"
     repo = RDF::DataObjects::Repository.new "sqlite3:test.db"
 
@@ -37,12 +43,68 @@ Manual downloads are available at <http://github.com/bhuga/rdf-do/downloads>
 
 Your repository is a fully-functional RDF.rb `RDF::Repository`.  As with any
 RDF.rb repository, this includes the mixins `RDF::Enumerable`, `RDF::Mutable`,
-`RDF::Durable`, and `RDF::Queryable`.  Please see <http://rdf.rubyforge.org> for
+`RDF::Durable`, and `RDF::Queryable`.  Please see <http://rdf.rubyforge.org/RDF/Repository.html> for
 more information.
 
+Example:
+
+    require 'rdf'
+    require 'rdf/ntriples'
+    require 'data_objects'
+    require 'do_sqlite3'
+    require 'rdf/do'
+
+    repo = RDF::DataObjects::Repository.new('sqlite3:test.db')
+    # repo = RDF::DataObjects::Repository.new 'postgres://postgres@server/database'
+    # heroku_repo = RDF::DataObjects::Repository.new(ENV['DATABASE_URL'])
+    repo.load('http://datagraph.org/jhacker/foaf.nt')
+
+    # How many statements did we have?
+    repo.count
+    #=> 10
+
+    # Get the URI of the first subject
+    jhacker = repo.first.subject
+    #=> #<RDF::URI(http://datagraph.org/jhacker/foaf)>
+
+    # Delete everything to do with it
+    jhacker_statements = repo.query(:subject => jhacker) 
+    repo.delete *jhacker_statements
+    repo.count
+    #=> 7
+
+    # with Postgres, we could have done this, but SQLite gives us a locking error:
+    # repo.delete(*repo.query(:subject => jhacker))
+
+    # Changed our mind--bring it back
+    repo.insert *jhacker_statements
+    repo.count
+    #=> 10
+
+
+
+### Developing
+
+The main project page is on Github, at <http://github.com/bhuga/rdf-do>.  You
+can get a working copy of the source tree with:
+
+    $ git clone git://github.com/bhuga/rdf-do.git
+
+Or with:
+
+    $ wget http://github.com/bhuga/rdf-do/tarball/master
+
+### Support
+
+The preferred method to report issues is the issue queue at
+<http://github.com/bhuga/rdf-do/issues>.  You'll get the the most attention if
+you submit a failing test for a bug, or a pending test for a feature. 
+
+We'd also like to hear from you on the mailing list:
+<http://lists.w3.org/Archives/Public/public-rdf-ruby>
+
 ### Miscellany
 
- * Author: Ben Lavender <blavender@gmail.com> <http://bhuga.net> <http://blog.datagraph.org>
+ * Author: Ben Lavender | <blavender@gmail.com> | <http://bhuga.net> | <http://blog.datagraph.org>
  * 'License':  RDF::DataObjects is free and unemcumbered software released into the public domain.  For more information, see the included UNLICENSE file.
 
-

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.3.0

data/lib/rdf/do/adapters/defaults.rb

@@ -24,19 +24,19 @@ module RDF::DataObjects
       end
 
       def each_subject_sql
-        'select subject from quads'
+        'select distinct subject from quads'
       end
 
       def each_predicate_sql
-        'select predicate from quads'
+        'select distinct predicate from quads'
       end
 
       def each_object_sql
-        'select object from quads'
+        'select distinct object from quads'
       end
 
       def each_context_sql
-        'select context from quads'
+        'select distinct context from quads'
       end
 
       ##

data/lib/rdf/do/adapters/postgres.rb

@@ -31,6 +31,15 @@ module RDF::DataObjects
         'insert into quads (subject, predicate, object, context) VALUES (?, ?, ?, ?)'
       end
 
+      # SQL prepared statement for multiple insertion
+      #
+      # @param  [Integer] The number of statements to be inserted
+      # @return [String]
+      def self.multiple_insert_sql(count)
+        sql = 'insert into quads (subject, predicate, object, context) VALUES '
+        sql + (1..count).map { "(?, ?, ?, ?)" }.join(',')
+      end
+
       # SQL prepared statement for deletions
       #
       # @return [String]

data/lib/rdf/do/version.rb

@@ -0,0 +1,23 @@
+module RDF::DataObjects
+  module VERSION
+    MAJOR = 0
+    MINOR = 3
+    TINY  = 0
+    EXTRA = nil
+
+    STRING = [MAJOR, MINOR, TINY].join('.')
+    STRING << ".#{EXTRA}" if EXTRA
+
+    ##
+    # @return [String]
+    def self.to_s() STRING end
+
+    ##
+    # @return [String]
+    def self.to_str() STRING end
+
+    ##
+    # @return [Array(Integer, Integer, Integer)]
+    def self.to_a() [MAJOR, MINOR, TINY] end
+  end
+end

data/lib/rdf/do.rb

@@ -1,6 +1,7 @@
 require 'data_objects'
 require 'rdf/ntriples'
 require 'enumerator'
+require 'rdf/do/version'
 
 module RDF
 
@@ -15,7 +16,6 @@ module RDF
   # @see RDF::DataObjects::Adapters
   # @see RDF::Repository
   module DataObjects
-
     ##
     # RDF::DataObjects::Repository is an RDF::Repository is backed by a
     # DataObjects connection.
@@ -88,7 +88,7 @@ module RDF
       # @param [RDF::Statement]
       # @return [void]
       def insert_statement(statement)
-        insert *[statement]
+        insert_statements [statement]
       end
 
       ##
@@ -98,20 +98,44 @@ module RDF
       # @param [RDF::Statement]
       # @return [void]
       def delete_statement(statement)
-        delete *[statement]
+        delete_statements [statement]
       end
 
-      def insert(*statements)
-        query = @adapter.insert_sql
-        statements.each do |s|
-          exec(query,serialize(s. subject),serialize(s.predicate), serialize(s.object), serialize(s.context)) 
+      ##
+      # Insert multiple statements into this repository
+      #
+      # @see RDF::Mutable#insert_statements
+      # @param  [Array]
+      # @return [void]
+      def insert_statements(statements)
+        if @adapter.respond_to?(:multiple_insert_sql)
+          each = statements.respond_to?(:each_statement) ? :each_statement : :each
+          args = []
+          count = 0
+          statements.__send__(each) do |s|
+            count += 1
+            args += [serialize(s. subject),serialize(s.predicate), serialize(s.object), serialize(s.context)]
+          end
+          query = @adapter.multiple_insert_sql(count)
+          exec(query,*(args.flatten))
+        else
+          query = @adapter.insert_sql
+          statements.each do |s|
+            exec(query, serialize(s. subject),serialize(s.predicate), serialize(s.object), serialize(s.context)) 
+          end
         end
       end
 
-      def delete(*statements)
+      ##
+      # Remove multiple statements from this repository
+      #
+      # @see RDF::Mutable#delete_statements
+      # @param  [Array]
+      # @return [void]
+      def delete_statements(statements)
         query = @adapter.delete_sql
         statements.each do |s|
-          exec(query,serialize(s. subject),serialize(s.predicate), serialize(s.object), serialize(s.context)) 
+          exec(query, serialize(s. subject), serialize(s.predicate), serialize(s.object), serialize(s.context)) 
         end
       end
 
@@ -165,72 +189,31 @@ module RDF
       end
 
       ##
-      # Helper method to handle the block/enumerator handling for each/each_subject/each_object, etc.
-      #
-      # Will call the given method with the given block is one is given.
-      # Will return an enumerator with the given method called as a block if no block is given.
+      # Iterate over all RDF::Statements in this repository.
       #
-      # @param [Symbol] method
+      # @see RDF::Enumerable#each
       # @param [Proc] &block
       # @return [Enumerable::Enumerator, void]
-      # @nodoc
-      # @private
-      def each_or_enumerator(method, &block)
-        if block_given?
-          self.send(method, &block)
-        else
-          ::Enumerable::Enumerator.new(self,:each_or_enumerator)
-        end
-      end
-
-      ##
-      # Implementation of #each
-      #
-      # @nodoc
-      # @private
-      # @return [void]
-      # @see RDF::Enumerable#each
-      # @see RDF::DataObjects::Repository#each_or_enumerator
-      def each_block(&block)
+      def each(&block)
+        return ::Enumerable::Enumerator.new(self,:each) unless block_given?
         reader = result(@adapter.each_sql)
         while reader.next!
           block.call(RDF::Statement.new(
-                      :subject   => unserialize(reader.values[0]),
-                      :predicate => unserialize(reader.values[1]),
-                      :object    => unserialize(reader.values[2]),
-                      :context   => unserialize(reader.values[3])))
+                     :subject   => unserialize(reader.values[0]),
+                     :predicate => unserialize(reader.values[1]),
+                     :object    => unserialize(reader.values[2]),
+                     :context   => unserialize(reader.values[3])))
         end
       end
 
-      ##
-      # Iterate over all RDF::Statements in this repository.
-      #
-      # @see RDF::Enumerable#each
-      # @param [Proc] &block
-      # @return [Enumerable::Enumerator, void]
-      def each(&block)
-        each_or_enumerator(:each_block, &block)
-      end
-
       ##
       # Iterate over all RDF::Resource subjects in this repository.
       #
       # @see RDF::Enumerable#each_subject
       # @param [Proc] &block
       # @return [Enumerable::Enumerator, void]
-      def each_subject(&block)
-        each_or_enumerator(:subject_block, &block)
-      end
-
-      ##
-      # Implementation of #each_subject
-      #
-      # @nodoc
-      # @private
-      # @return [void]
-      # @see RDF::Enumerable#each_subject
-      # @see RDF::DataObjects::Repository#each_or_enumerator
-      def subject_block(&block)
+      def each_subject(&block) 
+        return ::Enumerable::Enumerator.new(self,:each_subject) unless block_given?
         reader = result(@adapter.each_subject_sql)
         while reader.next!
           block.call(unserialize(reader.values[0]))
@@ -244,18 +227,7 @@ module RDF
       # @param [Proc] &block
       # @return [Enumerable::Enumerator, void]
       def each_predicate(&block)
-        each_or_enumerator(:predicate_block, &block)
-      end
-
-      ##
-      # Implementation of #each_predicate
-      #
-      # @nodoc
-      # @private
-      # @return [void]
-      # @see RDF::Enumerable#each_predicate
-      # @see RDF::DataObjects::Repository#each_or_enumerator
-      def predicate_block(&block)
+        return ::Enumerable::Enumerator.new(self,:each_predicate) unless block_given?
         reader = result(@adapter.each_predicate_sql)
         while reader.next!
           block.call(unserialize(reader.values[0]))
@@ -269,18 +241,7 @@ module RDF
       # @param [Proc] &block
       # @return [Enumerable::Enumerator, void]
       def each_object(&block)
-        each_or_enumerator(:object_block, &block)
-      end
-
-      ##
-      # Implementation of #each_object
-      #
-      # @nodoc
-      # @private
-      # @return [void]
-      # @see RDF::Enumerable#each_object
-      # @see RDF::DataObjects::Repository#each_or_enumerator
-      def object_block(&block)
+        return ::Enumerable::Enumerator.new(self,:each_object) unless block_given?
         reader = result(@adapter.each_object_sql)
         while reader.next!
           block.call(unserialize(reader.values[0]))
@@ -294,18 +255,7 @@ module RDF
       # @param [Proc] &block
       # @return [Enumerable::Enumerator, void]
       def each_context(&block)
-        each_or_enumerator(:context_block, &block)
-      end
-
-      ##
-      # Implementation of #each_context
-      #
-      # @nodoc
-      # @private
-      # @return [void]
-      # @see RDF::Enumerable#each_context
-      # @see RDF::DataObjects::Repository#each_or_enumerator
-      def context_block(&block)
+        return ::Enumerable::Enumerator.new(self,:each_context) unless block_given?
         reader = result(@adapter.each_context_sql)
         while reader.next!
           context = unserialize(reader.values[0])

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 1
-  version: 0.2.1
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Ben Lavender
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-02 00:00:00 +02:00
+date: 2010-04-17 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,8 +27,8 @@ dependencies:
         segments: 
         - 0
         - 1
-        - 3
-        version: 0.1.3
+        - 7
+        version: 0.1.7
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -55,8 +55,8 @@ dependencies:
         segments: 
         - 0
         - 1
-        - 0
-        version: 0.1.0
+        - 6
+        version: 0.1.6
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -103,6 +103,7 @@ files:
 - lib/rdf/do/adapters/defaults.rb
 - lib/rdf/do/adapters/postgres.rb
 - lib/rdf/do/adapters/sqlite3.rb
+- lib/rdf/do/version.rb
 - lib/rdf/do.rb
 has_rdoc: false
 homepage: http://rdf.rubyforge.org/