padrino-cache 0.11.4 → 0.12.0.rc1

data/lib/padrino-cache/legacy_store.rb

@@ -0,0 +1,68 @@
+module Padrino
+  module Cache
+    class LegacyStore < Moneta::Proxy
+      ##
+      # Return the a value for the given key
+      #
+      # @param [String] key
+      #   cache key
+      #
+      # @example
+      #   # with MyApp.cache.set('records', records)
+      #   MyApp.cache.get('records')
+      #
+      # @api public
+      def get(key)
+        warn 'cache.get(key) has been deprecated in favour of cache[key]'
+        self[key]
+      end
+
+      ##
+      # Set the value for a given key and optionally with an expire time
+      # Default expiry time is 86400.
+      #
+      # @param [String] key
+      #   cache key
+      # @param value
+      #   value of cache key
+      #
+      # @example
+      #   MyApp.cache.set('records', records)
+      #   MyApp.cache.set('records', records, :expires_in => 30) # => 30 seconds
+      #
+      # @api public
+      def set(key, value, opts = nil)
+        warn opts ? 'cache.set(key, value, opts) has been deprecated in favour of cache.store(key, value, opts)' :
+          'cache.set(key, value) has been deprecated in favour of cache[key] = value'
+        store(key, value, opts || {})
+      end
+
+      ##
+      # Reinitialize your cache
+      #
+      # @example
+      #   # with: MyApp.cache.set('records', records)
+      #   MyApp.cache.flush
+      #   MyApp.cache.get('records') # => nil
+      #
+      # @api public
+      def flush
+        warn 'cache.flush has been deprecated in favour of cache.clear'
+        clear
+      end
+
+      # (see Moneta::Proxy#store)
+      def store(key, value, options = {})
+        if options[:expires_in]
+          warn 'Option :expires_in has been deprecated in favour of :expires'
+          options[:expires] = options.delete(:expires_in).to_i
+        end
+        if options[:expires] && options[:expires] < 0
+          warn 'The use of negative expiration values is deprecated, use :expires => false'
+          options[:expires] = false
+        end
+        adapter.store(key, value, options)
+      end
+    end
+  end
+end

data/padrino-cache.gemspec

@@ -14,6 +14,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = ">= 1.3.6"
   s.version = Padrino.version
   s.date = Time.now.strftime("%Y-%m-%d")
+  s.license = "MIT"
 
   s.extra_rdoc_files = Dir["*.rdoc"]
   s.files         = `git ls-files`.split("\n")
@@ -24,4 +25,5 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency("padrino-core", Padrino.version)
   s.add_runtime_dependency("padrino-helpers", Padrino.version)
+  s.add_runtime_dependency("moneta", ["~> 0.7.0"])
 end

data/test/helper.rb

@@ -3,41 +3,4 @@ PADRINO_ROOT = File.dirname(__FILE__) unless defined?(PADRINO_ROOT)
 
 require File.expand_path('../../../load_paths', __FILE__)
 require File.join(File.dirname(__FILE__), '..', '..', 'padrino-core', 'test', 'helper')
-require 'uuid'
 require 'padrino-cache'
-
-class MiniTest::Spec
-
-  def executable_on_path(binary)
-    @matches = []
-
-    ENV['PATH'].split(":").each do |path|
-      bintest = File.executable?("#{path}/#{binary}")
-      pathmatch = "#{path}/#{binary}"
-      @matches << pathmatch if bintest == true
-    end
-
-    @matches.length == 1 ? @matches.first : false
-
-  end
-end
-
-MiniTest::Spec.class_eval do
-  def self.shared_examples
-    @shared_examples ||= {}
-  end
-end
-
-module MiniTest::Spec::SharedExamples
-  def shared_examples_for(desc, &block)
-    MiniTest::Spec.shared_examples[desc] = block
-  end
- 
-  def it_behaves_like(desc)
-    self.instance_eval do
-      MiniTest::Spec.shared_examples[desc].call
-    end
-  end
-end
- 
-Object.class_eval { include(MiniTest::Spec::SharedExamples) }

data/test/test_legacy_store.rb

@@ -0,0 +1,53 @@
+require File.expand_path(File.dirname(__FILE__) + '/helper')
+
+describe Padrino::Cache::LegacyStore do
+  def setup
+    @test_key = "val_#{Time.now.to_i}"
+  end
+
+  def teardown
+    Padrino.cache.clear
+  end
+
+  class Foo
+    def bar; "bar"; end
+  end
+
+  it "return nil trying to get a value that doesn't exist" do
+    Padrino.cache.flush
+    assert_equal nil, Padrino.cache.get(@test_key)
+  end
+
+  it 'set and get an object with marshal' do
+    Padrino.cache.set(@test_key, Foo.new)
+    assert_equal "bar", Padrino.cache.get(@test_key).bar
+  end
+
+  it 'set and get a nil value' do
+    Padrino.cache.set(@test_key, nil)
+    assert_equal '', Padrino.cache.get(@test_key).to_s
+  end
+
+  it 'set and get a raw value' do
+    Padrino.cache.set(@test_key, 'foo')
+    assert_equal 'foo', Padrino.cache.get(@test_key)
+  end
+
+  it "set a value that expires" do
+    init_time = ( Time.now - 20 )
+    Time.stub(:now, init_time) { Padrino.cache.set(@test_key, 'test', :expires_in => 1) }
+    Time.stub(:now, init_time + 20) { assert_equal nil, Padrino.cache.get(@test_key) }
+  end
+
+  it "be able to cache forever" do
+    Padrino.cache.set('forever', 'cached', :expires_in => -1)
+    2.times { |i| assert_equal 'cached', Padrino.cache.get('forever') }
+  end
+
+  it 'delete a value' do
+    Padrino.cache.set(@test_key, 'test')
+    assert_equal 'test', Padrino.cache.get(@test_key)
+    Padrino.cache.delete(@test_key)
+    assert_equal nil, Padrino.cache.get(@test_key)
+  end
+end

data/test/test_moneta_store.rb

@@ -0,0 +1,53 @@
+require File.expand_path(File.dirname(__FILE__) + '/helper')
+
+describe 'Padrino::Cache - Moneta store' do
+  def setup
+    @test_key = "val_#{Time.now.to_i}"
+  end
+
+  def teardown
+    Padrino.cache.clear
+  end
+
+  class Foo
+    def bar; "bar"; end
+  end
+
+  it "return nil trying to get a value that doesn't exist" do
+    Padrino.cache.clear
+    assert_equal nil, Padrino.cache[@test_key]
+  end
+
+  it 'set and get an object with marshal' do
+    Padrino.cache[@test_key] = Foo.new
+    assert_equal "bar", Padrino.cache[@test_key].bar
+  end
+
+  it 'set and get a nil value' do
+    Padrino.cache[@test_key] = nil
+    assert_equal '', Padrino.cache[@test_key].to_s
+  end
+
+  it 'set and get a raw value' do
+    Padrino.cache[@test_key] = 'foo'
+    assert_equal 'foo', Padrino.cache[@test_key]
+  end
+
+  it "set a value that expires" do
+    init_time = ( Time.now - 20 )
+    Time.stub(:now, init_time) { Padrino.cache.store(@test_key, 'test', :expires => 1) }
+    Time.stub(:now, init_time + 20) { assert_equal nil, Padrino.cache[@test_key] }
+  end
+
+  it "be able to cache forever" do
+    Padrino.cache.store('forever', 'cached', :expires => false)
+    2.times { |i| assert_equal 'cached', Padrino.cache['forever'] }
+  end
+
+  it 'delete a value' do
+    Padrino.cache[@test_key] = 'test'
+    assert_equal 'test', Padrino.cache[@test_key]
+    Padrino.cache.delete(@test_key)
+    assert_equal nil, Padrino.cache[@test_key]
+  end
+end

data/test/test_padrino_cache.rb

@@ -90,14 +90,14 @@ describe "PadrinoCache" do
     get "/foo"
     assert_equal 200, status
     assert_equal 'foo', body
-    assert_equal 'foo', @app.cache.get(:foo)
+    assert_equal 'foo', @app.cache[:foo][:body]
     get "/foo"
     assert_equal 'foo', body
 
     get "/bar"
     assert_equal 200, status
     assert_equal 'bar', body
-    assert_equal 'bar', @app.cache.get(:bar)
+    assert_equal 'bar', @app.cache[:bar][:body]
     get "/bar"
     assert_equal 'bar', body
   end
@@ -160,7 +160,7 @@ describe "PadrinoCache" do
       enable :caching
       controller :cache => true do
         get("/foo") {
-          expires_in 1
+          expires 1
           called ? 'test again' : (called = 'test')
         }
       end
@@ -184,8 +184,8 @@ describe "PadrinoCache" do
       enable :caching
       controller do
         get("/foo") {
-          expires_in 1
-          cache(:test, :expires_in => 2) do
+          expires 1
+          cache(:test, :expires => 2) do
             called ? 'test again' : (called = 'test')
           end
         }
@@ -197,7 +197,7 @@ describe "PadrinoCache" do
     get "/foo"
     assert_equal 200, status
     assert_equal 'test', body
-    sleep 2
+    sleep 3
     get "/foo"
     assert_equal 200, status
     assert_equal 'test again', body
@@ -231,14 +231,14 @@ describe "PadrinoCache" do
     get '/404'
     assert_equal 'fancy 404', body
     assert_equal 404, status
-    assert_equal nil, @app.cache.get('/404')
+    assert_equal nil, @app.cache['/404']
     get '/404'
     assert_equal 'fancy 404', body
     assert_equal 404, status
     get '/503'
     assert_equal 'fancy 503', body
     assert_equal 503, status
-    assert_equal nil, @app.cache.get('/503')
+    assert_equal nil, @app.cache['/503']
     get '/503'
     assert_equal 'fancy 503', body
     assert_equal 503, status
@@ -246,10 +246,10 @@ describe "PadrinoCache" do
 
   should 'cache should not hit with unique params' do
     call_count = 0
-    mock_app do 
+    mock_app do
       register Padrino::Cache
       enable :caching
-      before do 
+      before do
         param = params[:test] || 'none'
         cache_key "foo?#{param}"
       end
@@ -273,7 +273,7 @@ describe "PadrinoCache" do
 
   should 'resolve block cache keys' do
     call_count = 0
-    mock_app do 
+    mock_app do
       register Padrino::Cache
       enable :caching
 
@@ -294,7 +294,7 @@ describe "PadrinoCache" do
   end
 
   should 'raise an error if providing both a cache_key and block' do
-    mock_app do 
+    mock_app do
       register Padrino::Cache
       enable :caching
 
@@ -306,4 +306,29 @@ describe "PadrinoCache" do
     assert_raises(RuntimeError) { get '/foo' }
   end
 
+  should 'cache content_type' do
+    called = false
+    mock_app do
+      register Padrino::Cache
+      enable :caching
+      get '/foo', :cache => true do
+        content_type :json
+        if called
+          "you'll never see me"
+        else
+          cache_key :foo
+          called = '{"foo":"bar"}'
+
+          called
+        end
+      end
+    end
+    get "/foo"
+    assert_equal 200, status
+    assert_equal '{"foo":"bar"}', body
+    assert_equal '{"foo":"bar"}', @app.cache[:foo][:body]
+    get "/foo"
+    assert_equal '{"foo":"bar"}', body
+    assert_match /json/, last_response.content_type
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: padrino-cache
 version: !ruby/object:Gem::Version
-  version: 0.11.4
+  version: 0.12.0.rc1
 platform: ruby
 authors:
 - Padrino Team
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-24 00:00:00.000000000 Z
+date: 2013-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: padrino-core
@@ -19,28 +19,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.4
+        version: 0.12.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.4
+        version: 0.12.0.rc1
 - !ruby/object:Gem::Dependency
   name: padrino-helpers
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.4
+        version: 0.12.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.4
+        version: 0.12.0.rc1
+- !ruby/object:Gem::Dependency
+  name: moneta
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.7.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.7.0
 description: Caching support for memcached, page and fragment
 email: padrinorb@gmail.com
 executables: []
@@ -58,26 +72,15 @@ files:
 - lib/padrino-cache/helpers/cache_store.rb
 - lib/padrino-cache/helpers/fragment.rb
 - lib/padrino-cache/helpers/page.rb
-- lib/padrino-cache/parser.rb
-- lib/padrino-cache/store.rb
-- lib/padrino-cache/store/base.rb
-- lib/padrino-cache/store/file.rb
-- lib/padrino-cache/store/memcache.rb
-- lib/padrino-cache/store/memory.rb
-- lib/padrino-cache/store/mongo.rb
-- lib/padrino-cache/store/redis.rb
+- lib/padrino-cache/legacy_store.rb
 - padrino-cache.gemspec
 - test/helper.rb
-- test/stores/shared.rb
-- test/stores/test_dalli.rb
-- test/stores/test_file.rb
-- test/stores/test_memcache.rb
-- test/stores/test_memory.rb
-- test/stores/test_mongo.rb
-- test/stores/test_redis.rb
+- test/test_legacy_store.rb
+- test/test_moneta_store.rb
 - test/test_padrino_cache.rb
 homepage: http://www.padrinorb.com
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options:
@@ -91,9 +94,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: 1.3.6
+      version: 1.3.1
 requirements: []
 rubyforge_project: padrino-cache
 rubygems_version: 2.0.6
@@ -102,12 +105,7 @@ specification_version: 4
 summary: Page and fragment caching for Padrino
 test_files:
 - test/helper.rb
-- test/stores/shared.rb
-- test/stores/test_dalli.rb
-- test/stores/test_file.rb
-- test/stores/test_memcache.rb
-- test/stores/test_memory.rb
-- test/stores/test_mongo.rb
-- test/stores/test_redis.rb
+- test/test_legacy_store.rb
+- test/test_moneta_store.rb
 - test/test_padrino_cache.rb
 has_rdoc: