amalgalite 1.4.1-x86-mingw32 → 1.7.0-x86-mingw32

data/lib/amalgalite/type_maps/storage_map.rb

@@ -17,7 +17,7 @@ module Amalgalite::TypeMaps
       case obj
       when Float
         ::Amalgalite::SQLite3::Constants::DataType::FLOAT
-      when Fixnum
+      when Integer
         ::Amalgalite::SQLite3::Constants::DataType::INTEGER
       when NilClass
         ::Amalgalite::SQLite3::Constants::DataType::NULL

data/lib/amalgalite/version.rb

@@ -4,5 +4,5 @@
 #++
 
 module Amalgalite
-  VERSION = "1.4.1"
+  VERSION = "1.7.0"
 end

data/spec/aggregate_spec.rb

@@ -2,6 +2,7 @@ require 'spec_helper'
 
 class AggregateTest1 < ::Amalgalite::Aggregate
   def initialize
+    super
     @name = 'atest1'
     @arity = -1
     @count = 0
@@ -96,6 +97,7 @@ describe "Aggregate SQL Functions" do
   it "handles an error being thrown during the step function" do
     class AggregateTest5 < AggregateTest1
       def initialize
+        super
         @name = "atest5"
         @arity = -1
         @count = 0
@@ -117,6 +119,7 @@ describe "Aggregate SQL Functions" do
   it "handles an error being thrown during the finalize function" do
     class AggregateTest6 < AggregateTest1
       def initialize
+        super
         @name = "atest6"
         @count = 0
         @arity = -1
@@ -131,6 +134,7 @@ describe "Aggregate SQL Functions" do
 
   it "handles an error being thrown during initialization in the C extension" do
     class AggregateTest7 < AggregateTest1
+      @called = false
       def self.called?
         if @called then
           raise "Initialization error!"

data/spec/database_spec.rb

@@ -119,9 +119,13 @@ describe Amalgalite::Database do
     sql = "CREATE TABLE trace_test( x, y, z)"
     s = db.trace_tap = ::Amalgalite::Taps::StringIO.new
     db.execute( sql )
-    db.trace_tap.string.should eql("registered as trace tap\n#{sql}\n")
+    escaped_sql= Regexp.quote(sql)
+    db.trace_tap.string.should match(/registered as trace tap/)
+    db.trace_tap.string.should match(/#{escaped_sql}/)
+    s.trace_count.should eql(2)
     db.trace_tap = nil
-    s.string.should eql("registered as trace tap\n#{sql}\nunregistered as trace tap\n")
+    s.trace_count.should eql(3)
+    s.string.should match(/unregistered as trace tap/)
   end
 
   it "raises an exception if the wrong type of object is used for tracing" do
@@ -129,18 +133,13 @@ describe Amalgalite::Database do
     lambda { db.trace_tap = Object.new }.should raise_error(Amalgalite::Error)
   end
 
-  it "raises an exception if the wrong type of object is used for profile" do
-    db = Amalgalite::Database.new( SpecInfo.test_db )
-    lambda { db.profile_tap = Object.new }.should raise_error(Amalgalite::Error)
-  end
-
   it "profiles the execution of code" do
     db = Amalgalite::Database.new( SpecInfo.test_db )
-    s = db.profile_tap = ::Amalgalite::Taps::StringIO.new
+    s = db.trace_tap = ::Amalgalite::Taps::StringIO.new
     db.execute_batch( @schema )
-    db.profile_tap.samplers.size.should eql(6)
-    db.profile_tap = nil
-    s.string.should =~ /unregistered as profile tap/m
+    db.trace_tap.samplers.size.should eql(5)
+    db.trace_tap = nil
+    s.string.should =~ /unregistered as trace tap/
   end
 
   it "#execute yields each row when called with a block" do
@@ -167,13 +166,11 @@ describe Amalgalite::Database do
 
   it "can clear all registered taps" do
     db = Amalgalite::Database.new( SpecInfo.test_db )
-    s = db.profile_tap = ::Amalgalite::Taps::StringIO.new
-    db.trace_tap = s
+    s = db.trace_tap = ::Amalgalite::Taps::StringIO.new
     db.execute_batch( @schema )
-    db.profile_tap.samplers.size.should eql(6)
+    db.trace_tap.samplers.size.should eql(5)
     db.clear_taps!
     s.string.should =~ /unregistered as trace tap/m
-    s.string.should =~ /unregistered as profile tap/m
   end
 
   it "allows nested transactions even if SQLite under the covers does not" do

data/spec/default_map_spec.rb

@@ -12,7 +12,7 @@ describe Amalgalite::TypeMaps::DefaultMap do
       @map.bind_type_of( 3.14 ).should == ::Amalgalite::SQLite3::Constants::DataType::FLOAT
     end
 
-    it "Fixnum is bound to DataType::INTGER" do
+    it "Integer is bound to DataType::INTGER" do
       @map.bind_type_of( 42 ).should == ::Amalgalite::SQLite3::Constants::DataType::INTEGER
     end
 

data/spec/integeration_spec.rb

@@ -25,7 +25,7 @@ describe "Integration specifications" do
       "datetime"  => { :value => DateTime.now, :klass => DateTime }, 
       "timestamp" => { :value => Time.now, :klass => Time   } ,
       "date"      => { :value => Date.today, :klass => Date },
-      "integer"   => { :value => 42, :klass => Fixnum } ,
+      "integer"   => { :value => 42, :klass => Integer },
       "double"    => { :value => 3.14, :klass => Float },
       "varchar"   => { :value => "foobarbaz", :klass => String },
       "boolean"   => { :value => true, :klass => TrueClass },
@@ -36,7 +36,7 @@ describe "Integration specifications" do
         db.execute "CREATE TABLE t( c #{sql_type} )"
         db.execute "insert into t (c) values ( ? )", ruby_info[:value]
         rows = db.execute "select * from t"
-        rows.first['c'].class.should eql(ruby_info[:klass])
+        rows.first['c'].should be_kind_of(ruby_info[:klass])
 
         if [ DateTime, Time ].include?( ruby_info[:klass] ) then
           rows.first['c'].strftime("%Y-%m-%d %H:%M:%S").should eql(ruby_info[:value].strftime("%Y-%m-%d %H:%M:%S"))

data/spec/json_spec.rb

@@ -0,0 +1,24 @@
+require 'spec_helper'
+require 'amalgalite/sqlite3'
+require 'rbconfig'
+
+describe "Amalgalite handles the JSON extension" do
+  it "can parse a `json_each` call" do
+    db = Amalgalite::Database.new( ":memory:" )
+    values = %w[ a b c d e f g ]
+    db.execute("CREATE TABLE jtest(id, json)")
+    db.execute("INSERT INTO jtest(id, json) values (1, json($json))", { "$json" => values })
+    rows = db.execute("SELECT jtest.id as i, value as v FROM jtest, json_each(jtest.json)")
+
+    rows.size.should eq(values.size)
+  end
+
+  it "can return a proper json column" do
+    db = Amalgalite::Database.new( ":memory:" )
+    values = %w[ a b c d e f g ]
+    db.execute("CREATE TABLE jtest(id INTEGER, json JSON)")
+    db.execute("INSERT INTO jtest(id, json) values (1, json($json))", { "$json" => values })
+
+    db.execute("select * from jtest")
+  end
+end

data/spec/sqlite3/version_spec.rb

@@ -3,20 +3,26 @@ require 'amalgalite/sqlite3/version'
 
 describe "Amalgalite::SQLite3::Version" do
   it "should have the sqlite3 version" do
-    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/ )
+    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(3008011)
-    Amalgalite::SQLite3::Version.runtime_version_number.should eql(3008011)
+    Amalgalite::SQLite3::Version.to_i.should eql(3034000)
+    Amalgalite::SQLite3::Version.runtime_version_number.should eql(3034000)
 
     Amalgalite::SQLite3::Version::MAJOR.should eql(3)
-    Amalgalite::SQLite3::Version::MINOR.should eql(8)
-    Amalgalite::SQLite3::Version::RELEASE.should eql(11)
+    Amalgalite::SQLite3::Version::MINOR.should eql(34)
+    Amalgalite::SQLite3::Version::RELEASE.should eql(0)
     expect(Amalgalite::SQLite3::Version.to_a.size).to eql(3)
 
-    Amalgalite::SQLite3::Version.compiled_version.should be == "3.8.11.1"
-    Amalgalite::SQLite3::Version.compiled_version_number.should be == 3008011
+    Amalgalite::SQLite3::Version.compiled_version.should be == "3.34.0"
+    Amalgalite::SQLite3::Version.compiled_version_number.should be == 3034000
     Amalgalite::SQLite3::Version.compiled_matches_runtime?.should be == true
   end
+
+  it "should have the sqlite3 source id" do
+    source_id = "2020-12-01 16:14:00 a26b6597e3ae272231b96f9982c3bcc17ddec2f2b6eb4df06a224b91089fed5b"
+    Amalgalite::SQLite3::Version.compiled_source_id.should be == source_id
+    Amalgalite::SQLite3::Version.runtime_source_id.should be == source_id
+  end
 end

data/spec/storage_map_spec.rb

@@ -12,7 +12,7 @@ describe Amalgalite::TypeMaps::StorageMap do
       @map.bind_type_of( 3.14 ).should == ::Amalgalite::SQLite3::Constants::DataType::FLOAT
     end
 
-    it "Fixnum is bound to DataType::INTGER" do
+    it "Integer is bound to DataType::INTGER" do
       @map.bind_type_of( 42 ).should == ::Amalgalite::SQLite3::Constants::DataType::INTEGER
     end
 

data/tasks/default.rake

@@ -24,25 +24,18 @@ namespace :develop do
     File.open( "Gemfile", "w+" ) 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.puts 'source "https://rubygems.org/"'
+      f.puts 'source "https://rubygems.org"'
       f.puts 'gemspec'
     end
   end
 end
-desc "Boostrap development"
+desc "Bootstrap development"
 task :develop => "develop:default"
 
 #------------------------------------------------------------------------------
-# Minitest - standard TestTask
+# RSpec - 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|
     t.ruby_opts    = %w[ -w ]

data/tasks/extension.rake

@@ -23,9 +23,9 @@ begin
       ext.lib_dir   = File.join( 'lib', This.name )
       ext.gem_spec  = This.ruby_gemspec
 
-      ext.cross_compile  = true               # enable cross compilation (requires cross compile toolchain)
-      ext.cross_platform = 'i386-mingw32'     # forces the Windows platform instead of the default one
-                                              # configure options only for cross compile
+      ext.cross_compile  = true                         # enable cross compilation (requires cross compile toolchain)
+      ext.cross_platform = %w[x86-mingw32 x64-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,2.1,2.2}/"]
+CLOBBER << FileList["lib/#{This.name}/{1,2}.*/"]

data/tasks/this.rb

@@ -25,10 +25,10 @@ class ThisProject
   #
   # Yields self
   def initialize(&block)
-    @exclude_from_manifest = Regexp.union(/\.(git|DS_Store)/,
-                                          /^(doc|coverage|pkg|tmp|Gemfile(\.lock)?)/,
+    @exclude_from_manifest = Regexp.union(/\.(git|DS_Store|ruby-version)/,
+                                          /^(doc|coverage|pkg|tmp|.semaphore|Gemfile(\.lock)?)/,
                                           /^[^\/]+\.gemspec/,
-                                          /\.(swp|jar|bundle|so|rvmrc|travis.yml)$/,
+                                          /\.(swp|jar|bundle|so|rvmrc|travis.yml|byebug_history)$/,
                                           /~$/)
     @gemspecs              = Hash.new
     yield self if block_given?
@@ -146,7 +146,7 @@ class ThisProject
       spec.rdoc_options = [ "--main"  , 'README.md',
                             "--markup", "tomdoc" ]
 
-      spec.required_ruby_version = '>= 1.9.3'
+      spec.required_ruby_version = '>= 2.2.2'
     end
   end
 
@@ -194,7 +194,9 @@ class ThisProject
   end
 
   def license
-    "ISC"
+    license_file = project_path("LICENSE")
+    line = license_file.readlines.first
+    line.split(/\s+/).first
   end
 
   # Internal: The path to the gemspec file

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: amalgalite
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.7.0
 platform: x86-mingw32
 authors:
 - Jeremy Hinegardner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-14 00:00:00.000000000 Z
+date: 2021-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arrayfields
@@ -44,70 +44,70 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rake-compiler-dock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '6.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.14'
 - !ruby/object:Gem::Dependency
   name: zip
   requirement: !ruby/object:Gem::Requirement
@@ -122,12 +122,16 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-description: 'Amalgalite embeds the SQLite database engine in a ruby extension.  There
-  is no need to install SQLite separately.   Look in the examples/ directory to see
+description: 'Amalgalite embeds the SQLite database engine in a ruby extension. There
+  is no need to install SQLite separately. Look in the examples/ directory to see
   * general usage * blob io * schema information * custom functions * custom aggregates
   * requiring ruby code from a database * full text search Also Scroll through Amalgalite::Database
   for a quick example, and a general overview of the API. Amalgalite adds in the following
-  additional non-default SQLite extensions: * (http://sqlite.org/rtree.html) * (http://sqlite.org/fts3.html)'
+  additional non-default SQLite extensions: * (http://sqlite.org/rtree.html) * (http://sqlite.org/fts5.html)
+  - both fts3 and fts5 * (https://www.sqlite.org/geopoly.html) * (https://www.sqlite.org/json1.html)
+  Other extensions are add that might not be usable/visible by users of the gem. The
+  full list of extensions added is in (ext/amalgalite/c/extconf.rb). And those may
+  be cross referenced against the (https://www.sqlite.org/compile.html)'
 email: jeremy@copiousfreetime.org
 executables:
 - amalgalite-pack
@@ -155,7 +159,7 @@ files:
 - examples/bootstrap.rb
 - examples/define_aggregate.rb
 - examples/define_function.rb
-- examples/fts3.rb
+- examples/fts5.rb
 - examples/gem-db.rb
 - examples/require_me.rb
 - examples/requires.rb
@@ -175,11 +179,11 @@ files:
 - ext/amalgalite/c/sqlite3_options.h
 - ext/amalgalite/c/sqlite3ext.h
 - lib/amalgalite.rb
-- lib/amalgalite/1.8/amalgalite.so
-- lib/amalgalite/1.9/amalgalite.so
-- lib/amalgalite/2.0/amalgalite.so
-- lib/amalgalite/2.1/amalgalite.so
 - lib/amalgalite/2.2/amalgalite.so
+- lib/amalgalite/2.3/amalgalite.so
+- lib/amalgalite/2.4/amalgalite.so
+- lib/amalgalite/2.5/amalgalite.so
+- lib/amalgalite/2.6/amalgalite.so
 - lib/amalgalite/aggregate.rb
 - lib/amalgalite/blob.rb
 - lib/amalgalite/boolean.rb
@@ -229,6 +233,7 @@ files:
 - spec/function_spec.rb
 - spec/integeration_spec.rb
 - spec/iso_3166_database.rb
+- spec/json_spec.rb
 - spec/packer_spec.rb
 - spec/paths_spec.rb
 - spec/progress_handler_spec.rb
@@ -267,19 +272,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: '2.2'
+  - - "<"
+    - !ruby/object:Gem::Version
+      version: 2.7.dev
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
-summary: Amalgalite embeds the SQLite database engine in a ruby extension.  There
-  is no need to install SQLite separately.
+summary: Amalgalite embeds the SQLite database engine in a ruby extension. There is
+  no need to install SQLite separately.
 test_files:
 - spec/aggregate_spec.rb
 - spec/amalgalite_spec.rb
@@ -295,6 +302,7 @@ test_files:
 - spec/function_spec.rb
 - spec/integeration_spec.rb
 - spec/iso_3166_database.rb
+- spec/json_spec.rb
 - spec/packer_spec.rb
 - spec/paths_spec.rb
 - spec/progress_handler_spec.rb