jruby-ehcache-rails2 1.1.2 → 1.2.0

data/lib/active_support/cache/ehcache_store.rb

@@ -1,19 +1,18 @@
-require 'ehcache/rails/ehcache_rails_common'
+require 'ehcache/active_support_store'
+
+# Rails 3 cache store implementation which stores data in Ehcache:
+# http://www.ehcache.org/
 
 module ActiveSupport
   module Cache
-
-    # Rails 3 cache store implementation which stores data in Ehcache:
-    # http://www.ehcache.org/
-    class EhcacheStore < Store
-      include Ehcache::Rails
+    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)   # This comes from the Ehcache::Rails mixin.
+        @ehcache = self.create_cache(options)
         extend Strategy::LocalCache
       end
 

data/lib/active_support/ehcache_store.rb

@@ -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/active_support_store.rb

@@ -0,0 +1,47 @@
+# 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

metadata

@@ -1,93 +1,159 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: jruby-ehcache-rails2
-version: !ruby/object:Gem::Version
-  version: 1.1.2
-  segments:
-  - 1
-  - 1
-  - 2
-  prerelease: false
+version: !ruby/object:Gem::Version 
+  prerelease: 
+  version: 1.2.0
 platform: ruby
-authors:
-- Dylan Stamat
-- Jason Voegele
-autorequire: !!null 
+authors: 
+  - Dylan Stamat
+  - Jason Voegele
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-24 00:00:00.000000000 -04:00
-default_executable: ehcache
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: jruby-ehcache
-  requirement: &2157388140 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.1.2
-        segments:
-        - 1
-        - 1
-        - 2
-  type: :runtime
-  prerelease: false
-  version_requirements: *2157388140
-- !ruby/object:Gem::Dependency
-  name: jruby-ehcache
-  requirement: &2157387180 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.1.2
-        segments:
-        - 1
-        - 1
-        - 2
-  type: :runtime
-  prerelease: false
-  version_requirements: *2157387180
+
+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: 1.2.0
+    requirement: *id001
+    prerelease: false
+    type: :runtime
+  - !ruby/object:Gem::Dependency 
+    name: jruby-ehcache
+    version_requirements: &id002 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: "0"
+    requirement: *id002
+    prerelease: false
+    type: :runtime
+  - !ruby/object:Gem::Dependency 
+    name: rake
+    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: jeweler
+    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: rake
+    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: jeweler
+    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: rake
+    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: jeweler
+    version_requirements: &id008 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: "0"
+    requirement: *id008
+    prerelease: false
+    type: :development
+  - !ruby/object:Gem::Dependency 
+    name: jruby-ehcache
+    version_requirements: &id009 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: 1.2.0
+    requirement: *id009
+    prerelease: false
+    type: :runtime
 description: Rails 2 cache store provider using 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:
-- lib/active_support/cache/ehcache_store.rb
-- lib/ehcache/rails/ehcache_rails_common.rb
-- README.txt
-- bin/ehcache
-has_rdoc: true
+
+extra_rdoc_files: 
+  - README.txt
+files: 
+  - lib/active_support/cache/ehcache_store.rb
+  - lib/active_support/ehcache_store.rb
+  - lib/ehcache/active_support_store.rb
+  - README.txt
+  - bin/ehcache
 homepage: http://ehcache.rubyforge.org
 licenses: []
-post_install_message: !!null 
+
+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'
-      segments:
-      - 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'
-      segments:
-      - 0
+  requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
 requirements: []
+
 rubyforge_project: ehcache
-rubygems_version: 1.3.7
-signing_key: !!null 
+rubygems_version: 1.8.9
+signing_key: 
 specification_version: 3
 summary: Rails 2 cache store provider using Ehcache
 test_files: []
+

data/lib/ehcache/rails/ehcache_rails_common.rb

@@ -1,42 +0,0 @@
-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