jruby-ehcache 1.1.1 → 1.1.2

data/Rakefile

@@ -44,7 +44,7 @@ Jeweler::Tasks.new do |gemspec|
   gemspec.description = 'Rails 3 cache store provider using Ehcache'
   gemspec.files = FileList['lib/active_support/**/*', 'lib/ehcache/rails/**/*']
   gemspec.test_files = []
-  gemspec.add_dependency 'jruby-ehcache', ">=1.1.1"
+  gemspec.add_dependency 'jruby-ehcache', ">=1.1.2"
 end
 
 Jeweler::Tasks.new do |gemspec|
@@ -54,7 +54,7 @@ Jeweler::Tasks.new do |gemspec|
   gemspec.description = 'Rails 2 cache store provider using Ehcache'
   gemspec.files = FileList['lib/active_support/**/*', 'lib/ehcache/rails/**/*']
   gemspec.test_files = []
-  gemspec.add_dependency 'jruby-ehcache', ">=1.1.1"
+  gemspec.add_dependency 'jruby-ehcache', ">=1.1.2"
 end
 
 Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-1.1.1
+1.1.2

data/lib/ehcache/java.rb

@@ -3,6 +3,25 @@ require 'java'
 EHCACHE_LIBS_DIR = "#{Ehcache::EHCACHE_HOME}/ext"
 
 module Ehcache
+  module Rails
+    RAILS_ROOT_DIR = if defined?(::Rails)
+          ::Rails.root.to_s
+        elsif defined?(RAILS_ROOT)
+          RAILS_ROOT
+        end
+    if RAILS_ROOT_DIR
+      RAILS_LIB_DIR = File.join(RAILS_ROOT_DIR, 'lib')
+      Dir["#{RAILS_LIB_DIR}/**/*.jar"].each do |jar|
+        $CLASSPATH << File.expand_path(jar)
+      end
+    end
+  end
+  Dir["#{EHCACHE_LIBS_DIR}/**/*.jar"].each do |jar|
+    $CLASSPATH << File.expand_path(jar)
+  end
+  LOG = Java::OrgSlf4j::LoggerFactory.getLogger("JRubyEhcache")
+  LOG.info("Using Ehcache version #{Java::NetSfEhcacheUtil::ProductInfo.new.getVersion()}")
+=begin
   slf4j_loader = lambda { Java::OrgSlf4j::LoggerFactory.getLogger("JRubyEhcache") }
   begin
     LOG = slf4j_loader.call
@@ -28,7 +47,7 @@ module Ehcache
     VERSION = ehcache_version_loader.call
     LOG.info("Using bundled Ehcache #{VERSION}")
   end
-
+=end
   include_package 'net.sf.ehcache'
 
   module Config

data/lib/ehcache/rails/ehcache_rails_common.rb

@@ -0,0 +1,42 @@
+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
+
+module Ehcache
+  # Mixin module providing facilities for the Rails 2 and Rails 3 Cache::Store
+  # implementations.
+  module Rails
+
+    RAILS_CONFIG_DIR = File.join(RAILS_ROOT, 'config')
+
+    DEFAULT_RAILS_CACHE_NAME = 'rails_cache'
+
+    attr_reader :cache_manager
+
+    def create_cache_manager(options)
+      config = nil
+      if options[:ehcache_config]
+        Dir.chdir(RAILS_CONFIG_DIR) do
+          config = File.expand_path(options[:ehcache_config])
+        end
+      else
+        config = Ehcache::Config::Configuration.find(RAILS_CONFIG_DIR)
+      end
+      @cache_manager = Ehcache::CacheManager.create(config)
+    end
+
+    def create_cache(options)
+      create_cache_manager(options) if @cache_manager.nil?
+
+      @cache = @cache_manager.cache(options[:cache_name] || DEFAULT_RAILS_CACHE_NAME)
+    end
+
+    at_exit do
+      @cache_manager.shutdown if @cache_manager
+    end
+  end
+end

metadata

@@ -1,117 +1,122 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: jruby-ehcache
-version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 1.1.1
+version: !ruby/object:Gem::Version
+  version: 1.1.2
+  segments:
+  - 1
+  - 1
+  - 2
+  prerelease: false
 platform: ruby
-authors: 
-  - Dylan Stamat
-  - Jason Voegele
-autorequire: 
+authors:
+- Dylan Stamat
+- Jason Voegele
+autorequire: !!null 
 bindir: bin
 cert_chain: []
-
-date: 2011-05-05 00:00:00 -07:00
+date: 2011-10-24 00:00:00.000000000 -04:00
 default_executable: ehcache
-dependencies: 
-  - !ruby/object:Gem::Dependency 
-    name: activesupport
-    prerelease: false
-    requirement: &id001 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: "0"
-    type: :runtime
-    version_requirements: *id001
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: &2156568300 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+        segments:
+        - 0
+  type: :runtime
+  prerelease: false
+  version_requirements: *2156568300
 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: 
-  - 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.2/ehcache-core-2.4.2.jar
-  - ext/ehcache-2.4.2/ehcache-terracotta-2.4.2.jar
-  - ext/ehcache-2.4.2/slf4j-api-1.6.1.jar
-  - ext/ehcache-2.4.2/slf4j-jdk14-1.6.1.jar
-  - ext/ehcache-2.4.2/terracotta-toolkit-1.2-runtime-3.1.0.jar
-  - 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:
+- 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
+- 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/rails/ehcache_rails_common.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
 has_rdoc: true
 homepage: http://ehcache.rubyforge.org
 licenses: []
-
-post_install_message: 
+post_install_message: !!null 
 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'
+      segments:
+      - 0
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
+      - 0
 requirements: []
-
 rubyforge_project: ehcache
-rubygems_version: 1.5.1
-signing_key: 
+rubygems_version: 1.3.7
+signing_key: !!null 
 specification_version: 3
 summary: JRuby interface to Ehcache
 test_files: []
-