torquebox-base 1.0.0.CR2-java → 1.0.0-java

data/lib/active_support/cache/torque_box_store.rb

@@ -89,7 +89,12 @@ module ActiveSupport
       def write_entry(key, entry, options = {})
         args = [ :put_async, key, encode(entry) ]
         args[0] = :put_if_absent_async if options[:unless_exist]
-        args << options[:expires_in].to_i << SECONDS if options[:expires_in]
+        if options[:expires_in]
+          # Set the Infinispan expire a few minutes into the future to support
+          # :race_condition_ttl on read
+          expires_in = options[:expires_in].to_i + 5.minutes
+          args << expires_in << SECONDS
+        end
         cache.send( *args ) && true
       end
 

data/lib/torquebox-base.rb

@@ -1,6 +1,6 @@
 module TorqueboxBase
-  VERSION = '1.0.0.CR2'
-  MAVEN_VERSION = '1.0.0.CR2'
+  VERSION = '1.0.0'
+  MAVEN_VERSION = '1.0.0'
 end
 begin
   require 'java'

data/spec/torque_box_store_spec.rb

@@ -105,6 +105,42 @@ describe ActiveSupport::Cache::TorqueBoxStore do
       @cache.fetch("today", :force => true) { "Tuesday" }.should == "Tuesday"
     end
 
+    it "should support :race_condition_ttl" do
+      database = mock('database')
+      fetch_options = { :expires_in => 0.1.seconds, :race_condition_ttl => 30.seconds }
+      # First fetch looks up from database and populates
+      database.should_receive(:town).and_return("Pantsville")
+      @cache.fetch("town", fetch_options) {
+        database.town
+      }.should == "Pantsville"
+      # Sleep until the entry is expired
+      sleep(0.2)
+      # Create a set of CountDownLatches to test :race_condition_ttl
+      # without relying on sleep calls
+      read_latch = java.util.concurrent.CountDownLatch.new(1)
+      write_latch = java.util.concurrent.CountDownLatch.new(1)
+      # Read the cache from two threads but only one should hit our database
+      database.should_receive(:town).once.and_return {
+        # Trigger the read latch so the other thread can read the cached value
+        read_latch.count_down
+        write_latch.await(15, java.util.concurrent.TimeUnit::SECONDS)
+        "NoPantsville"
+      }
+      other_thread = Thread.new {
+        read_latch.await(15, java.util.concurrent.TimeUnit::SECONDS)
+        @cache.fetch("town", fetch_options) {
+          database.town
+        }.should == "Pantsville"
+        # Trigger the write latch to update the cached value
+        write_latch.count_down
+      }
+      @cache.fetch("town", fetch_options) {
+        database.town
+      }.should == "NoPantsville"
+      other_thread.join
+      @cache.read("town").should == "NoPantsville"
+    end
+
   end
 
   describe "multiples" do

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: torquebox-base
 version: !ruby/object:Gem::Version 
-  prerelease: 6
-  version: 1.0.0.CR2
+  prerelease: 
+  version: 1.0.0
 platform: java
 authors: []
 
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-25 00:00:00 -04:00
+date: 2011-04-29 00:00:00 -04:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -92,9 +92,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.3.1
+        version: "0"
 requirements: []
 
 rubyforge_project: