RubyGems - jruby-ehcache - Versions diffs - 1.2.0 → 1.2.1 - Mend

jruby-ehcache 1.2.0 → 1.2.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (19) hide show

data/.gitignore +2 -0
data/Gemfile.lock +2 -14
data/README.txt +9 -0
data/Rakefile +13 -62
data/VERSION +1 -1
data/ext/marshaled-ruby-object.jar +0 -0
data/jruby-ehcache-rails2.gemspec +14 -46
data/jruby-ehcache-rails3.gemspec +14 -46
data/jruby-ehcache.gemspec +9 -102
data/lib/active_support/cache/ehcache_store.rb +66 -0
data/lib/active_support/ehcache_store.rb +59 -0
data/lib/ehcache.rb +0 -27
data/lib/ehcache/active_support_store.rb +58 -0
data/lib/ehcache/cache.rb +11 -1
data/lib/ehcache/element.rb +12 -0
data/lib/ehcache/version.rb +3 -0
data/src/net/sf/ehcache/MarshaledRubyObject.java +15 -0
metadata +114 -211
data/lib/ehcache/extensions.rb +0 -31

data/.gitignore ADDED

	@@ -0,0 +1,2 @@
1	+ *.DS_Store
2	+ pkg/*

data/Gemfile.lock CHANGED

@@ -1,29 +1,17 @@
 PATH
   remote: .
   specs:
-    jruby-ehcache (1.2.0)
-      activesupport
+    jruby-ehcache (1.2.1)
       i18n
-      jruby-ehcache
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.1.1)
-      multi_json (~> 1.0)
-    git (1.2.5)
     i18n (0.6.0)
-    jeweler (1.6.4)
-      bundler (~> 1.0)
-      git (>= 1.2.5)
-      rake
-    multi_json (1.0.3)
-    rake (0.8.7)
 PLATFORMS
   java
+  ruby
 DEPENDENCIES
-  jeweler
   jruby-ehcache!
-  rake

data/README.txt CHANGED

@@ -51,6 +51,15 @@ OR
 $ jruby -S gem install jruby-ehcache-rails3
+== GEMFILE:
+Add the gem as you normally would in your Gemfile, making sure to require
+'ehcache' explicitly.  Here is an example of adding the rails3 gem to a Gemfile.
+gem 'jruby-ehcache-rails3', :require => 'ehcache'
 == REQUIREMENTS:
 Tested with JRuby 1.5.3.

data/Rakefile CHANGED

@@ -1,62 +1,13 @@
-require 'rake/testtask'
-require 'rake/rdoctask'
-task :default => [ :test ]
-desc "Executes the test suite"
-Rake::TestTask.new do |t|
-  t.name = :test
-  t.libs << 'lib' << 'ext' << 'test'
-  t.pattern = "test/test_*.rb"
-end
-begin
-  require 'jeweler'
-rescue LoadError
-  puts "Jeweler not available. Install it with: gem install jeweler"
-end
-def defaults(gemspec)
-  gemspec.rubyforge_project = 'ehcache'
-  gemspec.homepage = "http://ehcache.rubyforge.org"
-  gemspec.authors = ["Dylan Stamat", "Jason Voegele"]
-  gemspec.email = ['dstamat@elctech.com', 'jvoegele@terracotta.org']
-end
-Jeweler::Tasks.new do |gemspec|
-  defaults(gemspec)
-  gemspec.name = "jruby-ehcache"
-  gemspec.summary = "JRuby interface to Ehcache"
-  gemspec.description = "JRuby interface to the popular Java caching library Ehcache"
-  gemspec.files.exclude '.gitignore'
-  # These files go in the jruby-ehcache-rails2 and jruby-ehcache-rails3 gems
-  gemspec.files.exclude 'lib/active_support/**/*'
-  gemspec.files.exclude 'lib/ehcache/active_support_store.rb'
-  gemspec.add_dependency 'activesupport'
-  gemspec.add_dependency 'i18n' # activesupport 'requires' this but not in a bundler friendly way
-  gemspec.add_development_dependency 'rake'
-  gemspec.add_development_dependency 'jeweler'
-end
-Jeweler::Tasks.new do |gemspec|
-  defaults(gemspec)
-  gemspec.name = 'jruby-ehcache-rails3'
-  gemspec.summary = 'Rails 3 cache store provider using Ehcache'
-  gemspec.description = 'Rails 3 cache store provider using Ehcache'
-  gemspec.files = FileList['lib/active_support/**/*', 'lib/ehcache/active_support_store.rb']
-  gemspec.test_files = []
-  gemspec.add_dependency 'jruby-ehcache', ">=1.2.0"
-end
-Jeweler::Tasks.new do |gemspec|
-  defaults(gemspec)
-  gemspec.name = 'jruby-ehcache-rails2'
-  gemspec.summary = 'Rails 2 cache store provider using Ehcache'
-  gemspec.description = 'Rails 2 cache store provider using Ehcache'
-  gemspec.files = FileList['lib/active_support/**/*', 'lib/ehcache/active_support_store.rb']
-  gemspec.test_files = []
-  gemspec.add_dependency 'jruby-ehcache', ">=1.2.0"
-end
-Jeweler::GemcutterTasks.new
+require "bundler/gem_helper"
+Bundler::GemHelper.install_tasks :name => "jruby-ehcache"
+task :default => [ :test ]
+require 'rdoc/task'
+require 'rake/testtask'
+desc "Executes the test suite"
+Rake::TestTask.new do |t|
+  t.name = :test
+  t.libs << 'lib' << 'ext' << 'test'
+  t.pattern = "test/test_*.rb"
+end

data/VERSION CHANGED

	@@ -1 +1 @@
1	- 1.2.0
1	+ 1.2.1

data/ext/marshaled-ruby-object.jar ADDED

Binary file

data/jruby-ehcache-rails2.gemspec CHANGED

@@ -1,60 +1,28 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "ehcache/version"
 Gem::Specification.new do |s|
   s.name = %q{jruby-ehcache-rails2}
-  s.version = "1.2.0"
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.version = Ehcache::VERSION
   s.authors = [%q{Dylan Stamat}, %q{Jason Voegele}]
   s.date = %q{2012-03-14}
-  s.description = %q{Rails 2 cache store provider using Ehcache}
+  s.description = %q{The Ehcache cache store provider for Rails 2}
   s.email = [%q{dstamat@elctech.com}, %q{jvoegele@terracotta.org}]
-  s.executables = [%q{ehcache}]
-  s.extra_rdoc_files = [
-    "README.txt"
-  ]
-  s.files = [
-    "lib/active_support/cache/ehcache_store.rb",
-    "lib/active_support/ehcache_store.rb",
-    "lib/ehcache/active_support_store.rb"
-  ]
+  s.extra_rdoc_files = [ "README.txt" ]
   s.homepage = %q{http://ehcache.rubyforge.org}
-  s.require_paths = [%q{lib}]
   s.rubyforge_project = %q{ehcache}
   s.rubygems_version = %q{1.8.9}
   s.summary = %q{Rails 2 cache store provider using Ehcache}
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
+  s.files = `git ls-files`.split("\n").concat(
+      ["lib/active_support/ehcache_store.rb",
+       "lib/ehcache/active_support_store.rb"])
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<jruby-ehcache>, [">= 1.2.0"])
-      s.add_runtime_dependency(%q<jruby-ehcache>, [">= 0"])
-      s.add_development_dependency(%q<rake>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
-      s.add_development_dependency(%q<rake>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
-      s.add_runtime_dependency(%q<jruby-ehcache>, [">= 1.2.0"])
-    else
-      s.add_dependency(%q<jruby-ehcache>, [">= 1.2.0"])
-      s.add_dependency(%q<jruby-ehcache>, [">= 0"])
-      s.add_dependency(%q<rake>, [">= 0"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<rake>, [">= 0"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<jruby-ehcache>, [">= 1.2.0"])
-    end
-  else
-    s.add_dependency(%q<jruby-ehcache>, [">= 1.2.0"])
-    s.add_dependency(%q<jruby-ehcache>, [">= 0"])
-    s.add_dependency(%q<rake>, [">= 0"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<rake>, [">= 0"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<jruby-ehcache>, [">= 1.2.0"])
-  end
-end
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+  s.add_runtime_dependency "i18n"
+  s.add_runtime_dependency "jruby-ehcache"
+end

data/jruby-ehcache-rails3.gemspec CHANGED

@@ -1,60 +1,28 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "ehcache/version"
 Gem::Specification.new do |s|
   s.name = %q{jruby-ehcache-rails3}
-  s.version = "1.2.0"
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.version = Ehcache::VERSION
   s.authors = [%q{Dylan Stamat}, %q{Jason Voegele}]
   s.date = %q{2012-03-14}
-  s.description = %q{Rails 3 cache store provider using Ehcache}
+  s.description = %q{The Ehcache cache store provider for Rails 3}
   s.email = [%q{dstamat@elctech.com}, %q{jvoegele@terracotta.org}]
-  s.executables = [%q{ehcache}]
-  s.extra_rdoc_files = [
-    "README.txt"
-  ]
-  s.files = [
-    "lib/active_support/cache/ehcache_store.rb",
-    "lib/active_support/ehcache_store.rb",
-    "lib/ehcache/active_support_store.rb"
-  ]
+  s.extra_rdoc_files = [ "README.txt" ]
   s.homepage = %q{http://ehcache.rubyforge.org}
-  s.require_paths = [%q{lib}]
   s.rubyforge_project = %q{ehcache}
   s.rubygems_version = %q{1.8.9}
   s.summary = %q{Rails 3 cache store provider using Ehcache}
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
+  s.files = `git ls-files`.split("\n").concat(
+      ["lib/active_support/cache/ehcache_store.rb",
+       "lib/ehcache/active_support_store.rb"])
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<jruby-ehcache>, [">= 1.2.0"])
-      s.add_runtime_dependency(%q<jruby-ehcache>, [">= 0"])
-      s.add_development_dependency(%q<rake>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
-      s.add_development_dependency(%q<rake>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
-      s.add_runtime_dependency(%q<jruby-ehcache>, [">= 1.2.0"])
-    else
-      s.add_dependency(%q<jruby-ehcache>, [">= 1.2.0"])
-      s.add_dependency(%q<jruby-ehcache>, [">= 0"])
-      s.add_dependency(%q<rake>, [">= 0"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<rake>, [">= 0"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<jruby-ehcache>, [">= 1.2.0"])
-    end
-  else
-    s.add_dependency(%q<jruby-ehcache>, [">= 1.2.0"])
-    s.add_dependency(%q<jruby-ehcache>, [">= 0"])
-    s.add_dependency(%q<rake>, [">= 0"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<rake>, [">= 0"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<jruby-ehcache>, [">= 1.2.0"])
-  end
-end
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+  s.add_runtime_dependency "i18n"
+  s.add_runtime_dependency "jruby-ehcache"
+end

data/jruby-ehcache.gemspec CHANGED

@@ -1,117 +1,24 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "ehcache/version"
 Gem::Specification.new do |s|
   s.name = %q{jruby-ehcache}
-  s.version = "1.2.0"
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.version = Ehcache::VERSION
   s.authors = [%q{Dylan Stamat}, %q{Jason Voegele}]
   s.date = %q{2012-03-14}
   s.description = %q{JRuby interface to the popular Java caching library Ehcache}
   s.email = [%q{dstamat@elctech.com}, %q{jvoegele@terracotta.org}]
-  s.executables = [%q{ehcache}]
-  s.extra_rdoc_files = [
-    "README.txt"
-  ]
-  s.files = [
-    "Gemfile",
-    "Gemfile.lock",
-    "History.txt",
-    "License.txt",
-    "Manifest.txt",
-    "PostInstall.txt",
-    "README.txt",
-    "Rakefile",
-    "VERSION",
-    "bin/ehcache",
-    "config/ehcache.yml",
-    "config/ehcache_manual_rmi.yml",
-    "examples/ehcache.xml",
-    "examples/jruby-ehcache.rb",
-    "ext/ehcache-2.4.6/ehcache-core-2.4.6.jar",
-    "ext/ehcache-2.4.6/ehcache-terracotta-2.4.6.jar",
-    "ext/ehcache-2.4.6/slf4j-api-1.6.1.jar",
-    "ext/ehcache-2.4.6/slf4j-jdk14-1.6.1.jar",
-    "ext/ehcache-2.4.6/terracotta-toolkit-1.3-runtime-3.3.0.jar",
-    "jruby-ehcache-rails2.gemspec",
-    "jruby-ehcache-rails3.gemspec",
-    "jruby-ehcache.gemspec",
-    "lib/ehcache.rb",
-    "lib/ehcache/cache.rb",
-    "lib/ehcache/cache_manager.rb",
-    "lib/ehcache/config.rb",
-    "lib/ehcache/element.rb",
-    "lib/ehcache/extensions.rb",
-    "lib/ehcache/java.rb",
-    "lib/ehcache/yaml_config.rb",
-    "script/console",
-    "script/destroy",
-    "script/generate",
-    "script/txt2html",
-    "spec/cache_manager_spec.rb",
-    "spec/cache_spec.rb",
-    "spec/spec.opts",
-    "spec/spec_helper.rb",
-    "tasks/deployment.rake",
-    "tasks/environment.rake",
-    "tasks/website.rake",
-    "test/ehcache.xml",
-    "test/ehcache.yml",
-    "test/test_cache.rb",
-    "test/test_cache_manager.rb",
-    "test/test_configuration.rb",
-    "test/test_ehcache.rb",
-    "test/test_element.rb",
-    "test/test_helper.rb",
-    "test/test_yaml_config.rb",
-    "website/index.html",
-    "website/javascripts/rounded_corners_lite.inc.js",
-    "website/stylesheets/screen.css",
-    "website/template.html.erb"
-  ]
+  s.extra_rdoc_files = [ "README.txt" ]
   s.homepage = %q{http://ehcache.rubyforge.org}
-  s.require_paths = [%q{lib}]
   s.rubyforge_project = %q{ehcache}
   s.rubygems_version = %q{1.8.9}
   s.summary = %q{JRuby interface to Ehcache}
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<jruby-ehcache>, [">= 0"])
-      s.add_development_dependency(%q<rake>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
-      s.add_development_dependency(%q<rake>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
-      s.add_runtime_dependency(%q<activesupport>, [">= 0"])
-      s.add_runtime_dependency(%q<i18n>, [">= 0"])
-      s.add_development_dependency(%q<rake>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
-    else
-      s.add_dependency(%q<jruby-ehcache>, [">= 0"])
-      s.add_dependency(%q<rake>, [">= 0"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<rake>, [">= 0"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<activesupport>, [">= 0"])
-      s.add_dependency(%q<i18n>, [">= 0"])
-      s.add_dependency(%q<rake>, [">= 0"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<jruby-ehcache>, [">= 0"])
-    s.add_dependency(%q<rake>, [">= 0"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<rake>, [">= 0"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<activesupport>, [">= 0"])
-    s.add_dependency(%q<i18n>, [">= 0"])
-    s.add_dependency(%q<rake>, [">= 0"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
-  end
+  s.add_runtime_dependency "i18n"
 end

data/lib/active_support/cache/ehcache_store.rb ADDED

@@ -0,0 +1,66 @@
+require 'ehcache/active_support_store'
+# Rails 3 cache store implementation which stores data in Ehcache:
+# http://www.ehcache.org/
+module ActiveSupport
+  module Cache
+    class EhcacheStore < Ehcache::ActiveSupportStore
+      def initialize(*args)
+        args = args.flatten
+        options = args.extract_options!
+        super(options)
+        self.create_cache_manager(options)
+        @ehcache = self.create_cache(options)
+        extend Strategy::LocalCache
+      end
+      def increment(name, amount = 1, options = nil) # :nodoc:
+        @ehcache.compare_and_swap(name) { |current_value|
+          current_value + amount
+        }
+      end
+      def decrement(name, amount = 1, options = nil) # :nodoc:
+        @ehcache.compare_and_swap(name) { |current_value|
+          current_value - amount
+        }
+      end
+      def clear(options = nil)
+        @ehcache.remove_all
+      end
+      def stats
+        @ehcache.statistics
+      end
+      protected
+      # Read an entry from the cache.
+      def read_entry(key, options) # :nodoc:
+        @ehcache[key]
+      rescue Ehcache::EhcacheError => e
+        logger.error("EhcacheError (#{e}): #{e.message}")
+        false
+      end
+      # Write an entry to the cache.
+      def write_entry(key, entry, options) # :nodoc:
+        @ehcache.put(key, entry, options)
+        true
+      rescue Ehcache::EhcacheError => e
+        logger.error("EhcacheError (#{e}): #{e.message}")
+        false
+      end
+      # Delete an entry from the cache.
+      def delete_entry(key, options) # :nodoc:
+        @ehcache.remove(key)
+      rescue Exception => e
+        logger.error("EhcacheError (#{e}): #{e.message}")
+        false
+      end
+    end
+  end
+end

data/lib/active_support/ehcache_store.rb ADDED

@@ -0,0 +1,59 @@
+require 'ehcache/active_support_store'
+# Rails 2 cache store implementation which stores data in Ehcache:
+# http://www.ehcache.org/
+module ActiveSupport
+  module Cache
+    class EhcacheStore < Ehcache::ActiveSupportStore
+      def initialize(options = {})
+        super() # Rails 2.3.x Store doesn't take any arguments to initialize
+        @ehcache = self.create_cache
+      end
+      def read(key, options = nil)
+        @ehcache[key]
+      rescue Ehcache::EhcacheError => e
+        logger.error("EhcacheError (#{e}): #{e.message}")
+        false
+      end
+      def write(key, value, options = {})
+        @ehcache.put(key, value, options)
+        true
+      rescue Ehcache::EhcacheError => e
+        logger.error("EhcacheError (#{e}): #{e.message}")
+        false
+      end
+      def delete(key, options = nil)
+        @ehcache.remove(key)
+      rescue Exception => e
+        logger.error("EhcacheError (#{e}): #{e.message}")
+        false
+      end
+      def keys
+        @ehcache.keys
+      end
+      def exist?(key, options = nil)
+        @ehcache.exist?(key)
+      end
+      def delete_matched(matcher, options = nil)
+        super
+        raise "Not supported by Ehcache"
+      end
+      def clear
+        @ehcache.clear
+        true
+      rescue Exception => e
+        logger.error("EhcacheError (#{e}): #{e.message}")
+        false
+      end
+    end
+  end
+end

data/lib/ehcache.rb CHANGED

@@ -20,30 +20,3 @@ require 'ehcache/config'
 require 'ehcache/cache'
 require 'ehcache/cache_manager'
 require 'ehcache/element'
-if defined?(Rails)
-  require 'ehcache/active_support_store'
-  case Rails::VERSION::MAJOR
-  when 2
-    require 'active_support/ehcache_store' # AS 2 impl
-    ActiveSupport::Cache::EhcacheStore.config_directory = File.expand_path(File.join(RAILS_ROOT, 'config'))
-    ActiveSupport::Cache::EhcacheStore.default_cache_name = 'rails_cache'
-  when 3
-    require 'active_support/cache/ehcache_store' # AS 3 impl
-    # Railtie
-    module Ehcache
-      class Railtie < ::Rails::Railtie
-        initializer "ehcache.setup_paths" do
-          ActiveSupport::Cache::EhcacheStore.config_directory = File.expand_path(File.join(::Rails.root, 'config'))
-          ActiveSupport::Cache::EhcacheStore.default_cache_name = 'rails_cache'
-        end
-      end
-    end
-  end
-end

data/lib/ehcache/active_support_store.rb ADDED

@@ -0,0 +1,58 @@
+# Common code used in the ehcache_store implementations for ActiveSupport 2.x and 3.x
+require 'active_support'
+begin
+  require 'ehcache'
+rescue LoadError => e
+  $stderr.puts "You don't have ehcache installed in your application."
+  $stderr.puts "Please add it to your Gemfile and run bundle install"
+  raise e
+end
+# Base class for both the ActiveSupport 2 & 3 implementations
+module Ehcache
+  class ActiveSupportStore < ActiveSupport::Cache::Store
+    cattr_accessor :config_directory
+    cattr_accessor :default_cache_name
+    attr_reader :cache_manager
+    def create_cache_manager(options = {})
+      config_dir = self.class.config_directory
+      config = if options[:ehcache_config]
+        File.expand_path(File.join(config_dir, options[:ehcache_config]))
+      else
+        Ehcache::Config::Configuration.find(config_dir) if config_dir
+      end
+      # Ehcache will use the failsafe configuration if nothing is passed in
+      # Note: .create is a factory method
+      @cache_manager = Ehcache::CacheManager.create(config)
+    end
+    def create_cache(options = {})
+      create_cache_manager(options) if @cache_manager.nil?
+      @cache_manager.cache(options[:cache_name] || default_cache_name)
+    end
+    def default_cache_name
+      self.class.default_cache_name || 'app_cache'
+    end
+    at_exit do
+      @cache_manager.shutdown if @cache_manager
+    end
+  end
+end
+if defined?(Rails)
+  Ehcache::ActiveSupportStore.default_cache_name = 'rails_cache'
+  case Rails::VERSION::MAJOR
+  when 2
+    Ehcache::ActiveSupportStore.config_directory = File.expand_path(File.join(RAILS_ROOT, 'config'))
+  when 3
+    Ehcache::ActiveSupportStore.config_directory = File.expand_path(File.join(::Rails.root, 'config'))
+  end
+end

data/lib/ehcache/cache.rb CHANGED

@@ -10,6 +10,13 @@ class Java::NetSfEhcache::Cache
       yield self.get(key)
     end
   end
+  # Does this cache require marshalling of Ruby objects?
+  def marshal?
+    config = self.cache_configuration
+    config.overflow_to_disk? || config.overflow_to_off_heap? || config.terracotta_clustered?
+  end
   # Gets an element value from the cache.  Unlike the #get method, this method
   # returns the element value, not the Element object.
   def [](key)
@@ -26,7 +33,10 @@ class Java::NetSfEhcache::Cache
     if args.size == 1 && args.first.kind_of?(Ehcache::Element)
       element = args.first
     elsif args.size == 2
-      element = Ehcache::Element.create(args[0], args[1], options)
+      if marshal?
+        value = Java::NetSfEhcache::MarshaledRubyObject.new(Marshal.dump(args[1]).to_java_bytes)
+      end
+      element = Ehcache::Element.create(args[0], value, options)
     else
       raise ArgumentError, "Must be Element object or key and value arguments"
     end

data/lib/ehcache/element.rb CHANGED

@@ -9,6 +9,18 @@ class Java::NetSfEhcache::Element
     result
   end
+  alias element_value value
+  # Wrap the Element#value method to unmarshal Ruby objects if necessary.
+  def value
+    val = element_value
+    if val.kind_of?(Java::NetSfEhcache::MarshaledRubyObject)
+      Marshal.load(String.from_java_bytes(val.bytes))
+    else
+      val
+    end
+  end
   alias tti getTimeToIdle
   alias ttl getTimeToLive

data/lib/ehcache/version.rb ADDED

@@ -0,0 +1,3 @@
+module Ehcache
+  VERSION = "1.2.1"
+end

data/src/net/sf/ehcache/MarshaledRubyObject.java ADDED

@@ -0,0 +1,15 @@
+package net.sf.ehcache;
+import java.io.Serializable;
+public class MarshaledRubyObject implements Serializable {
+  private byte[] bytes;
+  public MarshaledRubyObject(byte[] bytes) {
+    this.bytes = bytes;
+  }
+  public byte[] getBytes() {
+    return this.bytes;
+  }
+}

metadata CHANGED

@@ -1,230 +1,133 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification
 name: jruby-ehcache
-version: !ruby/object:Gem::Version
+version: !ruby/object:Gem::Version
+  version: 1.2.1
   prerelease:
-  version: 1.2.0
 platform: ruby
-authors:
-  - Dylan Stamat
-  - Jason Voegele
+authors:
+- Dylan Stamat
+- Jason Voegele
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-03-14 00:00:00 Z
-dependencies:
-  - !ruby/object:Gem::Dependency
-    name: jruby-ehcache
-    version_requirements: &id001 !ruby/object:Gem::Requirement
-      none: false
-      requirements:
-        - - ">="
-          - !ruby/object:Gem::Version
-            version: "0"
-    requirement: *id001
-    prerelease: false
-    type: :runtime
-  - !ruby/object:Gem::Dependency
-    name: rake
-    version_requirements: &id002 !ruby/object:Gem::Requirement
-      none: false
-      requirements:
-        - - ">="
-          - !ruby/object:Gem::Version
-            version: "0"
-    requirement: *id002
-    prerelease: false
-    type: :development
-  - !ruby/object:Gem::Dependency
-    name: jeweler
-    version_requirements: &id003 !ruby/object:Gem::Requirement
-      none: false
-      requirements:
-        - - ">="
-          - !ruby/object:Gem::Version
-            version: "0"
-    requirement: *id003
-    prerelease: false
-    type: :development
-  - !ruby/object:Gem::Dependency
-    name: rake
-    version_requirements: &id004 !ruby/object:Gem::Requirement
-      none: false
-      requirements:
-        - - ">="
-          - !ruby/object:Gem::Version
-            version: "0"
-    requirement: *id004
-    prerelease: false
-    type: :development
-  - !ruby/object:Gem::Dependency
-    name: jeweler
-    version_requirements: &id005 !ruby/object:Gem::Requirement
-      none: false
-      requirements:
-        - - ">="
-          - !ruby/object:Gem::Version
-            version: "0"
-    requirement: *id005
-    prerelease: false
-    type: :development
-  - !ruby/object:Gem::Dependency
-    name: rake
-    version_requirements: &id006 !ruby/object:Gem::Requirement
-      none: false
-      requirements:
-        - - ">="
-          - !ruby/object:Gem::Version
-            version: "0"
-    requirement: *id006
-    prerelease: false
-    type: :development
-  - !ruby/object:Gem::Dependency
-    name: jeweler
-    version_requirements: &id007 !ruby/object:Gem::Requirement
-      none: false
-      requirements:
-        - - ">="
-          - !ruby/object:Gem::Version
-            version: "0"
-    requirement: *id007
-    prerelease: false
-    type: :development
-  - !ruby/object:Gem::Dependency
-    name: activesupport
-    version_requirements: &id008 !ruby/object:Gem::Requirement
-      none: false
-      requirements:
-        - - ">="
-          - !ruby/object:Gem::Version
-            version: "0"
-    requirement: *id008
-    prerelease: false
-    type: :runtime
-  - !ruby/object:Gem::Dependency
-    name: i18n
-    version_requirements: &id009 !ruby/object:Gem::Requirement
-      none: false
-      requirements:
-        - - ">="
-          - !ruby/object:Gem::Version
-            version: "0"
-    requirement: *id009
-    prerelease: false
-    type: :runtime
-  - !ruby/object:Gem::Dependency
-    name: rake
-    version_requirements: &id010 !ruby/object:Gem::Requirement
-      none: false
-      requirements:
-        - - ">="
-          - !ruby/object:Gem::Version
-            version: "0"
-    requirement: *id010
-    prerelease: false
-    type: :development
-  - !ruby/object:Gem::Dependency
-    name: jeweler
-    version_requirements: &id011 !ruby/object:Gem::Requirement
-      none: false
-      requirements:
-        - - ">="
-          - !ruby/object:Gem::Version
-            version: "0"
-    requirement: *id011
-    prerelease: false
-    type: :development
+date: 2012-03-14 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: &70252855820620 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70252855820620
 description: JRuby interface to the popular Java caching library Ehcache
-email:
-  - dstamat@elctech.com
-  - jvoegele@terracotta.org
-executables:
-  - ehcache
+email:
+- dstamat@elctech.com
+- jvoegele@terracotta.org
+executables:
+- ehcache
 extensions: []
-extra_rdoc_files:
-  - README.txt
-files:
-  - Gemfile
-  - Gemfile.lock
-  - History.txt
-  - License.txt
-  - Manifest.txt
-  - PostInstall.txt
-  - README.txt
-  - Rakefile
-  - VERSION
-  - bin/ehcache
-  - config/ehcache.yml
-  - config/ehcache_manual_rmi.yml
-  - examples/ehcache.xml
-  - examples/jruby-ehcache.rb
-  - ext/ehcache-2.4.6/ehcache-core-2.4.6.jar
-  - ext/ehcache-2.4.6/ehcache-terracotta-2.4.6.jar
-  - ext/ehcache-2.4.6/slf4j-api-1.6.1.jar
-  - ext/ehcache-2.4.6/slf4j-jdk14-1.6.1.jar
-  - ext/ehcache-2.4.6/terracotta-toolkit-1.3-runtime-3.3.0.jar
-  - jruby-ehcache-rails2.gemspec
-  - jruby-ehcache-rails3.gemspec
-  - jruby-ehcache.gemspec
-  - lib/ehcache.rb
-  - lib/ehcache/cache.rb
-  - lib/ehcache/cache_manager.rb
-  - lib/ehcache/config.rb
-  - lib/ehcache/element.rb
-  - lib/ehcache/extensions.rb
-  - lib/ehcache/java.rb
-  - lib/ehcache/yaml_config.rb
-  - script/console
-  - script/destroy
-  - script/generate
-  - script/txt2html
-  - spec/cache_manager_spec.rb
-  - spec/cache_spec.rb
-  - spec/spec.opts
-  - spec/spec_helper.rb
-  - tasks/deployment.rake
-  - tasks/environment.rake
-  - tasks/website.rake
-  - test/ehcache.xml
-  - test/ehcache.yml
-  - test/test_cache.rb
-  - test/test_cache_manager.rb
-  - test/test_configuration.rb
-  - test/test_ehcache.rb
-  - test/test_element.rb
-  - test/test_helper.rb
-  - test/test_yaml_config.rb
-  - website/index.html
-  - website/javascripts/rounded_corners_lite.inc.js
-  - website/stylesheets/screen.css
-  - website/template.html.erb
+extra_rdoc_files:
+- README.txt
+files:
+- .gitignore
+- Gemfile
+- Gemfile.lock
+- History.txt
+- License.txt
+- Manifest.txt
+- PostInstall.txt
+- README.txt
+- Rakefile
+- VERSION
+- bin/ehcache
+- config/ehcache.yml
+- config/ehcache_manual_rmi.yml
+- examples/ehcache.xml
+- examples/jruby-ehcache.rb
+- ext/ehcache-2.4.6/ehcache-core-2.4.6.jar
+- ext/ehcache-2.4.6/ehcache-terracotta-2.4.6.jar
+- ext/ehcache-2.4.6/slf4j-api-1.6.1.jar
+- ext/ehcache-2.4.6/slf4j-jdk14-1.6.1.jar
+- ext/ehcache-2.4.6/terracotta-toolkit-1.3-runtime-3.3.0.jar
+- ext/marshaled-ruby-object.jar
+- jruby-ehcache-rails2.gemspec
+- jruby-ehcache-rails3.gemspec
+- jruby-ehcache.gemspec
+- lib/active_support/cache/ehcache_store.rb
+- lib/active_support/ehcache_store.rb
+- lib/ehcache.rb
+- lib/ehcache/active_support_store.rb
+- lib/ehcache/cache.rb
+- lib/ehcache/cache_manager.rb
+- lib/ehcache/config.rb
+- lib/ehcache/element.rb
+- lib/ehcache/java.rb
+- lib/ehcache/version.rb
+- lib/ehcache/yaml_config.rb
+- script/console
+- script/destroy
+- script/generate
+- script/txt2html
+- spec/cache_manager_spec.rb
+- spec/cache_spec.rb
+- spec/spec.opts
+- spec/spec_helper.rb
+- src/net/sf/ehcache/MarshaledRubyObject.java
+- tasks/deployment.rake
+- tasks/environment.rake
+- tasks/website.rake
+- test/ehcache.xml
+- test/ehcache.yml
+- test/test_cache.rb
+- test/test_cache_manager.rb
+- test/test_configuration.rb
+- test/test_ehcache.rb
+- test/test_element.rb
+- test/test_helper.rb
+- test/test_yaml_config.rb
+- website/index.html
+- website/javascripts/rounded_corners_lite.inc.js
+- website/stylesheets/screen.css
+- website/template.html.erb
 homepage: http://ehcache.rubyforge.org
 licenses: []
 post_install_message:
 rdoc_options: []
-require_paths:
-  - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+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
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
 rubyforge_project: ehcache
-rubygems_version: 1.8.9
+rubygems_version: 1.8.15
 signing_key:
 specification_version: 3
 summary: JRuby interface to Ehcache
-test_files: []
+test_files:
+- spec/cache_manager_spec.rb
+- spec/cache_spec.rb
+- spec/spec.opts
+- spec/spec_helper.rb
+- test/ehcache.xml
+- test/ehcache.yml
+- test/test_cache.rb
+- test/test_cache_manager.rb
+- test/test_configuration.rb
+- test/test_ehcache.rb
+- test/test_element.rb
+- test/test_helper.rb
+- test/test_yaml_config.rb

data/lib/ehcache/extensions.rb DELETED

@@ -1,31 +0,0 @@
-require 'active_support/core_ext/string/inflections'
-require 'active_support/core_ext/array/extract_options'
-class Hash
-  # Merges self with another hash, recursively.
-  # This code was lovingly stolen from some random gem:
-  # http://gemjack.com/gems/tartan-0.1.1/classes/Hash.html
-  # Thanks to whoever made it.
-  def deep_merge(hash)
-    target = dup
-    hash.keys.each do |key|
-      if hash[key].is_a? Hash and self[key].is_a? Hash
-        target[key] = target[key].deep_merge(hash[key])
-        next
-      end
-      target[key] = hash[key]
-    end
-    target
-  end
-  def deep_merge!(second)
-    second.each_pair do |k,v|
-      if self[k].is_a?(Hash) and second[k].is_a?(Hash)
-        self[k].deep_merge!(second[k])
-      else
-        self[k] = second[k]
-      end
-    end
-  end
-end