sadie 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 059a448fff43ba5db055b31d3d3250c8f419c46e
-  data.tar.gz: 30b749609ac0075fe987fa0224c55110d1db2b61
+  metadata.gz: 3d35237ce7365435d796e102a1e8d8e2455d9363
+  data.tar.gz: 03e110b3da7e3ab6d6ad0445e3a7c6ce357fdb55
 SHA512:
-  metadata.gz: 946d2e414ea05b04e889f773d7e26b7cae6bce643fc2c54ebf190a613e5cdb886a0856f7a3d4fe249bb3a834f39d64cf716d8246c869ebfb4b19da171a5525eb
-  data.tar.gz: 9cfb3f414cfd401f199d704e0127de3d830b6152c0909c2f5da803bdc9a6fd2c030201f5be71b67baf12c6f91344814ee8dbe4b2d93618ac1d711056468d70a4
+  metadata.gz: 6f148d1da7eb8101b19d167ffb72fa7b1b0918093254fe62eaea3c915322b8658646150bbd89239a6ad31e29d73569977dbd9a4d5a05716f4eb2b351a343e6a6
+  data.tar.gz: 8e849601b5ea45613827de33250b67f31cc980aed5d306f6b051bc9438416b9f5a48f0f8f57d6795c53a48f7e11604308a8ddcbc55b8dd39fd2e0d0fc6d69b02

data/CHANGELOG

@@ -25,4 +25,5 @@
 [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
-[0.1.01] ** ground-up rewrite, ignore everything before this line if you're not a historian **
+[0.1.01] ** ground-up rewrite, ignore everything before this line if you're not a historian **
+[0.1.8] new version now at capability pairing with old version.

data/Rakefile

@@ -13,16 +13,27 @@ end
 
 namespace :spec do
   
+  desc "run all spec tests"
+  task :all => [ 'spec:sadie_server_lib', 'spec:storage_mechanism:memory',
+                 'spec:storage_mechanism:memory', 'spec:primer', 'spec:storage_manager',
+                 'spec:session', 'spec:server' ]do
+    a = 1 # a do nothing statement
+  end
+  
   desc "test sadie server library"
   task :sadie_server_lib do
     system "rspec spec/sadie_server_lib.rb"
   end
   
   namespace :storage_mechanism do
-    desc "test the memory based storage mechanism"
+    desc "test the memory-based storage mechanism"
     task :memory do
       system "rspec spec/storage_mechanisms/memory.rb"
     end
+    desc "test the file-based storage mechanism"
+    task :file do
+      system "rspec spec/storage_mechanisms/file.rb"
+    end
   end
   
   desc "test primer"

data/doc/{v2 → planning/brainstorm.txt}

@@ -158,4 +158,16 @@ It should be possible to choose the method of storage for an item
     end
   end
 
-  
+It should also be possible to set the default method of storage
+
+expire and refresh should accept the same triggers, which should be pluggable and should include, by default,
+
+* file changes
+* database table changes
+* git repository updates
+
+it should be possible to incorporate tests into the framework
+
+it should be possible to regularly run tests and make the output available as sadie data
+
+Right now, there's a refresh thread, an expiry thread, and the main thread, which essentially serves the get and set methods.  The set and unset methods are protected by the @storage_manager_thread_mutex such that the set and unset can never run at the same time and, similarly, only a single set or unset can be in operation at the same time.  And this is good.  But the next iteration will target a distributed deployment of cooperating sadie instances which share a redis server (or cluster) and a filesystem (possibly distributed via nfs or something similar) or an s3 bucket.  So, at this point, a simple mutex isn't really going to cut it.  I've found a redis-mutex gem that will be of some assistance.  But really what's needed is an abstraction on the locking mechanism...ideally even configurable to the point where I can sub in another in an initializer file...one that makes sense locally and in a distributed context.

data/doc/planning/todo.examples.txt

@@ -0,0 +1,7 @@
+===ActiveRecord/ActiveModel
+
+=Updating internal models based on git repo
+A great example would be to update activerecord and/or activemodel data representations based on changes in a git repo.  This could, in turn, fire off a series of tests that could 1) accept the changes and notify or 2) reject the changes, revert to earlier version and notify
+
+=Updating ActiveRecord database using internal models
+It would be handy to show how Sadie could augment a Rails site by using ActiveRecord models to update the database on which the Rails site depends.  Data mining would be an appropriate task to illustrate.

data/lib/primer.rb

@@ -13,6 +13,9 @@ class Primer
         if params.has_key?( :session )
           self.session = params[:session]
         end
+        if params.has_key?( :default_storage_mechanism )
+          self.storage_mechanism = params[:default_storage_mechanism]
+        end
       end      
     end
   end

data/lib/sadie/version.rb

@@ -1,3 +1,3 @@
 class Sadie
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end

data/lib/sadie_server.rb

@@ -1,10 +1,13 @@
 require 'sadie_session'
+require 'yaml'
+require 'pp'
 
 class SadieServer
   
-  attr_accessor :framework_dirpath
-  def initialize( params )
+  attr_accessor :framework_dirpath, :default_storage_mechanism
+  def initialize( params=nil )
     self.framework_dirpath = "/var/sadie"
+    self.default_storage_mechanism = :memory
     unless params.nil?
       if params.is_a? Hash
         if params.has_key?( :framework_dirpath )
@@ -12,7 +15,25 @@ class SadieServer
         end
       end      
     end
-    @sadie_session = SadieSession.new( :primers_dirpath => File.join( self.framework_dirpath, 'primers' ) )
+    
+    sess_params = {
+      :primers_dirpath => File.join( self.framework_dirpath, 'primers' )
+    }
+    if _config_hash.is_a?( Hash ) &&
+       _config_hash.has_key?( 'storage' ) &&
+       _config_hash['storage'].is_a?( Hash )
+      if _config_hash['storage'].has_key?( 'default_storage_mechanism' )
+        sess_params[:default_storage_mechanism] = _config_hash['storage']['default_storage_mechanism']
+      end
+      if _config_hash['storage'].has_key?( 'file' ) &&
+         _config_hash['storage']['file'].is_a?( Hash ) &&
+         _config_hash['storage']['file'].has_key?( 'key_storage_dirpath' )
+        sess_params[:file_storage_mechanism_dirpath] = _config_hash['storage']['file']['key_storage_dirpath']
+      end
+      
+    end
+    puts "sess_params: #{sess_params.pretty_inspect}"
+    @sadie_session = SadieSession.new( sess_params )
   end
    
   def get( key )
@@ -32,7 +53,25 @@ class SadieServer
 #   def get_multiple
 #   end
   
-  def self.proc_args( argv_param )
+  def _config_hash
+    
+    if @config_hash.nil?
+      @config_hash = YAML.load_file(File.join(self.framework_dirpath,'config','sadie.yml'))
+      
+      if @config_hash.is_a?( Hash )
+        if ( @config_hash.has_key?( 'storage' ) ) &&
+           ( @config_hash['storage'].is_a?( Hash ) ) &&
+           ( @config_hash['storage'].has_key?( 'default_storage_mechanism' ) )
+          @config_hash['storage']['default_storage_mechanism'] = @config_hash['storage']['default_storage_mechanism'].to_sym
+        end
+      end
+      
+    end
+    @config_hash
+    
+  end
+  
+  def self.proc_args( argv_param=nil )
     argv = argv_param.dup
     ARGV.clear
     ret = nil

data/lib/sadie_session.rb

@@ -1,5 +1,6 @@
 require 'sadie_storage_manager'
 require 'storage/memory'
+require 'storage/file'
 require 'primer'
 require 'thread'
 require 'rbtree'
@@ -22,14 +23,25 @@ class SadieSession
     end
     
     @registered_key = {}
-    
+    @default_storage_mechanism = :memory
+    @file_storage_mechanism_dirpath = nil
     unless params.nil?
       if params.is_a? Hash
+        
         if params.has_key?( :primers_dirpath )
           self.primers_dirpath = params[:primers_dirpath]
           puts "initializing session with primer dirpath: #{self.primers_dirpath}"
           _register_primers
         end
+        
+        if params.has_key?( :default_storage_mechanism )
+          @default_storage_mechanism = params[:default_storage_mechanism]
+        end
+        
+        if params.has_key?( :file_storage_mechanism_dirpath )
+          @file_storage_mechanism_dirpath = params[:file_storage_mechanism_dirpath]
+        end
+        
       end
     end
     
@@ -37,6 +49,7 @@ class SadieSession
     @storage_manager = SadieStorageManager.new
     @storage_manager_thread_mutex.synchronize do
       @storage_manager.register_storage_mechanism :memory, SadieStorageMechanismMemory.new
+      @storage_manager.register_storage_mechanism :file, SadieStorageMechanismFile.new(:key_storage_dirpath => @file_storage_mechanism_dirpath)
     end
   end
   
@@ -57,7 +70,7 @@ class SadieSession
   end
   
   def set( keys, value, params=nil )
-    expires, mechanism = :never, :memory
+    expires, mechanism = :never, @default_storage_mechanism
     unless params.nil?
       if params.is_a? Hash
         expires = params[:expire] if params.has_key?( :expire )
@@ -121,7 +134,8 @@ class SadieSession
   
   def _register_primers
     Dir.glob( File.join( self.primers_dirpath, "**", "*.rb" ) ).each do |primer_filepath|
-      p = Primer.new( :session => self )
+      p = Primer.new( :session => self,
+                      :default_storage_mechanism => @default_storage_mechanism )
       p.mode = :registration
       p.decorate( primer_filepath )
       _register_keys p.keys, primer_filepath

data/lib/sadie_storage_manager.rb

@@ -2,7 +2,6 @@ class SadieStorageManager
   
   def initialize
     @mechanisms = {}
-    @known_keys = {}
   end
   
   def register_storage_mechanism( handle, mechanism )
@@ -10,23 +9,35 @@ class SadieStorageManager
   end
   
   def mechanism_is_registered?( mechanism_handle )
-    
     @mechanisms.has_key?( mechanism_handle )
-    
+  end
+  
+  def registered_mechanisms
+    @mechanisms.keys
+  end
+  
+  def where_key?( key )
+    ret = nil
+    registered_mechanisms.each do |mech|
+      if @mechanisms[mech].has_key?( key )
+        ret = mech
+        break
+      end
+    end
+    ret
   end
   
   def has_key?( key )
-    @known_keys.has_key?( key )
+    ( ! where_key?( key ).nil? )
   end
   
   def get( key )
-    @mechanisms[@known_keys[key]].get( key ) if has_key?( key )
+    @mechanisms[where_key?( key )].get( key ) if has_key?( key )
   end
   
   def unset( key )
     if has_key?( key )
-      @mechanisms[@known_keys[key]].unset( key )
-      @known_keys.delete key
+      @mechanisms[where_key?( key )].unset( key )
     end
   end
   
@@ -44,16 +55,11 @@ class SadieStorageManager
             
               params[:keys].each do |key|
                 @mechanisms[params[:mechanism]].set( key, params[:value] )
-                @known_keys[key] = params[:mechanism]
               end
             end
-            
           end
-          
         end
-        
       end
-      
     end
   end
   

data/lib/storage/file.rb

@@ -0,0 +1,50 @@
+require 'sadie_storage_mechanism'
+class SadieStorageMechanismFile < SadieStorageMechanism
+  attr_accessor :key_storage_dirpath
+  
+  def initialize( params=nil )
+    self.key_storage_dirpath = "/tmp/sadie-key-storage"
+    unless params.nil?
+      if params.is_a?( Hash )
+        if params.has_key?( :key_storage_dirpath ) && ! params[:key_storage_dirpath].nil?
+          self.key_storage_dirpath = params[:key_storage_dirpath]
+        end
+      end
+    end
+  end
+  
+  def set( key, value )
+    _validate_keystorage_directory
+    File.open(_keyvalue_filepath(key), 'wb') { |file| file.write(value) }
+  end
+  
+  def get( key )
+    _validate_keystorage_directory
+    value = File.open(_keyvalue_filepath(key), 'rb') { |f| f.read }
+    value
+  end
+  
+  def unset( key )
+    _validate_keystorage_directory
+    File.delete(_keyvalue_filepath(key))
+  end
+  
+  def has_key?( key )
+    _validate_keystorage_directory
+    File.exists?(_keyvalue_filepath(key))
+  end
+  
+private
+
+  def _validate_keystorage_directory
+    raise "Key storage directory (#{self.key_storage_dirpath}) does not exist" unless _keystorage_directory_exists?
+  end
+
+  def _keyvalue_filepath(key)
+    File.join(self.key_storage_dirpath,key)
+  end
+  
+  def _keystorage_directory_exists?
+    Dir.exists?( self.key_storage_dirpath )
+  end
+end

data/spec/primer.rb

@@ -9,29 +9,40 @@ require 'pp'
 
 describe Primer do
   
+  before :each do
+    system 'install -d /tmp/sadie-test-keystor'
+    @session = SadieSession.new(
+      :primers_dirpath =>
+        File.join(
+          File.dirname( __FILE__ ), '..','test','v2',
+            'test_installation','primers'
+        ),
+      :file_storage_mechanism_dirpath => '/tmp/sadie-test-keystor'
+    )
+  end
+  
+  after :each do
+    system 'rm -rf /tmp/sadie-test-keystor'
+  end
+  
   it "should default to the memory storage mechanism" do
     p = Primer.new
     p.storage_mechanism.should == :memory
   end
   
   it  "should be able to successfully set using a storage manager" do
-    session = SadieSession.new( :primers_dirpath => File.join( File.dirname( __FILE__ ), '..','test','v2','test_installation','primers' ))
-    p = Primer.new( :session => session )
+    p = Primer.new( :session => @session )
     p.prime [ "simple.test"] do
       p.assign [ "simple.test" ] do
         p.set( "simple.value" )
       end
     end
-    session.get( "simple.test" ).should == "simple.value"
+    @session.get( "simple.test" ).should == "simple.value"
   end
   
   it "should not allow assignment for keys not mentioned in the prime directive" do
     expect {
-      session = SadieSession.new( :primers_dirpath => File.join( File.dirname( __FILE__ ), '..','test','v2','test_installation','primers' ))
-#       storage = SadieStorageManager.new
-#       mech = SadieStorageMechanismMemory.new
-#       storage.register_storage_mechanism :memory, mech
-      p = Primer.new( :session => session )
+      p = Primer.new( :session => @session )
       p.prime [ "simple.test"] do
         p.assign [ "simple.other" ]
       end
@@ -41,8 +52,7 @@ describe Primer do
   
   it "should not allow set for keys not mentioned in the assign directive" do
     expect {
-      session = SadieSession.new( :primers_dirpath => File.join( File.dirname( __FILE__ ), '..','test','v2','test_installation','primers' ))
-      p = Primer.new( :session => session )
+      p = Primer.new( :session => @session )
       p.prime [ "simple.test"] do
         p.assign [ "simple.test" ] do
           p.set ["simple.other"], "someval"
@@ -52,55 +62,50 @@ describe Primer do
   end
   
   it "should be ok to use strings instead of arrays for prime" do
-    session = SadieSession.new( :primers_dirpath => File.join( File.dirname( __FILE__ ), '..','test','v2','test_installation','primers' ))
-    p = Primer.new( :session => session )
+    p = Primer.new( :session => @session )
     p.prime "simple.test" do
       p.assign [ "simple.test" ] do
         p.set "someval"
       end
     end
-    session.get("simple.test").should == "someval"
+    @session.get("simple.test").should == "someval"
   end
   
   it "should be ok to use strings instead of arrays for assign" do
-    session = SadieSession.new( :primers_dirpath => File.join( File.dirname( __FILE__ ), '..','test','v2','test_installation','primers' ))
-    p = Primer.new( :session => session )
+    p = Primer.new( :session => @session )
     p.prime ["simple.test"] do
       p.assign "simple.test" do
         p.set "someval"
       end
     end
-    session.get("simple.test").should == "someval"
+    @session.get("simple.test").should == "someval"
   end
   
   it "should be ok to use strings instead of arrays for set" do
-    session = SadieSession.new( :primers_dirpath => File.join( File.dirname( __FILE__ ), '..','test','v2','test_installation','primers' ))
-    p = Primer.new( :session => session )
+    p = Primer.new( :session => @session )
     p.prime ["simple.test"] do
       p.assign "simple.test" do
         p.set "simple.test","someval"
       end
     end
-    session.get("simple.test").should == "someval"
+    @session.get("simple.test").should == "someval"
   end
   
   it "should successfully load a primer file using decorate method" do
-    session = SadieSession.new( :primers_dirpath => File.join( File.dirname( __FILE__ ), '..','test','v2','test_installation','primers' ))
-    p = Primer.new( :session => session )
+    p = Primer.new( :session => @session )
     p.decorate( File.join(File.dirname(__FILE__), '..', 'test', 'v2', 'test_installation', 'primers', 'minimal.rb') )
-    session.get( "minimal.primer" ).should == "testval"
+    @session.get( "minimal.primer" ).should == "testval"
   end
   
   it "should successfully execute before each clauses" do
     
-    session = SadieSession.new( :primers_dirpath => File.join( File.dirname( __FILE__ ), '..','test','v2','test_installation','primers' ))
-    p = Primer.new( :session => session )
+    p = Primer.new( :session => @session )
     def p.get_r
       @r
     end
     p.decorate( File.join(File.dirname(__FILE__), '..', 'test', 'v2', 'test_installation', 'primers', 'test_before_each.rb') )
-    session.get( "test.var1" ).should == "val1"
-    session.get( "test.var2" ).should == "val2"
+    @session.get( "test.var1" ).should == "val1"
+    @session.get( "test.var2" ).should == "val2"
     r= p.get_r
     r.has_key?("test.var1").should be_true
     r.has_key?("test.var2").should be_true
@@ -110,14 +115,13 @@ describe Primer do
   
   it "should successfully execute before key clauses" do
     
-    session = SadieSession.new( :primers_dirpath => File.join( File.dirname( __FILE__ ), '..','test','v2','test_installation','primers' ))
-    p = Primer.new( :session => session )
+    p = Primer.new( :session => @session )
     def p.get_r
       @r
     end
     p.decorate( File.join(File.dirname(__FILE__), '..', 'test', 'v2', 'test_installation', 'primers', 'test_before_key.rb') )
-    session.get( "test.var1" ).should == "val1"
-    session.get( "test.var2" ).should == "val2"
+    @session.get( "test.var1" ).should == "val1"
+    @session.get( "test.var2" ).should == "val2"
     r= p.get_r
     r.has_key?("test.var1").should be_true
     r.has_key?("test.var2").should be_false
@@ -126,14 +130,13 @@ describe Primer do
   
   it "should successfully execute after each clauses" do
     
-    session = SadieSession.new( :primers_dirpath => File.join( File.dirname( __FILE__ ), '..','test','v2','test_installation','primers' ))
-    p = Primer.new( :session => session )
+    p = Primer.new( :session => @session )
     def p.get_r
       @r
     end
     p.decorate( File.join(File.dirname(__FILE__), '..', 'test', 'v2', 'test_installation', 'primers', 'test_after_each.rb') )
-    session.get( "test.var1" ).should == "val1"
-    session.get( "test.var2" ).should == "val2"
+    @session.get( "test.var1" ).should == "val1"
+    @session.get( "test.var2" ).should == "val2"
     r= p.get_r
     r.has_key?("test.var1").should be_true
     r.has_key?("test.var2").should be_true
@@ -143,14 +146,13 @@ describe Primer do
   
   it "should successfully execute after key clauses" do
     
-    session = SadieSession.new( :primers_dirpath => File.join( File.dirname( __FILE__ ), '..','test','v2','test_installation','primers' ))
-    p = Primer.new( :session => session )
+    p = Primer.new( :session => @session )
     def p.get_r
       @r
     end
     p.decorate( File.join(File.dirname(__FILE__), '..', 'test', 'v2', 'test_installation', 'primers', 'test_after_key.rb') )
-    session.get( "test.var1" ).should == "val1"
-    session.get( "test.var2" ).should == "val2"
+    @session.get( "test.var1" ).should == "val1"
+    @session.get( "test.var2" ).should == "val2"
     r= p.get_r
     r.has_key?("test.var1").should be_true
     r.has_key?("test.var2").should be_false
@@ -158,10 +160,22 @@ describe Primer do
   end
   
   it "should set the refresh rate" do
-    session = SadieSession.new( :primers_dirpath => File.join( File.dirname( __FILE__ ), '..','test','v2','test_installation','primers' ))
-    p = Primer.new( :session => session )
+    p = Primer.new( :session => @session )
     p.decorate( File.join(File.dirname(__FILE__), '..', 'test', 'v2', 'test_installation', 'primers', 'test_refresh.rb') )
-    p.refresh_rate.should == 2
+    p.refresh_rate.should == 1
+  end
+  
+  it "should be possible to set the default storage mechanism" do
+    p1 = Primer.new( :session => @session )
+    p2 = Primer.new( :session => @session, :default_storage_mechanism => :file )
+    def p1.get_default_stormech
+      self.storage_mechanism
+    end
+    def p2.get_default_stormech
+      self.storage_mechanism
+    end
+    p1.get_default_stormech.should == :memory
+    p2.get_default_stormech.should == :file
   end
   
 end

data/spec/sadie_server.rb

@@ -4,8 +4,8 @@ $:.unshift File.join(File.dirname(__FILE__), '..')
 require 'sadie_server'
 
 class SadieServer
-  def self.proc_args( argv )
-    { :framework_dirpath => File.join( File.dirname( __FILE__ ), '..','test','v2','test_installation' ) }
+  def self.proc_args( argv=nil )
+    { :framework_dirpath => File.join( File.dirname( __FILE__ ), '..','test','v2','another_test_installation' ) }
   end
 end
 
@@ -20,6 +20,14 @@ describe 'the sadie server app' do
     Sinatra::Application
   end
   
+  before :each do
+    system 'install -d /tmp/sadie-test-keystor'
+  end
+  
+  after :each do
+    system 'rm -rf /tmp/sadie-test-keystor'
+  end
+  
   it "returns the correct value" do
     get '/minimal.primer'
     expect(last_response).to be_ok
@@ -36,4 +44,28 @@ describe 'the sadie server app' do
     expect(last_response).to be_ok
     expect(last_response.body).to eq('testval99')
   end
+  
+  it "should return the config as a hash" do
+    srv = SadieServer.new( SadieServer::proc_args )
+    srv._config_hash.is_a?( Hash ).should be_true
+  end
+  
+  it "should return the default storage mechanism config val as a symbol" do
+    srv = SadieServer.new( SadieServer::proc_args )
+    srv._config_hash['storage']['default_storage_mechanism'].is_a?(Symbol).should be_true
+  end
+  
+  it "should initialize the session with the default storage mechanism" do
+    srv = SadieServer.new( SadieServer::proc_args )
+    def srv.get_session
+      @sadie_session
+    end
+    sess = srv.get_session
+    puts "sess: #{sess.pretty_inspect}"
+    def sess.get_default_storage_mechanism
+      @default_storage_mechanism
+    end
+    sess.get_default_storage_mechanism.should == :file
+  end
+  
 end

data/spec/sadie_server_lib.rb

@@ -1,17 +1,20 @@
 $:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 require 'sadie_server'
 require 'pp'
+
+test_framework_dirpath = File.join( File.dirname(__FILE__), '..', 'test', 'v2', 'test_installation')
+
 describe SadieServer do
   
   describe '#proc_args' do
     
     it "should accept a framework-dirpath arg" do
       
-      result = SadieServer::proc_args ["--framework-dirpath=/tmp/sadietest"]
+      result = SadieServer::proc_args ["--framework-dirpath=#{test_framework_dirpath}"]
       result.should_not be_nil
       result.is_a?( Hash ).should be_true
       result.has_key?( :framework_dirpath ).should be_true
-      result[:framework_dirpath].should == '/tmp/sadietest'
+      result[:framework_dirpath].should == test_framework_dirpath
       
     end
     
@@ -21,8 +24,8 @@ describe SadieServer do
     
     it "should store the framework dirpath" do
       
-      serv = SadieServer.new( SadieServer::proc_args( ["--framework-dirpath=/tmp/sadietest"] ) )
-      serv.framework_dirpath.should == '/tmp/sadietest'
+      serv = SadieServer.new( SadieServer::proc_args( ["--framework-dirpath=#{test_framework_dirpath}"] ) )
+      serv.framework_dirpath.should == test_framework_dirpath
       
     end
     

data/spec/sadie_session.rb

@@ -3,74 +3,125 @@ require 'sadie_session'
 require 'pp'
 describe SadieSession do
   
+  before :each do
+    system 'install -d /tmp/sadie-test-keystor'
+    @session = SadieSession.new(
+      :primers_dirpath =>
+        File.join(
+          File.dirname( __FILE__ ), '..','test','v2',
+            'test_installation','primers'
+        ),
+      :file_storage_mechanism_dirpath => '/tmp/sadie-test-keystor'
+    )
+    @session_default_file = SadieSession.new(
+      :primers_dirpath =>
+        File.join(
+          File.dirname( __FILE__ ), '..','test','v2',
+            'test_installation','primers'
+        ),
+      :file_storage_mechanism_dirpath => '/tmp/sadie-test-keystor',
+      :default_storage_mechanism => :file
+    )
+  end
+  
+  after :each do
+    system 'rm -rf /tmp/sadie-test-keystor'
+  end
+  
   it "should be able to get and set" do
-    session = SadieSession.new( :primers_dirpath => File.join( File.dirname( __FILE__ ), '..','test','v2','test_installation','primers' ))
-    session.set('test.key','test.value')
-    session.get('test.key').should == 'test.value'
+    @session.set('test.key','test.value')
+    @session.get('test.key').should == 'test.value'
   end
   
   it "should register primers" do
-    session = SadieSession.new( :primers_dirpath => File.join( File.dirname( __FILE__ ), '..','test','v2','test_installation','primers' ))
-    session.primer_registered?("minimal.primer").should be_true
+    @session.primer_registered?("minimal.primer").should be_true
   end
   
   it "should not execute primer assign directives" do
-    session = SadieSession.new( :primers_dirpath => File.join( File.dirname( __FILE__ ), '..','test','v2','test_installation','primers' ))
-    session.has_key?("minimal.primer").should be_false
+    @session.has_key?("minimal.primer").should be_false
   end
   
   it "should be possible to _get_ registered keys" do
-    session = SadieSession.new( :primers_dirpath => File.join( File.dirname( __FILE__ ), '..','test','v2','test_installation','primers' ))
-    session.get("minimal.primer").should == "testval"    
+    @session.get("minimal.primer").should == "testval"    
   end
   
   it "should find primers in subdirectories" do
-    session = SadieSession.new( :primers_dirpath => File.join( File.dirname( __FILE__ ), '..','test','v2','test_installation','primers' ))
-    session.get("subdir.test").should == "testval"
+    @session.get("subdir.test").should == "testval"
   end
   
   it "should be possible to expire on get" do
-    session = SadieSession.new( :primers_dirpath => File.join( File.dirname( __FILE__ ), '..','test','v2','test_installation','primers' ))
-    session.get("test.expires.onget").should == "testval"
-    session.has_key?("test.expires.onget").should be_false
+    @session.get("test.expires.onget").should == "testval"
+    @session.has_key?("test.expires.onget").should be_false
   end
   
   it "should put keys in the expire schedule" do
-    session = SadieSession.new( :primers_dirpath => File.join( File.dirname( __FILE__ ), '..','test','v2','test_installation','primers' ))
-    
-    def session.in_expire_schedule?( key )
+    def @session.in_expire_schedule?( key )
       ( ! @expire_schedule.values.index(key).nil? )
     end
     
-    session.get("test.expires.nsecs").should == "testval"
-    session.in_expire_schedule?("test.expires.nsecs").should be true
+    @session.get("test.expires.nsecs").should == "testval"
+    @session.in_expire_schedule?("test.expires.nsecs").should be true
   end
   
   it "should expire keys using _expire_pass" do
     
-    session = SadieSession.new( :primers_dirpath => File.join( File.dirname( __FILE__ ), '..','test','v2','test_installation','primers' ))
-    def session.run_expiry_pass
+    def @session.run_expiry_pass
       _expiry_pass
     end
-    session.stub(:_current_time).and_return(2,5,8,11,14)
-    session.stub(:_expiry_loop).and_return(false)
-    session.get("test.expires.nsecs").should == "testval"
-    session.has_key?("test.expires.nsecs").should be_true
-    session.run_expiry_pass
-    session.has_key?("test.expires.nsecs").should be_false
+    @session.stub(:_current_time).and_return(2,5,8,11,14)
+    @session.stub(:_expiry_loop).and_return(false)
+    @session.get("test.expires.nsecs").should == "testval"
+    @session.has_key?("test.expires.nsecs").should be_true
+    @session.run_expiry_pass
+    @session.has_key?("test.expires.nsecs").should be_false
   end
   
   it "should refresh keys" do
     
-    session = SadieSession.new( :primers_dirpath => File.join( File.dirname( __FILE__ ), '..','test','v2','test_installation','primers' ))
-    def session.run_refresh_pass
+    def @session.run_refresh_pass
       _refresh_pass
     end
-    session.stub(:_current_time).and_return(2,5,8,11,14)
-    session.stub(:_refresh_loop).and_return(false)
-    session.get("test.refresh").should == "refresh"
-    session.run_refresh_pass
-    session.get("test.refresh").should == "rrefresh"
+    @session.stub(:_current_time).and_return(2,5,8,11,14)
+    @session.stub(:_refresh_loop).and_return(false)
+    @session.get("test.refresh").should == "refresh"
+    @session.run_refresh_pass
+    @session.get("test.refresh").should == "rrefresh"
+  end
+  
+  it "should set the default storage mechanism" do
+   def @session.get_default_storage_mechanism
+      @default_storage_mechanism
+    end
+    @session.get_default_storage_mechanism.should == :memory
+    @session_default_file = SadieSession.new(
+      :primers_dirpath => File.join( File.dirname( __FILE__ ), '..','test','v2','test_installation','primers' ),
+      :default_storage_mechanism => :file)
+    def @session_default_file.get_default_storage_mechanism
+      @default_storage_mechanism
+    end
+    @session_default_file.get_default_storage_mechanism.should == :file
+  end
+  
+  it "should initialize the file storage mechanism with the key storage dirpath set in init params" do
+    def @session.storagemgr
+      @storage_manager
+    end
+    mgr = @session.storagemgr
+    def mgr.getfilemech
+      @mechanisms[:file]
+    end
+    filemech = mgr.getfilemech
+    filemech.key_storage_dirpath.should == '/tmp/sadie-test-keystor'
+  end
+  
+  it "should store keys in different storage mechanisms" do
+    def @session.detect_storage_mechanism(key)
+      @storage_manager.where_key?( key )
+    end
+    @session.set('key1','val1',:mechanism => :memory)
+    @session.set('key2','val2',:mechanism => :file)
+    @session.detect_storage_mechanism('key1').should == :memory
+    @session.detect_storage_mechanism('key2').should == :file
   end
   
   # --- SLOW!
@@ -78,19 +129,17 @@ describe SadieSession do
     
     it "should expire keys after specified time" do
       
-      session = SadieSession.new( :primers_dirpath => File.join( File.dirname( __FILE__ ), '..','test','v2','test_installation','primers' ))
-      session.get("test.expires.nsecs").should == "testval"
-      session.has_key?("test.expires.nsecs").should be_true
+      @session.get("test.expires.nsecs").should == "testval"
+      @session.has_key?("test.expires.nsecs").should be_true
       sleep 2
-      session.has_key?("test.expires.nsecs").should be_false
+      @session.has_key?("test.expires.nsecs").should be_false
     end
     
     it "should refresh keys after specified time" do
       
-      session = SadieSession.new( :primers_dirpath => File.join( File.dirname( __FILE__ ), '..','test','v2','test_installation','primers' ))
-      session.get("test.refresh").should == "refresh"
+      @session.get("test.refresh").should == "refresh"
       sleep 2
-      session.get("test.refresh").should == "rrefresh"
+      @session.get("test.refresh").should == "rrefresh"
     end
     
   end

data/spec/storage_mechanisms/file.rb

@@ -0,0 +1,31 @@
+require 'storage/file'
+describe SadieStorageMechanismFile do
+  
+  before :each do
+    system 'install -d /tmp/stormech-file-test'
+    @mech = SadieStorageMechanismFile.new( :key_storage_dirpath => '/tmp/stormech-file-test' )
+  end
+  
+  after :each do
+    system 'rm -rf /tmp/stormech-file-test'
+  end
+  
+  it "should successfully return a set value" do
+    @mech.set 'somekey.test','some_value'
+    @mech.get( 'somekey.test' ).should == 'some_value'
+  end 
+  
+  it "should have a functional has_key? method" do
+    @mech.has_key?( "somekey.test" ).should be_false
+    @mech.set 'somekey.test','some_value'
+    @mech.has_key?( "somekey.test" ).should be_true
+  end
+  
+  it "should have a functional unset method" do
+    @mech.set 'somekey.test','some_value'
+    @mech.has_key?( "somekey.test" ).should be_true
+    @mech.unset 'somekey.test'
+    @mech.has_key?( "somekey.test" ).should be_false
+  end
+  
+end

data/test/v2/another_test_installation/config/sadie.yml

@@ -0,0 +1,4 @@
+storage:
+  default_storage_mechanism: file
+  file:
+    key_storage_dirpath: /tmp/sadie-test-keystor

data/test/v2/another_test_installation/primers/minimal.rb

@@ -0,0 +1,5 @@
+prime ["minimal.primer"] do
+  assign do
+    set "testval"
+  end
+end

data/test/v2/test_installation/config/sadie.yml

@@ -0,0 +1,4 @@
+storage:
+  default_storage_mechanism: memory
+  file:
+    key_storage_dirpath: /tmp/sadie-test-keystor

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sadie
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Fred McDavid
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-03 00:00:00.000000000 Z
+date: 2014-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -93,7 +93,8 @@ files:
 - bin/sadie_query_server
 - bin/sadie_server
 - bin/sadie_server.rb
-- doc/v2
+- doc/planning/brainstorm.txt
+- doc/planning/todo.examples.txt
 - lib/.gitignore
 - lib/primer.rb
 - lib/sadie/version.rb
@@ -101,6 +102,7 @@ files:
 - lib/sadie_session.rb
 - lib/sadie_storage_manager.rb
 - lib/sadie_storage_mechanism.rb
+- lib/storage/file.rb
 - lib/storage/memory.rb
 - rdoc/classes/Sadie.html
 - rdoc/created.rid
@@ -119,7 +121,11 @@ files:
 - spec/sadie_server_lib.rb
 - spec/sadie_session.rb
 - spec/storage_manager.rb
+- spec/storage_mechanisms/file.rb
 - spec/storage_mechanisms/memory.rb
+- test/v2/another_test_installation/config/sadie.yml
+- test/v2/another_test_installation/primers/minimal.rb
+- test/v2/test_installation/config/sadie.yml
 - test/v2/test_installation/primers/minimal.rb
 - test/v2/test_installation/primers/onelevel/twolevel/test_subdir.rb
 - test/v2/test_installation/primers/test_after_each.rb