flexirest 1.3.28 → 1.3.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06f57e7a69b3da8a839a5ee30a1c33cd25576fd0
-  data.tar.gz: 36070e158d45d127b26dc497f57d0f47a36b7eb2
+  metadata.gz: 09154cafbcffc062d4414e0cb632075b5404fde8
+  data.tar.gz: e5480c5145b3218380e06fd01c67d02956defd2b
 SHA512:
-  metadata.gz: 5cbcb419898a3c14349f6eb57becd64cb3d04b2c89e59dc9f21a5163d9df3aadcb3f2358aef4e0999094b73c7f5d3f070d15f4f266d05d3d6343787d2f1f2a45
-  data.tar.gz: 29f9987cb73598b12f6aae2f9eadca45b2b294f19325033b93a6027a51c1f0a280fdc5054094f3c8842434e1cc2570379c32c7047399b3eefb4174e1823ab32b
+  metadata.gz: 890f5a711e634ec310a781ccd1e404e53ad7ffa1fc341b077de6277746f5f351c3d833f28883e5c3fef043f2b4351c1d5471f98d7e4610e8aba8ff357c306d65
+  data.tar.gz: 845cad98cb6c3178b14ef44438247c3bf242a70df68ecba002eef1579959b041743171226e6c86fd80633aa2c27bed7a5ec4acfcdf127d83e17076dd64d7ac97

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 1.3.29
+
+Bugfix:
+
+- Setting `perform_caching` on `Flexirest::Base` was being ignored
+
 ## 1.3.28
 
 Feature:

data/lib/flexirest/caching.rb

@@ -5,13 +5,16 @@ module Flexirest
 
       def perform_caching(value = nil)
         @perform_caching ||= nil
-        @@perform_caching ||= nil
         if value.nil?
-          if @perform_caching.nil?
+          value = if @perform_caching.nil?
             @@perform_caching
           else
             @perform_caching
           end
+          if value.nil? && superclass.respond_to?(:perform_caching)
+            value = superclass.perform_caching
+          end
+          value
         else
           @perform_caching = value
         end
@@ -40,8 +43,8 @@ module Flexirest
       end
 
       def _reset_caching!
-        @@perform_caching = false
-        @perform_caching = false
+        @@perform_caching = nil
+        @perform_caching = nil
         @@cache_store = nil
       end
 

data/lib/flexirest/version.rb

@@ -1,3 +1,3 @@
 module Flexirest
-  VERSION = "1.3.28"
+  VERSION = "1.3.29"
 end

data/spec/lib/caching_spec.rb

@@ -189,7 +189,7 @@ describe Flexirest::Caching do
       expect(ret._status).to eq(200)
     end
 
-    it "should not write the response to the cache unless if has caching headers" do
+    it "should not write the response to the cache unless it has caching headers" do
       expect_any_instance_of(CachingExampleCacheStore5).to receive(:read).once.with("Person:/").and_return(nil)
       expect_any_instance_of(CachingExampleCacheStore5).not_to receive(:write)
       expect_any_instance_of(Flexirest::Connection).to receive(:get).with("/", an_instance_of(Hash)).and_return(OpenStruct.new(status:200, body:"{\"result\":true}", headers:{}))
@@ -204,6 +204,29 @@ describe Flexirest::Caching do
       Person.all
     end
 
+    it "should not write the response to the cache if there's an etag but perform_caching is off" do
+      expect(Person.cache_store).to_not receive(:read)
+      expect(Person.cache_store).to_not receive(:write)
+      expect_any_instance_of(Flexirest::Connection).to receive(:get).with("/", an_instance_of(Hash)).and_return(::FaradayResponseMock.new(OpenStruct.new(status:200, body:"{\"result\":true}", response_headers:{etag:"1234567890"})))
+      Person.perform_caching false
+      Person.all
+    end
+
+    it "should not write the response to the cache if there's an etag but perform_caching is off at the base level" do
+      begin
+        caching = Flexirest::Base.perform_caching
+        Flexirest::Base.perform_caching false
+        Person._reset_caching!
+        Person.cache_store = CachingExampleCacheStore5.new
+        expect(Person.cache_store).to_not receive(:read)
+        expect(Person.cache_store).to_not receive(:write)
+        expect_any_instance_of(Flexirest::Connection).to receive(:get).with("/", an_instance_of(Hash)).and_return(::FaradayResponseMock.new(OpenStruct.new(status:200, body:"{\"result\":true}", response_headers:{etag:"1234567890"})))
+        Person.all
+      ensure
+        Flexirest::Base.perform_caching caching
+      end
+    end
+
     it "should write the response to the cache if there's a hard expiry" do
       expect_any_instance_of(CachingExampleCacheStore5).to receive(:read).once.with("Person:/").and_return(nil)
       expect_any_instance_of(CachingExampleCacheStore5).to receive(:write).once.with("Person:/", an_instance_of(String), an_instance_of(Hash))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flexirest
 version: !ruby/object:Gem::Version
-  version: 1.3.28
+  version: 1.3.29
 platform: ruby
 authors:
 - Andy Jeffries
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-21 00:00:00.000000000 Z
+date: 2016-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler