jruby-ehcache-rails3 1.0.0 → 1.1.0

data/README.txt

@@ -62,7 +62,8 @@ $ sudo jruby -S gem install jruby-ehcache
 
 
 == LICENSE:
-Copyright (c) 2008 Dylan Stamat <dstamat@elctech.com>
+Copyright (c) 2008 - 2010 Dylan Stamat <dstamat@elctech.com> and
+                          Jason Voegele <jason@jvoegele.com>
 
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation

data/lib/active_support/cache/ehcache_store.rb

@@ -11,8 +11,9 @@ module ActiveSupport
       def initialize(*args)
         args = args.flatten
         options = args.extract_options!
-        super(*options)
-        @ehcache = self.create_cache   # This comes from the Ehcache::Rails mixin.
+        super(options)
+        self.create_cache_manager(options)
+        @ehcache = self.create_cache(options)   # This comes from the Ehcache::Rails mixin.
         extend Strategy::LocalCache
       end
 

data/lib/ehcache/rails/ehcache_rails_common.rb

@@ -19,15 +19,25 @@ module Ehcache
         end
 
     DEFAULT_RAILS_CACHE_NAME = 'rails_cache'
+    
+    attr_reader :cache_manager
 
-    def create_cache_manager(*args)
-      config = Ehcache::Config::Configuration.find(RAILS_CONFIG_DIR)
+    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(name = DEFAULT_RAILS_CACHE_NAME)
-      create_cache_manager if @cache_manager.nil?
-      @cache = @cache_manager.cache(name)
+    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

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: jruby-ehcache-rails3
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-    - 1
-    - 0
-    - 0
-  version: 1.0.0
+  prerelease: 
+  version: 1.1.0
 platform: ruby
 authors: 
   - Dylan Stamat
@@ -15,23 +11,31 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-15 00:00:00 -05:00
+date: 2011-05-04 00:00:00 -07:00
 default_executable: ehcache
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: jruby-ehcache
     prerelease: false
     requirement: &id001 !ruby/object:Gem::Requirement 
+      none: false
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
-            segments: 
-              - 1
-              - 0
-              - 0
-            version: 1.0.0
+            version: 1.1.0
     type: :runtime
     version_requirements: *id001
+  - !ruby/object:Gem::Dependency 
+    name: jruby-ehcache
+    prerelease: false
+    requirement: &id002 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: 1.1.0
+    type: :runtime
+    version_requirements: *id002
 description: Rails 3 cache store provider using Ehcache
 email: 
   - dstamat@elctech.com
@@ -46,33 +50,32 @@ files:
   - lib/active_support/cache/ehcache_store.rb
   - lib/ehcache/rails/ehcache_rails_common.rb
   - README.txt
+  - bin/ehcache
 has_rdoc: true
 homepage: http://ehcache.rubyforge.org
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-  - --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
   - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-          - 0
         version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-          - 0
         version: "0"
 requirements: []
 
 rubyforge_project: ehcache
-rubygems_version: 1.3.6
+rubygems_version: 1.5.1
 signing_key: 
 specification_version: 3
 summary: Rails 3 cache store provider using Ehcache