sadie 0.0.47 → 0.0.48

data/CHANGELOG

@@ -20,3 +20,4 @@
 [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.47] eachers now sane and can be set on any key, even other eacher provided keys
+[0.0.48] fixed bug that limited to one the number of eachers that could be associated with a key.

data/lib/sadie.rb

@@ -261,6 +261,8 @@ class Sadie
             sadiekey    = params["sadiekey"]
         end
         
+        whichEacherFrame != Sadie::EACH and debug! 8, "whicheacherframe: #{whichEacherFrame}, occur_at: #{occur_at}"
+        
         if midEacherInit?
             
             debug! 10, "in mid eacher init (#{sadiekey})"
@@ -279,11 +281,16 @@ class Sadie
             end            
             
         elsif whichEacherFrame == occur_at
+            
+            occur_at != Sadie::EACH and debug! 8, "pre-yield for skey: #{sadiekey}, #{occur_at}"
+            
             if block.arity == 0
                 yield self
             else
                 yield self, getEacherParam
             end
+            
+            occur_at != Sadie::EACH and debug! 8, "post-yield for skey: #{sadiekey}, #{occur_at}"
         end
     end
     
@@ -295,7 +302,7 @@ class Sadie
     #    
     def eacherFrame( sadiekey, occur_at, param=nil )
         
-        debug! 8, "eacherFrame(#{occur_at}): #{sadiekey}"
+        occur_at != Sadie::EACH and debug! 8, "eacherFrame(#{occur_at}): #{sadiekey}"
         
         key = sadiekey
 #         if defined? @eacher_frame_redirect
@@ -308,7 +315,7 @@ class Sadie
         defined? param and setEacherParam( param )
         if filepaths = eacherFilepaths( key )
             filepaths.each do |filepath|
-                debug! 10, "each frame loading: #{filepath} for key: #{key}"
+                 occur_at != Sadie::EACH and debug! 8, "eacher frame loading: #{filepath} for key: #{key}"
                 load filepath
             end
         end
@@ -709,15 +716,19 @@ class Sadie
     
     
     def whichEacherFrame
-        @eacher_frame
+        return nil if ! defined? @eacher_frame
+        @eacher_frame.last
     end
     
     def setEacherFrame( f )
-        @eacher_frame = f
+        defined? @eacher_frame or @eacher_frame = Array.new
+        @eacher_frame.push f
     end
     
     def unsetEacherFrame
-        @eacher_frame = nil
+        if defined? @eacher_frame
+            @eacher_frame.pop
+        end
     end
     
     def setEacherParam( p )

data/lib/sadie/version.rb

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

metadata

@@ -1,49 +1,62 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: sadie
-version: !ruby/object:Gem::Version
-  version: 0.0.47
+version: !ruby/object:Gem::Version 
+  hash: 127
   prerelease: 
+  segments: 
+  - 0
+  - 0
+  - 48
+  version: 0.0.48
 platform: ruby
-authors:
+authors: 
 - Fred McDavid
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-29 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-04-30 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: dbi
-  requirement: &22657300 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
-  prerelease: false
-  version_requirements: *22657300
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: dbd-mysql
-  requirement: &22656880 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
-  prerelease: false
-  version_requirements: *22656880
-description: Sadie is a data framework intended to ease the pain of managing related
-  data.
-email:
+  version_requirements: *id002
+description: Sadie is a data framework intended to ease the pain of managing related data.
+email: 
 - fred@landmetrics.com
 executables: []
+
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - README
 - CHANGELOG
 - TODO
-files:
+files: 
 - .gitignore
 - CHANGELOG
 - Gemfile
@@ -95,26 +108,36 @@ files:
 - test/test_primers/two/deep/two_results.res
 homepage: http://www.landmetrics.com/Sadie
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: sadie
 rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: A gem that provides sadie, a data access framework
 test_files: []
+