wrest 2.1.3 → 2.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f71da147141bb3c77dc79fa46d7b5560f526d958
-  data.tar.gz: f812789b289ee63449e78eb4c12ee68d0a0d2aba
+  metadata.gz: eba48163a5c17f71ae1d80d6908d90354962f619
+  data.tar.gz: 923faca9229e6d4840ed3a069814ba3cda8e552c
 SHA512:
-  metadata.gz: 9e6c8ca1e11f7e892bb305faf34925b1000fcf732b3a28be106697cce211a716eb409c9cc94c0fc96cab78adf71a109cb769ae8cbdb14263f6f19da190a5c5ae
-  data.tar.gz: a5a9d2212a01ba5a5334e17233ce3188759e05dcc46c92ba154aec9bea0793b0ad397bf589ca0d9f53f81c34cd57f0fa87de388d5de7ed5107f9f2a5b91d6a7b
+  metadata.gz: 7214ebb98effc3ea21cf3c35042de4217805059cea871756712111960d853cdfd00f83544b726e48e4ff3c610fa6ee712bf81285f42642e3ce56484670c1962d
+  data.tar.gz: 07d5d2a7da790e6b3a05fadd43e54964df4be025dd44f27cbef1c833f3c5bae6e0935ff40e9e96483f20445638931dce5f0e359b7e237ff96f68752ba38d7442

data/CHANGELOG

@@ -2,6 +2,12 @@ Features under the section marked 'Current' are completed but pending release as
 
 Features under a numbered section are complete and available in the Wrest gem.
 
+== 2.1.4
+ * Making cache keys include query params
+
+== 2.1.3
+ * Adding cache expiry for caches using request headers
+
 == 2.1.2
  * Setting cache keys as URI strings
 

data/README.md

@@ -1,6 +1,6 @@
 [![Build Status](https://travis-ci.org/c42/wrest.svg?branch=master)](https://travis-ci.org/c42/wrest)
 
-# Wrest 2.1.3
+# Wrest 2.1.4
 
 (c) Copyright 2009-2016 [Sidu Ponnappa](http://twitter.com/ponnappa). All Rights Reserved.
 

data/lib/wrest/cache_proxy.rb

@@ -40,7 +40,7 @@ module Wrest
       end
       
       def get
-        cached_response = @cache_store[@get.uri.to_s]
+        cached_response = @cache_store[@get.full_uri_string]
         return get_fresh_response if cached_response.nil?
 
         if cached_response.expired?
@@ -61,12 +61,12 @@ module Wrest
       end
 
       def cache(response)
-        @cache_store[@get.uri.uri_string] = response.clone if response && response.cacheable?
+        @cache_store[@get.full_uri_string] = response.clone if response && response.cacheable?
       end
 
       #:nodoc:
       def get_fresh_response
-        @cache_store.delete @get.hash
+        @cache_store.delete @get.full_uri_string
 
         response = @get.invoke_without_cache_check
 

data/lib/wrest/native/get.rb

@@ -8,6 +8,8 @@
 
 module Wrest::Native
   class Get < Request
+    QUERY_PARAMS_SEPERATOR = '?'
+    EMPTY_QUERY_PARAMS = ''
 
     attr_reader :cache_proxy
 
@@ -17,7 +19,7 @@ module Wrest::Native
 
       cache_store = (options[:cache_store] || Wrest::Caching.default_store) unless options[:disable_cache]
       @cache_proxy = Wrest::CacheProxy::new(self, cache_store)
-      
+
       super(
             wrest_uri,
             Net::HTTP::Get,
@@ -63,5 +65,14 @@ module Wrest::Native
       new_request
     end
 
+    def full_uri_string
+      @uri.to_s + query_params_string
+    end
+
+    private
+    def query_params_string
+      (@parameters.any?) ? QUERY_PARAMS_SEPERATOR + @parameters.to_query : EMPTY_QUERY_PARAMS
+    end
+
   end
 end

data/lib/wrest/version.rb

@@ -8,5 +8,5 @@
 # See the License for the specific language governing permissions and limitations under the License.
 
 module Wrest
-  VERSION = "2.1.3"
+  VERSION = "2.1.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wrest
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.1.4
 platform: ruby
 authors:
 - Sidu Ponnappa
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-25 00:00:00.000000000 Z
+date: 2016-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec