torquebox-cache 3.0.0-java → 3.0.1-java

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 508f24d56d7bf5191574deb27ca1eccf12d99683
+  data.tar.gz: 780810ff535b6dd439336a67e02382e19edfc19a
+SHA512:
+  metadata.gz: 70faed5c15b0aea796c92c46c82459a58d440ae87a5c09a1720ca9720a79375f99d06badbbd616581f786ac7e18b3ed96d1428a152a5d154e7d66edf3e7c064c
+  data.tar.gz: 921b2704c61dc783173950510e71b0b936d6d63fc44766135bd4199356d948154dd23ff68d1b96c351941da69e3c4cc0336b6275583be5a7761185b87726100a

data/lib/torquebox-cache.rb

@@ -1,6 +1,6 @@
 module TorqueboxCache
-  VERSION = '3.0.0'
-  MAVEN_VERSION = '3.0.0'
+  VERSION = '3.0.1'
+  MAVEN_VERSION = '3.0.1'
 end
 begin
   require 'java'

data/lib/torquebox/cache.rb

@@ -36,6 +36,7 @@ module TorqueBox
       end
     end
 
+    # @api public
     class Cache
 
       SECONDS = java.util.concurrent.TimeUnit::SECONDS
@@ -53,11 +54,14 @@ module TorqueBox
       end
 
       def initialize(opts = {})
-        return nothing unless INFINISPAN_AVAILABLE
         @options = opts
-        options[:transaction_mode] = :transactional unless options.has_key?( :transaction_mode )
-        options[:locking_mode] ||= :optimistic if (transactional? && !options.has_key?( :locking_mode ))
-        options[:sync] = true if options[:sync].nil?
+        
+        if INFINISPAN_AVAILABLE
+          options[:transaction_mode] = :transactional unless options.has_key?( :transaction_mode )
+          options[:locking_mode] ||= :optimistic if (transactional? && !options.has_key?( :locking_mode ))
+          options[:sync] = true if options[:sync].nil?
+        end
+
         if options[:encoding] == :marshal
           log( "Encoding of :marshal cannot be used with " +
                "TorqueBox::Infinispan::Cache - using :marshal_base64 instead",
@@ -312,7 +316,9 @@ module TorqueBox
           config.transaction.lockingMode( locking_mode )
         end
         if persisted?
-          store = config.loaders.add_file_cache_store
+          store = (config.respond_to?(:loaders) ? 
+                   config.loaders.add_file_cache_store :
+                   config.persistence.add_single_file_store)
           store.purgeOnStartup( false )
           store.location(options[:persist]) if File.exist?( options[:persist].to_s )
         end
@@ -325,7 +331,7 @@ module TorqueBox
         config.build
       end
 
-      def same_config?(c1, c2)
+      def same_5_config?(c1, c2)
         c1.clustering.cacheMode == c2.clustering.cacheMode &&
           (c1.loaders == c2.loaders ||
            (c1.loaders.cacheLoaders.size == c2.loaders.cacheLoaders.size &&
@@ -336,6 +342,25 @@ module TorqueBox
           c1.eviction.strategy == c2.eviction.strategy
       end
       
+      def same_6_config?(c1, c2)
+        c1.clustering.cacheMode == c2.clustering.cacheMode &&
+          (c1.persistence == c2.persistence ||
+           (c1.persistence.stores.size == c2.persistence.stores.size &&
+            c1.persistence.stores.first.location == c2.persistence.stores.first.location)) &&
+          c1.transaction.transactionMode == c2.transaction.transactionMode &&
+          c1.transaction.lockingMode == c2.transaction.lockingMode &&
+          c1.eviction.max_entries == c2.eviction.max_entries &&
+          c1.eviction.strategy == c2.eviction.strategy
+      end
+      
+      def same_config?(c1, c2)
+        if c1.respond_to?(:loaders)
+          same_5_config?(c1, c2)
+        else
+          same_6_config?(c1, c2)
+        end
+      end
+      
       def transaction_manager_lookup
         @tm ||= if TorqueBox.fetch('transaction-manager')
                   ContainerTransactionManagerLookup.new 

data/spec/cache_spec.rb

@@ -283,20 +283,25 @@ describe TorqueBox::Infinispan::Cache do
   end
 
   describe "with persistence" do
+
+    def cache_on_disk(dir=nil, name=nil)
+      five = org.infinispan.Version::VERSION[/^5/]
+      File.join(File.dirname(__FILE__), '..', 
+                (dir || (five ? 'Infinispan-FileCacheStore' : 'Infinispan-SingleFileStore')),
+                (name ? (five ? name : name+".dat") : ""))
+    end
+
     before(:all) do
-      @default_dir    = File.join(File.dirname(__FILE__), '..', 'Infinispan-FileCacheStore')
-      @configured_dir = File.join( File.dirname(__FILE__), '..', random_string + "-persisted.cache" )
-      @date_cfg_dir   = File.join( File.dirname(__FILE__), '..', random_string + "-persisted-date.cache" )
-      @index_dir      = File.join( File.dirname(__FILE__), '..', 'java.util.HashMap' )
-      FileUtils.mkdir @configured_dir 
-      FileUtils.mkdir @date_cfg_dir 
+      @configured_dir = random_string + "-persisted.cache"
+      @date_cfg_dir   = random_string + "-persisted-date.cache"
+      FileUtils.mkdir cache_on_disk(@configured_dir)
+      FileUtils.mkdir cache_on_disk(@date_cfg_dir)
     end
 
     after(:all) do
-      FileUtils.rm_rf @default_dir
-      FileUtils.rm_rf @configured_dir
-      FileUtils.rm_rf @date_cfg_dir
-      FileUtils.rm_rf @index_dir if File.exist?( @index_dir )
+      FileUtils.rm_rf cache_on_disk
+      FileUtils.rm_rf cache_on_disk(@configured_dir)
+      FileUtils.rm_rf cache_on_disk(@date_cfg_dir)
     end
 
     it "should persist the data with a default directory" do
@@ -304,22 +309,22 @@ describe TorqueBox::Infinispan::Cache do
       entry = java.util.HashMap.new
       entry.put( "Hello", "world" )
       cache.put('foo', entry)
-      File.exist?(@default_dir).should be_true
+      File.exist?(cache_on_disk(nil, 'persisted-cache')).should be_true
     end
 
     it "should persist the data with a configured directory" do
-      cache = TorqueBox::Infinispan::Cache.new( :name => 'persisted-date-cache', :persist => @configured_dir.to_s )
+      cache = TorqueBox::Infinispan::Cache.new( :name => 'persisted-date-cache', :persist => cache_on_disk(@configured_dir).to_s )
       entry = java.util.HashMap.new
       entry.put( "Hello", "world" )
       cache.put('foo', entry)
-      File.exist?("#{@configured_dir.to_s}/persisted-date-cache").should be_true
+      File.exist?(cache_on_disk(@configured_dir, "persisted-date-cache")).should be_true
     end
 
     it "should persist dates with a configured directory" do
-      cache = TorqueBox::Infinispan::Cache.new( :name => 'persisted-configured-date-cache', :persist => @date_cfg_dir.to_s )
+      cache = TorqueBox::Infinispan::Cache.new( :name => 'persisted-configured-date-cache', :persist => cache_on_disk(@date_cfg_dir).to_s )
       entry = java.util.Date.new
       cache.put('foo', entry).should be_nil
-      File.exist?("#{@date_cfg_dir.to_s}/persisted-configured-date-cache").should be_true
+      File.exist?(cache_on_disk(@date_cfg_dir, "persisted-configured-date-cache")).should be_true
     end
 
     it "should evict keys from the heap" do

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: torquebox-cache
 version: !ruby/object:Gem::Version
-  prerelease:
-  version: 3.0.0
+  version: 3.0.1
 platform: java
 authors:
 - The TorqueBox Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-08-28 00:00:00.000000000 Z
+date: 2013-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -18,13 +17,11 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 3.0.10
-    none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 3.0.10
-    none: false
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
@@ -34,13 +31,11 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.5.0
-    none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.5.0
-    none: false
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
@@ -49,14 +44,12 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.0
-    none: false
+        version: 3.0.1
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.0
-    none: false
+        version: 3.0.1
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
@@ -65,14 +58,12 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.0
-    none: false
+        version: 3.0.1
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.0
-    none: false
+        version: 3.0.1
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
@@ -82,13 +73,11 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.4.6
-    none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.4.6
-    none: false
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
@@ -98,13 +87,11 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 2.7.0
-    none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 2.7.0
-    none: false
   prerelease: false
   type: :development
 description: ''
@@ -122,14 +109,15 @@ files:
 - lib/torquebox/cache.rb
 - lib/active_support/cache/torquebox_store.rb
 - lib/active_support/cache/torque_box_store.rb
-- spec/spec.opts
-- spec/spec_helper.rb
-- spec/torque_box_store_spec.rb
 - spec/gem_hook_spec.rb
 - spec/cache_spec.rb
+- spec/spec_helper.rb
+- spec/torque_box_store_spec.rb
+- spec/spec.opts
 homepage: http://torquebox.org/
 licenses:
 - Public Domain
+metadata: {}
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -139,20 +127,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 requirements: []
 rubyforge_project:
-rubygems_version: 1.8.24
+rubygems_version: 2.1.9
 signing_key:
-specification_version: 3
+specification_version: 4
 summary: TorqueBox Cache Gem
 test_files:
-- spec/torque_box_store_spec.rb
 - spec/gem_hook_spec.rb
 - spec/cache_spec.rb
+- spec/torque_box_store_spec.rb