grape-rails-cache 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ed6145ae0b11da1d0d35a9611c67572a3ebd2c6
-  data.tar.gz: c9e5405e3375107967457509aa4051a17363311b
+  metadata.gz: 2cf9010721ffbc4bba100223ecf6680073ac2336
+  data.tar.gz: 898a459110b5521b9829be56e56e5a4f7c9dae18
 SHA512:
-  metadata.gz: 37d20990ba391b0c4b7e628f673da0c89285362bc66711366934324948a908ba4968828d3bbd09b631fc31fd5e2157367b1f474f6d0469de4167fdcaa1636bf5
-  data.tar.gz: 35457c02458efced04c9aae8b29887b64c76f0096c72a859aecfcbf40f7af594729a71c600b091f6814c00612a15c05328b2633eaef291c24238ae450b2e3a9b
+  metadata.gz: ebef843153d47923866360da8b416b1dff79421d265b29e300fdd836a6aee28ace85447ef31a45ced8dff058256aae3c179db6200cab3036d2a1b4111192be20
+  data.tar.gz: bb976a2490ff7e435a601175bfa1557427263076474cb6550784b29add88671a5c2ad319e61892bcb286c4e4d6817e3c428dae522efe1abb1632c5b8a7eb8e52

data/LICENSE.txt

@@ -1,22 +1,20 @@
-Copyright (c) 2013 Monterail.com
+The MIT License (MIT)
 
-MIT License
+Copyright (c) 2013-2014 Monterail.com LLC
 
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
 
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/lib/grape/rails/cache.rb

@@ -43,14 +43,14 @@ module Grape
             # HTTP Cache
             cache_key = opts[:key]
 
+            # Set Cache-Control
+            expires_in(opts[:expires_in] || default_expire_time, public: true)
+
             if opts[:etag]
               cache_key += ActiveSupport::Cache.expand_cache_key(opts[:etag])
               compare_etag(opts[:etag]) # Check if client has fresh version
             end
 
-            # Set Cache-Control
-            expires_in(opts[:expires_in] || default_expire_time, public: true)
-
             # Try to fetch from server side cache
             ::Rails.cache.fetch(cache_key, raw: true, expires_in: opts[:expires_in]) do
               block.call.to_json

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grape-rails-cache
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Tymon Tobolski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-02 00:00:00.000000000 Z
+date: 2014-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grape
@@ -103,9 +103,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.3
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: HTTP and server side cache integration for Grape and Rails
 test_files: []
-has_rdoc: