amalgalite 1.1.2-x86-mingw32 → 1.4.0-x86-mingw32

data/spec/default_map_spec.rb

@@ -1,4 +1,4 @@
-$: << File.expand_path(File.join(File.dirname(__FILE__),"..","lib"))
+require 'spec_helper'
 require 'amalgalite/type_maps/default_map'
 
 describe Amalgalite::TypeMaps::DefaultMap do

data/spec/function_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__),"spec_helper.rb"))
+require 'spec_helper'
 
 describe "Scalar SQL Functions" do
 

data/spec/integeration_spec.rb

@@ -1,4 +1,5 @@
-require File.expand_path(File.join(File.dirname(__FILE__),"spec_helper.rb"))
+require 'spec_helper'
+
 require 'date'
 require 'time'
 

data/spec/packer_spec.rb

@@ -1,6 +1,6 @@
-require File.expand_path(File.join(File.dirname(__FILE__),"spec_helper.rb"))
+require 'spec_helper'
+
 require 'amalgalite/packer'
-require 'gemspec'
 
 describe "Amalgalite::Packer" do
   before( :each ) do
@@ -51,8 +51,8 @@ describe "Amalgalite::Packer" do
 
   it "has all the lib files in the amalgalite gem" do
     ro = Amalgalite::Packer.amalgalite_require_order
-    glist = Amalgalite::GEM_SPEC.files.select { |l| l.index("lib/amalgalite") == 0 }
-    glist.map! { |l| l.sub("lib/","") }
+    glist = IO.readlines("Manifest.txt").select { |l| l.index("lib/amalgalite") == 0 }
+    glist.map! { |l| l.strip.sub("lib/","") }
     (glist - ro).each do |l|
       l.should_not =~ /amalgalite/
     end

data/spec/paths_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__),"spec_helper.rb"))
+require 'spec_helper'
 
 describe Amalgalite::Paths do
   before(:each) do

data/spec/progress_handler_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path( File.join( File.dirname( __FILE__ ), "spec_helper.rb" ) )
+require 'spec_helper'
 
 class PH < ::Amalgalite::ProgressHandler
   attr_reader :call_count
@@ -16,12 +16,11 @@ class PH < ::Amalgalite::ProgressHandler
   end
 end
 
-def query_thread( db )
-  Thread.new( db ) do |db|
+def query_thread( database )
+  Thread.new( database ) do |db|
     begin
       db.execute("select count(id) from country")
     rescue => e
-      had_error = e
       Thread.current[:exception] = e
     end
   end
@@ -69,7 +68,7 @@ describe "Progress Handlers" do
     qt.join
     ph.call_count.should eql(25)
     qt[:exception].should be_instance_of( ::Amalgalite::SQLite3::Error )
-    @iso_db.api.last_error_code.should == 9
+    @iso_db.api.last_error_code.should be == 9
     @iso_db.api.last_error_message.should  =~ /interrupted/
     qt[:exception].message.should =~ /interrupted/
   end

data/spec/requires_spec.rb

@@ -1,5 +1,5 @@
-$: << File.expand_path(File.join(File.dirname(__FILE__),"..","lib"))
-#require 'amalgalite/requires'
+require 'spec_helper'
+require 'amalgalite/requires'
 
 #describe Amalgalite::Requires do
 #  it "#require_order has all files in 'lib' and no more" do
@@ -18,3 +18,37 @@ $: << File.expand_path(File.join(File.dirname(__FILE__),"..","lib"))
 #end
 
 
+describe Amalgalite::Requires do
+  it "can import to an in-memory database" do
+    sql = <<-SQL
+CREATE TABLE rubylibs (
+      id                   INTEGER PRIMARY KEY AUTOINCREMENT,
+      filename   TEXT UNIQUE,
+      compressed BOOLEAN,
+      contents   BLOB
+      );
+INSERT INTO "rubylibs" VALUES(1, "application", "false", 'A=1');
+SQL
+    r = Amalgalite::Requires.new(:dbfile_name => ":memory:")
+    r.import(sql)
+    r.file_contents( "application" ).should == "A=1"
+  end
+
+
+  it "gives equal instances for file databases" do
+    a = Amalgalite::Requires.new( :dbfile_name => SpecInfo.test_db )
+    b = Amalgalite::Requires.new( :dbfile_name => SpecInfo.test_db )    
+
+    a.db_connection.should equal( b.db_connection )
+  end
+
+
+  it "gives separate instances for in-memory databases" do
+    a = Amalgalite::Requires.new( :dbfile_name => ":memory:" )
+    b = Amalgalite::Requires.new( :dbfile_name => ":memory:" )
+
+    a.db_connection.should_not equal(b.db_connection)
+  end
+
+  
+end

data/spec/rtree_spec.rb

@@ -1,4 +1,5 @@
-require File.expand_path( File.join( File.dirname(__FILE__), 'spec_helper'))
+require 'spec_helper'
+
 #
 # Example from http://sqlite.org/rtree.html
 #
@@ -37,9 +38,9 @@ describe "SQLite3 R*Tree extension" do
 
   it "queries normally" do
     r = @db.execute "SELECT * FROM demo_index WHERE id=1;"
-    r.size.should == 1
+    r.size.should be == 1
     row = r.first
-    row['id'].should == 1
+    row['id'].should be == 1
   end
 
   it "does a 'contained within' query" do
@@ -49,8 +50,8 @@ describe "SQLite3 R*Tree extension" do
        AND minY>=30.00  AND maxY<=30.44;
     sql
 
-    r.size.should == 1
-    r.first['id'].should == 1
+    r.size.should be == 1
+    r.first['id'].should be == 1
   end
 
   it "does an 'overlapping' query" do

data/spec/schema_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path( File.join( File.dirname(__FILE__), 'spec_helper'))
+require 'spec_helper'
 
 require 'amalgalite'
 require 'amalgalite/schema'
@@ -15,7 +15,7 @@ describe Amalgalite::Schema do
     s = @iso_db.schema
     sql = "CREATE VIEW v1 AS SELECT c.name, c.two_letter, s.name, s.subdivision FROM country AS c JOIN subcountry AS s ON c.two_letter = s.country"
     @iso_db.execute( sql )
-    s.dirty?.should == true
+    s.dirty?.should be == true
     @iso_db.schema.load_views
     @iso_db.schema.views.size.should eql(1)
     @iso_db.schema.views["v1"].sql.should eql(sql)
@@ -25,9 +25,9 @@ describe Amalgalite::Schema do
     s = @iso_db.schema
     sql = "CREATE TABLE t1( d1 default 't' )"
     @iso_db.execute( sql )
-    s.dirty?.should == true
+    s.dirty?.should be == true
     tt = @iso_db.schema.tables['t1']
-    tt.columns['d1'].default_value.should == "t"
+    tt.columns['d1'].default_value.should be == "t"
   end
 
   it "loads the tables and columns" do
@@ -56,23 +56,22 @@ describe Amalgalite::Schema do
     s = @iso_db.schema
     sql = "CREATE TABLE u( id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL , other text )"
     @iso_db.execute( sql )
-    s.dirty?.should == true
+    s.dirty?.should be == true
     ut = @iso_db.schema.tables['u']
     ut.primary_key.should == [ ut.columns['id'] ]
   end
 
   it "knows the primary key of a temporary table" do
     @iso_db.execute "CREATE TEMPORARY TABLE tt( a, b INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, c )"
-    tt = @iso_db.schema.load_table( 'tt' )
+    tt = @iso_db.schema.tables[ 'tt' ]
     tt.primary_key.should == [ tt.columns['b'] ]
-
   end
 
   it "knows what the primary key of a table is when it is a multiple column primary key" do
     sql = "CREATE TABLE m ( id1, id2, PRIMARY KEY (id2, id1) )"
     s = @iso_db.schema
     @iso_db.execute( sql )
-    s.dirty?.should == true
+    s.dirty?.should be == true
     mt = @iso_db.schema.tables['m']
     mt.primary_key.should == [ mt.columns['id2'], mt.columns['id1'] ]
   end
@@ -93,31 +92,40 @@ describe Amalgalite::Schema do
 
   it "knows the schema is dirty when a table is created" do
     s = @iso_db.schema
-    c = s.tables['country']
-    s.dirty?.should == false
+    s.tables['country']
+    s.dirty?.should be == false
     @iso_db.execute( "create table x1( a, b )" )
-    s.dirty?.should == true
+    s.dirty?.should be == true
   end
 
   it "knows the schema is dirty when a table is dropped" do
     s = @iso_db.schema
-    c = s.tables['country']
+    s.tables['country']
     @iso_db.execute( "create table x1( a, b )" )
-    s.dirty?.should == true
+    s.dirty?.should be == true
 
     @iso_db.schema.load_schema!
     s = @iso_db.schema
 
-    s.dirty?.should == false
+    s.dirty?.should be == false
     @iso_db.execute("drop table x1")
-    s.dirty?.should == true
+    s.dirty?.should be == true
   end
 
+  it "knows if a temporary table exists" do
+    @iso_db.execute "CREATE TEMPORARY TABLE tt(a,b,c)"
+    @iso_db.schema.tables.keys.include?('tt').should be == true
+    @iso_db.schema.tables['tt'].temporary?.should be == true
+  end
 
