amalgalite 0.2.4 → 0.4.0

data/lib/amalgalite/sqlite3/status.rb

@@ -0,0 +1,61 @@
+require 'amalgalite3'
+require 'amalgalite/sqlite3/constants'
+module Amalgalite::SQLite3
+
+  # 
+  # A Stat represents a single Status code and its current highwater mark.
+  #
+  # Some stats may not have a current or a highwater value, in those cases
+  # the associated _has_current?_ or _has_highwater?_ method returns false and the
+  # _current_ or _highwater_ method also returns +nil+.
+  #
+  class Stat
+    attr_reader :name
+    attr_reader :code
+
+    def initialize( name )
+      @name      = name
+      @code      = ::Amalgalite::SQLite3::Constants::Status.value_from_name( name )
+      @current   = nil
+      @highwater = nil
+    end
+
+    def current
+      update!
+      return @current
+    end
+
+    def highwater
+      update!
+      return @highwater
+    end
+
+    #
+    # reset the given stat's highwater mark.  This will also populate the
+    # _@current_ and _@highwater_ instance variables
+    #
+    def reset!
+      update!( true )
+    end
+  end
+
+  #
+  # Top level Status object holding all the Stat objects indicating the Status
+  # of the SQLite3 C library.
+  #
+  class Status
+    ::Amalgalite::SQLite3::Constants::Status.constants.each do |const_name|
+      method_name = const_name.downcase
+      module_eval( <<-code, __FILE__, __LINE__ )
+        def #{method_name}
+          @#{method_name} ||=  Amalgalite::SQLite3::Stat.new( '#{method_name}' )   
+        end
+      code
+    end
+  end
+
+  # return the status object for the sqlite database
+  def self.status
+    @status ||= Status.new
+  end
+end

data/lib/amalgalite/statement.rb

@@ -347,7 +347,7 @@ module Amalgalite
     #
     def is_column_rowid?( table_name, column_name )
       column_schema  = @db.schema.tables[table_name].columns[column_name]
-      if column_schema.primary_key? and column_schema.declared_data_type.upcase == "INTEGER" then
+      if column_schema.primary_key? and column_schema.declared_data_type and column_schema.declared_data_type.upcase == "INTEGER" then
         return true
       end
       return false

data/lib/amalgalite/table.rb

@@ -17,18 +17,18 @@ module Amalgalite
     # the original sql that was used to create this table
     attr_reader   :sql
 
-    # an array of Index objects holding the meta informationa about the indexes
-    # on this table
+    # hash of Index objects holding the meta informationa about the indexes
+    # on this table.  The keys of the indexes variable is the index name
     attr_accessor :indexes
 
-    # an array of Column objects holding the meta information about the columns
-    # in this table
+    # a hash of Column objects holding the meta information about the columns
+    # in this table.  keys are the column names
     attr_accessor :columns
 
     def initialize( name, sql ) 
       @name    = name
       @sql     = sql
-      @indexes = []
+      @indexes = {}
       @columns = {}
     end
   end

data/lib/amalgalite/type_map.rb

@@ -58,3 +58,6 @@ module Amalgalite
   module TypeMaps
   end
 end
+require 'amalgalite/type_maps/default_map'
+require 'amalgalite/type_maps/storage_map'
+require 'amalgalite/type_maps/text_map'

data/lib/amalgalite/version.rb

@@ -8,8 +8,8 @@ module Amalgalite
   module Version
 
     MAJOR   = 0
-    MINOR   = 2
-    BUILD   = 4
+    MINOR   = 4
+    BUILD   = 0
 
     #
     # return the Version as an array of MAJOR, MINOR, BUILD

data/spec/blob_spec.rb

@@ -14,7 +14,7 @@ describe Amalgalite::Blob do
       CREATE TABLE blobs(
         id      INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
         name    VARCHAR(128) NOT NULL UNIQUE,
-        data    BLOB ); 
+        data    TEXT ); 
     SQL
     @db.execute( @schema_sql )
     @junk_file = File.join( File.dirname(__FILE__), "test_output")

data/spec/boolean_spec.rb

@@ -1,6 +1,3 @@
-require 'rubygems'
-require 'spec'
-
 $: << File.expand_path(File.join(File.dirname(__FILE__),"..","lib"))
 require 'amalgalite'
 require 'amalgalite/boolean'

data/spec/database_spec.rb

@@ -184,11 +184,19 @@ describe Amalgalite::Database do
     s.string.should =~ /unregistered as profile tap/m
   end
 
