amalgalite 1.3.0 → 1.4.0

data/ext/amalgalite/c/sqlite3ext.h

@@ -28,7 +28,7 @@ typedef struct sqlite3_api_routines sqlite3_api_routines;
 ** WARNING:  In order to maintain backwards compatibility, add new
 ** interfaces to the end of this structure only.  If you insert new
 ** interfaces in the middle of this structure, then older different
-** versions of SQLite will not be able to load each others' shared
+** versions of SQLite will not be able to load each other's shared
 ** libraries!
 */
 struct sqlite3_api_routines {
@@ -236,11 +236,42 @@ struct sqlite3_api_routines {
   int (*blob_reopen)(sqlite3_blob*,sqlite3_int64);
   int (*vtab_config)(sqlite3*,int op,...);
   int (*vtab_on_conflict)(sqlite3*);
+  /* Version 3.7.16 and later */
+  int (*close_v2)(sqlite3*);
+  const char *(*db_filename)(sqlite3*,const char*);
+  int (*db_readonly)(sqlite3*,const char*);
+  int (*db_release_memory)(sqlite3*);
+  const char *(*errstr)(int);
+  int (*stmt_busy)(sqlite3_stmt*);
+  int (*stmt_readonly)(sqlite3_stmt*);
+  int (*stricmp)(const char*,const char*);
+  int (*uri_boolean)(const char*,const char*,int);
+  sqlite3_int64 (*uri_int64)(const char*,const char*,sqlite3_int64);
+  const char *(*uri_parameter)(const char*,const char*);
+  char *(*vsnprintf)(int,char*,const char*,va_list);
+  int (*wal_checkpoint_v2)(sqlite3*,const char*,int,int*,int*);
+  /* Version 3.8.7 and later */
+  int (*auto_extension)(void(*)(void));
+  int (*bind_blob64)(sqlite3_stmt*,int,const void*,sqlite3_uint64,
+                     void(*)(void*));
+  int (*bind_text64)(sqlite3_stmt*,int,const char*,sqlite3_uint64,
+                      void(*)(void*),unsigned char);
+  int (*cancel_auto_extension)(void(*)(void));
+  int (*load_extension)(sqlite3*,const char*,const char*,char**);
+  void *(*malloc64)(sqlite3_uint64);
+  sqlite3_uint64 (*msize)(void*);
+  void *(*realloc64)(void*,sqlite3_uint64);
+  void (*reset_auto_extension)(void);
+  void (*result_blob64)(sqlite3_context*,const void*,sqlite3_uint64,
+                        void(*)(void*));
+  void (*result_text64)(sqlite3_context*,const char*,sqlite3_uint64,
+                         void(*)(void*), unsigned char);
+  int (*strglob)(const char*,const char*);
 };
 
 /*
 ** The following macros redefine the API routines so that they are
-** redirected throught the global sqlite3_api structure.
+** redirected through the global sqlite3_api structure.
 **
 ** This header file is also used by the loadext.c source file
 ** (part of the main SQLite library - not an extension) so that
@@ -439,9 +470,48 @@ struct sqlite3_api_routines {
 #define sqlite3_blob_reopen            sqlite3_api->blob_reopen
 #define sqlite3_vtab_config            sqlite3_api->vtab_config
 #define sqlite3_vtab_on_conflict       sqlite3_api->vtab_on_conflict
+/* Version 3.7.16 and later */
+#define sqlite3_close_v2               sqlite3_api->close_v2
+#define sqlite3_db_filename            sqlite3_api->db_filename
+#define sqlite3_db_readonly            sqlite3_api->db_readonly
+#define sqlite3_db_release_memory      sqlite3_api->db_release_memory
+#define sqlite3_errstr                 sqlite3_api->errstr
+#define sqlite3_stmt_busy              sqlite3_api->stmt_busy
+#define sqlite3_stmt_readonly          sqlite3_api->stmt_readonly
+#define sqlite3_stricmp                sqlite3_api->stricmp
+#define sqlite3_uri_boolean            sqlite3_api->uri_boolean
+#define sqlite3_uri_int64              sqlite3_api->uri_int64
+#define sqlite3_uri_parameter          sqlite3_api->uri_parameter
+#define sqlite3_uri_vsnprintf          sqlite3_api->vsnprintf
+#define sqlite3_wal_checkpoint_v2      sqlite3_api->wal_checkpoint_v2
+/* Version 3.8.7 and later */
+#define sqlite3_auto_extension         sqlite3_api->auto_extension
+#define sqlite3_bind_blob64            sqlite3_api->bind_blob64
+#define sqlite3_bind_text64            sqlite3_api->bind_text64
+#define sqlite3_cancel_auto_extension  sqlite3_api->cancel_auto_extension
+#define sqlite3_load_extension         sqlite3_api->load_extension
+#define sqlite3_malloc64               sqlite3_api->malloc64
+#define sqlite3_msize                  sqlite3_api->msize
+#define sqlite3_realloc64              sqlite3_api->realloc64
+#define sqlite3_reset_auto_extension   sqlite3_api->reset_auto_extension
+#define sqlite3_result_blob64          sqlite3_api->result_blob64
+#define sqlite3_result_text64          sqlite3_api->result_text64
+#define sqlite3_strglob                sqlite3_api->strglob
 #endif /* SQLITE_CORE */
 
-#define SQLITE_EXTENSION_INIT1     const sqlite3_api_routines *sqlite3_api = 0;
-#define SQLITE_EXTENSION_INIT2(v)  sqlite3_api = v;
+#ifndef SQLITE_CORE
+  /* This case when the file really is being compiled as a loadable 
+  ** extension */
+# define SQLITE_EXTENSION_INIT1     const sqlite3_api_routines *sqlite3_api=0;
+# define SQLITE_EXTENSION_INIT2(v)  sqlite3_api=v;
+# define SQLITE_EXTENSION_INIT3     \
+    extern const sqlite3_api_routines *sqlite3_api;
+#else
+  /* This case when the file is being statically linked into the 
+  ** application */
+# define SQLITE_EXTENSION_INIT1     /*no-op*/
+# define SQLITE_EXTENSION_INIT2(v)  (void)v; /* unused parameter */
+# define SQLITE_EXTENSION_INIT3     /*no-op*/
+#endif
 
 #endif /* _SQLITE3EXT_H_ */

data/lib/amalgalite/version.rb

@@ -4,5 +4,5 @@
 #++
 
 module Amalgalite
-  VERSION = "1.3.0"
+  VERSION = "1.4.0"
 end

data/spec/database_spec.rb

@@ -59,7 +59,7 @@ describe Amalgalite::Database do
 
   it "closes normally" do
     db = Amalgalite::Database.new( SpecInfo.test_db )
-    lambda { db.close }.should_not raise_error( Amalgalite::SQLite3::Error )
+    expect { db.close }.not_to raise_error
   end
 
   it "returns the id of the last inserted row" do
@@ -255,7 +255,7 @@ describe Amalgalite::Database do
       rescue MyExceptionTest
         db.transaction("EXCLUSIVE") { }
       end
-    }.should_not raise_error( MyExceptionTest )
+    }.should_not raise_error
   end
 
   describe "#define_function" do
@@ -503,7 +503,7 @@ describe Amalgalite::Database do
 
   it "imports batch statements" do
     db = Amalgalite::Database.new(":memory:")
-    db.import("CREATE TABLE things(stuff TEXT); INSERT INTO things (stuff) VALUES (\"foobar\");").should be_true
+    db.import("CREATE TABLE things(stuff TEXT); INSERT INTO things (stuff) VALUES (\"foobar\");").should be_truthy
     db.first_value_from("SELECT stuff FROM things").should == "foobar"
   end
 

data/spec/spec_helper.rb

@@ -1,4 +1,5 @@
 require 'rspec'
+require 'fileutils'
 
 require 'amalgalite'
 require Amalgalite::Paths.spec_path( "iso_3166_database.rb" )
@@ -20,6 +21,10 @@ class SpecInfo
 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

data/spec/sqlite3/version_spec.rb

@@ -3,20 +3,20 @@ 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(3007015)
-    Amalgalite::SQLite3::Version.runtime_version_number.should eql(3007015)
+    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(15)
-    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 be == "3.7.15.2"
-    Amalgalite::SQLite3::Version.compiled_version_number.should be == 3007015
+    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/version_spec.rb

@@ -3,6 +3,6 @@ require 'amalgalite/version'
 
 describe "Amalgalite::VERSION" do
   it "should have a version string" do
-    Amalgalite::VERSION.should =~ /\d+\.\d+\.\d+/
+    expect(Amalgalite::VERSION).to match( /\d+\.\d+\.\d+/ )
   end
 end

data/tasks/custom.rake

@@ -56,13 +56,16 @@ namespace :util do
     puts api_todo.keys.sort.join("\n")
   end
 
-  desc "Download and integrate the next version of sqlite (use VERSION=x.y.z)"
-  task :update_sqlite do
+  desc "Download and integrate a version of sqlite"
+  task :update_sqlite, [:version,:year] do |task, args|
+    version      = args[:version] or abort "A version of SQLite please `rake #{task.name}[version,year]`"
+    version_year = args[:year]    or abort "The Year #{version} was released please `rake #{task.name}[version,year]`"
+
     require 'uri'
-    require 'net/http'
+    require 'open-uri'
     require 'zip'
 
-    parts = ENV['VERSION'].split(".")
+    parts = version.split(".")
     next_version = [ parts.shift.to_s ]
     parts.each do |p|
       next_version << "#{"%02d" % p }"
@@ -71,14 +74,14 @@ namespace :util do
 
     next_version = next_version.join('')
 
-    raise "VERSION env variable must be set" unless next_version
-    url = ::URI.parse("http://sqlite.org/sqlite-amalgamation-#{next_version}.zip")
+    url = ::URI.parse("http://sqlite.org/#{version_year}/sqlite-amalgamation-#{next_version}.zip")
     puts "downloading #{url.to_s} ..."
     file = "tmp/#{File.basename( url.path ) }"
     FileUtils.mkdir "tmp" unless File.directory?( "tmp" )
     File.open( file, "wb+") do |f|
-      res = Net::HTTP.get_response( url )
-      f.write( res.body )
+      open(url) do |input|
+        f.write( input.read )
+      end
     end
 
     puts "extracting..."

data/tasks/default.rake

@@ -1,5 +1,6 @@
 # vim: syntax=ruby
 require 'rake/clean'
+require 'digest'
 #------------------------------------------------------------------------------
 # If you want to Develop on this project just run 'rake develop' and you'll
 # have all you need to get going. If you want to use bundler for development,
@@ -9,39 +10,24 @@ namespace :develop do
 
   # Install all the development and runtime dependencies of this gem using the
   # gemspec.
-  task :default do
+  task :default => 'Gemfile' do
     require 'rubygems/dependency_installer'
-    installer = Gem::DependencyInstaller.new
-
-    This.set_coverage_gem
-
-    puts "Installing gem depedencies needed for development"
-    This.platform_gemspec.dependencies.each do |dep|
-      if dep.matching_specs.empty? then
-        puts "Installing : #{dep}"
-        installer.install dep
-      else
-        puts "Skipping   : #{dep} -> already installed #{dep.matching_specs.first.full_name}"
-      end
-    end
+    installer = ::Gem::DependencyInstaller.new
+    puts "Installing bundler..."
+    installer.install 'bundler'
+    sh 'bundle install'
     puts "\n\nNow run 'rake test'"
   end
 
   # Create a Gemfile that just references the gemspec
   file 'Gemfile' => :gemspec do
     File.open( "Gemfile", "w+" ) do |f|
-      f.puts 'source :rubygems'
+      f.puts "# DO NOT EDIT - This file is automatically generated"
+      f.puts "# Make changes to Manifest.txt and/or Rakefile and regenerate"
+      f.puts 'source "https://rubygems.org/"'
       f.puts 'gemspec'
     end
   end
-
-  desc "Create a bundler Gemfile"
-  task :using_bundler => 'Gemfile' do
-    puts "Now you can 'bundle'"
-  end
-
-  # Gemfiles are build artifacts
-  CLOBBER << FileList['Gemfile*']
 end
 desc "Boostrap development"
 task :develop => "develop:default"
@@ -50,19 +36,18 @@ task :develop => "develop:default"
 # Minitest - standard TestTask
 #------------------------------------------------------------------------------
 begin
+  require 'rake/testtask'
+  Rake::TestTask.new( :test ) do |t|
+    t.ruby_opts    = %w[ -w -rubygems ]
+    t.libs         = %w[ lib spec test ]
+    t.pattern      = "{test,spec}/**/{test_*,*_spec}.rb"
+  end
+
   require 'rspec/core/rake_task'
-  RSpec::Core::RakeTask.new( :test ) do |t|
+  RSpec::Core::RakeTask.new( :spec ) do |t|
     t.ruby_opts    = %w[ -w ]
     t.rspec_opts   = %w[ --color --format documentation ]
   end
-
-# require 'rake/testtask'
-# Rake::TestTask.new( :test ) do |t|
-#   t.ruby_opts    = %w[ -w -rubygems ]
-#   t.libs         = %w[ lib spec ]
-#   t.pattern      = "spec/**/*_spec.rb"
-# end
-#
   task :test_requirements
   task :test => :test_requirements
   task :default => :test
@@ -85,7 +70,7 @@ begin
     t.rdoc_files.include( FileList['*.{rdoc,md,txt}'], FileList['ext/**/*.c'],
                           FileList['lib/**/*.rb'] )
   end
-rescue LoadError => le
+rescue StandardError, LoadError
   This.task_warning( 'rdoc' )
 end
 
@@ -93,31 +78,16 @@ end
 # Coverage - optional code coverage, rcov for 1.8 and simplecov for 1.9, so
 #            for the moment only rcov is listed.
 #------------------------------------------------------------------------------
-if RUBY_VERSION < "1.9.0"
-  begin
-   require 'rcov/rcovtask'
-   Rcov::RcovTask.new( 'coverage' ) do |t|
-     t.libs      << 'spec'
-     t.pattern   = 'spec/**/*_spec.rb'
-     t.verbose   = true
-     t.rcov_opts << "-x ^/"           # remove all the global files
-     t.rcov_opts << "--sort coverage" # so we see the worst files at the top
-   end
-  rescue LoadError
-   This.task_warning( 'rcov' )
-  end
-else
-  begin
-    require 'simplecov'
-    desc 'Run tests with code coverage'
-    task :coverage do
-      ENV['COVERAGE'] = 'true'
-      Rake::Task[:test].execute
-    end
-    CLOBBER << FileList["coverage"]
-  rescue LoadError
-    This.task_warning( 'simplecov' )
+begin
+  require 'simplecov'
+  desc 'Run tests with code coverage'
+  task :coverage do
+    ENV['COVERAGE'] = 'true'
+    Rake::Task[:test].execute
   end
+  CLOBBER << 'coverage' if File.directory?( 'coverage' )
+rescue LoadError
+  This.task_warning( 'simplecov' )
 end
 
 #------------------------------------------------------------------------------
@@ -182,9 +152,10 @@ namespace :fixme do
   end
 
   def outdated_fixme_files
-    local_fixme_files.reject do |local|
+    local_fixme_files.select do |local|
       upstream     = fixme_project_path( local )
-      Digest::SHA256.file( local ) == Digest::SHA256.file( upstream )
+      upstream.exist? &&
+        ( Digest::SHA256.file( local ) != Digest::SHA256.file( upstream ) )
     end
   end
 
@@ -228,19 +199,18 @@ task :fixme => "fixme:default"
 desc "Build the #{This.name}.gemspec file"
 task :gemspec do
   File.open( This.gemspec_file, "wb+" ) do |f|
+    f.puts "# DO NOT EDIT - This file is automatically generated"
+    f.puts "# Make changes to Manifest.txt and/or Rakefile and regenerate"
     f.write This.platform_gemspec.to_ruby
   end
 end
 
-# the gemspec is also a dev artifact and should not be kept around.
-CLOBBER << This.gemspec_file.to_s
-
 # .rbc files from ruby 2.0
 CLOBBER << FileList["**/*.rbc"]
 
 # The standard gem packaging task, everyone has it.
 require 'rubygems/package_task'
-Gem::PackageTask.new( This.platform_gemspec ) do
+::Gem::PackageTask.new( This.platform_gemspec ) do
   # nothing
 end
 

data/tasks/extension.rake

@@ -24,7 +24,7 @@ begin
       ext.gem_spec  = This.ruby_gemspec
 
       ext.cross_compile  = true               # enable cross compilation (requires cross compile toolchain)
-      ext.cross_platform = 'i386-mswin32'     # forces the Windows platform instead of the default one
+      ext.cross_platform = 'i386-mingw32'     # forces the Windows platform instead of the default one
                                               # configure options only for cross compile
     end
   end
@@ -35,4 +35,4 @@ rescue LoadError
 end
 
 CLOBBER << FileList["lib/**/*.{jar,so,bundle}"]
-CLOBBER << FileList["lib/#{This.name}/{1.8,1.9,2.0}/"]
+CLOBBER << FileList["lib/#{This.name}/{1.8,1.9,2.0,2.1,2.2}/"]

data/tasks/this.rb

@@ -13,7 +13,7 @@ class ThisProject
   attr_accessor :email
 
   # The homepage of this project
-  attr_accessor :homepage 
+  attr_accessor :homepage
 
   # The regex of files to exclude from the manifest
   attr_accessor :exclude_from_manifest
@@ -25,7 +25,11 @@ class ThisProject
   #
   # Yields self
   def initialize(&block)
-    @exclude_from_manifest = %r/\.(git|DS_Store)|^(doc|coverage|pkg|tmp)|Gemfile*|\.(gemspec|swp|jar|bundle|so|rvmrc)$|~$/
+    @exclude_from_manifest = Regexp.union(/\.(git|DS_Store)/,
+                                          /^(doc|coverage|pkg|tmp|Gemfile(\.lock)?)/,
+                                          /^[^\/]+\.gemspec/,
+                                          /\.(swp|jar|bundle|so|rvmrc|travis.yml)$/,
+                                          /~$/)
     @gemspecs              = Hash.new
     yield self if block_given?
   end
@@ -119,7 +123,7 @@ class ThisProject
 
   # Internal: Returns the gemspace associated with the current ruby platform
   def platform_gemspec
-    gemspecs[platform]
+    gemspecs.fetch(platform) { This.ruby_gemspec }
   end
 
   def core_gemspec
@@ -132,6 +136,7 @@ class ThisProject
 
       spec.summary     = summary
       spec.description = description
+      spec.license     = license
 
       spec.files       = manifest
       spec.executables = spec.files.grep(/^bin/) { |f| File.basename(f) }
@@ -140,6 +145,8 @@ class ThisProject
       spec.extra_rdoc_files += spec.files.grep(/(txt|rdoc|md)$/)
       spec.rdoc_options = [ "--main"  , 'README.md',
                             "--markup", "tomdoc" ]
+
+      spec.required_ruby_version = '>= 1.9.3'
     end
   end
 
@@ -166,20 +173,6 @@ class ThisProject
     return spec
   end
 
-  # Internal: Set the recovery gem development dependency
-  #
-  # These are dynamically set since they cannot be hard coded as there is 
-  # no way to ship them correctly in the gemspec
-  #
-  # Returns nothing.
-  def set_coverage_gem
-    if RUBY_VERSION < "1.9.0"
-      platform_gemspec.add_development_dependency( 'rcov', '~> 1.0.0' )
-    else
-      platform_gemspec.add_development_dependency( 'simplecov', '~> 0.7.1' )
-    end
-  end
-
   # Internal: Return the platform of ThisProject at the current moment in time.
   def platform
     (RUBY_PLATFORM == "java") ? 'java' : Gem::Platform::RUBY
@@ -189,17 +182,21 @@ class ThisProject
   def description_section
     section_of( 'README.md', 'DESCRIPTION')
   end
- 
- # Internal: Return the summary text from the README 
+
+  # Internal: Return the summary text from the README
   def summary
     description_section.first
   end
 
-  # Internal: Return the full description text from the READEM
+  # Internal: Return the full description text from the README
   def description
     description_section.join(" ").tr("\n", ' ').gsub(/[{}]/,'').gsub(/\[[^\]]+\]/,'') # strip rdoc
   end
 
+  def license
+    "ISC"
+  end
+
   # Internal: The path to the gemspec file
   def gemspec_file
     project_path( "#{ name }.gemspec" )