sadie 0.0.46 → 0.0.47

data/CHANGELOG

@@ -18,4 +18,5 @@
 [0.0.41] minor bugfix
 [0.0.42,0.0.43] minor bugfix (hopefully), file now closing before method exit (a punt)
 [0.0.45] bugfix (punt worked!) in templated file handling
-[0.0.46] massive code cleanup. moved lots of things to private. documented all public methods.
+[0.0.46] massive code cleanup. moved lots of things to private. documented all public methods.
+[0.0.47] eachers now sane and can be set on any key, even other eacher provided keys

data/lib/sadie/version.rb

@@ -1,3 +1,3 @@
 class Sadie
-  VERSION = "0.0.46"
+  VERSION = "0.0.47"
 end

data/lib/sadie.rb

@@ -255,16 +255,21 @@ class Sadie
         
         # gen sadie key
         basefilename    = filepath.gsub(/^.*\//,"")
-        sadiekey        =  key_prefix + "." + basefilename.gsub(/\.each(?:\..*)*$/,"")
+        sadiekey        = key_prefix + "." + basefilename.gsub(/\.each(?:\..*)*$/,"")
+        sadiekey        = sadiekey.gsub( /^\.+/,"" )
         if params.has_key? "sadiekey"
             sadiekey    = params["sadiekey"]
         end
         
         if midEacherInit?
+            
+            debug! 10, "in mid eacher init (#{sadiekey})"
+            
             memorizeEacherFileLocation( sadiekey, filepath )
             
             if params.has_key? :provides
                 
+                # make sure we're passing an array
                 provide_array = params[:provides]
                 provide_array.respond_to? "each" or provide_array = [provide_array]
                 
@@ -282,7 +287,7 @@ class Sadie
         end
     end
     
-    # ==method: eacher
+    # ==method: eacherFrame
     #
     # ( usually this will be called by the class method...it looks better )
     #
@@ -290,17 +295,20 @@ class Sadie
     #    
     def eacherFrame( sadiekey, occur_at, param=nil )
         
+        debug! 8, "eacherFrame(#{occur_at}): #{sadiekey}"
+        
         key = sadiekey
-        if defined? @eacher_frame_redirect
-            if @eacher_frame_redirect.has_key? key
-                key = @eacher_frame_redirect[key]
-            end
-        end
+#         if defined? @eacher_frame_redirect
+#             if @eacher_frame_redirect.has_key? key
+#                 key = @eacher_frame_redirect[key]
+#             end
+#         end
         
         setEacherFrame( occur_at )
         defined? param and setEacherParam( param )
         if filepaths = eacherFilepaths( key )
             filepaths.each do |filepath|
+                debug! 10, "each frame loading: #{filepath} for key: #{key}"
                 load filepath
             end
         end
@@ -408,9 +416,23 @@ class Sadie
         
         debug! 10, "get(#{k})"
         
+        defined? @eacher_frame_redirect or @eacher_frame_redirect = Hash.new
+        
         if ! isset?( k )
-            # prime if not yet primed
-            primed?( k ) or _prime( k )
+            debug! 10, "#{k} is not set"
+            if isEacherKey?( k )
+                debug! 10, "sadiekey: #[k} is eacher, fetching: #{@eacher_frame_redirect[k]}"
+                get @eacher_frame_redirect[k]
+            
+            elsif primeable?( k )
+                
+                debug! 10, "calling eacher from get method for #{k}"
+                setUnbalancedEacher k
+                Sadie::eacherFrame( k, BEFORE )
+                
+                # prime if not yet primed
+                primed?( k ) or _prime( k )
+            end
         end
         
         return _recallExpensive( k ) if expensive?( k )
@@ -485,14 +507,22 @@ class Sadie
     # the cheap setter.  key, value pairs stored via this method are kept in memory
     def setCheap( k, v )
         
-        debug! 10,  "setting: #{k}"
+        debug! 9,  "setting cheap: #{k}"
+        Sadie::eacherFrame( k, BEFORE ) if ! eacherUnbalanced?( k )
+                setUnbalancedEacher k
+        
+        if getDebugLevel == 10
+            debug! 10, "dumping value:"
+            pp v
+        end
         
         # set it, mark not expensive and primed
         _set( k, v )
         _expensive( k, false )
+        _primed( k, true )
         
-        
-       _primed( k, true )
+        Sadie::eacherFrame( k, AFTER, v )
+        clearUnbalancedEacher k
         
     end
     
@@ -501,6 +531,12 @@ 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)
+        
+        debug! 9,  "setting expensive: #{k}"
+        Sadie::eacherFrame( k, BEFORE ) if ! eacherUnbalanced?( k )
+                         setUnbalancedEacher k
+
+        
         expensive_filepath              = _computeExpensiveFilepath( k )
         serialized_value                = Marshal::dump( v )
         
@@ -512,6 +548,9 @@ class Sadie
         }
         _expensive( k, true )
         _primed( k, true )
+        
+        Sadie::eacherFrame( k, AFTER, v )
+        clearUnbalancedEacher k
     end
 
     
@@ -572,9 +611,28 @@ class Sadie
     end
     
 
-    
+# ------------------------------------------------------------------------------------------------    
+# ------------------------------------------------------------------------------------------------    
+
     private
 
+    def setUnbalancedEacher( k )
+        debug! 10, "setting eacher unbalanced: #{k}"
+        defined? @eacher_unbalanced or @eacher_unbalanced = Hash.new
+        @eacher_unbalanced[k] = true
+    end
+    
+    def clearUnbalancedEacher( k )
+         debug! 10, "clearing eacher unbalanced: #{k}"
+       @eacher_unbalanced[k] = false if defined? @eacher_unbalanced
+    end
+    
+    def eacherUnbalanced?( k )
+        return false if ! defined? @eacher_unbalanced
+        return false if ! @eacher_unbalanced.has_key?( k )
+        return @eacher_unbalanced[k]
+    end
+    
     def cheap?( k )
         ! expensive? ( k )
     end
@@ -613,7 +671,7 @@ class Sadie
     
     def initializeEacherDirectory( key_prefix, current_dirpath )
         
-        puts "initializing eacher directory: #{current_dirpath}"
+        debug! 3, "initializing eacher directory: #{current_dirpath}"
         Dir.foreach( current_dirpath ) do |filename|
             
            # skip the dit dirs
@@ -635,7 +693,7 @@ class Sadie
     end
     
     def initializeEacherFile( key_prefix, filepath )
-        puts "initializing eacher file (#{key_prefix}): #{filepath}"
+        debug! 8, "initializing eacher file (#{key_prefix}): #{filepath}"
         setCurrentPrimerFilepath filepath
         setCurrentPrimerKeyPrefix key_prefix
         load filepath
@@ -676,9 +734,10 @@ class Sadie
     
 
     def isEacherKey?( key )
+        
         defined? @eacher_frame_redirect or return false
         @eacher_frame_redirect.has_key? key or return false
-        true
+        return true
     end
     
     def getEacherDependency( key )
@@ -722,6 +781,7 @@ class Sadie
         defined? @eacher_frame_redirect \
             or @eacher_frame_redirect = Hash.new
         providers.each do |provider|
+            debug! 10, "setting provider reverse map for #{provider} to #{sadiekey}"
             @eacher_frame_redirect[provider] = sadiekey
         end
         
@@ -736,7 +796,7 @@ class Sadie
     
     
     def memorizeEacherFileLocation( sadiekey, filepath )
-        
+        debug! 10, "memorizing eacher file location: #{filepath} for #{sadiekey}"
         # store the file path
         defined? @eacher_filepaths or @eacher_filepaths = Hash.new
         if ! @eacher_filepaths.has_key? sadiekey
@@ -1009,6 +1069,13 @@ class Sadie
         
     end
     
+    def primeable?( key )
+        p = getPrimerProvider( key )
+        return nil if ! defined? (p )
+        return nil if p == nil
+        return true
+    end
+    
     def getPrimerProvider( key )
         
         # fetch primers dirpath and validate the primer hash
@@ -1047,7 +1114,7 @@ class Sadie
             get( getEacherDependency( k ) )
         else
         
-            Sadie::eacherFrame( k, BEFORE )
+            #Sadie::eacherFrame( k, BEFORE )
             if provider  = getPrimerProvider( k )
                 primer_filepath, plugin_filepath, key_prefix = provider
             
@@ -1063,7 +1130,7 @@ class Sadie
                     setCurrentPrimerFilepath currfilepath
                 end
             end
-            Sadie::eacherFrame( k, AFTER )
+            #Sadie::eacherFrame( k, AFTER )
         end
     end
     

data/test/tc_sadie_toplevel.rb

@@ -16,6 +16,13 @@ class TestSadieToplevel < Test::Unit::TestCase
                                                 "sadie.primer_plugins_dirpath" => "lib/sadie/primer_plugins" } )
             sadie.initializePrimers
             
+            # test eacher on non-intentional non-prime
+            
+#             te = sadie.get( "toplevel_testeach" )
+#             puts "TE: #{te}"
+            assert_equal( sadie.get( "toplevel_testeach" ), "blahbloo" ) 
+            assert_equal( sadie.get( "toplevel_somegroup.eachtest" ), "blooblah" ) 
+                          
             # test top-level ini
             assert_equal( sadie.get( "toplevel.somegroup.somekey"       ), "someval"    )
             assert_equal( sadie.get( "toplevel.anothergroup.anotherkey" ), "anotherval" )

data/test/test_primers/toplevel.somegroup.somekey.each

@@ -0,0 +1,15 @@
+Sadie::eacher( :when => Sadie::BEFORE   ) do |sadie|
+    @testeach_toplevel2 = "bloo"
+    sadie.debug! 9, "here!!!"
+end
+
+Sadie::eacher( :when => Sadie::AFTER,
+               :provides => ["toplevel_somegroup.eachtest"]   ) do |sadie,val|
+               
+    @testeach_toplevel2 = "#{@testeach_toplevel2}blah"
+    sadie.debug! 9, "and!!!"
+    sadie.set "toplevel_somegroup.eachtest", @testeach_toplevel2 
+    sadie.debug! 9, "there!!!"
+    
+end
+

data/test/test_primers/toplevel_double.oneprime.each

@@ -0,0 +1,14 @@
+Sadie::eacher( :when => Sadie::BEFORE   ) do |sadie|
+    @testeach_topleveldouble = "blah"
+    sadie.debug! 10, ">>>>HERE!!!"
+end
+
+Sadie::eacher( :when => Sadie::AFTER,
+               :provides => ["toplevel_double.eachtest"]   ) do |sadie,val|
+               
+    @testeach_topleveldouble = "#{@testeach_topleveldouble}bloo"
+    sadie.set "toplevel_double.eachtest", @testeach_topleveldouble 
+    sadie.debug! 10, ">>>>THERE!!!"
+    
+end
+

data/test/test_primers/toplevel_testeach.res.rb

@@ -0,0 +1,4 @@
+Sadie::prime( "provides" =>     %w{ toplevel_testeach } ) do |sadie|
+    sadie.get "toplevel_double.twoprime"
+    sadie.set( "toplevel_testeach", sadie.get( "toplevel_double.eachtest" ) )
+end

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

@@ -4,7 +4,8 @@ Sadie::eacher( :when => Sadie::BEFORE   ) do |sadie|
     @testeach = "start"
 end
 
-Sadie::eacher(  :when => Sadie::EACH, :sadiekey => "two.deep.testquery.test.sql2ar"  ) do |sadie,param|
+Sadie::eacher(  :when => Sadie::EACH,
+                :sadiekey => "two.deep.testquery.test.sql2ar"  ) do |sadie,param|
     @testeach = "#{@testeach}#{param[0]}"
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sadie
 version: !ruby/object:Gem::Version
-  version: 0.0.46
+  version: 0.0.47
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-04-29 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dbi
-  requirement: &16171300 !ruby/object:Gem::Requirement
+  requirement: &22657300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16171300
+  version_requirements: *22657300
 - !ruby/object:Gem::Dependency
   name: dbd-mysql
-  requirement: &16170880 !ruby/object:Gem::Requirement
+  requirement: &22656880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16170880
+  version_requirements: *22656880
 description: Sadie is a data framework intended to ease the pain of managing related
   data.
 email:
@@ -80,9 +80,12 @@ files:
 - test/test_primers/.gitignore
 - test/test_primers/onedeep/multiresult.res
 - test/test_primers/toplevel.ini
+- test/test_primers/toplevel.somegroup.somekey.each
 - test/test_primers/toplevel_destructonget.res.rb
+- test/test_primers/toplevel_double.oneprime.each
 - test/test_primers/toplevel_double.res.rb
 - test/test_primers/toplevel_single.res.rb
+- test/test_primers/toplevel_testeach.res.rb
 - test/test_primers/two/deep/conf.ini
 - test/test_primers/two/deep/expensive.res
 - test/test_primers/two/deep/test.dbi.conx