-  it "raises an error if a transaction is attempted within a transaction" do
+  it "allows nested transactions even if SQLite under the covers does not" do
     db = Amalgalite::Database.new( SpecInfo.test_db )
-    db.transaction do |db2|
-      lambda{ db2.transaction }.should raise_error(Amalgalite::Error)
+    r = db.transaction do |db2|
+      r2 = db.transaction { 42 }
+      r2.should == 42
+      r2
     end
+    r.should == 42
+  end
+
+  it "returns the result of the transaction when a block is yielded" do
+    db = Amalgalite::Database.new( SpecInfo.test_db )
+    (db.transaction { 42 }).should == 42
   end
 
   it "#reload_schema!" do

data/spec/schema_spec.rb

@@ -43,4 +43,18 @@ describe Amalgalite::Schema do
     ct.columns['name'].should_not be_has_default_value
     ct.columns['id'].should_not be_auto_increment
   end
+
+  it "loads the indexes" do
+    c = @iso_db.schema.tables['country']
+    c.indexes.size.should == 2
+    c.indexes['country_name'].columns.size.should == 1
+    c.indexes['country_name'].should_not be_unique
+    c.indexes['country_name'].sequence_number.should == 0
+    c.indexes['country_name'].columns.first.should == @iso_db.schema.tables['country'].columns['name']
+    c.indexes['sqlite_autoindex_country_1'].should be_unique
+
+    subc = @iso_db.schema.tables['subcountry']
+    subc.indexes.size.should == 3
+    subc.indexes['subcountry_country'].columns.first.should == @iso_db.schema.tables['subcountry'].columns['country']
+  end
 end

data/spec/sqlite3/constants_spec.rb

@@ -13,13 +13,53 @@ describe Amalgalite::SQLite3::Constants do
   end
 
   it "has ResultCode constants" do
-    Amalgalite::SQLite3::Constants::ResultCode::OK.should == 0
   end
 
-  it "can return the constant from a number" do
-    c = Amalgalite::SQLite3::Constants::ResultCode.from_int( 21 )
-    c.should == "MISUSE"
+  describe 'ResultCode' do 
+    it "has constants" do
+      Amalgalite::SQLite3::Constants::ResultCode::OK.should == 0
+    end
+
+    it "can return the constant from a number" do
+      c = Amalgalite::SQLite3::Constants::ResultCode.name_from_value( 21 )
+      c.should == "MISUSE"
+    end
+
+    it "can return the number from a name" do
+      v = Amalgalite::SQLite3::Constants::ResultCode.value_from_name( "MISUSE" )
+      v.should == 21
+    end
+  end
+
+  describe 'Status' do
+    it "has constants" do
+      Amalgalite::SQLite3::Constants::Status::MEMORY_USED.should == 0
+    end
+
+    it "can return the constant from a number" do
+      c = Amalgalite::SQLite3::Constants::Status.name_from_value( 3 )
+      c.should == "SCRATCH_USED"
+    end
+    
+    it "can return the number from a name" do
+      v = Amalgalite::SQLite3::Constants::Status.value_from_name( "memory_used" )
+      v.should == 0
+    end
   end
 
+  describe 'DBStatus' do
+    it "has constants" do
+      Amalgalite::SQLite3::Constants::DBStatus::LOOKASIDE_USED.should == 0
+    end
 
+    it "can return the constant from a number" do
+      c = Amalgalite::SQLite3::Constants::DBStatus.name_from_value( 0 )
+      c.should == "LOOKASIDE_USED"
+    end
+    
+    it "can return the number from a name" do
+      v = Amalgalite::SQLite3::Constants::DBStatus.value_from_name( "lookaside_used" )
+      v.should == 0
+    end
+  end
 end

data/spec/sqlite3/database_status_spec.rb

@@ -0,0 +1,36 @@
+require File.expand_path(File.join(File.dirname(__FILE__), "..",  "spec_helper.rb"))
+require 'amalgalite/sqlite3'
+require 'rbconfig'
+
+describe "Amalgalite::SQLite3::Database::Status" do
+  before(:each) do
+    @db = Amalgalite::Database.new( "lookaside-test.db" )
+    @db.execute(" create table t(a, b)")
+    20.times do |x|
+      @db.execute("insert into t(a, b) values (?,?);", x, x+1)
+    end
+  end
+
+  after(:each) do
+    @db.close
+    FileUtils.rm_f "lookaside-test.db" 
+  end
+
+
+  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
+  end
+
+  it "can reset the highwater value" do
+    stat = @db.api.status.lookaside_used
+    before = stat.highwater
+    before.should > 0
+
+    stat.reset!
+    after = stat.highwater
+
+    after.should == 0
+    after.should_not == before
+  end
+end

data/spec/sqlite3/status_spec.rb

@@ -0,0 +1,18 @@
+require File.expand_path(File.join(File.dirname(__FILE__), "..", "spec_helper.rb"))
+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
+  end
+
+  it "can reset the highwater value" do
+    before = Amalgalite::SQLite3.status.memory_used.highwater
+    Amalgalite::SQLite3.status.memory_used.reset!
+    Amalgalite::SQLite3.status.memory_used.highwater.should > 0
+    after = Amalgalite::SQLite3.status.memory_used.highwater
+    after.should_not == before
+  end
+end

data/spec/sqlite3/version_spec.rb

@@ -5,10 +5,10 @@ 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.to_i.should == 3005009
+    Amalgalite::SQLite3::Version.to_i.should == 3006002
     Amalgalite::SQLite3::Version::MAJOR.should == 3
-    Amalgalite::SQLite3::Version::MINOR.should == 5
-    Amalgalite::SQLite3::Version::RELEASE.should == 9
+    Amalgalite::SQLite3::Version::MINOR.should == 6
+    Amalgalite::SQLite3::Version::RELEASE.should == 2
     Amalgalite::SQLite3::Version.to_a.should have(3).items
   end
 end

data/spec/sqlite3_spec.rb

@@ -17,18 +17,6 @@ describe "Amalgalite::SQLite3" do
     Amalgalite::SQLite3.complete?("SELECT * FROM sometable WHERE ", :utf16 => true).should == false
   end
 
-  it "knows how much memory it has used" do
-    Amalgalite::SQLite3.memory_used.should >= 0
-  end
-  
-  it "knows the maximum amount of memory it has used so far" do
-    Amalgalite::SQLite3.memory_highwater_mark.should >= 0
-  end
-  
-  it "can reset it maximum memory usage counter" do
-    Amalgalite::SQLite3.memory_highwater_mark_reset!.should >= 0
-  end
-
   it "can produce random data" do
     Amalgalite::SQLite3.randomness( 42 ).size.should == 42
   end

data/tasks/announce.rake

@@ -17,6 +17,8 @@ namespace :announce do
       mail.puts
       mail.puts info[:title]
       mail.puts
+      mail.puts "  gem install #{Amalgalite::GEM_SPEC.name}"
+      mail.puts
       mail.puts info[:urls]
       mail.puts 
       mail.puts info[:description]
@@ -25,7 +27,6 @@ namespace :announce do
       mail.puts 
       mail.puts info[:release_notes]
       mail.puts
-      mail.puts info[:urls]
     end 
     puts "Created the following as email.txt:"
     puts "-" * 72

data/tasks/config.rb

@@ -28,13 +28,14 @@ Configuration.for('packaging') {
   files {
     bin       FileList["bin/*"]
     ext       FileList["ext/*.{c,h,rb}"]
+    examples  FileList["examples/*"]
     lib       FileList["lib/**/*.rb"]
     test      FileList["spec/**/*.rb", "test/**/*.rb"]
     data      FileList["data/**/*"]
     tasks     FileList["tasks/**/*.r{ake,b}"]
     rdoc      FileList[proj_conf.readme, proj_conf.history,
                        proj_conf.license] + lib + FileList["ext/amalgalite3*.c"]
-    all       bin + ext + lib + test + data + rdoc + tasks 
+    all       bin + ext + examples + lib + test + data + rdoc + tasks 
   }
 
   puts "ext files = #{files.ext}"

data/tasks/distribution.rake

@@ -34,5 +34,12 @@ if pkg_config = Configuration.for_if_exist?("packaging") then
     desc "reinstall gem"
     task :reinstall => [:uninstall, :repackage, :install]
 
+    desc "distribute copiously"
+    task :copious => [:package] do
+        Rake::SshFilePublisher.new('jeremy@copiousfreetime.org',
+                               '/var/www/vhosts/www.copiousfreetime.org/htdocs/gems/gems',
+                               'pkg',"#{Amalgalite::GEM_SPEC.full_name}.gem").upload
+        sh "ssh jeremy@copiousfreetime.org rake -f /var/www/vhosts/www.copiousfreetime.org/htdocs/gems/Rakefile"
+    end
  end
 end

data/tasks/rubyforge.rake

@@ -15,17 +15,19 @@ if rf_conf = Configuration.for_if_exist?("rubyforge") then
 
       rubyforge = RubyForge.new
 
+      config = {}
+      config["release_notes"]     = proj_conf.description
+      config["release_changes"]   = Utils.release_notes_from(proj_conf.history)[Amalgalite::VERSION]
+      config["Prefomatted"]       = true
+
+      rubyforge.configure config
+
       # make sure this release doesn't already exist
       releases = rubyforge.autoconfig['release_ids']
       if releases.has_key?(Amalgalite::GEM_SPEC.name) and releases[Amalgalite::GEM_SPEC.name][Amalgalite::VERSION] then
         abort("Release #{Amalgalite::VERSION} already exists! Unable to release.")
       end
 
-      config = rubyforge.userconfig
-      config["release_notes"]     = proj_conf.description
-      config["release_changes"]   = Utils.release_notes_from(proj_conf.history)[Amalgalite::VERSION]
-      config["Prefomatted"]       = true
-
       puts "Uploading to rubyforge..."
       files = FileList[File.join("pkg","#{Amalgalite::GEM_SPEC.name}-#{Amalgalite::VERSION}*.*")].to_a
       rubyforge.login
@@ -38,9 +40,15 @@ if rf_conf = Configuration.for_if_exist?("rubyforge") then
     desc "Post news of #{proj_conf.name} to #{rf_conf.project} on rubyforge"
     task :rubyforge do
       info = Utils.announcement
+
+      puts "Subject : #{info[:subject]}"
+      msg = "#{info[:title]}\n\n#{info[:urls]}\n\n#{info[:release_notes]}"
+      puts msg
+
       rubyforge = RubyForge.new
+      rubyforge.configure
       rubyforge.login
-      rubyforge.post_news(rf_conf.project, info[:subject], "#{info[:title]}\n\n#{info[:urls]}\n\n#{info[:release_notes]}")
+      rubyforge.post_news(rf_conf.project, info[:subject], msg )
       puts "Posted to rubyforge"
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: amalgalite
 version: !ruby/object:Gem::Version 
-  version: 0.2.4
+  version: 0.4.0
 platform: ruby
 authors: 
 - Jeremy Hinegardner
@@ -9,11 +9,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-07-13 00:00:00 -06:00
+date: 2008-09-15 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: configuration
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -23,6 +24,7 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: arrayfields
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -32,50 +34,55 @@ dependencies:
     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  Also Scroll through Amalgalite::Database for a quick example, and a general overview of the API.
 email: jeremy@hinegardner.org
-executables: []
-
+executables: 
+- amalgalite-pack-into-db
 extensions: 
 - ext/extconf.rb
 extra_rdoc_files: 
 - README
 - HISTORY
 - LICENSE
-- lib/amalgalite/sqlite3/constants.rb
-- lib/amalgalite/sqlite3/version.rb
-- lib/amalgalite/taps/console.rb
-- lib/amalgalite/taps/io.rb
-- lib/amalgalite/type_maps/default_map.rb
-- lib/amalgalite/type_maps/storage_map.rb
-- lib/amalgalite/type_maps/text_map.rb
-- lib/amalgalite/statement.rb
 - lib/amalgalite/blob.rb
-- lib/amalgalite/version.rb
 - lib/amalgalite/boolean.rb
 - lib/amalgalite/column.rb
+- lib/amalgalite/core_ext/kernel/require.rb
 - lib/amalgalite/database.rb
 - lib/amalgalite/index.rb
 - lib/amalgalite/paths.rb
 - lib/amalgalite/profile_tap.rb
+- lib/amalgalite/requires.rb
 - lib/amalgalite/schema.rb
+- lib/amalgalite/sqlite3/constants.rb
+- lib/amalgalite/sqlite3/database/status.rb
+- lib/amalgalite/sqlite3/status.rb
+- lib/amalgalite/sqlite3/version.rb
 - lib/amalgalite/sqlite3.rb
-- lib/amalgalite/core_ext/kernel/require.rb
-- lib/amalgalite/requires.rb
+- lib/amalgalite/statement.rb
 - lib/amalgalite/table.rb
+- lib/amalgalite/taps/console.rb
+- lib/amalgalite/taps/io.rb
 - lib/amalgalite/taps.rb
 - lib/amalgalite/trace_tap.rb
 - lib/amalgalite/type_map.rb
+- lib/amalgalite/type_maps/default_map.rb
+- lib/amalgalite/type_maps/storage_map.rb
+- lib/amalgalite/type_maps/text_map.rb
+- lib/amalgalite/version.rb
 - lib/amalgalite/view.rb
 - lib/amalgalite.rb
-- ext/amalgalite3_blob.c
 - ext/amalgalite3.c
+- ext/amalgalite3_blob.c
 - ext/amalgalite3_constants.c
 - ext/amalgalite3_database.c
+- ext/amalgalite3_requires_bootstrap.c
 - ext/amalgalite3_statement.c
 files: 
-- ext/amalgalite3_blob.c
+- bin/amalgalite-pack-into-db
 - ext/amalgalite3.c
+- ext/amalgalite3_blob.c
 - ext/amalgalite3_constants.c
 - ext/amalgalite3_database.c
+- ext/amalgalite3_requires_bootstrap.c
 - ext/amalgalite3_statement.c
 - ext/sqlite3.c
 - ext/amalgalite3.h
@@ -84,44 +91,55 @@ files:
 - ext/sqlite3ext.h
 - ext/extconf.rb
 - ext/gen_constants.rb
-- lib/amalgalite/sqlite3/constants.rb
-- lib/amalgalite/sqlite3/version.rb
-- lib/amalgalite/taps/console.rb
-- lib/amalgalite/taps/io.rb
-- lib/amalgalite/type_maps/default_map.rb
-- lib/amalgalite/type_maps/storage_map.rb
-- lib/amalgalite/type_maps/text_map.rb
-- lib/amalgalite/statement.rb
+- examples/a.rb
+- examples/blob.rb
+- examples/bootstrap.rb
+- examples/filestore.db
+- examples/gem-db.rb
+- examples/requires.rb
+- examples/schema-info.rb
 - lib/amalgalite/blob.rb
-- lib/amalgalite/version.rb
 - lib/amalgalite/boolean.rb
 - lib/amalgalite/column.rb
+- lib/amalgalite/core_ext/kernel/require.rb
 - lib/amalgalite/database.rb
 - lib/amalgalite/index.rb
 - lib/amalgalite/paths.rb
 - lib/amalgalite/profile_tap.rb
+- lib/amalgalite/requires.rb
 - lib/amalgalite/schema.rb
+- lib/amalgalite/sqlite3/constants.rb
+- lib/amalgalite/sqlite3/database/status.rb
+- lib/amalgalite/sqlite3/status.rb
+- lib/amalgalite/sqlite3/version.rb
 - lib/amalgalite/sqlite3.rb
-- lib/amalgalite/core_ext/kernel/require.rb
-- lib/amalgalite/requires.rb
+- lib/amalgalite/statement.rb
 - lib/amalgalite/table.rb
+- lib/amalgalite/taps/console.rb
+- lib/amalgalite/taps/io.rb
 - lib/amalgalite/taps.rb
 - lib/amalgalite/trace_tap.rb
 - lib/amalgalite/type_map.rb
+- lib/amalgalite/type_maps/default_map.rb
+- lib/amalgalite/type_maps/storage_map.rb
+- lib/amalgalite/type_maps/text_map.rb
+- lib/amalgalite/version.rb
 - lib/amalgalite/view.rb
 - lib/amalgalite.rb
-- spec/sqlite3/constants_spec.rb
-- spec/sqlite3/version_spec.rb
-- spec/integeration_spec.rb
 - spec/amalgalite_spec.rb
 - spec/blob_spec.rb
-- spec/sqlite3_spec.rb
 - spec/boolean_spec.rb
 - spec/database_spec.rb
 - spec/default_map_spec.rb
+- spec/integeration_spec.rb
 - spec/paths_spec.rb
 - spec/schema_spec.rb
 - spec/spec_helper.rb
+- spec/sqlite3/constants_spec.rb
+- spec/sqlite3/database_status_spec.rb
+- spec/sqlite3/status_spec.rb
+- spec/sqlite3/version_spec.rb
+- spec/sqlite3_spec.rb
 - spec/statement_spec.rb
 - spec/storage_map_spec.rb
 - spec/tap_spec.rb
@@ -131,10 +149,10 @@ files:
 - README
 - HISTORY
 - LICENSE
-- tasks/distribution.rake
 - tasks/announce.rake
-- tasks/extension.rake
+- tasks/distribution.rake
 - tasks/documentation.rake
+- tasks/extension.rake
 - tasks/rspec.rake
 - tasks/rubyforge.rake
 - tasks/config.rb
@@ -150,7 +168,6 @@ rdoc_options:
 - README
 require_paths: 
 - lib
-- ext
 required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
@@ -166,7 +183,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: copiousfreetime
-rubygems_version: 1.0.1
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: Amalgalite embeds the SQLite database engine in a ruby extension