sadie 0.0.34 → 0.0.35

data/CHANGELOG

@@ -10,4 +10,4 @@
 [0.0.15] actually committed changes to code this time...doh
 [0.0.16] bugfixes, updated tests
 [0.0.17] bugfixes, updated tests
-
+[0.0.18] initializePrimers is no longer called by constructor...must now call manually before using get method

data/lib/sadie/defaults.rb

@@ -6,15 +6,9 @@ require 'sadie/version'
 class Sadie
     
   #ppdp = File.join("lib/sadie/primer_plugins",File.join("gems/sadie-#{Sadie::VERSION}",ENV['GEM_HOME']))
-  ppdp = File.join(ENV['GEM_HOME'],"gems/sadie-#{Sadie::VERSION}","lib/sadie/primer_plugins")
-  puts "ppdf: #{ppdp}"
-  if ! File.exists? ppdp
-      ppdp = "lib/sadie/primer_plugins"
-  end
   
   DEFAULTS = {
     "sadie.primers_dirpath" => File.expand_path("primers","/var/sadie"),
-    "sadie.sessions_dirpath" => File.expand_path("sessions","/var/sadie"),
-    "sadie.primer_plugins_dirpath" => ppdp
+    "sadie.sessions_dirpath" => File.expand_path("sessions","/var/sadie")
   }
 end

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

@@ -1,4 +1,3 @@
-require 'pp'
 Sadie::registerPrimerPlugin( {  "match" => /\.ini$/,
                                 "accepts-block" => false,
                                 "prime-on-init" => true } ) do |sadie, key_prefix, primer_file_filepath|
@@ -9,12 +8,8 @@ Sadie::registerPrimerPlugin( {  "match" => /\.ini$/,
     ini_file_root = ini_file_basename.gsub( /\.ini$/, "" )
     
     if inihash = Sadie::iniFileToHash( primer_file_filepath )
-#         puts "got hash"
-        pp inihash
         inihash.each do |section, section_hash|
-#             puts "got at least one section"
             section_hash.each do |key, value|
-#                 puts "got at least one key"
                 key_to_set =  key_prefix + "." + ini_file_root + "." + section + "." + key
                 key_to_set = key_to_set.gsub(/^\./,"")
                 sadie.set( key_to_set, value )
@@ -23,42 +18,4 @@ Sadie::registerPrimerPlugin( {  "match" => /\.ini$/,
         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/version.rb

@@ -1,3 +1,3 @@
 class Sadie
-  VERSION = "0.0.34"
+  VERSION = "0.0.35"
 end

data/lib/sadie.rb

@@ -12,10 +12,9 @@ require 'erb'
 # sessions, lazy, on-demand, one-time evaluation and file-based storage/retrieval
 # operations for resource-heavy data.
 # 
-# For simplicity, it supports simple, ini-style data
-# initialization, but for efficient optimization of resource-intensive computations, it
-# supports on-demand, one-time evaluation of "primers" which may define, or prime,
-# multiple key, value pairs in a single run.
+# New types of data primers can be added by calling addPrimerPluginsDirPath with a
+# directory containing plugin definitions
+#
 
 def S( key )
     instance = Sadie::getCurrentSadieInstance
@@ -133,31 +132,31 @@ class Sadie
         
         # internalize defaults to shortterm
         DEFAULTS.each do |key, value|
-            if key.eql? "sadie.primer_plugins_dirpath"
-                addPrimerPluginsDirPath value 
-            else
+#             if key.eql? "sadie.primer_plugins_dirpath"
+#                 addPrimerPluginsDirPath value 
+#             else
                 _set( key, value )
-            end
+#             end
         end
         
         # internalize supplied defaults, postponing a set of sadie.primers_dirpath
         # until the end if one is supplied.  The reason for this is that the setter
         # attempts to read the plugins and if the primer plugin dirpath has not
         # yet been set, then it'll choke if it processes the wrong one first
-        delay_set_primers_dirpath = nil
+#         delay_set_primers_dirpath = nil
       
         # iterate over constructor args, but do primers_dirpath last since it
         # causes a call to initializePrimers
         options.each do |key, value|
-            if key.eql? "sadie.primers_dirpath"
-                delay_set_primers_dirpath = value
-            else
+#             if key.eql? "sadie.primers_dirpath"
+#                 delay_set_primers_dirpath = value
+#             else
                 set( key, value )
-            end
+#             end
         end
         
-        defined? delay_set_primers_dirpath \
-            and set( "sadie.primers_dirpath", delay_set_primers_dirpath )
+#         defined? delay_set_primers_dirpath \
+#             and set( "sadie.primers_dirpath", delay_set_primers_dirpath )
         
         # if a path to a session is given, init using session file
         if options.has_key?( "sadie.session_filepath" )
@@ -170,6 +169,16 @@ class Sadie
             set( "sadie.session_id", _generateNewSessionId )
         end
         
+        # add the default sadie plugins dir
+        plugins_dirpath = File.join(
+            ENV['GEM_HOME'],
+            "gems/sadie-#{Sadie::VERSION}",
+            "lib/sadie/primer_plugins"
+        )
+        if ! File.exists? plugins_dirpath   # for dev
+            plugins_dirpath = "lib/sadie/primer_plugins"
+        end        
+        addPrimerPluginsDirPath plugins_dirpath
         
     end
     
@@ -186,6 +195,8 @@ class Sadie
             or @plugins_dir_paths = Array.new        
         @plugins_dir_paths.include?(exppath) \
             or @plugins_dir_paths.unshift(exppath)
+        
+        @@primer_plugins_initialized = nil
     end
     
    
@@ -343,17 +354,17 @@ class Sadie
         
 #          puts "setCheap( #{k}, #{v} )"
 
-        if  k.eql? "sadie.primer_plugins_dirpath" 
-            puts "adding primer plugins dirpath via setCheap"
-            if v.respond_to? "each"
-                v.each do |plugindir|
-                    addPrimerPluginsDirPath plugindir
-                end
-            else
-                addPrimerPluginsDirPath v
-            end
-            v = @plugins_dir_paths
-        end
+#         if  k.eql? "sadie.primer_plugins_dirpath" 
+#             puts "adding primer plugins dirpath via setCheap"
+#             if v.respond_to? "each"
+#                 v.each do |plugindir|
+#                     addPrimerPluginsDirPath plugindir
+#                 end
+#             else
+#                 addPrimerPluginsDirPath v
+#             end
+#             v = @plugins_dir_paths
+#         end
         
         
         
@@ -362,9 +373,9 @@ class Sadie
         _expensive( k, false )
         
         # if we've reset the primers dirpath, init the primers
-        if k.eql?( "sadie.primers_dirpath" )
-            initializePrimers
-        end
+#         if k.eql?( "sadie.primers_dirpath" )
+#             initializePrimers
+#         end
         
        _primed( k, true )
         
@@ -433,6 +444,27 @@ class Sadie
         _initializeWithSessionId( get( "sadie.session_id" ) )
     end
     
+    def initializePrimers
+        
+        Sadie::setCurrentSadieInstance( self )
+        
+        # make sure primer plugins have been initialized
+        primerPluginsInitialized? \
+            or initializePrimerPlugins
+        
+        
+        primers_dirpath = get( "sadie.primers_dirpath" ) \
+            or raise "sadie.primers_dirpath not set"
+
+        return true if primersInitialized? primers_dirpath
+
+        puts "Initializing primers..."
+        initializePrimerDirectory( "", primers_dirpath )
+        puts "...finished initializing primers."
+        
+        @@flag_primed[primers_dirpath] = true
+    end
+    
 
     
     private
@@ -520,7 +552,7 @@ class Sadie
     def initializePrimerPlugins
         
         defined? @plugins_dir_paths \
-            or raise 'sadie.primer_plugins_dirpath not set'
+            or raise 'plugins_dir_paths not set'
         
         puts "Initializing primer plugins..."
         
@@ -565,27 +597,6 @@ class Sadie
         return @@flag_primed[toplevel_dirpath]
     end
     
-    def initializePrimers
-        
-        Sadie::setCurrentSadieInstance( self )
-        
-        # make sure primer plugins have been initialized
-        primerPluginsInitialized? \
-            or initializePrimerPlugins
-        
-        
-        primers_dirpath = get( "sadie.primers_dirpath" ) \
-            or raise "sadie.primers_dirpath not set"
-
-        return true if primersInitialized? primers_dirpath
-
-        puts "Initializing primers..."
-        initializePrimerDirectory( "", primers_dirpath )
-        puts "...finished initializing primers."
-        
-        @@flag_primed[primers_dirpath] = true
-    end
-    
     def initializePrimerDirectory( key_prefix, current_dirpath )
         puts "initializing primer directory: #{current_dirpath}"
         Dir.foreach( current_dirpath ) do |filename|

data/test/tc_sadie_toplevel.rb

@@ -14,6 +14,7 @@ class TestSadieToplevel < Test::Unit::TestCase
             sadie = Sadie::getSadieInstance( {  "sadie.primers_dirpath" => "test/test_primers",
                                                 "sadie.sessions_dirpath" => dir,
                                                 "sadie.primer_plugins_dirpath" => "lib/sadie/primer_plugins" } )
+            sadie.initializePrimers
             
             # test top-level ini
             assert_equal( sadie.get( "toplevel.somegroup.somekey"       ), "someval"    )

data/test/tc_sadie_twodeep.rb

@@ -10,6 +10,7 @@ class TestSadieTwoDeep < Test::Unit::TestCase
             sadie = Sadie::getSadieInstance( {  "sadie.primers_dirpath" => "test/test_primers",
                                                 "sadie.sessions_dirpath" => dir,
                                                 "sadie.primer_plugins_dirpath" => "lib/sadie/primer_plugins" } )
+            sadie.initializePrimers
             
             # test two-deep ini
             assert_equal( sadie.get( "two.deep.conf.section.thiskey" ), "thisval" )

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sadie
 version: !ruby/object:Gem::Version
-  version: 0.0.34
+  version: 0.0.35
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-17 00:00:00.000000000Z
+date: 2012-04-18 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dbi
-  requirement: &19769680 !ruby/object:Gem::Requirement
+  requirement: &20670980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19769680
+  version_requirements: *20670980
 - !ruby/object:Gem::Dependency
   name: mysql
-  requirement: &19769260 !ruby/object:Gem::Requirement
+  requirement: &20670560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19769260
+  version_requirements: *20670560
 - !ruby/object:Gem::Dependency
   name: dbd-mysql
-  requirement: &19768840 !ruby/object:Gem::Requirement
+  requirement: &20670140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19768840
+  version_requirements: *20670140
 description: Sadie is a data framework intended to ease the pain of managing related
   data.
 email: