drb_sqlite 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 430cd23f23fe750696819ed0983fc2d59ae834377baa110020f4cd1fc40b46e8
-  data.tar.gz: f95b7c841e4db138ae6f9b2e07f518265310dc3c7f976f785cdd92eda7bdfec8
+  metadata.gz: 14e8618477946900f490b2a4ec23267bf2c3128bb5d99259d6462e892aa067ec
+  data.tar.gz: f5f33b7870b201df683d36172e0b8b99bdfc145f06b84ea353b19a7ea7970f9a
 SHA512:
-  metadata.gz: 845c07f80418bb90bca9a2f06fc09cec3e5cb459d708c8ec2194597ca856e93f91ba028ea12bb37a502ea62aa21a21f6274214cf24c6825c9c5e77c5bd32d032
-  data.tar.gz: 505fc7f928541802c9722eb166369cd1d890cc98078ccfd08b58be3d014c9e9bce8515d8287c2211e554deb8b89f1641d09db6eecca878b2669d7e0ca1e1380e
+  metadata.gz: 5f609fa2d44d5e39d9348740e0566f953a2f0d9f87e59993bdd0de3a4f57da1b78ef827a4b830a5319e278c16343bcd6a2c3ada3016d1d0c80e2fc55f63146f2
+  data.tar.gz: f2b275ec2b8ef66b21a5065a20e3ef637188d4198f96067aa92ce23b8821d967617a06868365bc307d8010bb84555917c38462bea1902f934c227f5fdf3ff9ee

data/lib/drb_sqlite.rb

@@ -4,25 +4,55 @@
 
 require 'drb'
 
+class SQLiteServerError < Exception
+end
 
 class DRbSQLite
 
-  def initialize(dbfile=nil, host: nil, port: '57000')
-    
-    @dbfile = dbfile
+  def initialize(raw_dbfile=nil, host: nil, port: '57000')
+        
     DRb.start_service
-    @server = DRbObject.new nil, "druby://#{host}:#{port}"    
-    @server.load(dbfile)
+    @server = DRbObject.new nil, "druby://#{host}:#{port}"
+    load(raw_dbfile) if raw_dbfile
         
   end
   
   def execute(*args, &blk)
-    @server.execute @dbfile, *args, &blk
+    
+    r = @server.execute @dbfile, *args, &blk
+    
+    if r.is_a? String and r =~ /^SQLiteServerError:/ then
+      raise SQLiteServerError, r[/(?<=^SQLiteServerError: )(.*)/]
+    end
+    
+    r
+  end
+  
+  def exists?(dbfile)
+    @server.exists? dbfile
+  end
+  
+  def load(raw_dbfile)
+    
+    if raw_dbfile =~ /^sqlite:\/\// then
+      host, @dbfile = raw_dbfile\
+          .match(/(?<=^sqlite:\/\/)([^\/]+)\/(.*)/).captures
+    else
+      @dbfile = raw_dbfile
+    end
+
+    @server.load(@dbfile)
   end
   
   def query(*args, &blk)
-    @server.query @dbfile, *args, &blk
+    
+    r = @server.query @dbfile, *args, &blk
+    
+    if r.is_a? String and r =~ /^SQLiteServerError:/ then
+      raise SQLiteServerError, r[/(?<=^SQLiteServerError: )(.*)/]
+    end
+    
+    r    
   end
     
 end
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: drb_sqlite
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - James Robertson