merb-cache 0.9.7 → 0.9.8

data/lib/merb-cache/merb-cache.rb

@@ -1,165 +0,0 @@
-require "merb-cache/cache-action"
-require "merb-cache/cache-page"
-require "merb-cache/cache-fragment"
-
-class Merb::Cache
-  attr_reader  :config, :store
-
-  class StoreNotFound < Exception
-    def initialize(cache_store)
-      super("cache_store (#{cache_store}) not found (not implemented?)")
-    end
-  end
-
-  DEFAULT_CONFIG = {
-    :cache_html_directory => Merb.dir_for(:public) / "cache",
-
-    #:store => "database",
-    #:table_name => "merb_cache",
-
-    #:disable => "development", # disable merb-cache in development
-    #:disable => true, # disable merb-cache in all environments
-
-    :store => "file",
-    :cache_directory => Merb.root_path("tmp/cache"),
-
-    #:store => "memcache",
-    #:host => "127.0.0.1:11211",
-    #:namespace => "merb_cache",
-    #:track_keys => true,
-
-    #:store => "memory",
-    # store could be: file, memcache, memory, database, dummy, ...
-  }
-
-  # Called in the after_app_loads loop and instantiate the right backend
-  #
-  # ==== Raises
-  # Store#NotFound::
-  #   If the cache_store mentionned in the config is unknown
-  def start
-    @config = DEFAULT_CONFIG.merge(Merb::Plugins.config[:merb_cache] || {})
-    if @config[:disable] == true || Merb.environment.to_s == @config[:disable].to_s
-      config[:disable_page_caching] = true
-      config[:store] = "dummy"
-    end
-    @config[:cache_html_directory] ||= Merb.dir_for(:public) / "cache"
-    require "merb-cache/cache-store/#{@config[:store]}"
-    @store = Merb::Cache.const_get("#{@config[:store].capitalize}Store").new
-    Merb.logger.info("Using #{@config[:store]} cache")
-  rescue LoadError
-    raise Merb::Cache::StoreNotFound, @config[:store].inspect
-  end
-
-  # Compute a cache key and yield it to the given block
-  # It is used by the #expire_page, #expire_action and #expire methods.
-  #
-  # ==== Parameters
-  # options<String, Hash>:: The key or the Hash that will be used to build the key
-  # controller<String>:: The name of the controller
-  # controller_based<Boolean>:: only used by action and page caching
-  #
-  # ==== Options (options)
-  # :key<String>:: The complete or partial key that will be computed.
-  # :action<String>:: The action name that will be used to compute the key
-  # :controller<String>:: The controller name that will be part of the key
-  # :params<Array[String]>::
-  #   The params will be joined together (with '/') and added to the key
-  # :match<Boolean, String>::
-  #   true, it will try to match multiple cache entries
-  #   string, shortcut for {:key => "mykey", :match => true}
-  #
-  # ==== Examples
-  #   expire(:key => "root_key", :params => [session[:me], params[:id]])
-  #   expire(:match => "root_key")
-  #   expire_action(:action => 'list')
-  #   expire_page(:action => 'show', :controller => 'news')
-  #
-  # ==== Returns
-  # The result of the given block
-  #
-  def expire_key_for(options, controller, controller_based = false)
-    key = ""
-    if options.is_a? Hash
-      case
-      when key = options[:key]
-      when action = options[:action]
-        controller = options[:controller] || controller
-        key = "/#{controller}/#{action}"
-      when match = options[:match]
-        key = match
-      end
-      if _params = options[:params]
-        key += "/" + _params.join("/")
-      end
-      yield key, !options[:match].nil?
-    else
-      yield controller_based ? "/#{controller}/#{options}" : options, false
-    end
-  end
-
-  # Compute a cache key based on the given parameters
-  # Only used by the #cached_page?, #cached_action?, #cached?, #cache,
-  # #cache_get and #cache_set methods
-  #
-  # ==== Parameters
-  # options<String, Hash>:: The key or the Hash that will be used to build the key
-  # controller<String>:: The name of the controller
-  # controller_based<Boolean>:: only used by action and page caching
-  #
-  # ==== Options (options)
-  # :key<String>:: The complete or partial key that will be computed.
-  # :action<String>:: The action name that will be used to compute the key
-  # :controller<String>:: The controller name that will be part of the key
-  # :params<Array[String]>::
-  #   The params will be joined together (with '/') and added to the key
-  #
-  # ==== Examples
-  #   cache_set("my_key", @data)
-  #   cache_get(:key => "root_key", :params => [session[:me], params[:id]])
-  #
-  # ==== Returns
-  # The computed key
-  def key_for(options, controller, controller_based = false)
-    key = ""
-    if options.is_a? Hash
-      case
-      when key = options[:key]
-      when action = options[:action]
-        controller = options[:controller] || controller
-        key = "/#{controller}/#{action}"
-      end
-      if _params = options[:params]
-        key += "/" + _params.join("/")
-      end
-    else
-      key = controller_based ? "/#{controller}/#{options}" : options
-    end
-    key
-  end
-
-  module ControllerInstanceMethods
-    # Mixed in Merb::Controller and provides expire_all for action and fragment caching.
-    def expire_all
-      Merb::Controller._cache.store.expire_all
-    end
-  end
-end
-
-module Merb
-  class Controller
-    cattr_reader :_cache
-    @@_cache = Merb::Cache.new
-    # extends Merb::Controller with new instance methods
-    include Merb::Cache::ControllerInstanceMethods
-    class << self
-      # extends Merb::Controller with new class methods
-      include Merb::Cache::ControllerClassMethods
-    end
-  end
-end
-
-Merb::BootLoader.after_app_loads do
-  # the cache starts after the application is loaded
-  Merb::Controller._cache.start
-end

data/lib/merb-cache/merbtasks.rb

@@ -1,6 +0,0 @@
-namespace :merb_cache do
-  desc "Do something for merb-cache"
-  task :default do
-    puts "merb-cache doesn't do anything"
-  end
-end

data/spec/config/database.yml

@@ -1,14 +0,0 @@
----
-:development: &defaults
-  :adapter: sqlite3
-  :database: tmp/merb-cache.sqlite3
-  :log_stream: log/sql.log
-  :log_level: 0
-
-:test:
-  <<: *defaults
-  :database: tmp/merb-cache.sqlite3
-
-:production:
-  <<: *defaults
-  :database: tmp/merb-cache.sqlite3

data/spec/controller.rb

@@ -1,101 +0,0 @@
-class CacheController < Merb::Controller
-  self._template_root = File.dirname(__FILE__) / "views"
-
-  cache_action :action3
-  cache_action :action4, 0.05
-
-  cache_page :action5
-  cache_page :action6, 0.05
-  # or cache_pages :action5, [:action6, 0.05]
-  cache_page :action7
-
-  cache_action :action8, 0.05, :if => proc {|controller| !controller.params[:id].empty?}
-  cache_action :action9, 0.05, :unless => proc {|controller| controller.params[:id].empty?}
-  cache_action :action10, :if => :non_empty_id?
-  cache_action :action11, :unless => :empty_id?
-
-  cache_actions :cache_actions_1, [:cache_actions_2, 0.05], [:cache_actions_3, { :if => :empty_id? }]
-
-  def action1
-    render
-  end
-
-  def action2
-    render
-  end
-
-  def action3
-    "test action3"
-  end
-
-  def action4
-    "test action4"
-  end
-
-  def action5
-    "test action5"
-  end
-
-  def action6
-    Time.now.to_s
-  end
-
-  def action7
-    provides :js, :css, :html, :xml, :jpg
-    case params[:format]
-    when "css"
-      "CSS"
-    when "js"
-      "JS"
-    when "html"
-      "HTML"
-    when "xml"
-      "XML"
-    when "jpg"
-      "JPG"
-    else
-      raise "BAD FORMAT: #{params[:format].inspect}"
-    end
-  end
-
-  def action8
-    "test action8"
-  end
-
-  def action9
-    "test action9"
-  end
-
-  def action10
-    "test action10"
-  end
-
-  def action11
-    "test action11"
-  end
-
-  def cache_actions_1
-    'test cache_actions_1'
-  end
-
-  def cache_actions_2
-    'test cache_actions_2'
-  end
-
-  def cache_actions_3
-    'test cache_actions_3'
-  end
-
-  def index
-    "test index"
-  end
-
-  private
-    def empty_id?
-      params[:id].empty?
-    end
-
-    def non_empty_id?
-      !empty_id?
-    end
-end