sadie 0.0.8 → 0.0.9

data/lib/sadie/primer_plugins/DatabaseConnection.plugin.rb

@@ -1,26 +1,71 @@
 # WARNING: THIS DOESN'T WORK YET!!!
 
 Sadie::registerPrimerPlugin( {  "match" => /\.dbi\.conx$/,
-                                "accepts-block" => true } ) do |sadie, key_prefix, primer_file_filepath, block|
-
-    # build parameter hash
-    dbparams = Hash.new
-    inifile = Ini.new( primer_file_filepath )
-    inifile.each do | section, key_from_ini_file, value |
-        section.match(/^connection$/) \
-            or next
-        dbparams[key_from_ini_file] = value
-    end
+                                "accepts-block" => false,
+                                "prime-on-init" => false } ) do |sadie, key_prefix, primer_file_filepath|
+    
+    # determine key
+    sadie_key = key_prefix+'.'+File.basename( primer_file_filepath )
     
-    # validate dbistr
-    dbparams.has_key( 'dbistr' ) \
-        or raise 'requried connection::dbistr was not defined'
     
-    # default user and pass to nil
-    user = dbparams.has_key('user') ? dbparams['user']: nil;
-    pass = dbparams.has_key('pass') ? dbparams['pass']: nil;
+    Sadie::prime( { "provides" => [ sadie_key ] }) do |sadie|
+        
+        if inihash = Sadie::iniFileToHash( primer_file_filepath )
+            dbparams = Hash.new
+            
+            inihash.each do |section, section_hash|
+                section.match(/^connection$/) \
+                    or next
+                section_hash.each do |key, value|
+                    dbparams[key] = value
+                end
+            end
+            
+            if ! dbparams.empty?
+                # validate dbistr
+                dbparams.has_key?( 'dbistr' ) \
+                    or raise 'requried connection::dbistr was not defined'
+                
+                # default user and pass to nil
+                user = dbparams.has_key?('user') ? dbparams['user']: nil;
+                pass = dbparams.has_key?('pass') ? dbparams['pass']: nil;
+                
+                # call connect with block
+                require 'rubygems'
+                require 'mysql'
+                require 'dbi'
+                
+                dbh = DBI.connect( dbparams['dbistr'], user, pass )
+                
+                # determine key
+                #sadie_key = key_prefix+'.'+File.basename( primer_file_filepath )
+                
+#                 puts "installing db connection: #{sadie_key}"
+                
+                sadie.set( sadie_key, dbh )
+                
+            end
+        end
+    end            
     
-    # call connect with block
-    require 'dbi'
-    DBI.connect( dbparams['dbistr'], user, pass, block )
+#     # build parameter hash
+#     dbparams = Hash.new
+#     inifile = Ini.new( primer_file_filepath )
+#     inifile.each do | section, key_from_ini_file, value |
+#         section.match(/^connection$/) \
+#             or next
+#         dbparams[key_from_ini_file] = value
+#     end
+#     
+#     # validate dbistr
+#     dbparams.has_key?( 'dbistr' ) \
+#         or raise 'requried connection::dbistr was not defined'
+#     
+#     # default user and pass to nil
+#     user = dbparams.has_key?('user') ? dbparams['user']: nil;
+#     pass = dbparams.has_key?('pass') ? dbparams['pass']: nil;
+#     
+#     # call connect with block
+#     require 'dbi'
+#     DBI.connect( dbparams['dbistr'], user, pass, block )
 end

data/lib/sadie/primer_plugins/IniFile.plugin.rb

@@ -2,20 +2,59 @@ Sadie::registerPrimerPlugin( {  "match" => /\.ini$/,
                                 "accepts-block" => false,
                                 "prime-on-init" => true } ) do |sadie, key_prefix, primer_file_filepath|
     
-    require 'ini'
-    
     ini_file_basename = File.basename primer_file_filepath
     ini_file_root = ini_file_basename.gsub( /\.ini$/, "" )
     
-    inifile = Ini.new( primer_file_filepath )
-#      puts "key_prefix: #{key_prefix}, primer_file_filepath: #{primer_file_filepath}"
-    inifile.each do | section, key_from_ini_file, value |
-        
-        # compute key
-#         key_prefix = sadie.getCurrentPrimerKeyPrefix
-        key_to_set =  key_prefix + "." + ini_file_root + "." +section + "." + key_from_ini_file
-        key_to_set = key_to_set.gsub( /^\.+/, "" )
+    if inihash = Sadie::iniFileToHash( primer_file_filepath )
         
-        sadie.set( key_to_set, value )
+        inihash.each do |section, section_hash|
+            
+            section_hash.each do |key, value|
+                
+                key_to_set =  key_prefix + "." + ini_file_root + "." + section + "." + key
+                key_to_set = key_to_set.gsub(/^\./,"")
+                sadie.set( key_to_set, value )
+                
+            end  
+        end
     end
+    
+#     section = nil
+#     File.open( primer_file_filepath, "r" ).each do |f|
+#         f.each_line do |line|
+#             next if line.match(/^;/) # skip comments
+#             if matches = line.match(/\[([^\]]+)\]/)
+#                 section = matches[1]
+#             elsif matches = line.match(/^\s*([^\s\=]+)\s*\=\s*([^\s]+)\s*$/)
+#                 key = matches[1]
+#                 value = matches[2]
+#                 if qmatches = value.match(/[\'\"](.*)[\'\"]/)
+#                     newvalue = qmatches[1]
+#                     value = newvalue
+#                 end
+#                 if defined? section
+#                     key_to_set =  key_prefix + "." + ini_file_root + "." +section + "." + key
+#                     sadie.set( key_to_set, value )
+#                 end
+#             end
+#         end
+#     end
+    
+#     require 'rubygems'
+#     require 'ini'
+#     
+#     ini_file_basename = File.basename primer_file_filepath
+#     ini_file_root = ini_file_basename.gsub( /\.ini$/, "" )
+#     
+#     inifile = Ini.new( primer_file_filepath )
+# #      puts "key_prefix: #{key_prefix}, primer_file_filepath: #{primer_file_filepath}"
+#     inifile.each do | section, key_from_ini_file, value |
+#         
+#         # compute key
+# #         key_prefix = sadie.getCurrentPrimerKeyPrefix
+#         key_to_set =  key_prefix + "." + ini_file_root + "." +section + "." + key_from_ini_file
+#         key_to_set = key_to_set.gsub( /^\.+/, "" )
+#         
+#         sadie.set( key_to_set, value )
+#     end
 end

data/lib/sadie/primer_plugins/Resource.plugin.rb

@@ -1,5 +1,5 @@
 Sadie::registerPrimerPlugin( {  "match" => /(\.res|\.res\.rb)$/,
-                                "accepts-block" => true,
+                                "accepts-block" => false,
                                 "prime-on-init" => false } ) do |sadie, key_prefix, primer_file_filepath, block|
     
     load( primer_file_filepath )

data/lib/sadie/primer_plugins/SQLQueryTo2DArray.plugin.rb

@@ -0,0 +1,36 @@
+Sadie::registerPrimerPlugin( { "match" => /\.sql$/,
+                               "accepts-block" => false,
+                               "prime-on-init" => false } ) do |sadie, key_prefix, primer_file_filepath|
+    primer_file_basename = File.basename( primer_file_filepath )
+    sadie_key = key_prefix + '.' + primer_file_basename
+    sadie_key = sadie_key.gsub(/^\./,"")
+    
+    Sadie::prime( { "provides" => [ sadie_key ] }) do |sadie|
+    
+        if ( matches = primer_file_basename.match( /^(.*)\.([^\.]+)\.sql$/ ) )
+            dbi_sadie_key = key_prefix + '.' + matches[2] + ".dbi.conx"
+#             puts "dbi_sadie_key: #{dbi_sadie_key}, connecting..."
+            dbconx = sadie.get( dbi_sadie_key )
+#             puts "dbconx: #{dbconx}"
+            if ( dbconx = sadie.get( dbi_sadie_key ) )
+#                 puts "  connected."
+                if sql_query = Sadie::templatedFileToString( primer_file_filepath )
+                    
+                    sth = dbconx.prepare(sql_query)
+                    sth.execute
+                    
+                    result = Array.new
+                    while row = sth.fetch
+                        result.push row.to_a
+                    end
+                    
+                    
+                    sadie.setExpensive( sadie_key, result )
+                    
+                    # Close the statement handle when done
+                    sth.finish
+                end
+            end
+        end
+    end
+end

data/lib/sadie/primer_plugins/TemplateTextFile.plugin.rb

@@ -0,0 +1,13 @@
+Sadie::registerPrimerPlugin( { "match" => /\.tmpl$/,
+                               "accepts-block" => false,
+                               "prime-on-init" => false } ) do |sadie, key_prefix, primer_file_filepath|
+    primer_file_basename = File.basename( primer_file_filepath )
+    sadie_key = key_prefix + '.' + primer_file_basename
+    sadie_key = sadie_key.gsub(/^\./,"")
+    
+    Sadie::prime( { "provides" => [ sadie_key ] }) do |sadie|
+    
+        sadie.setExpensive( sadie_key, Sadie::templatedFileToString( primer_file_filepath ) )
+    
+    end
+end

data/lib/sadie/version.rb

@@ -2,5 +2,5 @@
 # this file sets the version of the Sadie gem
 
 class Sadie
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/lib/sadie.rb

@@ -3,8 +3,7 @@ require 'rubygems'
 require "bundler/setup"
 require 'bundler'
 Bundler.require(:default)
-#require 'ini'
-
+require 'erb'
 
 # ==Description: Sadie
 # Sadie is a data framework intended to ease the pain of constructing, accessing, and 
@@ -17,6 +16,11 @@ Bundler.require(:default)
 # supports on-demand, one-time evaluation of "primers" which may define, or prime,
 # multiple key, value pairs in a single run.
 
+def S( key )
+    instance = Sadie::getCurrentSadieInstance
+    return instance.get( key )
+end
+
 class Sadie
     
     # ==method: Sadie::getSadieInstance
@@ -62,6 +66,44 @@ class Sadie
         current_sadie_instance = Sadie::getCurrentSadieInstance
         current_sadie_instance.registerPrimerPlugin( arghash, &block )
     end
+    
+    # ==method: Sadie::iniFileToHash
+    #
+    # utility class method.  accepts a filepath.  digests inin file and returns hash of hashes.
+    #
+    def self.iniFileToHash ( filepath )
+        section = nil
+        ret = Hash.new
+        File.open( filepath, "r" ).each do |f|
+            f.each_line do |line|
+                next if line.match(/^;/) # skip comments
+                if matches = line.match(/\[([^\]]+)\]/)
+                    section = matches[1]
+                    ret[section] = Hash.new
+                elsif matches = line.match(/^\s*([^\s\=]+)\s*\=\s*([^\s]+)\s*$/)
+                    key = matches[1]
+                    value = matches[2]
+                    
+                    # strip quotes
+                    if qmatches = value.match(/[\'\"](.*)[\'\"]/)
+                        value = qmatches[1]
+                    end
+                    
+                    if defined? section
+                        ret[section][key] = value
+                    end
+                end
+            end
+        end
+        ret.empty? and return nil
+        return ret
+    end
+    
+    def self.templatedFileToString( filepath )
+        f = open( filepath )
+        template = ERB.new( f.read )
+        template.result
+    end
 
     
     # ==method: constructor
@@ -110,20 +152,31 @@ class Sadie
             and set( "sadie.primers_dirpath", delay_set_primers_dirpath )
         
         # if a path to a session is given, init using session file
-        if defined? options[:sadie.session_filepath] && options[:sadie.session_filepath].match(/^[^\s]+$/)
-            set( "sadie.session_filepath", options[:sadie.session_filepath] )
+        if options.has_key?( "sadie.session_filepath" )
+            set( "sadie.session_filepath", options["sadie.session_filepath"] )
             _initializeWithSessionFilePath( get("sadie.session_filepath") )
-            return
-        end
-        
-        # determine session id, init from session if provided as arg
-        if defined?options[:sadie.session_id] && options[:sadie.session_id].match(/^[^\s]+$/)
-            set( "sadie.session_id", options[:sadie.session_id] )
+        elsif options.has_key?( "sadie.session_id" )
+            set( "sadie.session_id", options["sadie.session_id"] )
             _initializeWithSessionId( get( "sadie.session_id" ) )
         else
             set( "sadie.session_id", _generateNewSessionId )
         end
         
+#         if  defined? options["sadie.session_filepath"] \
+#             && options["sadie.session_filepath"].match(/^[^\s]+$/)
+#             set( "sadie.session_filepath", options["sadie.session_filepath"] )
+#             _initializeWithSessionFilePath( get("sadie.session_filepath") )
+#             return
+#         end
+#         
+#         # determine session id, init from session if provided as arg
+#         if defined?options["sadie.session_id"] && options["sadie.session_id"].match(/^[^\s]+$/)
+#             set( "sadie.session_id", options["sadie.session_id"] )
+#             _initializeWithSessionId( get( "sadie.session_id" ) )
+#         else
+#             set( "sadie.session_id", _generateNewSessionId )
+#         end
+        
     end
     
     def prime ( primer_definition, &block )
@@ -140,7 +193,7 @@ class Sadie
         if midPrimerInit?
             
             # mid primer init, just memorize primer location
-            memorizePrimerLocation( @@mid_primer_filepath,  primer_definition["provides"] )
+            memorizePrimerLocation( @@mid_primer_filepath, getCurrentPrimerPluginFilepath, primer_definition["provides"] )
         else
             
             # run code block with the current sadie instance
@@ -164,31 +217,42 @@ class Sadie
     end
 
     def registerPrimerPlugin ( arghash, &block )
+        
+        # if mid plugin init is set, we're registering the plugin
+        # init mode, just store arghash info
+        accepts_block = arghash.has_key?( "accepts-block" ) && arghash["accepts-block"] ? true : false
+        prime_on_init = arghash.has_key?( "prime-on-init" ) && arghash["prime-on-init"] ? true : false
+        
+        
+        
+        
+        
+        # if mid plugin init, register the plugin params with the match
         if midPluginInit?
             
-            # init mode, just store arghash info
-            accepts_block = arghash.has_key?( "accepts-block" ) && arghash["accepts-block"] ? true : false
-            prime_on_init = arghash.has_key?( "prime-on-init" ) && arghash["prime-on-init"] ? true : false
             regPluginMatch( arghash["match"], @@mid_plugin_filepath, accepts_block, prime_on_init )
             
+        # midplugininit returned false, we're actually in the process of either initializing
+        # a primer or actually priming
         else
-            
-            # prime mode
-            currentPrimerPluginPrimerOnInit? \
-                or setMidPrimerInit( @@current_primer_filepath )
-            key_prefix = getCurrentPrimerKeyPrefix
-            if currentPrimerPluginAcceptsBlock?
-                
-                # call with block only if accepts block
-                yield( self, key_prefix, @@current_primer_filepath, block )
-                
-            else
+            yield( self, getCurrentPrimerKeyPrefix, @@current_primer_filepath ) \
+#                unless midPrimerInit?
+            # if registering the prime mode, skips block exec
+#            
+#             if currentPrimerPluginAcceptsBlock?
+#                 
+#                 # call with block only if accepts block
+#                 yield( self, getCurrentPrimerKeyPrefix, @@current_primer_filepath, &block )
+#                 
+#             else
                 
-                yield( self, key_prefix, @@current_primer_filepath )
+#             yield( self, getCurrentPrimerKeyPrefix, @@current_primer_filepath ) \
+#                 if prime_on_init or 
                 
-            end
-            currentPrimerPluginPrimerOnInit? \
-                or unsetMidPrimerInit
+#             end
+            
+#             prime_on_init \
+#                 or unsetMidPrimerInit
             
         end
     end
@@ -338,6 +402,7 @@ class Sadie
     # the expensive setter.  key, value pairs stored via this method are not kept in memory
     # but are stored to file and recalled as needed
     def setExpensive(k,v)
+#         puts "setting expensive, key: #{k}"
         expensive_filepath              = _computeExpensiveFilepath( k )
         serialized_value                = Marshal::dump( v )
         File.open(expensive_filepath, 'w') { |f|
@@ -428,31 +493,6 @@ class Sadie
         return false;
     end
     
-    def primeWithPlugin( key_prefix, filepath )
-        
-        # when this primes, the block run of registerPrimerPlugin needs
-        # to know whether or not it accepts block
-        @@primer_plugin_lookup.each do | plugin_array |
-           
-           # we just need to match the basename
-           filename = File.basename( filepath )
-           
-           regexp, plugin_filepath, accepts_block, prime_on_init = plugin_array
-           
-           if regexp.match( filename )
-               
-               currentPrimerPluginAcceptsBlock( accepts_block )
-               currentPrimerPluginPrimeOnInit( prime_on_init )
-               
-               plugin_filename = File.basename( plugin_filepath )
-               
-               load( plugin_filepath )
-               
-               return
-           end
-        end
-    end
-    
     def currentPrimerPluginAcceptsBlock( accepts )
         @@primer_plugin_accepts_block = accepts
     end
@@ -465,7 +505,7 @@ class Sadie
         @@primer_plugin_prime_on_init = prime_on_init
     end
     
-    def currentPrimerPluginPrimerOnInit?
+    def currentPrimerPluginPrimeOnInit?
         @@primer_plugin_prime_on_init
     end
     
@@ -514,6 +554,7 @@ class Sadie
             load( filepath )
             unsetMidPluginInit
         end
+        puts "...finished initializing primer plugins"
         @@primer_plugins_initialized = true
     end
     
@@ -556,7 +597,7 @@ class Sadie
 
         puts "Initializing primers..."
         initializePrimerDirectory( "", primers_dirpath )
-        
+        puts "...finished initializing primers."
         
         @@flag_primed[primers_dirpath] = true
     end
@@ -590,11 +631,49 @@ class Sadie
             setCurrentPrimerKeyPrefix key_prefix
             
             basename = File.basename( filepath )
-            primeWithPlugin( key_prefix, filepath )
+            initializePrimerWithPlugin( key_prefix, filepath )
+            
+            
         end
     end
     
+    def initializePrimerWithPlugin( key_prefix, filepath )
+        
+        @@primer_plugin_lookup.each do | plugin_array |
+           
+           # we just need to match the basename
+           filename = File.basename( filepath )
+           
+           regexp, plugin_filepath, accepts_block, prime_on_init = plugin_array
+           
+           if regexp.match( filename )
+               
+#                currentPrimerPluginAcceptsBlock( accepts_block )
+#                currentPrimerPluginPrimeOnInit( prime_on_init )
+               setCurrentPrimerPluginFilepath( plugin_filepath )
+               prime_on_init \
+                    or setMidPrimerInit( filepath )
+               
+               plugin_filename = File.basename( plugin_filepath )
+               
+               load( plugin_filepath )
+               
+               prime_on_init \
+                    or unsetMidPrimerInit
+               
+               
+               return
+           end
+        end
+    end
     
+    def setCurrentPrimerPluginFilepath( filepath )
+        @@current_primer_plugin_filepath = filepath
+    end
+    
+    def getCurrentPrimerPluginFilepath
+        @@current_primer_plugin_filepath
+    end
     
     def setCurrentPrimerKeyPrefix ( prefix )
         @@current_primer_keyprefix = prefix
@@ -617,7 +696,7 @@ class Sadie
     # ==memorizePrimerLocation
     #
     # internal, ignore the man behind the curtain
-    def memorizePrimerLocation( filepath, primer_provides )
+    def memorizePrimerLocation( filepath, plugin_filepath, primer_provides )
         
         # validate primer hash
         #primer_dirpath = @@mid_primer_toplevel_primer_dirpath
@@ -627,7 +706,7 @@ class Sadie
         
         # interate over provides setting primer providers for each
         primer_provides.each do | key |
-            setPrimerProvider( key, filepath )
+            setPrimerProvider( key, filepath, plugin_filepath, getCurrentPrimerKeyPrefix )
         end
     end
     
@@ -635,13 +714,13 @@ class Sadie
     # ==setPrimerProvider
     #
     # internal, ignore the man behind the curtain
-    def setPrimerProvider( primer_name, primer_filepath )
+    def setPrimerProvider( primer_name, primer_filepath, primer_plugin_filepath, key_prefix )
         
         primer_dirpath = _get( "sadie.primers_dirpath" )
         @@primer_hash.has_key?( primer_dirpath ) \
             or @@primer_hash[primer_dirpath] = Hash.new
         
-        @@primer_hash["#{primer_dirpath}"]["#{primer_name}"] = primer_filepath
+        @@primer_hash["#{primer_dirpath}"]["#{primer_name}"] = [ primer_filepath, primer_plugin_filepath, key_prefix ]
         
     end
     
@@ -677,13 +756,17 @@ class Sadie
 
     def _prime ( k )
         
-        provider = getPrimerProvider( k ) \
-            or return true;
+        if provider  = getPrimerProvider( k )
+            primer_filepath, plugin_filepath, key_prefix = provider
         
-        setCurrentPrimerFilepath(provider)
-        Sadie::setCurrentSadieInstance( self )
-        load provider
-        true
+            setCurrentPrimerFilepath(primer_filepath)
+            setCurrentPrimerKeyPrefix( key_prefix )
+            Sadie::setCurrentSadieInstance( self )
+            
+#             puts "_prime( #{k} ) loading #{provider}"
+            
+            load plugin_filepath
+        end
         
     end
     
@@ -738,7 +821,15 @@ class Sadie
     
     
     # init given path to session file
-    def _initializeWithSessionFilePath(session_filepath)
+    def _initializeWithSessionFilePath( session_filepath )
+        
+        puts "session_filepath: #{session_filepath}"
+        
+        defined?( session_filepath ) \
+            or raise "session_filepath was undefined"
+        
+        /^\s*$/.match("#{session_filepath}") \
+            and raise "session_filepath was empty string"
         
         # bail on non-existant file
         File.exist?( session_filepath ) \
@@ -766,8 +857,8 @@ class Sadie
     
     # init given session id               
     def _initializeWithSessionId(session_id)
-        session_filepath = File.expand_path( "session."+session_id, get( "sadie.sessions_dirpath" ) )
-        _initializeWithSessionFilePath(session_filepath)
+        session_filepath = File.expand_path( "session."+session_id, _get( "sadie.sessions_dirpath" ) )
+        _initializeWithSessionFilePath( session_filepath )
     end
         
     # gen new session id

data/sadie.gemspec

@@ -22,6 +22,9 @@ Gem::Specification.new do |s|
   # s.add_development_dependency "rspec"
   # s.add_runtime_dependency "rest-client"
 
-  s.add_runtime_dependency "ini"
-
+  #s.add_runtime_dependency "ini"
+  s.add_runtime_dependency "dbi"
+  s.add_runtime_dependency "mysql"
+  s.add_runtime_dependency "dbd-mysql"
+  
 end

data/test/README

@@ -0,0 +1,9 @@
+These tests depend on a mysql database created as follows on the local machine:
+
+create database test
+grant all on test.* to test@localhost identified by 'test'
+CREATE TABLE `test` (
+  `col1` int(8) DEFAULT NULL,
+  `col2` varchar(256) DEFAULT NULL
+)
+INSERT INTO `test` VALUES (1,'testing123'),(2,'testing456');

data/test/tc_sadie_toplevel.rb

@@ -1,4 +1,8 @@
-$LOAD_PATH << File.join(File.dirname(__FILE__), '..', 'lib')
+#$LOAD_PATH << File.join(File.dirname(__FILE__), '..', 'lib')
+#$LOAD_PATH << File.join(File.dirname(__FILE__), '..', 'lib')
+#$:.unshift(File.expand_path('./lib', ENV['rvm_path']))
+$:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+$:.unshift ENV["GEM_HOME"]
 
 require "test/unit"
 require "sadie"
@@ -22,7 +26,7 @@ class TestSadieToplevel < Test::Unit::TestCase
             dog1a = sadie.get( "toplevel_destructonget.oneprime" )
             dog2a = sadie.get( "toplevel_destructonget.twoprime" )
             dog2b = sadie.get( "toplevel_destructonget.twoprime" )
-            sleep( 2 )
+            sleep( 0.01 )
             dog1b = sadie.get( "toplevel_destructonget.oneprime" )
             assert_equal( dog2a, dog2b )
             assert_not_equal( dog1a, dog1b )

data/test/tc_sadie_twodeep.rb

@@ -20,6 +20,23 @@ class TestSadieTwoDeep < Test::Unit::TestCase
             
             # test two-deep expensive
             assert_equal( sadie.get( "expensive.oneprime" ), "primedit" )
+            
+            # test db connection
+            dbconx = sadie.get( "two.deep.test.dbi.conx" )
+            assert_not_nil( dbconx )
+            
+            # test sql22darray
+            tablearray = sadie.get( "two.deep.testquery.test.sql" )
+            assert_not_nil( tablearray )
+            assert_equal( tablearray[0][0], 1 )
+            assert_equal( tablearray[1][1], "testing456" )
+
+            # test templating
+            template_text = sadie.get( "two.deep.test_template.txt.tmpl" )
+            template_text = template_text.gsub(/\s+/," ").gsub(/^\s*/,"").gsub(/\s*$/,"")
+#             puts "template text\n#{template_text}"
+            assert( (template_text.match(/later\s+gator/)), "incorrect match on template text" )
+            assert( (template_text.match(/test\/test\_primers/)), "incorrect match on template text" )
         end
     end
 end

data/test/test_primers/two/deep/test.dbi.conx

@@ -0,0 +1,4 @@
+[connection]
+dbistr = DBI:Mysql:test:127.0.0.1
+user = test
+pass = test

data/test/test_primers/two/deep/test_template.txt.tmpl

@@ -0,0 +1,10 @@
+<% testmode = "later" %>
+<% animal = "gator" %>
+<% if testmode.eql? "initial" %>
+  my first time thru
+<% end %>
+<% if testmode.eql? "later" %>
+  later
+<% end %>
+<%= animal %>
+<%= S("sadie.primers_dirpath") %>

data/test/test_primers/two/deep/testquery.test.sql

@@ -0,0 +1 @@
+select * from test

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sadie
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 0
   - 0
-  - 8
-  version: 0.0.8
+  - 9
+  version: 0.0.9
 platform: ruby
 authors: 
 - Fred McDavid
@@ -15,10 +15,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-24 00:00:00 Z
+date: 2012-01-25 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: ini
+  name: dbi
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
@@ -31,6 +31,34 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: mysql
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: dbd-mysql
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id003
 description: Sadie is a data framework intended to ease the pain of managing related data.
 email: 
 - fred@landmetrics.com
@@ -54,7 +82,8 @@ files:
 - lib/sadie/primer_plugins/DatabaseConnection.plugin.rb
 - lib/sadie/primer_plugins/IniFile.plugin.rb
 - lib/sadie/primer_plugins/Resource.plugin.rb
-- lib/sadie/primer_plugins/SQLQuery.plugin.rb
+- lib/sadie/primer_plugins/SQLQueryTo2DArray.plugin.rb
+- lib/sadie/primer_plugins/TemplateTextFile.plugin.rb
 - lib/sadie/version.rb
 - rdoc/classes/Sadie.html
 - rdoc/created.rid
@@ -68,6 +97,7 @@ files:
 - rdoc/index.html
 - rdoc/rdoc-style.css
 - sadie.gemspec
+- test/README
 - test/tc_sadie_toplevel.rb
 - test/tc_sadie_twodeep.rb
 - test/test_primers/.gitignore
@@ -78,6 +108,9 @@ files:
 - test/test_primers/toplevel_single.res.rb
 - test/test_primers/two/deep/conf.ini
 - test/test_primers/two/deep/expensive.res
+- test/test_primers/two/deep/test.dbi.conx
+- test/test_primers/two/deep/test_template.txt.tmpl
+- test/test_primers/two/deep/testquery.test.sql
 - test/test_primers/two/deep/two_results.res
 homepage: http://www.landmetrics.com/Sadie
 licenses: []

data/lib/sadie/primer_plugins/SQLQuery.plugin.rb

@@ -1,21 +0,0 @@
-# WARNING: THIS DOESN'T WORK YET!!!
-
-Sadie::registerPrimerPlugin( { "match" => /\.sql$/,
-                               "accepts-block" => true } ) do |sadie, key_prefix, primer_file_filepath, block|
-
-    # read query from file @filepath, ditch newlines
-    f = open( primer_file_filepath )
-    query = f.read
-    close( f )
-    query = query.gsub(/\n/,'')
-    
-    # get the database and run query
-    db_key = key_prefix+".db.conx"
-    sadie.get( db_key ) do | dbh |
-        
-        # run the query
-        dbh.select_all( query, block )
-        
-    end
-    raise 'Sadie returned nil for key: #{db_key}'
-end