-  it "can load the schema of a temporary table" do
-    @iso_db.execute "CREATE TEMPORARY TABLE tt( a, b, c )"
-    @iso_db.schema.tables['tt'].should be_nil
-    @iso_db.schema.load_table('tt').should_not be_nil
-    @iso_db.schema.tables['tt'].should be_temporary
+  it "sees that temporary tables shadow real tables" do
+    @iso_db.execute "CREATE TABLE tt(x)"
+    @iso_db.schema.tables['tt'].temporary?.should be == false
+    @iso_db.execute "CREATE TEMP TABLE tt(a,b,c)"
+    @iso_db.schema.tables['tt'].temporary?.should be == true
+    @iso_db.execute "DROP TABLE tt"
+    @iso_db.schema.tables['tt'].temporary?.should be == false
+    @iso_db.schema.tables['tt'].columns.size.should be == 1
   end
+
 end

data/spec/spec_helper.rb

@@ -1,9 +1,5 @@
-require 'rubygems'
 require 'rspec'
-
-$:.unshift File.expand_path(File.join(File.dirname(__FILE__),"..","lib"))
-require 'amalgalite/paths'
-$:.unshift Amalgalite::Paths.root_dir
+require 'fileutils'
 
 require 'amalgalite'
 require Amalgalite::Paths.spec_path( "iso_3166_database.rb" )
@@ -19,12 +15,16 @@ class SpecInfo
     end
 
     def make_clone_iso_db
-      new_path = make_master_iso_db.duplicate( 'testing' )
+      make_master_iso_db.duplicate( 'testing' )
     end
   end
 end
 
 RSpec.configure do |config|
+  config.expect_with :rspec do |c|
+    c.syntax = [:should, :expect]
+  end
+
   config.before(:all) do 
     SpecInfo.make_master_iso_db
   end
@@ -36,7 +36,7 @@ RSpec.configure do |config|
   config.before( :each ) do
     @iso_db_path = SpecInfo.make_clone_iso_db
     @iso_db      = Amalgalite::Database.new( @iso_db_path )
-    @schema     = IO.read( Amalgalite::Iso3166Database.schema_file )
+    @schema      = IO.read( Amalgalite::Iso3166Database.schema_file )
   end
 
   config.after( :each ) do

data/spec/sqlite3/constants_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__),%w[ .. spec_helper.rb ]))
+require 'spec_helper'
 
 require 'amalgalite/sqlite3/constants'
 

data/spec/sqlite3/database_status_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), "..",  "spec_helper.rb"))
+require 'spec_helper'
 require 'amalgalite/sqlite3'
 require 'rbconfig'
 
@@ -18,14 +18,14 @@ describe "Amalgalite::SQLite3::Database::Status" do
 
 
   it "knows how much lookaside memory it has used" do
-    @db.api.status.lookaside_used.highwater.should > 0
-    @db.api.status.lookaside_used.current.should >= 0
+    @db.api.status.lookaside_used.highwater.should be > 0
+    @db.api.status.lookaside_used.current.should be >= 0
   end
 
   it "can reset the highwater value" do
     stat = @db.api.status.lookaside_used
     before = stat.highwater
-    before.should > 0
+    before.should be > 0
 
     stat.reset!
     after = stat.highwater

data/spec/sqlite3/status_spec.rb

@@ -1,20 +1,20 @@
-require File.expand_path(File.join(File.dirname(__FILE__), "..", "spec_helper.rb"))
+require 'spec_helper'
 require 'amalgalite/sqlite3'
 require 'rbconfig'
 
 describe "Amalgalite::SQLite3::Status" do
   it "knows how much memory it has used" do
-    Amalgalite::SQLite3.status.memory_used.current.should >= 0
-    Amalgalite::SQLite3.status.memory_used.highwater.should >= 0
+    Amalgalite::SQLite3.status.memory_used.current.should be >= 0
+    Amalgalite::SQLite3.status.memory_used.highwater.should be >= 0
   end
 
   it "can reset the highwater value" do
     before = Amalgalite::SQLite3.status.memory_used.highwater
-    before.should > 0
+    before.should be > 0
 
     current = Amalgalite::SQLite3.status.memory_used.current
     Amalgalite::SQLite3.status.memory_used.reset!
-    Amalgalite::SQLite3.status.memory_used.highwater.should == current
+    Amalgalite::SQLite3.status.memory_used.highwater.should be == current
 
     after = Amalgalite::SQLite3.status.memory_used.highwater
     after.should_not eql(before)

data/spec/sqlite3/version_spec.rb

@@ -1,22 +1,22 @@
-require File.expand_path(File.join(File.dirname(__FILE__),"..","spec_helper.rb"))
+require 'spec_helper'
 require 'amalgalite/sqlite3/version'
 
 describe "Amalgalite::SQLite3::Version" do
   it "should have the sqlite3 version" do
-    Amalgalite::SQLite3::VERSION.should =~ /\d\.\d\.\d/
-    Amalgalite::SQLite3::Version.to_s.should =~ /\d\.\d\.\d/
-    Amalgalite::SQLite3::Version.runtime_version.should =~ /\d\.\d\.\d/
+    expect(Amalgalite::SQLite3::VERSION).to match(/\d\.\d\.\d/)
+    expect(Amalgalite::SQLite3::Version.to_s).to match( /\d\.\d\.\d/ )
+    expect(Amalgalite::SQLite3::Version.runtime_version).to match( /\d\.\d\.\d/ )
 
-    Amalgalite::SQLite3::Version.to_i.should eql(3007005)
-    Amalgalite::SQLite3::Version.runtime_version_number.should eql(3007005)
+    Amalgalite::SQLite3::Version.to_i.should eql(3008007)
+    Amalgalite::SQLite3::Version.runtime_version_number.should eql(3008007)
 
     Amalgalite::SQLite3::Version::MAJOR.should eql(3)
-    Amalgalite::SQLite3::Version::MINOR.should eql(7)
-    Amalgalite::SQLite3::Version::RELEASE.should eql(5)
-    Amalgalite::SQLite3::Version.to_a.should have(3).items
+    Amalgalite::SQLite3::Version::MINOR.should eql(8)
+    Amalgalite::SQLite3::Version::RELEASE.should eql(7)
+    expect(Amalgalite::SQLite3::Version.to_a.size).to eql(3)
 
-    Amalgalite::SQLite3::Version.compiled_version.should == "3.7.5"
-    Amalgalite::SQLite3::Version.compiled_version_number.should == 3007005
-    Amalgalite::SQLite3::Version.compiled_matches_runtime?.should == true
+    Amalgalite::SQLite3::Version.compiled_version.should be == "3.8.7.4"
+    Amalgalite::SQLite3::Version.compiled_version_number.should be == 3008007
+    Amalgalite::SQLite3::Version.compiled_matches_runtime?.should be == true
   end
 end

data/spec/sqlite3_spec.rb

@@ -1,10 +1,10 @@
-require File.expand_path(File.join(File.dirname(__FILE__),"spec_helper.rb"))
+require 'spec_helper'
 require 'amalgalite/sqlite3'
 require 'rbconfig'
 
 describe "Amalgalite::SQLite3" do
-  it "is threadsafe is ruby is compiled with pthread support, in this case that is (#{Config::CONFIG['configure_args'].include?( "--enable-pthread" )})" do
-    Amalgalite::SQLite3.threadsafe?.should eql(Config::CONFIG['configure_args'].include?( "--enable-pthread" ))
+  it "is threadsafe is ruby is compiled with pthread support, in this case that is (#{RbConfig::CONFIG['configure_args'].include?( "--enable-pthread" )})" do
+    Amalgalite::SQLite3.threadsafe?.should eql(RbConfig::CONFIG['configure_args'].include?( "--enable-pthread" ))
   end
 
   it "knows if an SQL statement is complete" do

data/spec/statement_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path( File.join( File.dirname( __FILE__ ), "spec_helper.rb" ) )
+require 'spec_helper'
 
 describe Amalgalite::Statement do
   before(:each) do
@@ -125,10 +125,9 @@ describe Amalgalite::Statement do
   end
 
   it "can execute a single sql command and say if there is remaining sql to execute" do
-    db = Amalgalite::Database.new( SpecInfo.test_db )
     stmt = @db.prepare( @schema )
     stmt.execute
-    stmt.remaining_sql.size.should > 0
+    stmt.remaining_sql.size.should be > 0
     stmt.close
   end
 
@@ -148,7 +147,7 @@ describe Amalgalite::Statement do
     db.execute( "create table t1(c1,c2,c3)" )
     db.execute("insert into t1(c1,c2,c3) values (1,2,'abc')")
     db.prepare( "select oid,* from t1" ) do |stmt|
-      rows = stmt.execute
+      stmt.execute
       stmt.should be_using_rowid_column
     end
 

data/spec/storage_map_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path( File.join( File.dirname( __FILE__ ), "spec_helper.rb" ) )
+require 'spec_helper'
 require 'amalgalite/type_maps/storage_map'
 
 describe Amalgalite::TypeMaps::StorageMap do

data/spec/tap_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path( File.join( File.dirname( __FILE__ ), "spec_helper.rb" ) )
+require 'spec_helper'
 
 require 'amalgalite'
 require 'amalgalite/trace_tap'
@@ -34,11 +34,11 @@ describe Amalgalite::Taps::StringIO do
   end
 
   it "has a stdout tap" do
-    s = ::Amalgalite::Taps::Stdout.new
+    ::Amalgalite::Taps::Stdout.new
   end
-  
+
   it "has a stderr tap" do
-    s = ::Amalgalite::Taps::Stderr.new
+    ::Amalgalite::Taps::Stderr.new
   end
 end