padrino-cache 0.12.8.1 → 0.12.9

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 7ea5a3f30ee18ca7e5e953661f676beb493cd6b7
-  data.tar.gz: c2d8952b6f77fe6c25520c9ce56e45596e30eb22
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZThkZjA2ZTMyOWI1MWZkMTgwMDdiNTU1Mzk2MDhiMmViZTY0YTFjNA==
+  data.tar.gz: !binary |-
+    YTgzNTJiNDRiNTA2MDdhZjk1OGY4MTg0NzRlZDU0ZTVmZmUwNjE3YQ==
 SHA512:
-  metadata.gz: 8bba4e4dfcd575eb1b734a54370eb7f8e7c6bd9e9b93d484cce3cf70771def3e8167ae6209ce09b32564d80bd23d9bac42bdcbef21a184bdc72f0feebb8a7f58
-  data.tar.gz: 8503fb0ddb4433e97dddd3e5bc4f0c779a5ee137abe7c10f66cbabaed1c06f4ad51399d25303c02eb1d58757cf55b6ac00fe38fc5fcaa95dc1856418bd3453aa
+  metadata.gz: !binary |-
+    ZmUyZmM1NzI5NTU3MTIzZmQxMDJjNjEzZTM3MjU5YjRhOGQ1MjY1OTBmMDFm
+    NDkwMjExMzBjMGQwODhlZjFkM2NkZjkxYWMxZmI3MTk5NDFiOWU0YTFjMDM1
+    YTE0MzFlNTIxYTgyZDBjODViZGIxMmJiYzYyYjAzYjRiZGU1MDk=
+  data.tar.gz: !binary |-
+    MTU0MTQ0NzdmYTU0Mzg1Y2YyZWFmMTEwMmE1MTZmY2M5NDdkOTRjZGRiMTY0
+    YmFiZGE0MzNjNjhhYjAwMDMyMjQ3NDMwYmZjNmNjNWUyZWY4NmVjMGQ2ZDg2
+    ZWI4Y2RhZmFhZTdlNWNmMDAyOGNkMWFkYjliNDg3MWUyMmE4Mzk=

data/Rakefile

@@ -1,5 +1 @@
-# coding:utf-8
-RAKE_ROOT = __FILE__
-
-require 'rubygems'
-require File.expand_path(File.dirname(__FILE__) + '/../gem_rake_helper')
+require File.expand_path(File.dirname(__FILE__) + '/../gem_rake_helper')

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

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

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

@@ -135,7 +135,7 @@ module Padrino
 
           content = {
             :body         => @_response_buffer,
-            :content_type => @_content_type
+            :content_type => response.content_type
           }
 
           settings.cache.store(route_cache_key, content, :expires => cache_expires)

data/test/helper.rb

@@ -1,6 +1,24 @@
 ENV['RACK_ENV'] = 'test'
 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 'minitest/autorun'
+require 'minitest/pride'
+require 'rack/test'
 require 'padrino-cache'
+
+require 'ext/rack-test-methods'
+
+class MiniTest::Spec
+  include Rack::Test::Methods
+
+  # Sets up a Sinatra::Base subclass defined with the block
+  # given. Used in setup or individual spec methods to establish
+  # the application.
+  def mock_app(base=Padrino::Application, &block)
+    @app = Sinatra.new(base, &block)
+  end
+
+  def app
+    Rack::Lint.new(@app)
+  end
+end

data/test/test_padrino_cache.rb

@@ -479,4 +479,46 @@ describe "PadrinoCache" do
     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
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: padrino-cache
 version: !ruby/object:Gem::Version
-  version: 0.12.8.1
+  version: 0.12.9
 platform: ruby
 authors:
 - Padrino Team
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-06 00:00:00.000000000 Z
+date: 2018-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: padrino-core
@@ -19,42 +19,44 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.8.1
+        version: 0.12.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.8.1
+        version: 0.12.9
 - !ruby/object:Gem::Dependency
   name: padrino-helpers
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.8.1
+        version: 0.12.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.8.1
+        version: 0.12.9
 - !ruby/object:Gem::Dependency
   name: moneta
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: !binary |-
+          MC43LjA=
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: !binary |-
+          MC43LjA=
 description: Caching support for memcached, page and fragment
 email: padrinorb@gmail.com
 executables: []
@@ -62,9 +64,9 @@ extensions: []
 extra_rdoc_files:
 - README.rdoc
 files:
-- ".document"
-- ".gitignore"
-- ".yardopts"
+- .document
+- .gitignore
+- .yardopts
 - LICENSE.txt
 - README.rdoc
 - Rakefile
@@ -85,22 +87,22 @@ licenses:
 metadata: {}
 post_install_message: 
 rdoc_options:
-- "--charset=UTF-8"
+- --charset=UTF-8
 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
 requirements: []
 rubyforge_project: padrino-cache
-rubygems_version: 2.5.1
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Page and fragment caching for Padrino