juno 0.2.0 → 0.2.1

data/spec/generate.rb

@@ -6,49 +6,104 @@ TESTS = {
   'simple_memory' => {
     :store => :Memory
   },
+  'simple_memory_with_expires' => {
+    :store => :Memory,
+    :options => ':expires => true',
+    :specs => EXPIRES_SPECS,
+  },
   'simple_file' => {
     :store => :File,
     :options => ':dir => File.join(make_tempdir, "simple_file")'
   },
+  'simple_file_with_expires' => {
+    :store => :File,
+    :options => ':dir => File.join(make_tempdir, "simple_file_with_expires"), :expires => true',
+    :specs => EXPIRES_SPECS
+  },
   'simple_hashfile' => {
     :store => :HashFile,
     :options => ':dir => File.join(make_tempdir, "simple_hashfile")'
   },
+  'simple_hashfile_with_expires' => {
+    :store => :HashFile,
+    :options => ':dir => File.join(make_tempdir, "simple_hashfile_with_expires"), :expires => true',
+    :specs => EXPIRES_SPECS
+  },
   'simple_cassandra' => {
     :store => :Cassandra,
-    :specs => EXPIRES_SPECS,
+    :specs => EXPIRES_SPECS
   },
   'simple_dbm' => {
     :store => :DBM,
     :options => ':file => File.join(make_tempdir, "simple_dbm")'
   },
+  'simple_dbm_with_expires' => {
+    :store => :DBM,
+    :options => ':file => File.join(make_tempdir, "simple_dbm_with_expires"), :expires => true',
+    :specs => EXPIRES_SPECS
+  },
   'simple_gdbm' => {
     :store => :GDBM,
     :options => ':file => File.join(make_tempdir, "simple_gdbm")'
   },
+  'simple_gdbm_with_expires' => {
+    :store => :GDBM,
+    :options => ':file => File.join(make_tempdir, "simple_gdbm_with_expires"), :expires => true',
+    :specs => EXPIRES_SPECS
+  },
   'simple_sdbm' => {
     :store => :SDBM,
     :options => ':file => File.join(make_tempdir, "simple_sdbm")'
   },
+  'simple_sdbm_with_expires' => {
+    :store => :SDBM,
+    :options => ':file => File.join(make_tempdir, "simple_sdbm_with_expires"), :expires => true',
+    :specs => EXPIRES_SPECS
+  },
   'simple_pstore' => {
     :store => :PStore,
     :options => ':file => File.join(make_tempdir, "simple_pstore")'
   },
+  'simple_pstore_with_expires' => {
+    :store => :PStore,
+    :options => ':file => File.join(make_tempdir, "simple_pstore_with_expires"), :expires => true',
+    :specs => EXPIRES_SPECS
+  },
   'simple_yaml' => {
     :store => :YAML,
     :options => ':file => File.join(make_tempdir, "simple_yaml")'
   },
+  'simple_yaml_with_expires' => {
+    :store => :YAML,
+    :options => ':file => File.join(make_tempdir, "simple_yaml_with_expires"), :expires => true',
+    :specs => EXPIRES_SPECS
+  },
   'simple_localmemcache' => {
     :store => :LocalMemCache,
     :options => ':file => File.join(make_tempdir, "simple_localmemcache")'
   },
+  'simple_localmemcache_with_expires' => {
+    :store => :LocalMemCache,
+    :options => ':file => File.join(make_tempdir, "simple_localmemcache_with_expires"), :expires => true',
+    :specs => EXPIRES_SPECS
+  },
   'simple_tokyocabinet' => {
     :store => :TokyoCabinet,
     :options => ':file => File.join(make_tempdir, "simple_tokyocabinet")'
   },
+  'simple_tokyocabinet_with_expires' => {
+    :store => :TokyoCabinet,
+    :options => ':file => File.join(make_tempdir, "simple_tokyocabinet_with_expires"), :expires => true',
+    :specs => EXPIRES_SPECS
+  },
   'simple_sqlite' => {
     :store => :Sqlite,
-    :options => ':file => ":memory:"'
+    :options => ':file => File.join(make_tempdir, "simple_sqlite")'
+  },
+  'simple_sqlite_with_expires' => {
+    :store => :Sqlite,
+    :options => ':file => File.join(make_tempdir, "simple_sqlite_with_expires"), :expires => true',
+    :specs => EXPIRES_SPECS
   },
   'simple_redis' => {
     :store => :Redis,
@@ -75,14 +130,31 @@ TESTS = {
     # We don't want Riak warnings in tests
     :preamble => "require 'riak'\n\nRiak.disable_list_keys_warnings = true\n\n"
   },
+  'simple_riak_with_expires' => {
+    :store => :Riak,
+    :options => ":bucket => 'simple_riak_with_expires', :expires => true",
+    # We don't want Riak warnings in tests
+    :preamble => "require 'riak'\n\nRiak.disable_list_keys_warnings = true\n\n",
+    :specs => EXPIRES_SPECS
+  },
   'simple_couch' => {
     :store => :Couch,
     :options => ":db => 'simple_couch'"
   },
+  'simple_couch_with_expires' => {
+    :store => :Couch,
+    :options => ":db => 'simple_couch_with_expires', :expires => true",
+    :specs => EXPIRES_SPECS
+  },
   'simple_mongo' => {
     :store => :Mongo,
     :options => ":db => 'simple_mongo'"
   },
+  'simple_mongo_with_expires' => {
+    :store => :Mongo,
+    :options => ":db => 'simple_mongo_with_expires', :expires => true",
+    :specs => EXPIRES_SPECS
+  },
   'simple_null' => {
     :store => :Null,
     :specs => [:null, :marshallable_key, :returndifferent]
@@ -93,23 +165,40 @@ TESTS = {
   },
   'simple_sequel' => {
     :store => :Sequel,
-    :options => ":db => (defined?(JRUBY_VERSION) ? 'jdbc:sqlite:/' : 'sqlite:/')"
+    :options => ':db => (defined?(JRUBY_VERSION) ? "jdbc:sqlite:" : "sqlite:") + File.join(make_tempdir, "simple_sequel")'
+  },
+  'simple_sequel_with_expires' => {
+    :store => :Sequel,
+    :options => ':db => (defined?(JRUBY_VERSION) ? "jdbc:sqlite:" : "sqlite:") + File.join(make_tempdir, "simple_sequel_with_expires"), :expires => true',
+    :specs => EXPIRES_SPECS
   },
   'simple_datamapper' => {
     :store => :DataMapper,
-    :options => ':setup => "sqlite3://#{make_tempdir}/simple_datamapper-default.sqlite3"',
+    :options => ':setup => "sqlite3://#{make_tempdir}/simple_datamapper"',
     # DataMapper needs default repository to be setup
     :preamble => "require 'dm-core'\nDataMapper.setup(:default, :adapter => :in_memory)\n"
   },
+  'simple_datamapper_with_expires' => {
+    :store => :DataMapper,
+    :options => ':setup => "sqlite3://#{make_tempdir}/simple_datamapper_with_expires", :expires => true',
+    # DataMapper needs default repository to be setup
+    :preamble => "require 'dm-core'\nDataMapper.setup(:default, :adapter => :in_memory)\n",
+    :specs => EXPIRES_SPECS
+  },
   'simple_datamapper_with_repository' => {
     :store => :DataMapper,
-    :options => ':repository => :repo, :setup => "sqlite3://#{make_tempdir}/simple_datamapper-repo.sqlite3"',
+    :options => ':repository => :repo, :setup => "sqlite3://#{make_tempdir}/simple_datamapper_with_repository"',
     # DataMapper needs default repository to be setup
     :preamble => "require 'dm-core'\nDataMapper.setup(:default, :adapter => :in_memory)\n"
   },
   'simple_activerecord' => {
     :store => :ActiveRecord,
-    :options => ":connection => { :adapter => (defined?(JRUBY_VERSION) ? 'jdbcsqlite3' : 'sqlite3'), :database => File.join(make_tempdir, 'simple_activerecord.sqlite3') }"
+    :options => ":connection => { :adapter => (defined?(JRUBY_VERSION) ? 'jdbcsqlite3' : 'sqlite3'), :database => File.join(make_tempdir, 'simple_activerecord') }"
+  },
+  'simple_activerecord_with_expires' => {
+    :store => :ActiveRecord,
+    :options => ":connection => { :adapter => (defined?(JRUBY_VERSION) ? 'jdbcsqlite3' : 'sqlite3'), :database => File.join(make_tempdir, 'simple_activerecord_with_expires') }, :expires => true",
+    :specs => EXPIRES_SPECS
   },
   'simple_fog' => {
     :store                  => :Fog,
@@ -120,8 +209,17 @@ TESTS = {
     # Put Fog into testing mode
     :preamble               => "require 'fog'\nFog.mock!\n"
   },
-  # 'cache' => {
-  # },
+  'simple_fog_with_expires' => {
+    :store                  => :Fog,
+    :options => ":aws_access_key_id => 'fake_access_key_id',
+    :aws_secret_access_key  => 'fake_secret_access_key',
+    :provider               => 'AWS',
+    :dir                    => 'juno',
+    :expires                => true",
+    # Put Fog into testing mode
+    :preamble               => "require 'fog'\nFog.mock!\n",
+    :specs => EXPIRES_SPECS
+  },
   'expires_memory' => {
     :build => %{
 Juno.build do
@@ -307,18 +405,18 @@ end},
     :specs => [:null, :store, :returndifferent, :marshallable_key]
   },
   'adapter_activerecord' => {
-    :build => "Juno::Adapters::ActiveRecord.new(:connection => { :adapter => (defined?(JRUBY_VERSION) ? 'jdbcsqlite3' : 'sqlite3'), :database => File.join(make_tempdir, 'adapter_activerecord.sqlite3') })",
+    :build => "Juno::Adapters::ActiveRecord.new(:connection => { :adapter => (defined?(JRUBY_VERSION) ? 'jdbcsqlite3' : 'sqlite3'), :database => File.join(make_tempdir, 'adapter_activerecord') })",
     :specs => ADAPTER_SPECS,
     :tests => %{
 it 'updates an existing key/value' do
   @store['foo/bar'] = '1'
   @store['foo/bar'] = '2'
-  records = @store.table.find :all, :conditions => { :key => 'foo/bar' }
+  records = @store.table.find :all, :conditions => { :k => 'foo/bar' }
   records.count.should == 1
 end
 
 it 'uses an existing connection' do
-  ActiveRecord::Base.establish_connection :adapter => (defined?(JRUBY_VERSION) ? 'jdbcsqlite3' : 'sqlite3'), :database => File.join(make_tempdir, 'activerecord-existing.sqlite3')
+  ActiveRecord::Base.establish_connection :adapter => (defined?(JRUBY_VERSION) ? 'jdbcsqlite3' : 'sqlite3'), :database => File.join(make_tempdir, 'activerecord-existing')
 
   store = Juno::Adapters::ActiveRecord.new
   store.table.table_exists?.should == true
@@ -334,7 +432,7 @@ end
     :specs => ADAPTER_SPECS
   },
   'adapter_datamapper' => {
-    :build => 'Juno::Adapters::DataMapper.new(:setup => "sqlite3://#{make_tempdir}/adapter_datamapper.sqlite3")',
+    :build => 'Juno::Adapters::DataMapper.new(:setup => "sqlite3://#{make_tempdir}/adapter_datamapper")',
     # DataMapper needs default repository to be setup
     :preamble => "require 'dm-core'\nDataMapper.setup(:default, :adapter => :in_memory)\n",
     :specs => ADAPTER_SPECS + [:returndifferent_stringkey_objectvalue,
@@ -342,10 +440,10 @@ end
                                :store_stringkey_objectvalue],
     :tests => %q{
 it 'does not cross contaminate when storing' do
-  first = Juno::Adapters::DataMapper.new(:setup => "sqlite3://#{make_tempdir}/datamapper-first.sqlite3")
+  first = Juno::Adapters::DataMapper.new(:setup => "sqlite3://#{make_tempdir}/datamapper-first")
   first.clear
 
-  second = Juno::Adapters::DataMapper.new(:repository => :sample, :setup => "sqlite3://#{make_tempdir}/datamapper-second.sqlite3")
+  second = Juno::Adapters::DataMapper.new(:repository => :sample, :setup => "sqlite3://#{make_tempdir}/datamapper-second")
   second.clear
 
   first['key'] = 'value'
@@ -356,10 +454,10 @@ it 'does not cross contaminate when storing' do
 end
 
 it 'does not cross contaminate when deleting' do
-  first = Juno::Adapters::DataMapper.new(:setup => "sqlite3://#{make_tempdir}/datamapper-first.sqlite3")
+  first = Juno::Adapters::DataMapper.new(:setup => "sqlite3://#{make_tempdir}/datamapper-first")
   first.clear
 
-  second = Juno::Adapters::DataMapper.new(:repository => :sample, :setup => "sqlite3://#{make_tempdir}/datamapper-second.sqlite3")
+  second = Juno::Adapters::DataMapper.new(:repository => :sample, :setup => "sqlite3://#{make_tempdir}/datamapper-second")
   second.clear
 
   first['key'] = 'value'
@@ -438,11 +536,11 @@ end
     :specs => ADAPTER_SPECS
   },
   'adapter_sequel' => {
-    :build => "Juno::Adapters::Sequel.new(:db => (defined?(JRUBY_VERSION) ? 'jdbc:sqlite:/' : 'sqlite:/'))",
+    :build => 'Juno::Adapters::Sequel.new(:db => (defined?(JRUBY_VERSION) ? "jdbc:sqlite:" : "sqlite:") + File.join(make_tempdir, "adapter_sequel"))',
     :specs => ADAPTER_SPECS
   },
   'adapter_sqlite' => {
-    :build => 'Juno::Adapters::Sqlite.new(:file => ":memory:")',
+    :build => 'Juno::Adapters::Sqlite.new(:file => File.join(make_tempdir, "adapter_sqlite"))',
     :specs => ADAPTER_SPECS
   },
   'adapter_tokyocabinet' => {
@@ -547,6 +645,13 @@ it "removes and returns a #{val_type} element with a #{key_type} key from the ba
   @store.key?(#{key1}).should == false
 end
 
+it "overwrites existing #{val_type} values with #{key_type}" do
+  @store[#{key1}] = #{val1}
+  @store[#{key1}].should == #{val1}
+  @store[#{key1}] = #{val2}
+  @store[#{key1}].should == #{val2}
+end
+
 it "does not run the block if the #{key_type} key is available" do
   @store[#{key1}] = #{val1}
   unaltered = "unaltered"

data/spec/junospecs.rb

@@ -77,6 +77,13 @@ shared_examples_for 'store_stringkey_stringvalue' do
     @store.key?("strkey1").should == false
   end
 
+  it "overwrites existing String values with String" do
+    @store["strkey1"] = "strval1"
+    @store["strkey1"].should == "strval1"
+    @store["strkey1"] = "strval2"
+    @store["strkey1"].should == "strval2"
+  end
+
   it "does not run the block if the String key is available" do
     @store["strkey1"] = "strval1"
     unaltered = "unaltered"
@@ -243,6 +250,13 @@ shared_examples_for 'store_stringkey_objectvalue' do
     @store.key?("strkey1").should == false
   end
 
+  it "overwrites existing Object values with String" do
+    @store["strkey1"] = Value.new(:objval1)
+    @store["strkey1"].should == Value.new(:objval1)
+    @store["strkey1"] = Value.new(:objval2)
+    @store["strkey1"].should == Value.new(:objval2)
+  end
+
   it "does not run the block if the String key is available" do
     @store["strkey1"] = Value.new(:objval1)
     unaltered = "unaltered"
@@ -409,6 +423,13 @@ shared_examples_for 'store_stringkey_hashvalue' do
     @store.key?("strkey1").should == false
   end
 
+  it "overwrites existing Hash values with String" do
+    @store["strkey1"] = {"hashval1"=>"hashval2"}
+    @store["strkey1"].should == {"hashval1"=>"hashval2"}
+    @store["strkey1"] = {"hashval3"=>"hashval4"}
+    @store["strkey1"].should == {"hashval3"=>"hashval4"}
+  end
+
   it "does not run the block if the String key is available" do
     @store["strkey1"] = {"hashval1"=>"hashval2"}
     unaltered = "unaltered"
@@ -575,6 +596,13 @@ shared_examples_for 'store_objectkey_stringvalue' do
     @store.key?(Value.new(:objkey1)).should == false
   end
 
+  it "overwrites existing String values with Object" do
+    @store[Value.new(:objkey1)] = "strval1"
+    @store[Value.new(:objkey1)].should == "strval1"
+    @store[Value.new(:objkey1)] = "strval2"
+    @store[Value.new(:objkey1)].should == "strval2"
+  end
+
   it "does not run the block if the Object key is available" do
     @store[Value.new(:objkey1)] = "strval1"
     unaltered = "unaltered"
@@ -741,6 +769,13 @@ shared_examples_for 'store_objectkey_objectvalue' do
     @store.key?(Value.new(:objkey1)).should == false
   end
 
+  it "overwrites existing Object values with Object" do
+    @store[Value.new(:objkey1)] = Value.new(:objval1)
+    @store[Value.new(:objkey1)].should == Value.new(:objval1)
+    @store[Value.new(:objkey1)] = Value.new(:objval2)
+    @store[Value.new(:objkey1)].should == Value.new(:objval2)
+  end
+
   it "does not run the block if the Object key is available" do
     @store[Value.new(:objkey1)] = Value.new(:objval1)
     unaltered = "unaltered"
@@ -907,6 +942,13 @@ shared_examples_for 'store_objectkey_hashvalue' do
     @store.key?(Value.new(:objkey1)).should == false
   end
 
+  it "overwrites existing Hash values with Object" do
+    @store[Value.new(:objkey1)] = {"hashval1"=>"hashval2"}
+    @store[Value.new(:objkey1)].should == {"hashval1"=>"hashval2"}
+    @store[Value.new(:objkey1)] = {"hashval3"=>"hashval4"}
+    @store[Value.new(:objkey1)].should == {"hashval3"=>"hashval4"}
+  end
+
   it "does not run the block if the Object key is available" do
     @store[Value.new(:objkey1)] = {"hashval1"=>"hashval2"}
     unaltered = "unaltered"
@@ -1073,6 +1115,13 @@ shared_examples_for 'store_hashkey_stringvalue' do
     @store.key?({"hashkey1"=>"hashkey2"}).should == false
   end
 
+  it "overwrites existing String values with Hash" do
+    @store[{"hashkey1"=>"hashkey2"}] = "strval1"
+    @store[{"hashkey1"=>"hashkey2"}].should == "strval1"
+    @store[{"hashkey1"=>"hashkey2"}] = "strval2"
+    @store[{"hashkey1"=>"hashkey2"}].should == "strval2"
+  end
+
   it "does not run the block if the Hash key is available" do
     @store[{"hashkey1"=>"hashkey2"}] = "strval1"
     unaltered = "unaltered"
@@ -1239,6 +1288,13 @@ shared_examples_for 'store_hashkey_objectvalue' do
     @store.key?({"hashkey1"=>"hashkey2"}).should == false
   end
 
+  it "overwrites existing Object values with Hash" do
+    @store[{"hashkey1"=>"hashkey2"}] = Value.new(:objval1)
+    @store[{"hashkey1"=>"hashkey2"}].should == Value.new(:objval1)
+    @store[{"hashkey1"=>"hashkey2"}] = Value.new(:objval2)
+    @store[{"hashkey1"=>"hashkey2"}].should == Value.new(:objval2)
+  end
+
   it "does not run the block if the Hash key is available" do
     @store[{"hashkey1"=>"hashkey2"}] = Value.new(:objval1)
     unaltered = "unaltered"
@@ -1405,6 +1461,13 @@ shared_examples_for 'store_hashkey_hashvalue' do
     @store.key?({"hashkey1"=>"hashkey2"}).should == false
   end
 
+  it "overwrites existing Hash values with Hash" do
+    @store[{"hashkey1"=>"hashkey2"}] = {"hashval1"=>"hashval2"}
+    @store[{"hashkey1"=>"hashkey2"}].should == {"hashval1"=>"hashval2"}
+    @store[{"hashkey1"=>"hashkey2"}] = {"hashval3"=>"hashval4"}
+    @store[{"hashkey1"=>"hashkey2"}].should == {"hashval3"=>"hashval4"}
+  end
+
   it "does not run the block if the Hash key is available" do
     @store[{"hashkey1"=>"hashkey2"}] = {"hashval1"=>"hashval2"}
     unaltered = "unaltered"

data/spec/simpl_memory_with_expires_spec.rb

@@ -0,0 +1,53 @@
+# Generated file
+require 'helper'
+
+begin
+  Juno.new(:Memory, :expires => true).close
+
+  describe "simpl_memory_with_expires" do
+    before do
+      @store = Juno.new(:Memory, :expires => true)
+      @store.clear
+    end
+
+    after do
+      @store.close.should == nil if @store
+    end
+
+    it_should_behave_like 'null_objectkey_objectvalue'
+    it_should_behave_like 'null_objectkey_stringvalue'
+    it_should_behave_like 'null_objectkey_hashvalue'
+    it_should_behave_like 'null_stringkey_objectvalue'
+    it_should_behave_like 'null_stringkey_stringvalue'
+    it_should_behave_like 'null_stringkey_hashvalue'
+    it_should_behave_like 'null_hashkey_objectvalue'
+    it_should_behave_like 'null_hashkey_stringvalue'
+    it_should_behave_like 'null_hashkey_hashvalue'
+    it_should_behave_like 'store_objectkey_objectvalue'
+    it_should_behave_like 'store_objectkey_stringvalue'
+    it_should_behave_like 'store_objectkey_hashvalue'
+    it_should_behave_like 'store_stringkey_objectvalue'
+    it_should_behave_like 'store_stringkey_stringvalue'
+    it_should_behave_like 'store_stringkey_hashvalue'
+    it_should_behave_like 'store_hashkey_objectvalue'
+    it_should_behave_like 'store_hashkey_stringvalue'
+    it_should_behave_like 'store_hashkey_hashvalue'
+    it_should_behave_like 'returndifferent_objectkey_objectvalue'
+    it_should_behave_like 'returndifferent_objectkey_stringvalue'
+    it_should_behave_like 'returndifferent_objectkey_hashvalue'
+    it_should_behave_like 'returndifferent_stringkey_objectvalue'
+    it_should_behave_like 'returndifferent_stringkey_stringvalue'
+    it_should_behave_like 'returndifferent_stringkey_hashvalue'
+    it_should_behave_like 'returndifferent_hashkey_objectvalue'
+    it_should_behave_like 'returndifferent_hashkey_stringvalue'
+    it_should_behave_like 'returndifferent_hashkey_hashvalue'
+    it_should_behave_like 'marshallable_key'
+    it_should_behave_like 'expires_stringkey_stringvalue'
+
+  end
+rescue LoadError => ex
+  puts "Test simpl_memory_with_expires not executed: #{ex.message}"
+rescue Exception => ex
+  puts "Test simpl_memory_with_expires not executed: #{ex.message}"
+  #puts "#{ex.backtrace.join("\n")}"
+end