sadie 0.0.52 → 0.1.6

data/spec/sadie_session.rb

@@ -0,0 +1,99 @@
+$:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+require 'sadie_session'
+require 'pp'
+describe SadieSession do
+  
+  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'
+  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
+  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
+  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"    
+  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"
+  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
+  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 )
+      ( ! @expire_schedule.values.index(key).nil? )
+    end
+    
+    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
+      _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
+  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
+      _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"
+  end
+  
+  # --- SLOW!
+  if ENV.has_key?('SADIE_SESSION_TEST_TIMERS') && ENV['SADIE_SESSION_TEST_TIMERS'].to_i == 1
+    
+    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
+      sleep 2
+      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"
+      sleep 2
+      session.get("test.refresh").should == "rrefresh"
+    end
+    
+  end
+  
+
+end

data/spec/storage_manager.rb

@@ -0,0 +1,58 @@
+$:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+require 'sadie_storage_manager'
+require 'storage_mechanisms/memory'
+
+describe SadieStorageManager do
+  
+  it "should be able to get and set using the memory storage mechanism" do
+    
+    storage = SadieStorageManager.new
+    mech = SadieStorageMechanismMemory.new
+    storage.register_storage_mechanism :memory, mech
+    storage.set( :mechanism => :memory,
+                 :keys => [ "simple.test" ],
+                 :value => "test.value" )
+    mech.get( "simple.test" ).should == "test.value"
+  end
+  
+  it "should report a mechanism is registered after it has been registered" do
+    storage = SadieStorageManager.new
+    mech = SadieStorageMechanismMemory.new
+    storage.register_storage_mechanism :memory, mech
+    storage.mechanism_is_registered?( :memory ).should be_true
+  end
+  
+  it "should have a functional has_key? method" do
+    storage = SadieStorageManager.new
+    mech = SadieStorageMechanismMemory.new
+    storage.register_storage_mechanism :memory, mech
+    storage.has_key?( "test.key" ).should be_false
+    storage.set( :keys => ["test.key"],
+                 :value => "test.value",
+                 :mechanism => :memory )
+    storage.has_key?( "test.key" ).should be_true
+  end
+  
+  it "should have a functional get method" do
+    storage = SadieStorageManager.new
+    mech = SadieStorageMechanismMemory.new
+    storage.register_storage_mechanism :memory, mech
+    storage.set( :keys => ["test.key"],
+                 :value => "test.value",
+                 :mechanism => :memory )
+    storage.get( "test.key" ).should == "test.value"
+  end
+  
+  it "should have a functional unset method" do
+    storage = SadieStorageManager.new
+    mech = SadieStorageMechanismMemory.new
+    storage.register_storage_mechanism :memory, mech
+    storage.set( :keys => ["test.key"],
+                 :value => "test.value",
+                 :mechanism => :memory )
+    storage.has_key?( "test.key" ).should be_true
+    storage.unset "test.key"
+    storage.has_key?( "test.key" ).should be_false
+  end
+  
+end

data/spec/storage_mechanisms/memory.rb

@@ -0,0 +1,28 @@
+require 'storage/memory'
+describe SadieStorageMechanismMemory do
+  
+  it "should successfully return a set value" do
+    
+    mech = SadieStorageMechanismMemory.new
+    mech.set 'somekey.test','some_value'
+    mech.get( 'somekey.test' ).should == 'some_value'
+    
+  end
+  
+  it "should have a functional has_key? method" do
+    mech = SadieStorageMechanismMemory.new
+    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 = SadieStorageMechanismMemory.new
+    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/test_installation/primers/minimal.rb

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

data/test/v2/test_installation/primers/onelevel/twolevel/test_subdir.rb

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

data/test/v2/test_installation/primers/test_after_each.rb

@@ -0,0 +1,14 @@
+prime ["test.var1","test.var2"] do
+  
+  @r = {}
+  
+  after :each do |varname,val|
+    @r[varname] = val
+  end
+  
+  assign do
+    set "test.var1","val1"
+    set "test.var2","val2"
+  end
+  
+end

data/test/v2/test_installation/primers/test_after_key.rb

@@ -0,0 +1,14 @@
+prime ["test.var1","test.var2"] do
+  
+  @r = {}
+  
+  after "test.var1" do |varname,val|
+    @r[varname] = val
+  end
+  
+  assign do
+    set "test.var1","val1"
+    set "test.var2","val2"
+  end
+  
+end

data/test/v2/test_installation/primers/test_before_each.rb

@@ -0,0 +1,14 @@
+prime ["test.var1","test.var2"] do
+  
+  @r = {}
+  
+  before :each do |varname|
+    @r[varname] = 1
+  end
+  
+  assign do
+    set "test.var1","val1"
+    set "test.var2","val2"
+  end
+  
+end

data/test/v2/test_installation/primers/test_before_key.rb

@@ -0,0 +1,14 @@
+prime ["test.var1","test.var2"] do
+  
+  @r = {}
+  
+  before "test.var1" do |varname|
+    @r[varname] = 1
+  end
+  
+  assign do
+    set "test.var1","val1"
+    set "test.var2","val2"
+  end
+  
+end

data/test/v2/test_installation/primers/test_expires_after_n_secs.rb

@@ -0,0 +1,6 @@
+prime ["test.expires.nsecs"] do
+  expire 1
+  assign do
+    set "testval"
+  end
+end

data/test/v2/test_installation/primers/test_expires_on_get.rb

@@ -0,0 +1,6 @@
+prime ["test.expires.onget"] do
+  expire :on_get
+  assign do
+    set "testval"
+  end
+end

data/test/v2/test_installation/primers/test_refresh.rb

@@ -0,0 +1,10 @@
+prime ["test.refresh"] do
+  refresh 1
+  assign do
+    if session.has_key?( "test.refresh" )
+      set session.get("test.refresh").gsub(/^r/,"rr")
+    else
+      set "refresh"
+    end
+  end
+end

metadata

@@ -1,43 +1,80 @@
 --- !ruby/object:Gem::Specification
 name: sadie
 version: !ruby/object:Gem::Version
-  version: 0.0.52
-  prerelease: 
+  version: 0.1.6
 platform: ruby
 authors:
 - Fred McDavid
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-01 00:00:00.000000000Z
+date: 2014-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: dbi
-  requirement: &14999900 !ruby/object:Gem::Requirement
-    none: false
+  name: sinatra
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.4
   type: :runtime
   prerelease: false
-  version_requirements: *14999900
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.4.4
 - !ruby/object:Gem::Dependency
-  name: dbd-mysql
-  requirement: &14999480 !ruby/object:Gem::Requirement
-    none: false
+  name: rbtree
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.2
   type: :runtime
   prerelease: false
-  version_requirements: *14999480
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.2
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Sadie is a data framework intended to ease the pain of managing related
   data.
 email:
 - fred@landmetrics.com
-executables: []
+executables:
+- sadie
+- sadie_query_server
+- sadie_server
+- sadie_server.rb
 extensions: []
 extra_rdoc_files:
 - README
@@ -52,16 +89,19 @@ files:
 - README
 - Rakefile
 - TODO
+- bin/sadie
+- bin/sadie_query_server
+- bin/sadie_server
+- bin/sadie_server.rb
+- doc/v2
 - lib/.gitignore
-- lib/sadie.rb
-- lib/sadie/debug.rb
-- lib/sadie/defaults.rb
-- lib/sadie/primer_plugins/DatabaseConnection.plugin.rb
-- lib/sadie/primer_plugins/IniFile.plugin.rb
-- lib/sadie/primer_plugins/Resource.plugin.rb
-- lib/sadie/primer_plugins/SQLQueryTo2DArray.plugin.rb
-- lib/sadie/primer_plugins/TemplateTextFile.plugin.rb
+- lib/primer.rb
 - lib/sadie/version.rb
+- lib/sadie_server.rb
+- lib/sadie_session.rb
+- lib/sadie_storage_manager.rb
+- lib/sadie_storage_mechanism.rb
+- lib/storage/memory.rb
 - rdoc/classes/Sadie.html
 - rdoc/created.rid
 - rdoc/files/README.html
@@ -74,47 +114,42 @@ files:
 - rdoc/index.html
 - rdoc/rdoc-style.css
 - sadie.gemspec
-- test/README
-- test/tc_sadie_toplevel.rb
-- test/tc_sadie_twodeep.rb
-- 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
-- test/test_primers/two/deep/test_template.txt.tmpl
-- test/test_primers/two/deep/testquery.test.sql2ar
-- test/test_primers/two/deep/testquery.test.sql2ar.each
-- test/test_primers/two/deep/two_results.res
+- spec/primer.rb
+- spec/sadie_server.rb
+- spec/sadie_server_lib.rb
+- spec/sadie_session.rb
+- spec/storage_manager.rb
+- spec/storage_mechanisms/memory.rb
+- 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
+- test/v2/test_installation/primers/test_after_key.rb
+- test/v2/test_installation/primers/test_before_each.rb
+- test/v2/test_installation/primers/test_before_key.rb
+- test/v2/test_installation/primers/test_expires_after_n_secs.rb
+- test/v2/test_installation/primers/test_expires_on_get.rb
+- test/v2/test_installation/primers/test_refresh.rb
 homepage: http://www.landmetrics.com/Sadie
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: sadie
-rubygems_version: 1.8.15
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A gem that provides sadie, a data access framework
 test_files: []

data/lib/sadie/debug.rb

@@ -1 +0,0 @@
-#

data/lib/sadie/defaults.rb

@@ -1,14 +0,0 @@
-# ==Notes
-# this file sets defaults which can and should be overridden using arguments
-# the sadie constructor
-require 'sadie/version'
-
-class Sadie
-    
-  #ppdp = File.join("lib/sadie/primer_plugins",File.join("gems/sadie-#{Sadie::VERSION}",ENV['GEM_HOME']))
-  
-  DEFAULTS = {
-    "sadie.primers_dirpath" => File.expand_path("primers","/var/sadie"),
-    "sadie.sessions_dirpath" => File.expand_path("sessions","/var/sadie")
-  }
-end

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

@@ -1,80 +0,0 @@
-# WARNING: THIS DOESN'T WORK YET!!!
-
-Sadie::registerPrimerPlugin( {  "match" => /\.dbi\.conx$/,
-                                "accepts-block" => false,
-                                "prime-on-init" => false } ) do |sadie, key_prefix, primer_file_filepath|
-    
-    # determine key
-    sadie_key = key_prefix+'.'+File.basename( primer_file_filepath )
-    
-    
-    Sadie::prime( { "provides" => [ sadie_key ] }) do |sadie|
-        
-        if inihash = Sadie::iniFileToHash( primer_file_filepath )
-            dbparams = Hash.new
-            
-            inihash.each do |section, section_hash|
-                section.match(/^connection$/) \
-                    or next
-                section_hash.each do |key, value|
-                    dbparams[key] = value
-                end
-            end
-            
-            if ! dbparams.empty?
-                # validate dbistr
-                dbparams.has_key?( 'dbistr' ) \
-                    or raise 'requried connection::dbistr was not defined'
-                
-                # default user and pass to nil
-                user = dbparams.has_key?('user') ? dbparams['user']: nil;
-                pass = dbparams.has_key?('pass') ? dbparams['pass']: nil;
-                
-                # call connect with block
-                require 'rubygems'
-                #require 'mysql'
-                #require 'pg'
-                require 'dbi'
-                #require "dbd-mysql"
-                
-                begin
-                    dbh = DBI.connect( dbparams['dbistr'], user, pass )
-                rescue DBI::DatabaseError => e
-                    puts "A database connection error occurred..."
-                    puts "  Error code: #{e.err}"
-                    puts "  Error message: #{e.errstr}"
-                    exit
-                end
-                
-                # determine key
-                #sadie_key = key_prefix+'.'+File.basename( primer_file_filepath )
-                
-#                 puts "installing db connection: #{sadie_key}"
-                
-                sadie.set( sadie_key, dbh )
-                
-            end
-        end
-    end            
-    
-#     # build parameter hash
-#     dbparams = Hash.new
-#     inifile = Ini.new( primer_file_filepath )
-#     inifile.each do | section, key_from_ini_file, value |
-#         section.match(/^connection$/) \
-#             or next
-#         dbparams[key_from_ini_file] = value
-#     end
-#     
-#     # validate dbistr
-#     dbparams.has_key?( 'dbistr' ) \
-#         or raise 'requried connection::dbistr was not defined'
-#     
-#     # default user and pass to nil
-#     user = dbparams.has_key?('user') ? dbparams['user']: nil;
-#     pass = dbparams.has_key?('pass') ? dbparams['pass']: nil;
-#     
-#     # call connect with block
-#     require 'dbi'
-#     DBI.connect( dbparams['dbistr'], user, pass, block )
-end

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

@@ -1,23 +0,0 @@
-Sadie::registerPrimerPlugin( {  "match" => /\.ini$/,
-                                "accepts-block" => false,
-                                "prime-on-init" => true } ) do |sadie, key_prefix, primer_file_filepath|
-    
-    puts "processing ini file: #{primer_file_filepath}"
-    
-    ini_file_basename = File.basename primer_file_filepath
-    ini_file_root = ini_file_basename.gsub( /\.ini$/, "" )
-    
-    if inihash = Sadie::iniFileToHash( primer_file_filepath )
-        inihash.each do |section, section_hash|
-            key_to_set =  key_prefix + "." + ini_file_root + "." + section
-            key_to_set = key_to_set.gsub(/^\./,"")
-            sadie.set key_to_set, section_hash
-            section_hash.each do |key, value|
-                kvkey_to_set =  key_to_set + "." + key
-                sadie.set( kvkey_to_set, value )
-                
-            end  
-        end
-    end
-    
-end

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

@@ -1,7 +0,0 @@
-Sadie::registerPrimerPlugin( {  "match" => /(\.res|\.res\.rb)$/,
-                                "accepts-block" => false,
-                                "prime-on-init" => false } ) do |sadie, key_prefix, primer_file_filepath, block|
-    
-    load( primer_file_filepath )
-    
-end

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

@@ -1,39 +0,0 @@
-Sadie::registerPrimerPlugin( { "match" => /\.sql2ar$/,
-                               "accepts-block" => false,
-                               "prime-on-init" => false } ) do |sadie, key_prefix, primer_file_filepath|
-    
-    primer_file_basename = File.basename( primer_file_filepath )
-    sadie_key = key_prefix + '.' + primer_file_basename
-    sadie_key = sadie_key.gsub(/^\./,"")
-    
-    #sadie.debug! 10, "registersql2ar[#{sadie_key},#{primer_file_basename}]"
-    
-    Sadie::prime( { "provides" => [ sadie_key ] }) do |sadie|
-        #puts "priming sql2ar: #{sadie_key}"
-        if ( matches = primer_file_basename.match( /^(.*)\.([^\.]+)\.sql2ar$/ ) )
-            dbi_sadie_key = key_prefix + '.' + matches[2] + ".dbi.conx"
-            #puts "dbi_sadie_key: #{dbi_sadie_key}"
-            #dbconx = sadie.get( dbi_sadie_key )
-            if ( dbconx = sadie.get( dbi_sadie_key ) )
-                if sql_query = Sadie::templatedFileToString( primer_file_filepath )
-                    sadie.debug! 5, "sql2ar: querying database: #{sql_query}"
-                    sth = dbconx.prepare(sql_query)
-                    sth.execute
-                    
-                    result = Array.new
-                    while row = sth.fetch
-                        row_as_array = row.to_a
-                        sadie.debug! 10,  "row_as_array: #{row_as_array}"
-                        Sadie::eacherFrame sadie_key, Sadie::EACH, row_as_array
-                        result.push row_as_array
-                    end
-                    
-                    sadie.setExpensive( sadie_key, result )
-                    
-                    # Close the statement handle when done
-                    sth.finish
-                end
-            end
-        end
-    end
-end

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

@@ -1,13 +0,0 @@
-Sadie::registerPrimerPlugin( { "match" => /\.tmpl$/,
-                               "accepts-block" => false,
-                               "prime-on-init" => false } ) do |sadie, key_prefix, primer_file_filepath|
-    primer_file_basename = File.basename( primer_file_filepath )
-    sadie_key = key_prefix + '.' + primer_file_basename
-    sadie_key = sadie_key.gsub(/^\./,"")
-    
-    Sadie::prime( { "provides" => [ sadie_key ] }) do |sadie|
-    
-        sadie.setExpensive( sadie_key, Sadie::templatedFileToString( primer_file_filepath ) )
-    
-    end
-end