amalgalite 0.10.0 → 0.10.1

data/HISTORY

@@ -1,4 +1,12 @@
 = Amalgalite Changelog
+== Version 0.10.1 - 2009-08-01
+
+* Add version subdirectory for extension on all platforms for building locally
+  on gem install.
+* Small documentation change for Amalgalite::Database#new
+* Add gem for x86-ming32 platform  
+* Add specs to validate the R*Tree index is compiled correctly
+
 == Version 0.10.0 - 2009-06-28
 
 === Enhancements 

data/README

@@ -30,6 +30,10 @@ Look in the examples/ directory to see
 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 extension(s):
+
+* {R*Tree index extension}[http://sqlite.org/rtree.html]
+
 == CREDITS
 
 * Jamis Buck for the first {ruby sqlite implementation}[http://www.rubyforge.org/projects/sqlite-ruby]

data/ext/amalgalite/extconf.rb

@@ -4,7 +4,6 @@ require 'rbconfig'
 # make available table and column meta data api
 $CFLAGS += " -DSQLITE_ENABLE_COLUMN_METADATA=1"  
 $CFLAGS += " -DSQLITE_ENABLE_RTREE=1"
-$CFLAGS += " -DSQLITE_OMIT_BUILTIN_TEST=1"
 
 # we compile sqlite the same way that the installation of ruby is compiled.
 if Config::CONFIG['configure_args'].include?( "--enable-pthread" ) then
@@ -33,4 +32,5 @@ if CONFIG['arch'] =~ /(mswin|mingw)/i then
   CONFIG['debugflags'] = CONFIG['debugflags'].gsub(/-g/,'') if CONFIG['debugflags']
   CONFIG['warnflags'] = CONFIG['warnflags'].gsub(/-Wall/,'') if CONFIG['warnflags']
 end
-create_makefile('amalgalite/amalgalite3')
+subdir = RUBY_VERSION.sub(/\.\d$/,'')
+create_makefile("amalgalite/#{subdir}/amalgalite3")

data/gemspec.rb

@@ -49,8 +49,12 @@ Amalgalite::GEM_SPEC = Gem::Specification.new do |spec|
   end 
 end
 
-Amalgalite::GEM_SPEC_WIN = Amalgalite::GEM_SPEC.clone
-Amalgalite::GEM_SPEC_WIN.platform = ::Gem::Platform.new( "i386-mswin32_60" )
-Amalgalite::GEM_SPEC_WIN.extensions = []
+Amalgalite::GEM_SPEC_MSWIN32 = Amalgalite::GEM_SPEC.clone
+Amalgalite::GEM_SPEC_MSWIN32.platform = ::Gem::Platform.new( "i386-mswin32" )
+Amalgalite::GEM_SPEC_MSWIN32.extensions = []
 
-Amalgalite::SPECS = [ Amalgalite::GEM_SPEC, Amalgalite::GEM_SPEC_WIN ]
+Amalgalite::GEM_SPEC_MINGW32= Amalgalite::GEM_SPEC.clone
+Amalgalite::GEM_SPEC_MINGW32.platform = ::Gem::Platform.new( "i386-mingw32" )
+Amalgalite::GEM_SPEC_MINGW32.extensions = []
+
+Amalgalite::SPECS = [ Amalgalite::GEM_SPEC, Amalgalite::GEM_SPEC_MSWIN32, Amalgalite::GEM_SPEC_MINGW32 ]

data/lib/amalgalite.rb

@@ -16,12 +16,11 @@ module Amalgalite
   class Error < ::StandardError; end
 end
 
-# support for fat binaries on windows
-if RUBY_PLATFORM =~ /(mswin|mingw)/i then
-  require "amalgalite/#{RUBY_VERSION.sub(/\.\d$/,'')}/amalgalite3"
-else
-  require "amalgalite/amalgalite3"
-end
+# use a version subdirectory for extensions, initially to support windows, but
+# why make a special case, it doesn't hurt anyone to have an extra subdir
+# someplace 
+require "amalgalite/#{RUBY_VERSION.sub(/\.\d$/,'')}/amalgalite3"
+
 require 'amalgalite/aggregate'
 require 'amalgalite/blob'
 require 'amalgalite/boolean'

data/lib/amalgalite/database.rb

@@ -15,7 +15,7 @@ module Amalgalite
   #
   # The encapsulation of a connection to an SQLite3 database.  
   #
-  # Example opening and possibly creating a new daabase
+  # Example opening and possibly creating a new database
   #
   #   db = Amalgalite::Database.new( "mydb.db" )
   #   db.execute( "SELECT * FROM table" ) do |row|
@@ -28,6 +28,9 @@ module Amalgalite
   #
   #   db = Amalgalite::Database.new( "mydb.db", "r" )
   #
+  # Open an in-memory database:
+  #
+  #   db = Amalgalite::Database.new( ":memory:" )
   #
   class Database
 
@@ -108,7 +111,9 @@ module Amalgalite
     # :call-seq:
     #   Amalgalite::Database.new( filename, "w+", opts = {}) -> Database
     #
-    # The first parameter is the filename of the sqlite database.  
+    # The first parameter is the filename of the sqlite database.  Specifying
+    # ":memory:" as the filename creates an in-memory database.
+    #
     # The second parameter is the standard file modes of how to open a file.
     #
     # The modes are:

data/lib/amalgalite/version.rb

@@ -9,7 +9,7 @@ module Amalgalite
 
     MAJOR   = 0
     MINOR   = 10
-    BUILD   = 0
+    BUILD   = 1
 
     #
     # return the Version as an array of MAJOR, MINOR, BUILD

data/spec/rtree_spec.rb

@@ -0,0 +1,71 @@
+require 'rubygems'
+require 'spec'
+require File.expand_path( File.join( File.dirname(__FILE__), 'spec_helper'))
+
+$: << File.expand_path(File.join(File.dirname(__FILE__),"..","lib"))
+require 'amalgalite'
+require 'amalgalite/database'
+
+# Example from http://sqlite.org/rtree.html
+#
+describe "SQLite3 R*Tree extension" do
+  before( :each ) do
+    @db = Amalgalite::Database.new( ":memory:" )
+    x = @db.execute_batch <<-sql
+    CREATE VIRTUAL TABLE demo_index USING rtree(
+       id,              -- Integer primary key
+       minX, maxX,      -- Minimum and maximum X coordinate
+       minY, maxY       -- Minimum and maximum Y coordinate
+    );
+    -- 
+    INSERT INTO demo_index VALUES(
+        1,                   -- Primary key
+        -80.7749, -80.7747,  -- Longitude range
+        30.3776, 30.3778     -- Latitude range
+    );
+    INSERT INTO demo_index VALUES(
+        2,
+        -81.0, -79.6,
+        35.0, 36.2
+    );
+    sql
+    x.should == 3
+  end
+
+  after( :each ) do
+    @db.close
+  end
+
+  it "has 2 rows" do
+    r = @db.first_value_from( "SELECT count(*) FROM demo_index")
+    r.should == 2
+  end
+
+  it "queries normally" do
+    r = @db.execute "SELECT * FROM demo_index WHERE id=1;"
+    r.size.should == 1
+    row = r.first
+    row['id'].should == 1
+  end
+
+  it "does a 'contained within' query" do
+    r = @db.execute <<-sql
+    SELECT id FROM demo_index
+     WHERE minX>=-81.08 AND maxX<=-80.58
+       AND minY>=30.00  AND maxY<=30.44;
+    sql
+
+    r.size.should == 1
+    r.first['id'].should == 1
+  end
+
+  it "does an 'overlapping' query" do
+    r = @db.execute <<-sql
+    SELECT id FROM demo_index
+     WHERE maxX>=-81.08 AND minX<=-80.58
+       AND maxY>=30.00  AND minY<=35.44;
+    sql
+    r.size.should == 2
+  end
+end
+

data/spec/spec_helper.rb

@@ -2,7 +2,6 @@ require 'rubygems'
 require 'spec'
 
 $: << File.expand_path(File.join(File.dirname(__FILE__),"..","lib"))
-$: << File.expand_path(File.join(File.dirname(__FILE__),"..","ext"))
 
 require 'amalgalite'
 

data/tasks/distribution.rake

@@ -33,7 +33,7 @@ if pkg_config = Configuration.for_if_exist?("packaging") then
 
     desc "dump gemspec for win"
     task :gemspec_win do
-      puts Amalgalite::GEM_SPEC_WIN.to_ruby
+      puts Amalgalite::GEM_SPEC_MINGW32.to_ruby
     end
 
     desc "reinstall gem"
@@ -49,10 +49,13 @@ if pkg_config = Configuration.for_if_exist?("packaging") then
         cp "ext/amalgalite/amalgalite3.so", "lib/amalgalite/#{s}/", :verbose => true
       end
 
-      Amalgalite::GEM_SPEC_WIN.files += FileList["lib/amalgalite/{1.8,1.9}/**.{dll,so}"]
-      Gem::Builder.new( Amalgalite::GEM_SPEC_WIN ).build 
-      mkdir "pkg" unless File.directory?( 'pkg' )
-      mv Dir["*.gem"].first, "pkg"
+      Amalgalite::SPECS.each do |spec|
+        next if spec.platform == "ruby"
+        spec.files +=  FileList["lib/amalgalite/{1.8,1.9}/**.{dll,so}"]
+        Gem::Builder.new( spec ).build 
+        mkdir "pkg" unless File.directory?( 'pkg' )
+        mv Dir["*.gem"].first, "pkg"
+      end
     end
 
     task :clobber do

data/tasks/extension.rake

@@ -32,6 +32,12 @@ if ext_config = Configuration.for_if_exist?('extension') then
         Dir.chdir(path.dirname) do |d| 
           ruby conf.to_s
           sh "make"
+
+          # install into requireable location so specs will run
+          subdir = "amalgalite/#{RUBY_VERSION.sub(/\.\d$/,'')}"
+          dest_dir = Amalgalite::Paths.lib_path( subdir )
+          mkdir_p dest_dir, :verbose => true
+          cp "amalgalite3.#{Config::CONFIG['DLEXT']}", dest_dir, :verbose => true
         end
       end
     end
@@ -77,7 +83,7 @@ if ext_config = Configuration.for_if_exist?('extension') then
         parts = path.split
         conf  = parts.last
         Dir.chdir(path.dirname) do |d| 
-          if File.exist?( "Makfeile" ) then
+          if File.exist?( "Makefile" ) then
             sh "make clean"
           end
           rm_f "rbconfig.rb"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: amalgalite
 version: !ruby/object:Gem::Version 
-  version: 0.10.0
+  version: 0.10.1
 platform: ruby
 authors: 
 - Jeremy Hinegardner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-28 00:00:00 -06:00
+date: 2009-08-01 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -62,7 +62,7 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.5.0
     version: 
-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  Also Scroll through Amalgalite::Database for a quick example, and a general overview of the API.
+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  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 extension(s):  * {R*Tree index extension}[http://sqlite.org/rtree.html]"
 email: jeremy@hinegardner.org
 executables: 
 - amalgalite-pack
@@ -178,6 +178,7 @@ files:
 - spec/paths_spec.rb
 - spec/progress_handler_spec.rb
 - spec/requires_spec.rb
+- spec/rtree_spec.rb
 - spec/schema_spec.rb
 - spec/spec_helper.rb
 - spec/sqlite3/constants_spec.rb