cashier 0.1.0 → 0.2.0

data/..gemspec

@@ -0,0 +1,21 @@
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "./version"
+
+Gem::Specification.new do |s|
+  s.name        = "."
+  s.version     = .::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["TODO: Write your name"]
+  s.email       = ["TODO: Write your email address"]
+  s.homepage    = ""
+  s.summary     = %q{TODO: Write a gem summary}
+  s.description = %q{TODO: Write a gem description}
+
+  s.rubyforge_project = "."
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+end

data/.gitignore

@@ -0,0 +1,42 @@
+# rcov generated
+coverage
+
+# rdoc generated
+rdoc
+
+# yard generated
+doc
+.yardoc
+
+# bundler
+.bundle
+
+# jeweler generated
+pkg
+
+# Have editor/IDE/OS specific files you need to ignore? Consider using a global gitignore: 
+#
+# * Create a file at ~/.gitignore
+# * Include files you want ignored
+# * Run: git config --global core.excludesfile ~/.gitignore
+#
+# After doing this, these files will be ignored in all your git projects,
+# saving you from having to 'pollute' every project you touch with them
+#
+# Not sure what to needs to be ignored for particular editors/OSes? Here's some ideas to get you started. (Remember, remove the leading # of the line)
+#
+# For MacOS:
+#
+.DS_Store
+#
+# For TextMate
+#*.tmproj
+#tmtags
+#
+# For emacs:
+#*~
+#\#*
+#.\#*
+#
+# For vim:
+*.swp

data/.infinity_test

@@ -0,0 +1,19 @@
+infinity_test do
+  notifications :growl
+
+  use  :test_framework => :rspec
+
+  before_run do
+    clear :terminal
+  end
+
+  heuristics do
+    add('lib/(.+)\.rb') do |file|
+      run :all => :tests
+    end
+    
+    add('rails_app') do |file|
+      run :all => :tests
+    end
+  end
+end

data/Gemfile

@@ -1,16 +1,4 @@
 source "http://rubygems.org"
-# Add dependencies required to use your gem here.
-# Example:
-#   gem "activesupport", ">= 2.3.5"
 
-gem 'redis'
-gem 'redis-namespace'
-
-# Add dependencies to develop your gem here.
-# Include everything needed to run rake, tests, features, etc.
-group :development do
-  gem "rspec", "~> 2.3.0"
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.5.2"
-  gem "rcov", ">= 0"
-end
+# Specify your gem's dependencies in ..gemspec
+gemspec

data/Gemfile.lock

@@ -1,33 +1,118 @@
+PATH
+  remote: .
+  specs:
+    cashier (0.2.0)
+
 GEM
   remote: http://rubygems.org/
   specs:
+    abstract (1.0.0)
+    actionmailer (3.0.4)
+      actionpack (= 3.0.4)
+      mail (~> 2.2.15)
+    actionpack (3.0.4)
+      activemodel (= 3.0.4)
+      activesupport (= 3.0.4)
+      builder (~> 2.1.2)
+      erubis (~> 2.6.6)
+      i18n (~> 0.4)
+      rack (~> 1.2.1)
+      rack-mount (~> 0.6.13)
+      rack-test (~> 0.5.7)
+      tzinfo (~> 0.3.23)
+    activemodel (3.0.4)
+      activesupport (= 3.0.4)
+      builder (~> 2.1.2)
+      i18n (~> 0.4)
+    activerecord (3.0.4)
+      activemodel (= 3.0.4)
+      activesupport (= 3.0.4)
+      arel (~> 2.0.2)
+      tzinfo (~> 0.3.23)
+    activeresource (3.0.4)
+      activemodel (= 3.0.4)
+      activesupport (= 3.0.4)
+    activesupport (3.0.4)
+    archive-tar-minitar (0.5.2)
+    arel (2.0.8)
+    builder (2.1.2)
+    columnize (0.3.2)
     diff-lcs (1.1.2)
-    git (1.2.5)
-    jeweler (1.5.2)
-      bundler (~> 1.0.0)
-      git (>= 1.2.5)
-      rake
+    erubis (2.6.6)
+      abstract (>= 1.0.0)
+    i18n (0.5.0)
+    infinity_test (1.0.2)
+      notifiers (>= 1.1.0)
+      watchr (>= 0.7)
+    linecache19 (0.5.11)
+      ruby_core_source (>= 0.1.4)
+    mail (2.2.15)
+      activesupport (>= 2.3.6)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    memcache-client (1.8.5)
+    mime-types (1.16)
+    notifiers (1.1.0)
+    polyglot (0.3.1)
+    rack (1.2.1)
+    rack-mount (0.6.13)
+      rack (>= 1.0.0)
+    rack-test (0.5.7)
+      rack (>= 1.0)
+    rails (3.0.4)
+      actionmailer (= 3.0.4)
+      actionpack (= 3.0.4)
+      activerecord (= 3.0.4)
+      activeresource (= 3.0.4)
+      activesupport (= 3.0.4)
+      bundler (~> 1.0)
+      railties (= 3.0.4)
+    railties (3.0.4)
+      actionpack (= 3.0.4)
+      activesupport (= 3.0.4)
+      rake (>= 0.8.7)
+      thor (~> 0.14.4)
     rake (0.8.7)
-    rcov (0.9.9)
-    redis (2.1.1)
-    redis-namespace (0.10.0)
-      redis (< 3.0.0)
-    rspec (2.3.0)
-      rspec-core (~> 2.3.0)
-      rspec-expectations (~> 2.3.0)
-      rspec-mocks (~> 2.3.0)
-    rspec-core (2.3.1)
-    rspec-expectations (2.3.0)
+    rspec (2.5.0)
+      rspec-core (~> 2.5.0)
+      rspec-expectations (~> 2.5.0)
+      rspec-mocks (~> 2.5.0)
+    rspec-core (2.5.1)
+    rspec-expectations (2.5.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.3.0)
+    rspec-mocks (2.5.0)
+    rspec-rails (2.5.0)
+      actionpack (~> 3.0)
+      activesupport (~> 3.0)
+      railties (~> 3.0)
+      rspec (~> 2.5.0)
+    ruby-debug-base19 (0.11.24)
+      columnize (>= 0.3.1)
+      linecache19 (>= 0.5.11)
+      ruby_core_source (>= 0.1.4)
+    ruby-debug19 (0.11.6)
+      columnize (>= 0.3.1)
+      linecache19 (>= 0.5.11)
+      ruby-debug-base19 (>= 0.11.19)
+    ruby_core_source (0.1.4)
+      archive-tar-minitar (>= 0.5.2)
+    sqlite3 (1.3.3)
+    thor (0.14.6)
+    treetop (1.4.9)
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.24)
+    watchr (0.7)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.0.0)
-  jeweler (~> 1.5.2)
-  rcov
-  redis
-  redis-namespace
-  rspec (~> 2.3.0)
+  cashier!
+  infinity_test
+  memcache-client
+  rails
+  rspec
+  rspec-rails
+  ruby-debug19
+  sqlite3

data/Rakefile

@@ -1,31 +1,5 @@
-require 'rubygems'
 require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-require 'rake'
-
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = "cashier"
-  gem.homepage = "http://github.com/Adman65/cashier"
-  gem.license = "MIT"
-  gem.summary = %Q{Tag based caching for Rails}
-  gem.description = %Q{Associate different cached content with a tag, then expire by tag instead of key}
-  gem.email = "Adman1965@gmail.com"
-  gem.authors = ["Adam Hawkins"]
-  # Include your dependencies below. Runtime dependencies are required when using your gem,
-  # and development dependencies are only needed for development (ie running rake tasks, tests, etc)
-  #  gem.add_runtime_dependency 'redis'
-  #  gem.add_runtime_dependency 'redis-namespace'
-  #  gem.add_development_dependency 'rspec', '> 1.2.3'
-end
-Jeweler::RubygemsDotOrgTasks.new
+Bundler::GemHelper.install_tasks
 
 require 'rspec/core'
 require 'rspec/core/rake_task'
@@ -39,13 +13,3 @@ RSpec::Core::RakeTask.new(:rcov) do |spec|
 end
 
 task :default => :spec
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "cashier #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end

data/cashier.gemspec

@@ -1,70 +1,30 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "cashier/version"
 
 Gem::Specification.new do |s|
-  s.name = %q{cashier}
-  s.version = "0.1.0"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Adam Hawkins"]
-  s.date = %q{2011-01-05}
+  s.name        = "cashier"
+  s.version     = Cashier::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["Adam Hawkins"]
+  s.email       = ["adman1965@gmail.com"]
+  s.homepage    = "https://github.com/Adman65/cashier"
+  s.summary     = %q{Tag based caching for Rails}
   s.description = %q{Associate different cached content with a tag, then expire by tag instead of key}
-  s.email = %q{Adman1965@gmail.com}
-  s.extra_rdoc_files = [
-    "LICENSE.txt"
-  ]
-  s.files = [
-    ".rvmrc",
-    "Gemfile",
-    "Gemfile.lock",
-    "LICENSE.txt",
-    "Rakefile",
-    "VERSION",
-    "cashier.gemspec",
-    "lib/cashier.rb",
-    "lib/cashier/controller_helper.rb",
-    "readme.md",
-    "spec/cashier_spec.rb",
-    "spec/spec_helper.rb"
-  ]
-  s.homepage = %q{http://github.com/Adman65/cashier}
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Tag based caching for Rails}
-  s.test_files = [
-    "spec/cashier_spec.rb",
-    "spec/spec_helper.rb"
-  ]
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+  s.rubyforge_project = "cashier"
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<redis>, [">= 0"])
-      s.add_runtime_dependency(%q<redis-namespace>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
-    else
-      s.add_dependency(%q<redis>, [">= 0"])
-      s.add_dependency(%q<redis-namespace>, [">= 0"])
-      s.add_dependency(%q<rspec>, ["~> 2.3.0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
-      s.add_dependency(%q<rcov>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<redis>, [">= 0"])
-    s.add_dependency(%q<redis-namespace>, [">= 0"])
-    s.add_dependency(%q<rspec>, ["~> 2.3.0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
-    s.add_dependency(%q<rcov>, [">= 0"])
-  end
+  s.add_development_dependency 'rails'
+  s.add_development_dependency 'rspec'
+  s.add_development_dependency 'rspec-rails'
+  s.add_development_dependency 'infinity_test'
+  s.add_development_dependency 'memcache-client'
+  s.add_development_dependency 'ruby-debug19'
+  s.add_development_dependency 'sqlite3'
 end
 

data/lib/cashier.rb

@@ -3,75 +3,76 @@
 module Cashier
   extend self
 
-  # used to track all the tags Cashier is storing
-  STORAGE_KEY = 'cashier-tags'
+  CACHE_KEY = 'cashier-tags'
 
   def perform_caching?
     ::ApplicationController.perform_caching
   end
 
-  # shamefully taken straight from Resque.
-  # Thanks Defunkt :D
-
-  # Accepts:
-  #   1. A 'hostname:port' string
-  #   2. A 'hostname:port:db' string (to select the Redis db)
-  #   3. A 'hostname:port/namespace' string (to set the Redis namespace)
-  #   4. A redis URL string 'redis://host:port'
-  #   5. An instance of `Redis`, `Redis::Client`, `Redis::DistRedis`,
-  #      or `Redis::Namespace`.
-  def redis=(server)
-    if server.respond_to? :split
-      if server =~ /redis\:\/\//
-        redis = Redis.connect(:url => server)
-      else
-        server, namespace = server.split('/', 2)
-        host, port, db = server.split(':')
-        redis = Redis.new(:host => host, :port => port,
-          :thread_safe => true, :db => db)
-      end
-      namespace ||= :cashier
+  def store_fragment(fragment, *tags)
+    return unless perform_caching?
 
-      @redis = Redis::Namespace.new(namespace, :redis => redis)
-    elsif server.respond_to? :namespace=
-        @redis = server
-    else
-      @redis = Redis::Namespace.new(:cashier, :redis => server)
+    tags.each do |tag|
+      # store the fragment
+      fragments = Rails.cache.fetch(tag) || []
+      Rails.cache.write(tag, fragments + [fragment])
     end
-  end
 
-  # Returns the current Redis connection. If none has been created, will
-  # create a new one.
-  def redis
-    return @redis if @redis
-    self.redis = 'localhost:6379'
-    self.redis
+    # now store the tag for book keeping
+    cashier_tags = Rails.cache.fetch(CACHE_KEY) || []
+    cashier_tags = (cashier_tags + tags).uniq
+    Rails.cache.write(CACHE_KEY, cashier_tags)
   end
 
   def expire(*tags)
     return unless perform_caching?
 
+    # delete them from the cache
     tags.each do |tag|
-      # check to see if the tag exsists
-      # some redis versions return nil or []
-      members = redis.smembers(tags)
-      if members.is_a?(Array)
-        members.each do |cache_key|
-          Rails.cache.delete(cache_key)
+      if fragment_keys = Rails.cache.fetch(tag)
+        fragment_keys.each do |fragment_key|
+          Rails.cache.delete(fragment_key)
         end
-        redis.del(tag)
-        redis.srem(STORAGE_KEY, tag)
       end
+      Rails.cache.delete(tag)
     end
+
+    # now remove them from the list
+    # of stored tags
+    cashier_tags = Rails.cache.fetch(CACHE_KEY) || []
+    cashier_tags = (cashier_tags - tags).uniq
+    Rails.cache.write(CACHE_KEY, cashier_tags)
   end
 
   def tags
-    redis.smembers STORAGE_KEY
+    Rails.cache.fetch(CACHE_KEY) || []
   end
 
-  def wipe
+  def clear
     expire(*tags)
+    Rails.cache.delete(CACHE_KEY)
   end
-end  
+
+  def wipe
+    clear
+  end
+
+  def keys
+    tags.inject([]) do |arry, tag|
+      arry += Rails.cache.fetch(tag)
+    end.compact
+  end
+
+  def keys_for(tag)
+    Rails.cache.fetch(tag) || []
+  end
+end
 
 require 'cashier/controller_helper'
+require 'cashier/matchers'
+
+if defined?(::Rails)
+  if Rails::VERSION::MAJOR == 3
+    require 'cashier/railtie'
+  end
+end