scraperwiki 2.0.1 → 2.0.2

data/lib/scraperwiki.rb

@@ -79,18 +79,22 @@ module ScraperWiki
         SQLiteMagic._do_save_sqlite(unique_keys, rjdata, table_name)
     end 
 
+    def ScraperWiki.close_sqlite()
+        SQLiteMagic.close
+    end
+
     # Internal function to check a row of data, convert to right format
     def ScraperWiki._convdata(unique_keys, scraper_data)
         if unique_keys
             for key in unique_keys
                 if !key.kind_of?(String) and !key.kind_of?(Symbol)
-                    return 'unique_keys must each be a string or a symbol, this one is not: ' + key
+                    raise 'unique_keys must each be a string or a symbol, this one is not: ' + key
                 end
                 if !scraper_data.include?(key) and !scraper_data.include?(key.to_sym)
-                    return 'unique_keys must be a subset of data, this one is not: ' + key
+                    raise 'unique_keys must be a subset of data, this one is not: ' + key
                 end
                 if scraper_data[key] == nil and scraper_data[key.to_sym] == nil
-                    return 'unique_key value should not be nil, this one is nil: ' + key
+                    raise 'unique_key value should not be nil, this one is nil: ' + key
                 end
             end
         end

data/lib/scraperwiki/sqlite_save_info.rb

@@ -11,10 +11,14 @@ require 'set'
 require 'sqlite3'
 
 module SQLiteMagic
-  @db = SQLite3::Database.new("scraperwiki.sqlite")
+  @db = nil
   @sqlitesaveinfo = {}
 
   def SQLiteMagic._do_save_sqlite(unique_keys, data, swdatatblname)
+    if @db.nil?
+      @db = SQLite3::Database.new("scraperwiki.sqlite")
+    end
+
     res = { }
     if data.class == Hash
       data = [data]
@@ -58,9 +62,6 @@ module SQLiteMagic
       end
 
       lres = ssinfo.insertdata(ldata)
-      if lres.include?('error')
-        return lres
-      end
       nrecords += 1
     end
 
@@ -69,13 +70,19 @@ module SQLiteMagic
     return res
   end
 
+  def SQLiteMagic.close()
+    @db.close
+    @db = nil
+    @sqlitesaveinfo = {}
+  end
+
 
   class SqliteSaveInfo
     def initialize(swdatatblname, db)
       @swdatatblname = swdatatblname
       @swdatakeys = [ ]
       @swdatatypes = [  ]
-      @sqdatatemplate = ""
+      @sqdatatemplate = "" 
       @db = db
     end
 
@@ -87,8 +94,6 @@ module SQLiteMagic
 
       tblinfo = @db.execute("PRAGMA main.table_info(`%s`)" % @swdatatblname)
       # puts "tblinfo="+ tblinfo.to_s
-        # there's a bug:  PRAGMA main.table_info(swdata) returns the schema for otherdatabase.swdata 
-        # following an attach otherdatabase where otherdatabase has a swdata and main does not
       
       @swdatakeys = tblinfo.map { |a| a[1] }
       @swdatatypes = tblinfo.map { |a| a[2] }
@@ -194,8 +199,9 @@ module SQLiteMagic
     end
 
     def insertdata(data)
-      values = @swdatakeys.map { |k| data[k] } # this was data.get(k) in Python
-      return @db.query(@sqdatatemplate, values)
+      values = @swdatakeys.map { |k| data[k] } 
+      res = @db.query(@sqdatatemplate, values)
+      res.close
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scraperwiki
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
   prerelease: 
 platform: ruby
 authors: