sadie 0.0.51 → 0.0.52

data/CHANGELOG

@@ -24,3 +24,4 @@
 [0.0.49] botched the upload...resubmitting
 [0.0.50] fixed isset? bug (was only working for non-expensive keys)
 [0.0.51] eacher bugfix. now correctly handles specific keys.
+[0.0.52] code cleanup

data/lib/sadie/version.rb

@@ -1,3 +1,3 @@
 class Sadie
-  VERSION = "0.0.51"
+  VERSION = "0.0.52"
 end

data/lib/sadie.rb

@@ -261,6 +261,7 @@ class Sadie
             sadiekey    = params[:sadiekey]
         end
         
+        
         whichEacherFrame != Sadie::EACH and debug! 10, "whicheacherframe: #{whichEacherFrame}, occur_at: #{occur_at}"
         
         if midEacherInit?
@@ -282,6 +283,11 @@ class Sadie
             
         elsif whichEacherFrame == occur_at
             
+            # bugfix: running eachers that aren't supposed to be run because they're
+            #         in the same eacher file
+            #puts "sadiekey: #{sadiekey}, getEacherKey: #{getEacherKey}"
+            #return if sadiekey != getEacherKey
+           
             occur_at != Sadie::EACH and debug! 10, "pre-yield for skey: #{sadiekey}, #{occur_at}"
             
             if block.arity == 0
@@ -304,23 +310,18 @@ class Sadie
         
         occur_at != Sadie::EACH and 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
-        
         setEacherFrame( occur_at )
         defined? param and setEacherParam( param )
-        if filepaths = eacherFilepaths( key )
+        setEacherKey sadiekey
+        if filepaths = eacherFilepaths( sadiekey )
             filepaths.each do |filepath|
-                 occur_at != Sadie::EACH and debug! 8, "eacher frame loading: #{filepath} for key: #{key}"
+                 occur_at != Sadie::EACH and debug! 8, "eacher frame loading: #{filepath} for sadiekey: #{sadiekey}"
                 load filepath
             end
         end
         unsetEacherParam
         unsetEacherFrame
+        unsetEacherKey
     end
     
     
@@ -516,7 +517,7 @@ class Sadie
     # the cheap setter.  key, value pairs stored via this method are kept in memory
     def setCheap( k, v )
         
-        debug! 9,  "setting cheap: #{k}"
+#         debug! 8,  "setting cheap: [#{k},#{v}]"
         Sadie::eacherFrame( k, BEFORE ) if ! eacherUnbalanced?( k )
                 setUnbalancedEacher k
         
@@ -619,6 +620,12 @@ class Sadie
         @flag_primed[primers_dirpath] = true
     end
     
+    def getEacherKey
+        return nil if ! defined? @eacher_key
+        @eacher_key.last
+    end
+    
+
 
 # ------------------------------------------------------------------------------------------------    
 # ------------------------------------------------------------------------------------------------    
@@ -734,18 +741,33 @@ class Sadie
     end
     
     def setEacherParam( p )
-        @eacher_param = p
+        defined? @eacher_param or @eacher_param = Array.new
+        @eacher_param.push p
     end
     
     def unsetEacherParam
-        @eacher_param = nil
+        if defined? @eacher_param
+            @eacher_param.pop
+        end
     end
     
     def getEacherParam
-        @eacher_param
+        return nil if ! defined? @eacher_param
+        @eacher_param.last
     end
     
-
+    def setEacherKey( k )
+        defined? @eacher_key or @eacher_key = Array.new
+        @eacher_key.push k
+    end
+    
+    def unsetEacherKey
+        if defined? @eacher_key
+            @eacher_key.pop
+        end
+    end
+    
+ 
     def isEacherKey?( key )
         
         defined? @eacher_frame_redirect or return false

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sadie
 version: !ruby/object:Gem::Version
-  version: 0.0.51
+  version: 0.0.52
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-05-01 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dbi
-  requirement: &19570920 !ruby/object:Gem::Requirement
+  requirement: &14999900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19570920
+  version_requirements: *14999900
 - !ruby/object:Gem::Dependency
   name: dbd-mysql
-  requirement: &19570500 !ruby/object:Gem::Requirement
+  requirement: &14999480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19570500
+  version_requirements: *14999480
 description: Sadie is a data framework intended to ease the pain of managing related
   data.
 email: