sadie 0.0.39 → 0.0.40

data/CHANGELOG

@@ -12,5 +12,6 @@
 [0.0.17] bugfixes, updated tests
 [0.0.18...0.0.34] bugfixes, working on more natural integration with olsen
 [0.0.35] initializePrimers is no longer called by constructor...must now call manually before using get method
-[0.0.36] added lots of debugging that's going to need to come out, but also added eachers, a VERY cool
-         enhancement that offers a huge optimization path with very low developer resources
+[0.0.39] added lots of debugging that's going to need to come out, but also added eachers, a VERY cool
+         enhancement that offers a huge optimization path with very low developer resources
+[0.0.40] removed over-debugging         

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

@@ -4,9 +4,7 @@ Sadie::registerPrimerPlugin( { "match" => /\.sql2ar$/,
     primer_file_basename = File.basename( primer_file_filepath )
     sadie_key = key_prefix + '.' + primer_file_basename
     sadie_key = sadie_key.gsub(/^\./,"")
-    puts "DEFINING sql2ar primer for: #{sadie_key}"
     Sadie::prime( { "provides" => [ sadie_key ] }) do |sadie|
-        puts "priming via sql2ar for: #{sadie_key}"
         if ( matches = primer_file_basename.match( /^(.*)\.([^\.]+)\.sql2ar$/ ) )
             dbi_sadie_key = key_prefix + '.' + matches[2] + ".dbi.conx"
             dbconx = sadie.get( dbi_sadie_key )
@@ -16,12 +14,9 @@ Sadie::registerPrimerPlugin( { "match" => /\.sql2ar$/,
                     sth = dbconx.prepare(sql_query)
                     sth.execute
                     
-                    
-                    puts "looping thru db query results"
                     result = Array.new
                     while row = sth.fetch
                         row_as_array = row.to_a
-                        puts "calling eacherFrame each for sadiekey: #{sadie_key}"
                         Sadie::eacherFrame sadie_key, Sadie::EACH, row_as_array
                         result.push row_as_array
                     end

data/lib/sadie/version.rb

@@ -1,3 +1,3 @@
 class Sadie
-  VERSION = "0.0.39"
+  VERSION = "0.0.40"
 end

data/lib/sadie.rb

@@ -67,10 +67,8 @@ class Sadie
         # store the file path
         defined? @eacher_filepaths or @eacher_filepaths = Hash.new
         if ! @eacher_filepaths.has_key? sadiekey
-            puts "memorizing eacher filepath #{filepath} for sadiekey: #{sadiekey}"
             @eacher_filepaths[sadiekey] = [filepath]
         elsif ! @eacher_filepaths[sadiekey].include? filepath
-            puts "memorizing eacher filepath #{filepath} for sadiekey: #{sadiekey}"
             @eacher_filepaths[sadiekey].push filepath
         end
     end
@@ -95,37 +93,11 @@ class Sadie
         @eacher_init = nil
     end
 
-    # ==method: Sadie::eacher
-    #
-    # called by eacher files to hook into priming operations
-#     def self.eacher( eacher_params, &block )
-#         puts "HERE!!!"
-#         current_sadie_instance = Sadie::getCurrentSadieInstance
-#         filepath = current_sadie_instance.getCurrentPrimerFilepath
-#         key_prefix = current_sadie_instance.getCurrentPrimerKeyPrefix
-#         
-#         occur_at = eacher_params[:when]
-#         puts "eacher, occur_at: #{occur_at}"
-#         
-#         # gen sadie key
-#         basefilename = filepath.gsub(/^.*\//,"")
-#         sadiekey =  key_prefix + "." + basefilename.gsub(/\.each(?:\..*)$/,"")
-#         if eacher_params.has_key? "sadiekey"
-#             sadiekey = eacher_params["sadiekey"]
-#         end
-#         
-#         if current_sadie_instance.midEacherInit?
-#             memorizeEacherFileLocation( sadiekey, filepath )
-#         elsif current_sadie_instance.whichEacherFrame == occur_at
-#             current_sadie_instance.eacher( eacher_params, &block )
-#         end
-#     end
     
     def eacher( params, &block )
         filepath = getCurrentPrimerFilepath
         key_prefix = getCurrentPrimerKeyPrefix
         occur_at = params[:when]
-#         puts "eacher, occur_at: #{occur_at}"
         
         # gen sadie key
         basefilename = filepath.gsub(/^.*\//,"")
@@ -158,7 +130,6 @@ class Sadie
     end
     
     def setEachersProvidedByPrimer( sadiekey, providers )
-        puts "setting eachers to be provided by #{sadiekey} primer to #{providers}"
         
         # record reverse map for use by eacherFrame
         defined? @eacher_frame_redirect \
@@ -188,13 +159,14 @@ class Sadie
     end
     
     def getEachersProvidedByPrimer( sadiekey )
-        puts "looking for eachers provided by: #{sadiekey}"
         defined? @eachers_provided or return nil
         @eachers_provided.has_key? sadiekey or return nil
-        puts "found eachers for #{sadiekey}"
         @eachers_provided[sadiekey]
     end
     
+    # ==method: Sadie::eacher
+    #
+    # called by eacher files to hook into priming operations
     def self.eacher( eacher_params, &block )
         current_sadie_instance = Sadie::getCurrentSadieInstance
         current_sadie_instance.eacher( eacher_params, &block )
@@ -215,11 +187,9 @@ class Sadie
             end
         end
         
-        puts "eacherFrame (#{key},#{occur_at})"
         setEacherFrame( occur_at )
         defined? param and setEacherParam( param )
         if filepaths = eacherFilepaths( key )
-#             puts "found each file paths for key: #{key}, filepaths: #{filepaths}"
             filepaths.each do |filepath|
                 load filepath
             end
@@ -251,6 +221,7 @@ class Sadie
     def getEacherParam
         @eacher_param
     end
+    
     # == initialize eachers
     #
     # register all the eachers
@@ -434,8 +405,6 @@ class Sadie
         return self
     end
     
-   
-    
     def prime( primer_definition, &block )
         # validate params
         defined? primer_definition \
@@ -907,19 +876,6 @@ class Sadie
         primer_provides.each do | key |
             setPrimerProvider( key, filepath, plugin_filepath, getCurrentPrimerKeyPrefix )
             
-#             # handle eachers
-#             if eachers_provided = getEachersProvidedByPrimer( key )
-#                 eachers_provided.each do |eacherkey|
-#                     
-# #                     Sadie::prime( { "provides" => [ eacherkey ] }) do |sadie|
-# #                         puts "calling sadie.get(#{key} to produce #{eacherkey}"
-# #                         sadie.get key
-# #                     end
-#                     
-# #                     puts "setting eacher #{eacherkey} to be provided by file: #{filepath}"
-# #                     setPrimerProvider( eacherkey, filepath, plugin_filepath, getCurrentPrimerKeyPrefix )
-#                 end
-#             end
         end
         
     end
@@ -969,7 +925,6 @@ class Sadie
     end
 
     def _prime ( k )
-        puts ">>>priming: #{k}"
         
         if isEacherKey? k
             get( getEacherDependency( k ) )
@@ -977,7 +932,6 @@ class Sadie
         
             Sadie::eacherFrame( k, BEFORE )
             if provider  = getPrimerProvider( k )
-                puts "got provider for sadiekey: #{k}"
                 primer_filepath, plugin_filepath, key_prefix = provider
             
                 setCurrentPrimerFilepath(primer_filepath)

data/test/tc_sadie_twodeep.rb

@@ -27,24 +27,18 @@ class TestSadieTwoDeep < Test::Unit::TestCase
             assert_not_nil( dbconx )
             
             # test eacher
-            puts "!!!"
-            puts "!!!"
             eachertest = sadie.get("simple.eacher.test")
-            #assert_equal( eachertest, "start12end")
+            assert_equal( eachertest, "start12end")
             
             # test sqlTo2DArray
             tablearray = sadie.get( "two.deep.testquery.test.sql2ar" )
-            puts "!!!"
-            puts "!!!"
             assert_not_nil( tablearray )
-            puts "tablearray: #{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

data/test/test_primers/two/deep/testquery.test.sql2ar.each

@@ -2,18 +2,15 @@ require 'sadie'
 
 Sadie::eacher( :when => Sadie::BEFORE   ) do |sadie|
     @testeach = "start"
-    puts "testeach[start]: #{@testeach}"
 end
 
 Sadie::eacher(  :when => Sadie::EACH, :sadiekey => "two.deep.testquery.test.sql2ar"  ) do |sadie,param|
     @testeach = "#{@testeach}#{param[0]}"
-    puts "testeach[each]: #{@testeach}"
 end
 
 Sadie::eacher( :when => Sadie::AFTER, :provides => ["simple.eacher.test"]   ) do |sadie|
     @testeach = "#{@testeach}end"
     sadie.set "simple.eacher.test", @testeach 
-    puts "testeach[end]: #{@testeach}"
 end
 
 #def dsl_correct?; ( bitch_to_wrap_head_around? ) && ( rewritten_atleast_three_times? ) && ( seems_easy_now_that_its_done? ) && ( have_less_hair_now? ); end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sadie
 version: !ruby/object:Gem::Version
-  version: 0.0.39
+  version: 0.0.40
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-04-20 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dbi
-  requirement: &11389960 !ruby/object:Gem::Requirement
+  requirement: &23113620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *11389960
+  version_requirements: *23113620
 - !ruby/object:Gem::Dependency
   name: mysql
-  requirement: &11439500 !ruby/object:Gem::Requirement
+  requirement: &23113200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *11439500
+  version_requirements: *23113200
 - !ruby/object:Gem::Dependency
   name: dbd-mysql
-  requirement: &11439080 !ruby/object:Gem::Requirement
+  requirement: &23162880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *11439080
+  version_requirements: *23162880
 description: Sadie is a data framework intended to ease the pain of managing related
   data.
 email: