grape-rails-cache 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2cf9010721ffbc4bba100223ecf6680073ac2336
-  data.tar.gz: 898a459110b5521b9829be56e56e5a4f7c9dae18
+  metadata.gz: c606eb3c07de22f542487e53f8b90fbd45cc60ab
+  data.tar.gz: 8c656e986a358c457b907b307ed253d77f1f7e81
 SHA512:
-  metadata.gz: ebef843153d47923866360da8b416b1dff79421d265b29e300fdd836a6aee28ace85447ef31a45ced8dff058256aae3c179db6200cab3036d2a1b4111192be20
-  data.tar.gz: bb976a2490ff7e435a601175bfa1557427263076474cb6550784b29add88671a5c2ad319e61892bcb286c4e4d6817e3c428dae522efe1abb1632c5b8a7eb8e52
+  metadata.gz: be8284046f2812679f272e98501d4b8252f806ebdad96d4d6e195fe1c9cc0d07567631d9b94604ce6470caf7e9183f9b5acf00edd3cc1c837038838876d95a62
+  data.tar.gz: c48adc75c73dd554bb33e2be2b03bf69998fd9a2c43e324eac66e8fee7da27b8dc5c99e2d90090f15ece417f325c9f455ee938116159e0dec1db4f081923f9d7

data/README.md

@@ -10,11 +10,15 @@
 
 Add this line to your rails application's Gemfile:
 
-    gem 'grape-rails-cache'
+```ruby
+gem 'grape-rails-cache'
+```
 
 And then execute:
 
-    $ bundle
+```bash
+$ bundle
+```
 
 ## Usage
 

data/lib/grape/rails/cache.rb

@@ -20,10 +20,12 @@ module Grape
           # Based on actionpack/lib/action_controller/base.rb, line 1216
           def expires_in(seconds, options = {})
             cache_control = []
-            cache_control << "max-age=#{seconds}"
-            cache_control.delete("no-cache")
+            if seconds == 0
+              cache_control << "no-cache"
+            else
+              cache_control << "max-age=#{seconds}"
+            end
             if options[:public]
-              cache_control.delete("private")
               cache_control << "public"
             else
               cache_control << "private"
@@ -52,7 +54,8 @@ module Grape
             end
 
             # Try to fetch from server side cache
-            ::Rails.cache.fetch(cache_key, raw: true, expires_in: opts[:expires_in]) do
+            cache_store_expire_time = opts[:cache_store_expires_in] || opts[:expires_in] || default_expire_time
+            ::Rails.cache.fetch(cache_key, raw: true, expires_in: cache_store_expire_time) do
               block.call.to_json
             end
           end

data/lib/grape/rails/cache/version.rb

@@ -1,7 +1,7 @@
 module Grape
   module Rails
     module Cache
-      VERSION = "0.1.1"
+      VERSION = "0.1.2"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grape-rails-cache
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Tymon Tobolski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-07 00:00:00.000000000 Z
+date: 2014-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grape