amalgalite 0.2.1 → 0.2.2

data/HISTORY

@@ -1,4 +1,12 @@
 = Changelog
+== Version 0.2.2
+
+* Bugfixes
+  * Database#pragma should accept a block just like Database#execute does
+
+* compatibility fix
+  * convert to using extconf.rb instead of mkrf for muster integration
+
 == Version 0.2.1 - 2008-07-05
 
 * Bugfixes

data/ext/extconf.rb

@@ -0,0 +1,13 @@
+require 'mkmf'
+require 'rbconfig'
+
+# make available table and column meta data api
+$CFLAGS += " -DSQLITE_ENABLE_COLUMN_METADATA=1"  
+
+# we compile sqlite the same way that the installation of ruby is compiled.
+if Config::CONFIG['configure_args'].include?( "--enable-pthread" ) then
+  $CFLAGS += " -DSQLITE_THREADSAFE=1"
+else
+  $CFLAGS += "-DSQLITE_THREADSAFE=0"
+end
+create_makefile('amalgalite3')

data/gemspec.rb

@@ -23,7 +23,6 @@ Amalgalite::GEM_SPEC = Gem::Specification.new do |spec|
   # spec.add_dependency("rake", ">= 0.8.1")
   spec.add_dependency("configuration", ">= 0.0.5")
   spec.add_dependency("arrayfields", ">= 4.5.0")
-  spec.add_dependency("mkrf", ">= 0.2.3")
   
 
   if ext_conf = Configuration.for_if_exist?("extension") then

data/lib/amalgalite/blob.rb

@@ -78,7 +78,7 @@ module Amalgalite
     #              and +length+.  +read+ should have the behavior of IO#read
     #   :db_blob : not normally used by an end user, used to initialize a blob
     #              object that is returned from an SQL query.
-    #   :string  : used when a Blob is part of a WHERE clause
+    #   :string  : used when a Blob is part of a WHERE clause or result
     #
     # And additional key of :block_size may be used to indicate the maximum size
     # of a single block of data to move from the source to the destination, this
@@ -96,7 +96,7 @@ module Amalgalite
       @block_size              = params[:block_size] || Blob.default_block_size
       @column                  = params[:column]     
 
-      raise Blob::Error, "A :column parameter is required for a Blob" unless @column
+      raise Blob::Error, "A :column parameter is required for a Blob" unless @column or params.has_key?( :string )
 
       if params.has_key?( :file ) then
         @source = File.open( params[:file], "r" )
@@ -147,6 +147,13 @@ module Amalgalite
       end
     end
 
+    ##
+    # conver the blob to a string
+    #
+    def to_s
+      to_string_io.string
+    end
+
     ##
     # write the Blob contents to a StringIO
     #

data/lib/amalgalite/core_ext/kernel/require.rb

@@ -0,0 +1,14 @@
+module Kernel
+  alias :original_require :require
+  #
+  # hook into the system 'require' to allow for required text or blobs from an
+  # amalgalite database.  
+  #
+  def require( filename )
+    found = Amalgalite::Requires.require( filename )
+    unless found
+      found = original_require( filename )
+    end
+    return found
+  end
+end

data/lib/amalgalite/database.rb

@@ -437,8 +437,8 @@ module Amalgalite
     # Run a pragma command against the database
     # 
     # Returns the result set of the pragma
-    def pragma( cmd )
-      execute("PRAGMA #{cmd}")
+    def pragma( cmd, &block )
+      execute("PRAGMA #{cmd}", &block)
     end
 
     ##

data/lib/amalgalite/requires.rb

@@ -0,0 +1,75 @@
+module Amalgalite
+  #
+  # Requires encapsulates requiring itesm from the database
+  class Requires
+    class << self
+      def load_path_db_connections
+        @load_path_db_connections ||= {}
+      end
+      def load_path
+        @load_path ||= []
+      end
+
+      def db_connection_to( dbfile_name )
+        unless connection = load_path_db_connections[ dbfile_name ] 
+          puts "loading file #{dbfile_name}"
+          connection = ::Amalgalite::Database.new( dbfile_name )
+          load_path_db_connections[dbfile_name] = connection
+        end
+        return connection
+      end
+
+      def require( filename )
+        load_path.each { |lp| lp.require( filename ) }
+      end
+    end
+
+    attr_reader :dbfile_name
+    attr_reader :table_name
+    attr_reader :filename_column
+    attr_reader :contents_column
+    attr_reader :db_connection
+
+    def initialize( opts = {} )
+      @dbfile_name     = opts[:dbfile_name]     || "lib.db"
+      @table_name      = opts[:table_name]      || "rubylibs"
+      @filename_column = opts[:filename_column] || "filename"
+      @contents_column = opts[:contents_column] || "contents"
+      @db_connection   = Requires.db_connection_to( dbfile_name )
+      Requires.load_path << self
+    end
+
+    #
+    # return the sql to find the file contents for a file in this requires
+    #
+    def sql
+      @sql ||= "SELECT #{filename_column}, #{contents_column} FROM #{table_name} WHERE #{filename_column} = ?"
+    end
+
+    #
+    # require a file in this database table.  This will check and see if the
+    # file is already required.  If it isn't it will select the contents
+    # associated with the row identified by the filename and eval those contents
+    # within the context of TOPLEVEL_BINDING.  The filename is then appended to
+    # $".
+    #
+    # if the file was required then true is returned, otherwise false 
+    #
+    def require( filename )
+      if $".include?( filename ) then
+        return false
+      else
+        begin
+          rows = db_connection.execute(sql, filename)
+          row = rows.first
+          eval( row[contents_column].to_s, TOPLEVEL_BINDING)
+          $" << row[filename_column]
+        rescue => e
+          raise LoadError, "Failure loading #{filename} from #{dbfile_name} : #{e}"
+        end
+      end
+      return true
+    end
+  end
+end
+require 'amalgalite/core_ext/kernel/require'

data/lib/amalgalite/type_maps/default_map.rb

@@ -158,10 +158,10 @@ module Amalgalite::TypeMaps
     end
 
     ##
-    # convert a string to a blog
+    # convert a string to a blob
     #
     def blob( str )
-      raise NotImplementedError, "Blob type conversion is not implemented"
+      ::Amalgalite::Blob.new( :string => str )
     end
   end
 end

data/lib/amalgalite/version.rb

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

data/spec/database_spec.rb

@@ -159,6 +159,14 @@ describe Amalgalite::Database do
     count.should == 10
   end
 
+  it "#pragma yields each row when called with a block" do
+    count = 0
+    @iso_db.pragma( "index_info( subcountry_country )" ) do |row|
+      count += 1
+    end
+    count.should == 1
+  end
+
   it "can use something that responds to 'write' as a tap" do
     db = Amalgalite::Database.new( SpecInfo.test_db )
     s2 = db.trace_tap   = StringIO.new

data/spec/default_map_spec.rb

@@ -70,8 +70,9 @@ describe Amalgalite::TypeMaps::DefaultMap do
       @map.result_value_of( "bool", "True" ).should == true
     end
 
-    it "raises NotImplemeted for blob conversion" do
-      lambda{ @map.result_value_of( "Blob", "some blob" ) }.should raise_error( NotImplementedError )
+    it "Blob is returned for declated types of 'blob'" do
+      blob = @map.result_value_of( "blob", "stuff")
+      blob.to_s.should == "stuff"
     end
 
     it "raises and error if an unknown sql type is returned" do

data/tasks/config.rb

@@ -92,7 +92,8 @@ Configuration.for('rdoc') {
 # Extensions
 #-----------------------------------------------------------------------
 Configuration.for('extension') {
-  configs   Configuration.for('packaging').files.ext.find_all { |x| %w[ mkrf_conf.rb extconf.rb ].include?(File.basename(x)) }
+  #configs   Configuration.for('packaging').files.ext.find_all { |x| %w[ mkrf_conf.rb extconf.rb ].include?(File.basename(x)) }
+  configs   Configuration.for('packaging').files.ext.find_all { |x| %w[ extconf.rb ].include?(File.basename(x)) }
 }
 
 #-----------------------------------------------------------------------

data/tasks/extension.rake

@@ -15,7 +15,8 @@ if ext_config = Configuration.for_if_exist?('extension') then
         conf  = parts.last
         Dir.chdir(path.dirname) do |d| 
           ruby conf.to_s
-          sh "rake default"
+          #sh "rake default"
+          sh "make"
         end
       end
     end
@@ -26,7 +27,8 @@ if ext_config = Configuration.for_if_exist?('extension') then
         parts = path.split
         conf  = parts.last
         Dir.chdir(path.dirname) do |d| 
-          sh "rake clean"
+          #sh "rake clean"
+          sh "make clean"
         end
       end
     end
@@ -37,7 +39,8 @@ if ext_config = Configuration.for_if_exist?('extension') then
         parts = path.split
         conf  = parts.last
         Dir.chdir(path.dirname) do |d| 
-          sh "rake clobber"
+          #sh "rake clobber"
+          sh "make distclean"
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: amalgalite
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - Jeremy Hinegardner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-07-05 00:00:00 -06:00
+date: 2008-07-12 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,26 +30,26 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 4.5.0
     version: 
-- !ruby/object:Gem::Dependency 
-  name: mkrf
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.2.3
-    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: []
 
 extensions: 
-- ext/mkrf_conf.rb
+- 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/database.rb
@@ -57,30 +57,23 @@ extra_rdoc_files:
 - lib/amalgalite/paths.rb
 - lib/amalgalite/profile_tap.rb
 - lib/amalgalite/schema.rb
-- lib/amalgalite/sqlite3/constants.rb
-- lib/amalgalite/sqlite3/version.rb
 - lib/amalgalite/sqlite3.rb
-- lib/amalgalite/statement.rb
+- lib/amalgalite/core_ext/kernel/require.rb
+- lib/amalgalite/requires.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.c
 - ext/amalgalite3_blob.c
+- ext/amalgalite3.c
 - ext/amalgalite3_constants.c
 - ext/amalgalite3_database.c
 - ext/amalgalite3_statement.c
 files: 
-- ext/amalgalite3.c
 - ext/amalgalite3_blob.c
+- ext/amalgalite3.c
 - ext/amalgalite3_constants.c
 - ext/amalgalite3_database.c
 - ext/amalgalite3_statement.c
@@ -89,9 +82,18 @@ files:
 - ext/sqlite3.h
 - ext/sqlite3_options.h
 - ext/sqlite3ext.h
+- ext/extconf.rb
 - ext/gen_constants.rb
-- ext/mkrf_conf.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
 - lib/amalgalite/blob.rb
+- lib/amalgalite/version.rb
 - lib/amalgalite/boolean.rb
 - lib/amalgalite/column.rb
 - lib/amalgalite/database.rb
@@ -99,34 +101,27 @@ files:
 - lib/amalgalite/paths.rb
 - lib/amalgalite/profile_tap.rb
 - lib/amalgalite/schema.rb
-- lib/amalgalite/sqlite3/constants.rb
-- lib/amalgalite/sqlite3/version.rb
 - lib/amalgalite/sqlite3.rb
-- lib/amalgalite/statement.rb
+- lib/amalgalite/core_ext/kernel/require.rb
+- lib/amalgalite/requires.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/version_spec.rb
-- spec/sqlite3_spec.rb
 - spec/statement_spec.rb
 - spec/storage_map_spec.rb
 - spec/tap_spec.rb
@@ -136,10 +131,10 @@ files:
 - README
 - HISTORY
 - LICENSE
-- tasks/announce.rake
 - tasks/distribution.rake
-- tasks/documentation.rake
+- tasks/announce.rake
 - tasks/extension.rake
+- tasks/documentation.rake
 - tasks/rspec.rake
 - tasks/rubyforge.rake
 - tasks/config.rb
@@ -171,7 +166,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: copiousfreetime
-rubygems_version: 1.1.1
+rubygems_version: 1.0.1
 signing_key: 
 specification_version: 2
 summary: Amalgalite embeds the SQLite database engine in a ruby extension

data/ext/mkrf_conf.rb

@@ -1,14 +0,0 @@
-require 'rubygems'
-require 'mkrf'
-require 'rbconfig'
-Mkrf::Generator.new('amalgalite3') do |g|
-  # turn on some compilation options
-  g.cflags << " -DSQLITE_ENABLE_COLUMN_METADATA=1"  # make available table and column meta data api
-
-  # we compile sqlite the same way that the installation of ruby is compiled.
-  if Config::CONFIG['configure_args'].include?( "--enable-pthread" ) then
-    g.cflags << " -DSQLITE_THREADSAFE=1"
-  else
-    g.cflags << " -DSQLITE_THREADSAFE=0"
-  end
-end