padrino-cache 0.12.9 → 0.13.0.beta1

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZThkZjA2ZTMyOWI1MWZkMTgwMDdiNTU1Mzk2MDhiMmViZTY0YTFjNA==
-  data.tar.gz: !binary |-
-    YTgzNTJiNDRiNTA2MDdhZjk1OGY4MTg0NzRlZDU0ZTVmZmUwNjE3YQ==
+SHA1:
+  metadata.gz: 788f55f9c8d59072188545b3578a53250d12aeca
+  data.tar.gz: a8fadd17541f1b35234d8771e5bd90ef7bb38bc8
 SHA512:
-  metadata.gz: !binary |-
-    ZmUyZmM1NzI5NTU3MTIzZmQxMDJjNjEzZTM3MjU5YjRhOGQ1MjY1OTBmMDFm
-    NDkwMjExMzBjMGQwODhlZjFkM2NkZjkxYWMxZmI3MTk5NDFiOWU0YTFjMDM1
-    YTE0MzFlNTIxYTgyZDBjODViZGIxMmJiYzYyYjAzYjRiZGU1MDk=
-  data.tar.gz: !binary |-
-    MTU0MTQ0NzdmYTU0Mzg1Y2YyZWFmMTEwMmE1MTZmY2M5NDdkOTRjZGRiMTY0
-    YmFiZGE0MzNjNjhhYjAwMDMyMjQ3NDMwYmZjNmNjNWUyZWY4NmVjMGQ2ZDg2
-    ZWI4Y2RhZmFhZTdlNWNmMDAyOGNkMWFkYjliNDg3MWUyMmE4Mzk=
+  metadata.gz: ddc3499620444450fbbb78332dad102cd2069cb2e34eb072fb7ddfab58bf12672b8860acb8937c1970d08a80d13e9f3dfb3b3f858f03bc0e42cf358ab2a6009f
+  data.tar.gz: bae429f3ee32d8976cc8fb748665586b4e675578914cc89d5240b5aee619b65638a4207abf2843ed1cb845e704cb12cf7c97224484aa4a371ee040a7b0dbadf9

data/lib/padrino-cache/helpers/cache_object.rb

@@ -5,8 +5,7 @@ module Padrino
         def cache_object(key, opts = {})
           if settings.caching?
             began_at = Time.now
-            if settings.cache.key?(key.to_s)
-              value = settings.cache[key.to_s]
+            if value = settings.cache[key.to_s]
               logger.debug "GET Object", began_at, key.to_s if defined?(logger)
             else
               value = yield

data/lib/padrino-cache/helpers/fragment.rb

@@ -51,10 +51,9 @@ module Padrino
         def cache(key, opts = {}, &block)
           if settings.caching?
             began_at = Time.now
-            if settings.cache.key?(key.to_s)
-              value = settings.cache[key.to_s]
+            if value = settings.cache[key.to_s]
               logger.debug "GET Fragment", began_at, key.to_s if defined?(logger)
-              concat_content(value.to_s.html_safe)
+              concat_content(value.html_safe)
             else
               value = capture_html(&block)
               settings.cache.store(key.to_s, value, opts)

data/lib/padrino-cache/helpers/page.rb

@@ -63,11 +63,6 @@ module Padrino
           @route.cache_expires = time
         end
 
-        def expires_in(time)
-          warn 'expires_in has been deprecated in favour of expires'
-          expires(time)
-        end
-
         ##
         # This helper is used within a route or route to indicate the name in the cache.
         #
@@ -135,7 +130,7 @@ module Padrino
 
           content = {
             :body         => @_response_buffer,
-            :content_type => response.content_type
+            :content_type => @_content_type
           }
 
           settings.cache.store(route_cache_key, content, :expires => cache_expires)

data/lib/padrino-cache.rb

@@ -3,7 +3,6 @@ require 'padrino-core'
 require 'padrino-helpers'
 FileSet.glob_require('padrino-cache/{helpers}/*.rb', __FILE__)
 require 'moneta'
-require 'padrino-cache/legacy_store'
 
 module Padrino
   class << self
@@ -118,12 +117,7 @@ module Padrino
     def self.new(name, options = {})
       # Activate expiration by default
       options[:expires] = true unless options.include?(:expires)
-      a = Moneta.new(name, options)
-      Moneta.build do
-        # Use proxy to support deprecated Padrino interface
-        use LegacyStore
-        adapter a
-      end
+      Moneta.new(name, options)
     end
 
     Padrino.cache = Padrino::Cache.new(:LRUHash)

data/test/test_padrino_cache.rb

@@ -473,52 +473,6 @@ describe "PadrinoCache" do
       register Padrino::Cache
     end
 
-    adapter = @app.cache.adapter
-    while adapter.respond_to? :adapter
-      adapter = adapter.adapter
-    end
-    assert_kind_of Moneta::Adapters::Memory, adapter
-  end
-
-  it "should check key existence" do
-    count1, count2 = 0, 0
-    mock_app do
-      register Padrino::Cache
-      enable :caching
-      get "/" do
-        cache(:foo) do
-          count1 += 1
-          nil
-        end
-        count1.inspect
-      end
-
-      get "/object" do
-        cache_object(:bar) do
-          count2 += 1
-          nil
-        end
-        count2.inspect
-      end
-    end
-    2.times { get "/" }
-    assert_equal "1", body
-    2.times { get "/object" }
-    assert_equal "1", body
-  end
-
-  it 'should cache full mime type of content_type' do
-    mock_app do
-      register Padrino::Cache
-      enable :caching
-      get '/foo', :cache => true do
-        content_type :json, :charset => 'utf-8'
-        '{}'
-      end
-    end
-    get "/foo"
-    assert_equal 'application/json;charset=utf-8', last_response.content_type
-    get "/foo"
-    assert_equal 'application/json;charset=utf-8', last_response.content_type
+    assert @app.cache.adapter.adapter.is_a?(Moneta::Adapters::Memory)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: padrino-cache
 version: !ruby/object:Gem::Version
-  version: 0.12.9
+  version: 0.13.0.beta1
 platform: ruby
 authors:
 - Padrino Team
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-23 00:00:00.000000000 Z
+date: 2015-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: padrino-core
@@ -19,44 +19,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.9
+        version: 0.13.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.9
+        version: 0.13.0.beta1
 - !ruby/object:Gem::Dependency
   name: padrino-helpers
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.9
+        version: 0.13.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.9
+        version: 0.13.0.beta1
 - !ruby/object:Gem::Dependency
   name: moneta
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MC43LjA=
+        version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MC43LjA=
+        version: 0.7.0
 description: Caching support for memcached, page and fragment
 email: padrinorb@gmail.com
 executables: []
@@ -75,10 +73,8 @@ files:
 - lib/padrino-cache/helpers/cache_store.rb
 - lib/padrino-cache/helpers/fragment.rb
 - lib/padrino-cache/helpers/page.rb
-- lib/padrino-cache/legacy_store.rb
 - padrino-cache.gemspec
 - test/helper.rb
-- test/test_legacy_store.rb
 - test/test_moneta_store.rb
 - test/test_padrino_cache.rb
 homepage: http://www.padrinorb.com
@@ -92,18 +88,22 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       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.6.14
+rubygems_version: 2.0.6
 signing_key: 
 specification_version: 4
 summary: Page and fragment caching for Padrino
-test_files: []
+test_files:
+- test/helper.rb
+- test/test_moneta_store.rb
+- test/test_padrino_cache.rb
+has_rdoc: 

data/lib/padrino-cache/legacy_store.rb

@@ -1,68 +0,0 @@
-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 => 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/test/test_legacy_store.rb

@@ -1,53 +0,0 @@
-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