wallet 0.0.5 → 1.0.0.beta.1

data/features/cash.feature

@@ -0,0 +1,18 @@
+Feature: Cash
+  As a programmer
+  I want a DSL for action caching
+  So that I can easily manage action caching inside a large application
+
+  Scenario: Cash actions in a controller for the default TTL
+    When I tell Wallet to `cash` an action on a controller
+    Then that action on that controller should cache for the default TTL
+
+  Scenario: Cash every configured action in a controller for a specific TTL
+    When I tell Wallet to `cash` any configured actions on a controller for a specific amount of time
+    Then any configured actions on that controller should cache for that amount of time
+
+  Scenario: Cash a single action in a controller for a spefic amount of time 
+    When I tell Wallet to `cash` all configured actions in a controller for 20 minutes
+    And I tell Wallet to `cash` the `index` action for 30 minutes
+    Then all configured actions except for index on that controller should cache for 20 minutes
+    And the `index` action on that controller should cache for 30 minutes

data/features/controller.feature

@@ -0,0 +1,10 @@
+Feature: Controller DSL
+  As a programmer
+  I want to be able to mix Wallet into my controller
+  so that I can cache actions on that controller
+
+  Scenario: Telling a controller to cache actions
+    Given I have setup Wallet to cache several actions in a controller
+    When I mix Wallet::Cash into that controller
+    And I call the `cash!` method on it
+    Then it should tell Rails to cache the appropriate actions

data/features/default_ttl.feature

@@ -0,0 +1,12 @@
+Feature: 
+  As a programmer
+  I want a configurable TTL default
+  So that I can provide a default TTL for my action cache
+
+  Scenario: TTL defaults to 10 minutes
+    Given I have not configured Wallet
+    Then the default TTL should be 10 minutes
+
+  Scenario: Change the default TTL
+    When I set the default TTL to 20 minutes
+    Then all cache TTL's should default to 20 minutes

data/features/reset.feature

@@ -0,0 +1,9 @@
+Feature: Reset Wallet
+  As a programmer
+  I want a way to reset the Wallet configuration
+  So that I can easily test it
+
+  Scenario: resetting the Wallet back to it's factory settings
+    Given I have configured Wallet
+    When I reset Wallet
+    Then Wallet should return to it's default settings

data/features/step_definitions/cash_steps.rb

@@ -0,0 +1,45 @@
+When /^I tell Wallet to `cash` an action on a controller$/ do
+  Wallet.open do
+    cash :home do
+      index
+    end
+  end
+end
+
+Then /^that action on that controller should cache for the default TTL$/ do
+  Wallet.home.index.should == Wallet.default_ttl
+end
+
+When /^I tell Wallet to `cash` any configured actions on a controller for a specific amount of time$/ do
+  Wallet.open do
+    cash :home, :for => 27.minutes do
+      index
+    end
+  end
+end
+
+Then /^any configured actions on that controller should cache for that amount of time$/ do
+  Wallet.home.index.should == 27.minutes
+end
+
+When /^I tell Wallet to `cash` all configured actions in a controller for (\d+) minutes$/ do |num|
+  Wallet.open do
+    cash :home, :for => 20.minutes do
+      show
+      print
+      index 30.minutes
+    end
+  end
+end
+
+When /^I tell Wallet to `cash` the `index` action for (\d+) minutes$/ do |arg1|
+end
+
+Then /^all configured actions except for index on that controller should cache for (\d+) minutes$/ do |arg1|
+  Wallet.home.show.should == 20.minutes
+  Wallet.home.print.should == 20.minutes
+end
+
+Then /^the `index` action on that controller should cache for (\d+) minutes$/ do |arg1|
+  Wallet.home.index.should == 30.minutes
+end

data/features/step_definitions/controller_steps.rb

@@ -0,0 +1,27 @@
+Given /^I have setup Wallet to cache several actions in a controller$/ do
+  class HomeController
+    def self.caches_action(action_name, options)
+    end
+  end
+
+  Wallet.open do
+    cash :home do
+      index 2.minutes
+    end
+  end
+end
+
+When /^I mix Wallet::Cash into that controller$/ do
+  class HomeController
+    include Wallet::Cash
+  end
+end
+
+When /^I call the `cash!` method on it$/ do
+  @call = proc { HomeController.cash! }
+end
+
+Then /^it should tell Rails to cache the appropriate actions$/ do
+  HomeController.should_receive(:caches_action).with(:index, :expires_in => 2.minutes).and_return nil
+  @call.call
+end

data/features/step_definitions/default_ttl_steps.rb

@@ -0,0 +1,14 @@
+Given /^I have not configured Wallet$/ do
+end
+
+Then /^the default TTL should be (\d+) minutes$/ do |num|
+  Wallet.default_ttl.should == num.to_i.minutes
+end
+
+When /^I set the default TTL to (\d+) minutes$/ do |num|
+  Wallet.default_ttl = num.to_i.minutes
+end
+
+Then /^all cache TTL's should default to (\d+) minutes$/ do |num|
+  Wallet.default_ttl.should == num.to_i.minutes
+end

data/features/step_definitions/reset_steps.rb

@@ -0,0 +1,21 @@
+Given /^I have configured Wallet$/ do
+  Wallet.default_ttl = 100.minutes
+
+  Wallet.open do
+    cash :home do
+      index
+    end
+  end
+
+  Wallet.default_ttl.should == 100.minutes
+  Wallet.home.index.should == Wallet.default_ttl
+end
+
+When /^I reset Wallet$/ do
+  Wallet.reset!
+end
+
+Then /^Wallet should return to it's default settings$/ do
+  Wallet.default_ttl.should == 10.minutes
+  Wallet.home.should be_nil
+end

data/features/support/env.rb

@@ -0,0 +1,3 @@
+$LOAD_PATH.unshift './lib'
+require 'wallet'
+require 'cucumber/rspec/doubles'

data/features/support/hooks.rb

@@ -0,0 +1,3 @@
+Before do
+  Wallet.reset!
+end

data/lib/wallet.rb

@@ -1 +1,7 @@
+require 'active_support/all'
 require 'wallet/wallet'
+require 'wallet/configuration'
+require 'wallet/cached_actions'
+require 'wallet/cash'
+require 'wallet/railtie'
+require 'wallet/engine_railtie'

data/lib/wallet/cached_actions.rb

@@ -0,0 +1,18 @@
+module Wallet
+  module Configuration
+    class CachedActions
+      attr_reader :actions
+
+      def initialize(options={})
+        @actions = {}
+        @default_ttl = options[:default_ttl] || Wallet.default_ttl
+      end
+
+      def method_missing(action_name, *args, &block)
+        action = action_name.to_sym
+        @actions[action] = args.first.to_i if args.first
+        @actions[action] ||= @default_ttl
+      end
+    end
+  end
+end

data/lib/wallet/cash.rb

@@ -0,0 +1,16 @@
+module Wallet
+  module Cash
+    extend ActiveSupport::Concern
+
+    module ClassMethods
+      def cash!
+        Wallet::Configuration.controllers.each do |controller_name, actions_configs|
+          controller = "#{controller_name}_controller".camelize.constantize
+          actions_configs.actions.each do |action_name, ttl|
+            controller.caches_action action_name, ttl
+          end
+        end
+      end
+    end
+  end
+end

data/lib/wallet/configuration.rb

@@ -0,0 +1,20 @@
+module Wallet
+  module Configuration
+    extend self
+
+    def cash(controller, options={}, &block)
+      controllers[controller.to_sym] ||= Wallet::Configuration::CachedActions.new(
+        :default_ttl => (options[:for] || Wallet.default_ttl)
+      )
+      controllers[controller.to_sym].instance_eval &block
+    end
+    
+    def controllers
+      @controllers ||= {}
+    end
+
+    def reset!
+      @controllers = {}
+    end
+  end
+end

data/lib/wallet/engine_railtie.rb

@@ -0,0 +1,12 @@
+require 'rails'
+
+module Wallet
+  module Railtie 
+    def self.included(base)
+      base.config.before_eager_load do
+        wallet = base.root + "/config/wallet.rb"
+        require wallet if File.exists?(wallet)
+      end
+    end
+  end
+end

data/lib/wallet/railtie.rb

@@ -0,0 +1,12 @@
+require 'rails'
+
+module Wallet
+  module Rails
+    class Railtie < ::Rails::Railtie
+      config.before_eager_load do
+        wallet = ::Rails.root.to_s + "/config/wallet.rb" 
+        require wallet if File.exists?(wallet)  
+      end
+    end
+  end
+end

data/lib/wallet/wallet.rb

@@ -1,127 +1,21 @@
-# Author::    Matt Parker  (mailto:moonmaster9000@gmail.com)
-# License::   Distributes under the same terms as Ruby
+module Wallet
+  extend self
+  attr_accessor :default_ttl
 
-class Wallet
-  
-  class << self
-    # Attempts to read and load the configuration file (RAILS_ROOT/config/wallet.yml by default)
-    def load_from_config(config_file=nil)
-      config_file = RAILS_ROOT + "/config/wallet.yml" unless config_file
-      new((File.open(config_file) rescue ""))
-    end
+  def default_ttl
+    @default_ttl ||= 10.minutes
   end
 
-  # This error gets thrown whenever you attempt to retreive a TTL
-  # for an action that's not in the wallet. 
-  class ActionNotCached < StandardError
+  def reset!
+    @default_ttl = nil
+    Configuration.reset!
   end
-  
-  class YamlError < StandardError; end
 
-  class UnknownController < StandardError
+  def open(&block)
+    Configuration.instance_eval &block
   end
 
-  attr_reader :config #:nodoc:
-  attr_reader :default_ttl #:nodoc:
-
-  # Pass in a yaml string to this method that represents your configuration. 
-  # Let's assume you have a PagesController with a show action and an index action, 
-  # and let's suppose you would like wallet to default your action cache ttl's to 5 hours. 
-  # Then your yaml might be formatted like so:
-  #   # /path/to/wallet.yml
-  #   
-  #   default_ttl: 5 hours
-  #
-  #   pages:
-  #     show: 
-  #     index: 20 minutes
-  #
-  # That would result in the following values:
-  #   irb> w = Wallet.new File.open("/path/to/wallet.yml")
-  #   irb> w.cached? :pages, :show
-  #   => true
-  #   irb> w.cached? :pages, :index
-  #   => true
-  #   irb> w.cached? :pages, :new
-  #   => false
-  #   irb> w.ttl :pages, :show
-  #   => 300
-  #   irb> w.ttl :pages, :index
-  #   => 1200
-  #   irb> w.ttl :pages, :new
-  #   Wallet::ActionNotCached: You asked for the TTL for the 'new' action in the 'pages' controller, 
-  #   but according to our wallet configuration, that action is not cached.
-  #       from ./lib/wallet/wallet.rb:54:in `ttl'
-  #       from (irb):6
-  def initialize(config_yml="")
-    yml = YAML.load config_yml rescue nil
-    @config = yml || {}
-    @default_ttl = @config["default_ttl"] ? convert_time(@config["default_ttl"]) : 60
-    @config.delete "default_ttl"
-    setup_action_caching
-  end
-
-  # Returns true or false based on whether or not a controller action is configured for caching in the wallet
-  #   irb> w = Wallet.new "pages:\n  show:"
-  #   irb> w.cached? :pages, :show
-  #   => true
-  def cached?(controller, action)
-    controller, action = stringify_params controller, action
-    @config.has_key?(controller) && 
-      @config[controller].respond_to?(:has_key?) && 
-      @config[controller].has_key?(action)
-  end
-
-  def cached_actions(controller)
-    @config[controller] ? @config[controller].keys : []
-  end
-
-  # Returns the value of the ttl for a controller / action. Throws an exception if the controller/action isn't setup
-  # for caching. 
-  #   irb> w = Wallet.new "pages:\n  show:"
-  #   irb> w.cached? :pages, :show
-  #   => true
-  #   irb> w.ttl :pages, :new
-  #   Wallet::ActionNotCached: You asked for the TTL for the 'new' action in the 'pages' controller, 
-  #   but according to our wallet configuration, that action is not cached.
-  #       from ./lib/wallet/wallet.rb:54:in `ttl'
-  #       from (irb):6
-  def ttl(controller, action)
-    raise ActionNotCached.new("You asked for the TTL for the '#{action}' action in the '#{controller}' controller, but according to our wallet configuration, that action is not cached.") unless cached?(controller, action) 
-    controller, action = stringify_params controller, action
-    if @config[controller][action]
-      convert_time @config[controller][action]
-    else
-      @default_ttl
-    end
-  end
-
-  private
-  def convert_time(time)
-    if !(time =~ /^\ *\d+(?:\ +|\.)(?:hours?|minutes?|days?|seconds?)\ *$/)
-      raise YamlError.new(
-        "'#{time}' is not a valid time phrase. Valid phrases are a number followed by " +
-        "a space followed by 'hours' or 'minutes' or 'days' (or the singular versions of those)."
-      )
-    else
-      time = time.strip.gsub(/\ +/, '.')
-      eval time
-    end
-  end
-  
-  def stringify_params(*args)
-    args.map! {|a| a.to_s}
-    return *args
-  end
-
-  def setup_action_caching
-    @config.each do |controller, actions|
-      controller_class = (controller + "_controller").camelize.constantize rescue nil
-      if controller_class         
-        cached_actions(controller).each do |action|
-          controller_class.send :caches_action, action.to_sym, :expires_in => ttl(controller, action)
-        end
-      end
-    end
+  def method_missing(method_name, *args, &block)
+    Configuration.controllers[method_name.to_sym]
   end
 end

data/readme.markdown

@@ -0,0 +1,85 @@
+# Wallet
+
+Wallet, a simple ruby DSL for centralizing action cache configuration inside your Rails app.
+
+## Installation
+
+Wallet is a gem, available from http://rubygems.org. 
+
+Add the following to your Rails 3 app's Gemfile:
+
+    gem 'wallet', '~> 1.0.0.beta.1'
+
+## Usage
+
+Let's imagine your app has a controller `HomeController`, and you want to action cache the index action inside of it. First, create a `config/wallet.rb` inside your rails root, then open your `Wallet` and add some `cash`:
+
+    Wallet.open do
+      cash :home do
+        index
+      end
+    end
+
+Next, open your `ApplicationController`, and add the following into it: 
+
+    class ApplicationController < ActionController::Base
+      include Wallet::Cash
+      cash!
+    end
+
+The `cash!` method will setup action caching for your controllers (if they have any cache configuration in Wallet). 
+
+With this code in place, Rails will action cache the `index` action inside your home controller for the default TTL (time-to-live) duration: 10 minutes. You can change the default ttl by passing a duration to the `default_ttl` method:
+
+    Wallet.default_ttl = 2.minutes
+
+Now, suppose we have another controller, `ArticlesController`, and we want to cache the `show` and `index` actions on it for a duration of 20 minutes. Simple!
+
+    Wallet.open do
+      cash :articles, :for => 20.minutes do
+        show
+        index
+      end
+    end
+
+This will cache only the `show` and `index` actions on the `ArticlesController`.
+
+Now imagine we've added a third action, `comments`, to our `ArticlesController`, and we want to cache it for only 1 minute:
+
+    Wallet.open do
+      cash :articles, :for => 20.minutes do
+        show
+        index
+        comments 1.minute
+      end
+    end
+
+## Before filters and action caching
+
+Sometimes, even though an action is cached, you want a before filter to run before Rails try's to serve out the cached response. Authentication is one common use case. You can accomplish this with Wallet by simply calling `cash!` after the before filters:
+
+    class ApplicationController < ActionController::Base
+      include Wallet::Cash
+
+      before_filter :authentication
+      cash!
+
+      private
+      def authentication
+        #...
+      end
+    end
+
+Now, the `authentication` method will run before your before filters. 
+
+## Engines
+
+Wallet plays nice with engines. If you'd like to use Wallet inside your engine, create a `config/wallet.rb` file inside your engine, then include `Wallet::Railtie` inside your Engine railtie:
+
+module Comments
+  class Engine < Rails::Engine
+    include Wallet::Railtie
+  end
+end
+
+Now, Rails will load the `config/wallet.rb` inside your engine before your controllers load. 

data/wallet.gemspec

@@ -0,0 +1,19 @@
+Gem::Specification.new do |s|
+  # METADATA
+  s.name        = "wallet"
+  s.version     = File.read "VERSION"
+  s.summary     = "Simple action-cache configuration management for Rails 3."
+  s.description = "A simple DSL for configuring action caching inside your rails app."
+  s.authors     = "Matt Parker"
+  s.email       = "moonmaster9000@gmail.com"
+  s.homepage    = "http://github.com/moonmaster9000/wallet"
+  
+  # FILES PACKAGED WITH THIS GEM
+  s.files       = Dir.glob("lib/**/*") << "readme.markdown" << "wallet.gemspec"
+  s.test_files  = Dir.glob "features/**/*"
+
+  # DEPENDENCIES
+  s.add_dependency "rails", "~> 3.0"
+  s.add_development_dependency "cucumber",  "~> 0.10"
+  s.add_development_dependency "rspec",     "~> 2.0"
+end

metadata

@@ -1,12 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: wallet
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 62196353
+  prerelease: 6
   segments: 
+  - 1
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - beta
+  - 1
+  version: 1.0.0.beta.1
 platform: ruby
 authors: 
 - Matt Parker
@@ -14,65 +17,124 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-05 00:00:00 -04:00
-default_executable: 
+date: 2011-06-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
-        - 2
-        - 3
         - 3
-        version: 2.3.3
+        - 0
+        version: "3.0"
   type: :runtime
   version_requirements: *id001
-description: Wallet is a rails gem that allows you to manage all of your action caching configuration in a single yaml file. Supports TTLs.
+- !ruby/object:Gem::Dependency 
+  name: cucumber
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 31
+        segments: 
+        - 0
+        - 10
+        version: "0.10"
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 2
+        - 0
+        version: "2.0"
+  type: :development
+  version_requirements: *id003
+description: A simple DSL for configuring action caching inside your rails app.
 email: moonmaster9000@gmail.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- README.rdoc
+extra_rdoc_files: []
+
 files: 
-- README.rdoc
-- lib/wallet.rb
+- lib/wallet/cached_actions.rb
+- lib/wallet/cash.rb
+- lib/wallet/configuration.rb
+- lib/wallet/engine_railtie.rb
+- lib/wallet/railtie.rb
 - lib/wallet/wallet.rb
-has_rdoc: true
+- lib/wallet.rb
+- readme.markdown
+- wallet.gemspec
+- features/cash.feature
+- features/controller.feature
+- features/default_ttl.feature
+- features/reset.feature
+- features/step_definitions/cash_steps.rb
+- features/step_definitions/controller_steps.rb
+- features/step_definitions/default_ttl_steps.rb
+- features/step_definitions/reset_steps.rb
+- features/support/env.rb
+- features/support/hooks.rb
 homepage: http://github.com/moonmaster9000/wallet
 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 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
-summary: Centralized YAML configuration for action caching.
+summary: Simple action-cache configuration management for Rails 3.
 test_files: 
-- spec/lib_specs/wallet_spec.rb
-- spec/spec_helper.rb
+- features/cash.feature
+- features/controller.feature
+- features/default_ttl.feature
+- features/reset.feature
+- features/step_definitions/cash_steps.rb
+- features/step_definitions/controller_steps.rb
+- features/step_definitions/default_ttl_steps.rb
+- features/step_definitions/reset_steps.rb
+- features/support/env.rb
+- features/support/hooks.rb

data/README.rdoc

@@ -1,59 +0,0 @@
-==Introduction
-
-Wallet is a rails gem that allows you to manage all of your action caching configuration in a single yaml file. It supports TTLs.
-
-==Motivation
-
-For a large project, it's nice from a systems administration point of view to be able to quickly manage caching in a single place.
-Having a central YAML file for managing action caching also opens up the possibility of creating backend web interfaces for your application
-that could allow site administrators of your app to manage the TTL's from anywhere. 
-
-
-==Installation
-
-To add wallet to your RAILS app, add a config.gem line like the following to the Rails::Initializer section of your environment.rb:
-
-  config.gem "wallet", :lib => 'wallet', :version => '>=0.0.3', :source => "http://gemcutter.org"
-
-Then install the missing gem: 
-
-  bash$ sudo rake gems:install
-
-Lastly, create an initializer that conditionally loads wallet (e.g., RAILS_ROOT/initializers/wallet.rb)
-  
-  Wallet.load_from_config # will load from RAILS_ROOT/config/wallet.yml by default.
-
-==Usage
-
-Once it's installed, you can create a "wallet.yml" file in your RAILS_ROOT/config directory to manage action caching for your application. 
-Suppose you have a controller "ChannelsController" with actions "cartoon_network" and "current_tv". At it's simplest, you could put
-the following in your "wallet.yml":
-  
-  # RAILS_ROOT/config/wallet.yml
-
-  channels:
-    cartoon_network:
-    current_tv:
-
-Wallet would read this file and setup action caching for the cartoon_network and current_tv actions; it would default the TTL
-on those actions to 60 seconds. If you wanted a different default, you could add a special "default_ttl:" entry to your "wallet.yml":
-
-  # RAILS_ROOT/config/wallet.yml
-
-  default_ttl: 30 minutes
-
-  channels:
-    cartoon_network:
-    current_tv:
-
-Noticed that we simple specified "30 minutes". The format of the ttls is "\d\ (minutes?|days?|hours?)".
-
-Lastly, suppose you wanted current_tv to cache for 5 hours, but cartoon_network to still use the default:
-
-  # RAILS_ROOT/config/wallet.yml
-
-  default_ttl: 30 minutes
-
-  channels:
-    cartoon_network: 
-    current_tv: 5 hours

data/spec/lib_specs/wallet_spec.rb

@@ -1,84 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-
-describe Wallet do
-  describe "Wallet::new" do
-    it "should load the config on initialization if provided with a path to a yaml file" do
-      YAML.should_receive(:load).once
-      wallet = Wallet.new("channels:\n  adult_swim:")
-      wallet.config.should_not == false
-    end
-    
-    it "should not load the wallet.yml file on initialization if no file is provided" do
-      YAML.should_receive(:load).once
-      wallet = Wallet.new
-      wallet.config.should be_empty
-    end
-
-    it "should set the default_ttl to 60 if no default_ttl: is provided in the config yml" do
-      wallet = Wallet.new
-      wallet.default_ttl.should == 60
-    end
-
-    it "should set the default_ttl to 300 if the default_ttl is set to 5.hours in the config yml" do
-      wallet = Wallet.new "default_ttl: 5.hours"
-      wallet.default_ttl.should == 5.hours.to_i
-    end
-    
-    it "should set the default_ttl to 300 if the default_ttl is set to '5 hours' in the config yml" do
-      wallet = Wallet.new "default_ttl: 5 hours"
-      wallet.default_ttl.should == 5.hours.to_i
-    end
-
-    it "should throw an exception if i make a mistake with my time format" do
-      proc {Wallet.new "default_ttl: 5.hurs"}.should raise_error(Wallet::YamlError)
-    end
-  end
-
-  describe "Wallet::cached?" do
-    before do
-      config_yml = "channels:\n  cartoon_network:\n"
-      @wallet = Wallet.new config_yml
-    end
-
-    it "should return true for a controller/action that is cached" do
-      @wallet.cached?("channels", "cartoon_network").should == true
-    end
-
-    it "should return false for a controller/action that is not cached" do
-      @wallet.cached?("blah", "blah").should == false
-      @wallet.cached?("channels", "blah").should == false
-    end
-
-    it "should work with both strings and symbols" do
-      @wallet.cached?("channels", "cartoon_network").should == true
-      @wallet.cached?(:channels, :cartoon_network).should == true
-    end
-  end
-
-  describe "Wallet::ttl" do
-    before do
-      config_yml = "channels:\n  cartoon_network: 5 hours\n  current_tv:\n  hbo: 2.minutes\n  pbs: 60 days"
-      @wallet = Wallet.new config_yml
-    end
-
-    it "should return 5 minutes for the channels:cartoon_network ttl" do
-      @wallet.ttl(:channels, :cartoon_network).should == 5.hours.to_i
-    end
-
-    it "should return the default ttl for the current_tv action" do
-      @wallet.ttl(:channels, :current_tv).should == @wallet.default_ttl
-    end
-    
-    it "should return 2 minutes for the channels:hbo ttl" do
-      @wallet.ttl(:channels, :hbo).should == 2.minutes.to_i
-    end
-    
-    it "should return 60 days for the pbs channel ttl" do
-      @wallet.ttl(:channels, :pbs).should == 60.days.to_i
-    end
-
-    it "should raise a ActionNotCached error for the dne action" do
-      proc {@wallet.ttl(:channels, :dne)}.should raise_error(Wallet::ActionNotCached)
-    end
-  end
-end

data/spec/spec_helper.rb

@@ -1,3 +0,0 @@
-$LOAD_PATH << './lib'
-require 'active_support'
-require 'wallet'