merb-cache 1.0.15 → 1.1.0.pre

data/Rakefile

@@ -1,80 +1,73 @@
-require File.expand_path(File.join(File.dirname(__FILE__), "..", "rake_helpers"))
+require 'rubygems'
+require 'rake'
 
-##############################################################################
-# Package && release
-##############################################################################
-RUBY_FORGE_PROJECT  = "merb"
-PROJECT_URL         = "http://merbivore.com"
-PROJECT_SUMMARY     = "Merb plugin that provides caching (page, action, fragment, object)"
-PROJECT_DESCRIPTION = PROJECT_SUMMARY
-
-GEM_AUTHOR = "Ben Burkert"
-GEM_EMAIL  = "ben@benburkert.com"
-
-GEM_NAME    = "merb-cache"
-PKG_BUILD   = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
-GEM_VERSION = Merb::VERSION + PKG_BUILD
-
-RELEASE_NAME    = "REL #{GEM_VERSION}"
-
-require "extlib/tasks/release"
-
-spec = Gem::Specification.new do |s|
-  s.rubyforge_project = RUBY_FORGE_PROJECT
-  s.name = GEM_NAME
-  s.version = GEM_VERSION
-  s.platform = Gem::Platform::RUBY
-  s.has_rdoc = true
-  s.extra_rdoc_files = ["README", "LICENSE", 'TODO']
-  s.summary = PROJECT_SUMMARY
-  s.description = PROJECT_DESCRIPTION
-  s.author = GEM_AUTHOR
-  s.email = GEM_EMAIL
-  s.homepage = PROJECT_URL
-  s.add_dependency('merb-core', "~> #{Merb::VERSION}")
-  s.require_path = 'lib'
-  s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,spec}/**/*")
-end
+# Assume a typical dev checkout to fetch the current merb-core version
+require File.expand_path('../../merb-core/lib/merb-core/version', __FILE__)
 
-Rake::GemPackageTask.new(spec) do |pkg|
-  pkg.gem_spec = spec
-end
+# Load this library's version information
+require File.expand_path('../lib/merb-cache/version', __FILE__)
+
+begin
+
+  gem 'jeweler', '~> 1.4'
+  require 'jeweler'
+
+  Jeweler::Tasks.new do |gemspec|
+
+    gemspec.version     = Merb::Cache::VERSION
+
+    gemspec.name        = "merb-cache"
+    gemspec.description = "Merb plugin for supporting assets"
+    gemspec.summary     = "Merb plugin that provides caching (page, action, fragment, object)"
+
+    gemspec.authors     = [ "Ben Burkert" ]
+    gemspec.email       = "ben@benburkert.com"
+    gemspec.homepage    = "http://merbivore.com/"
+
+    gemspec.files       = %w(LICENSE Rakefile README TODO) + Dir['{lib,spec}/**/*']
 
-desc "Install the gem"
-task :install do
-  Merb::RakeHelper.install(GEM_NAME, :version => GEM_VERSION)
+    # Runtime dependencies
+    gemspec.add_dependency 'merb-core', "~> #{Merb::VERSION}"
+
+    # Development dependencies
+    gemspec.add_development_dependency 'rspec', '>= 1.2.9'
+
+  end
+
+  Jeweler::GemcutterTasks.new
+
+rescue LoadError
+  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end
 
-desc "Uninstall the gem"
-task :uninstall do
-  Merb::RakeHelper.uninstall(GEM_NAME, :version => GEM_VERSION)
+require 'spec/rake/spectask'
+Spec::Rake::SpecTask.new(:spec) do |spec|
+  spec.spec_opts << '--options' << 'spec/spec.opts' if File.exists?('spec/spec.opts')
+  spec.libs << 'lib' << 'spec'
+  spec.spec_files = FileList['spec/**/*_spec.rb']
 end
 
-desc "Create a gemspec file"
-task :gemspec do
-  File.open("#{GEM_NAME}.gemspec", "w") do |file|
-    file.puts spec.to_ruby
-  end
+Spec::Rake::SpecTask.new(:rcov) do |spec|
+  spec.libs << 'lib' << 'spec'
+  spec.pattern = 'spec/**/*_spec.rb'
+  spec.rcov = true
 end
 
-desc "Run all examples (or a specific spec with TASK=xxxx)"
-Spec::Rake::SpecTask.new('spec') do |t|
-  t.spec_opts  = ["-cfs"]
-  t.spec_files = begin
-    if ENV["TASK"] 
-      ENV["TASK"].split(',').map { |task| "spec/**/#{task}_spec.rb" }
-    else
-      FileList['spec/**/*_spec.rb']
-    end
-  end
+task :default => :spec
+
+require 'rake/rdoctask'
+Rake::RDocTask.new do |rdoc|
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title = "test_gem #{Merb::Cache::VERSION}"
+  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-desc 'Default: run spec examples'
-task :default => 'spec'
 
 ##############################################################################
 # memcached
 ##############################################################################
+
 MEMCACHED_PORTS = 43042..43043
 
 namespace :memcached do

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

@@ -189,4 +189,4 @@ module Merb::Cache::CacheMixin
 
     return parameters, conditions.except(:params, :store, :stores)
   end
-end
+end

data/lib/merb-cache/stores/fundamental/memcached_store.rb

@@ -89,8 +89,9 @@ module Merb::Cache
     #
     # Use :buffer_requests option to use bufferring,
     # :no_block to use non-blocking async I/O.
+    # :support_cas to support CAS
     def connect(config = {})
-      @memcached = ::Memcached.new(@servers, config.only(:buffer_requests, :no_block).merge(:namespace => @namespace))
+      @memcached = ::Memcached.new(@servers, config.only(:buffer_requests, :no_block, :support_cas).merge(:namespace => @namespace))
     end
 
     # Returns cache key calculated from base key

data/lib/merb-cache/stores/strategy/abstract_strategy_store.rb

@@ -1,4 +1,4 @@
-# -*- coding: undecided -*-
+# -*- coding: utf-8 -*-
 module Merb::Cache
   # A strategy store wraps one or
   # more fundamental stores, acting as a middle man between caching
@@ -35,29 +35,29 @@ module Merb::Cache
   class AbstractStrategyStore < AbstractStore
     # START: interface for creating strategy stores.  This should/might change.
     def self.contextualize(*stores)
-        Class.new(self) do
-          cattr_accessor :contextualized_stores
+      Class.new(self) do
+        cattr_accessor :contextualized_stores
 
-          self.contextualized_stores = stores
-        end
+        self.contextualized_stores = stores
       end
+    end
 
-      class << self
-        alias_method :[], :contextualize
-      end
+    class << self
+      alias_method :[], :contextualize
+    end
 
-      attr_accessor :stores
+    attr_accessor :stores
 
-      def initialize(config = {})
-        @stores = contextualized_stores.map do |cs|
-          case cs
-          when Symbol
-            Merb::Cache[cs]
-          when Class
-            cs.new(config)
-          end
+    def initialize(config = {})
+      @stores = contextualized_stores.map do |cs|
+        case cs
+        when Symbol
+          Merb::Cache[cs]
+        when Class
+          cs.new(config)
         end
       end
+    end
 
     # END: interface for creating strategy stores.
 

data/lib/merb-cache/stores/strategy/gzip_store.rb

@@ -8,7 +8,7 @@ module Merb::Cache
   # large pages.
   class GzipStore < AbstractStrategyStore
     def writable?(key, parameters = {}, conditions = {})
-      true
+      @stores.any? {|c| c.writable?(key, parameters, conditions)}
     end
 
     def read(key, parameters = {})
@@ -29,7 +29,7 @@ module Merb::Cache
 
     def fetch(key, parameters = {}, conditions = {}, &blk)
       wrapper_blk = lambda { compress(blk.call) }
-      decompress(read(key, parameters) || @stores.capture_first {|s| s.fetch(key, parameters, conditions, &wrapper_blk)})
+      read(key, parameters) || decompress(@stores.capture_first {|s| s.fetch(key, parameters, conditions, &wrapper_blk)})
     end
 
     def exists?(key, parameters = {})

data/lib/merb-cache/version.rb

@@ -0,0 +1,5 @@
+module Merb
+  module Cache
+    VERSION = '1.1.0.pre'.freeze
+  end
+end

data/lib/merb-cache.rb

@@ -1,12 +1,14 @@
 # make sure we're running inside Merb
 if defined?(Merb::Plugins)
-  require "merb-cache" / "cache"
-  require "merb-cache" / "core_ext" / "enumerable"
-  require "merb-cache" / "core_ext" / "hash"
-  require "merb-cache" / "merb_ext" / "controller"
-  require "merb-cache" / "cache_request"
+
+  require "merb-cache/cache"
+  require "merb-cache/core_ext/enumerable"
+  require "merb-cache/core_ext/hash"
+  require "merb-cache/merb_ext/controller"
+  require "merb-cache/cache_request"
 
   class Merb::Controller
     include Merb::Cache::CacheMixin
   end
+
 end

data/spec/merb-cache/cache_request_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe Merb::Cache::CacheRequest do
   it "should subclass Merb::Request" do

data/spec/merb-cache/cache_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe Merb::Cache do
   before(:each) do

data/spec/merb-cache/core_ext/enumerable_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 describe Enumerable do
   describe "#capture_first" do

data/spec/merb-cache/core_ext/hash_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 describe Hash do
   

data/spec/merb-cache/merb_ext/controller_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 describe Merb::Cache::CacheMixin do
   before(:all) do

data/spec/merb-cache/stores/fundamental/abstract_store_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require 'spec_helper'
 
 describe 'all stores', :shared => true do
   describe "#writable?" do

data/spec/merb-cache/stores/fundamental/file_store_spec.rb

@@ -1,6 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-# has 'all stores' shared group
-require File.dirname(__FILE__) + '/abstract_store_spec'
+require 'spec_helper'
+require 'merb-cache/stores/fundamental/abstract_store_spec'
 
 describe Merb::Cache::FileStore do
   it_should_behave_like 'all stores'

data/spec/merb-cache/stores/fundamental/memcached_store_spec.rb

@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/abstract_store_spec'
+require 'spec_helper'
+require 'merb-cache/stores/fundamental/abstract_store_spec'
 
 begin
   require 'memcached'

data/spec/merb-cache/stores/strategy/abstract_strategy_store_spec.rb

@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/../fundamental/abstract_store_spec'
+require 'spec_helper'
+require 'merb-cache/stores/fundamental/abstract_store_spec'
 
 
 describe Merb::Cache::AbstractStrategyStore do

data/spec/merb-cache/stores/strategy/action_store_spec.rb

@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/abstract_strategy_store_spec'
+require 'spec_helper'
+require 'merb-cache/stores/strategy/abstract_strategy_store_spec'
 
 describe Merb::Cache::ActionStore do
   it_should_behave_like 'all strategy stores'

data/spec/merb-cache/stores/strategy/adhoc_store_spec.rb

@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/abstract_strategy_store_spec'
+require 'spec_helper'
+require 'merb-cache/stores/strategy/abstract_strategy_store_spec'
 
 describe Merb::Cache::AdhocStore do
   it_should_behave_like 'all stores'

data/spec/merb-cache/stores/strategy/gzip_store_spec.rb

@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/abstract_strategy_store_spec'
+require 'spec_helper'
+require 'merb-cache/stores/strategy/abstract_strategy_store_spec'
 
 describe Merb::Cache::GzipStore do
   it_should_behave_like 'all strategy stores'
@@ -10,11 +10,17 @@ describe Merb::Cache::GzipStore do
   end
 
   describe "#writable?" do
-    it "should always be true" do
+    it "should be true whatever the key" do
       @store.writable?(:foo).should be_true
       @store.writable?('foo').should be_true
       @store.writable?(123).should be_true
     end
+
+    it "should be false if none of the context caches are writable" do
+      @store.stores.each {|s| s.should_receive(:writable?).and_return false}
+
+      @store.writable?(:foo).should be_false
+    end
   end
 
   describe "#read" do

data/spec/merb-cache/stores/strategy/page_store_spec.rb

@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/abstract_strategy_store_spec'
+require 'spec_helper'
+require 'merb-cache/stores/strategy/abstract_strategy_store_spec'
 
 describe Merb::Cache::PageStore do
   it_should_behave_like 'all strategy stores'

data/spec/merb-cache/stores/strategy/sha1_store_spec.rb

@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/abstract_strategy_store_spec'
+require 'spec_helper'
+require 'merb-cache/stores/strategy/abstract_strategy_store_spec'
 
 describe Merb::Cache::SHA1Store do
   it_should_behave_like 'all strategy stores'

data/spec/spec.opts

@@ -0,0 +1,2 @@
+--format specdoc
+--colour

data/spec/spec_helper.rb

@@ -1,24 +1,29 @@
-$:.push File.join(File.dirname(__FILE__), '..', 'lib')
+require "rubygems"
 
-# Deps
-require 'rubygems'
+# Use current merb-core sources if running from a typical dev checkout.
+lib = File.expand_path('../../../merb-core/lib', __FILE__)
+$LOAD_PATH.unshift(lib) if File.directory?(lib)
 require 'merb-core'
+
+# Use current merb-action-args sources if running from a typical dev checkout.
+lib = File.expand_path('../../../merb-action-args/lib', __FILE__)
+$LOAD_PATH.unshift(lib) if File.directory?(lib)
 require 'merb-action-args'
-require File.join(File.dirname(__FILE__), '..', 'lib', 'merb-cache')
 
-Merb.disable(:initfile)
+# The lib under test
+require "merb-cache"
+
+# Satisfies Autotest and anyone else not using the Rake tasks
+require 'spec'
 
-Merb.start :environment => "test",
-           :adapter     => "runner",
-           :log_file    => File.join(File.dirname(__FILE__), '..', 'log', 'merb_test.log')
+Merb.start :environment => 'test'
 
-require "merb-core/test"
 Spec::Runner.configure do |config|
-  config.include Merb::Test::Helpers
-  #config.include Merb::Test::ControllerHelper
+  config.include Merb::Test::RequestHelper
   config.include Merb::Test::RouteHelper
 end
 
+
 class DummyStore < Merb::Cache::AbstractStore
   cattr_accessor :vault
   attr_accessor  :options

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb-cache
 version: !ruby/object:Gem::Version 
-  version: 1.0.15
+  version: 1.1.0.pre
 platform: ruby
 authors: 
 - Ben Burkert
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-04 00:00:00 +00:00
+date: 2010-02-20 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,23 +20,34 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.0.15
+        version: 1.1.0.pre
     version: 
-description: Merb plugin that provides caching (page, action, fragment, object)
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.2.9
+    version: 
+description: Merb plugin for supporting assets
 email: ben@benburkert.com
 executables: []
 
 extensions: []
 
 extra_rdoc_files: 
-- README
 - LICENSE
+- README
 - TODO
 files: 
 - LICENSE
 - README
 - Rakefile
 - TODO
+- lib/merb-cache.rb
 - lib/merb-cache/cache.rb
 - lib/merb-cache/cache_request.rb
 - lib/merb-cache/core_ext/enumerable.rb
@@ -51,7 +62,7 @@ files:
 - lib/merb-cache/stores/strategy/gzip_store.rb
 - lib/merb-cache/stores/strategy/page_store.rb
 - lib/merb-cache/stores/strategy/sha1_store.rb
-- lib/merb-cache.rb
+- lib/merb-cache/version.rb
 - spec/merb-cache/cache_request_spec.rb
 - spec/merb-cache/cache_spec.rb
 - spec/merb-cache/core_ext/enumerable_spec.rb
@@ -66,14 +77,15 @@ files:
 - spec/merb-cache/stores/strategy/gzip_store_spec.rb
 - spec/merb-cache/stores/strategy/page_store_spec.rb
 - spec/merb-cache/stores/strategy/sha1_store_spec.rb
+- spec/spec.opts
 - spec/spec_helper.rb
 has_rdoc: true
-homepage: http://merbivore.com
+homepage: http://merbivore.com/
 licenses: []
 
 post_install_message: 
-rdoc_options: []
-
+rdoc_options: 
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -84,13 +96,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
   version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      version: "0"
+      version: 1.3.1
   version: 
 requirements: []
 
-rubyforge_project: merb
+rubyforge_project: 
 rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3