flexirest 1.9.15 → 1.9.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9109fa6e8a984fd09fc43604d7908893d1039c5f36ddbf610f39886ec2ca051d
-  data.tar.gz: dbcb5e768a3562effe9f2169f85e2ccb9f26c4de5cb4d176e243dbe6fbe35e9a
+  metadata.gz: 70788d1c6cfd0e3490c50e6eec78136eb5f6e1031dd6135e943ab7a1a0367db0
+  data.tar.gz: ed5282f589dd2893fc16db20197d6109382887a6b3a5a936e2f04113c6ba70cf
 SHA512:
-  metadata.gz: 81c0b923e2463e633bbf6485a8e32ea1ea6bc4988f028ffcb4fb662b8e8000d1d6e8b8c7004317805eeebb4245fb50fc6b2f91dee3ab75f0f2b20370b0013e3d
-  data.tar.gz: a2f56d7e3c5af7e72c4ae63b98984705e548c9ff626d677347786b4c35750058400458cddeee3ff5e602e2b8df57b46caba4650270620b7fd332247ff7712c0c
+  metadata.gz: 21b69a5820a346cbdfded7e4f0c30e79f5ff10d4f2e272d59f0163070d1e4a729ebaf95d9fe7ccbb70fc15ba952bdee741bcbb994740b40e1882d7c6a0516ba3
+  data.tar.gz: 57fc2b560629d9cf2521d4f06b3f0dcdca059a686a88f3fe7cc8ca2b4ac912bd1896074243c8a589d5989b4019acc8d0eac709dd95d1f2cd7885ac0523eac702

data/.travis.yml

@@ -1,5 +1,5 @@
 language: ruby
 rvm:
+  - 2.7.0
   - 2.6.0
   - 2.5.0
-  - 2.4.0

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 1.9.16
+
+Bugfix:
+
+- Cached responses were always returning as `dirty?`/`changed?` (thanks to AKRathore for the bug report).
+
 ## 1.9.15
 
 Bugfix:

data/flexirest.gemspec

@@ -36,7 +36,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "simplecov"
   spec.add_development_dependency "simplecov-rcov"
   spec.add_development_dependency 'coveralls'
-  spec.add_development_dependency "api-auth", ">= 1.3.1"
+  spec.add_development_dependency "api-auth", ">= 1.3.1", "< 2.4"
   spec.add_development_dependency 'typhoeus'
   spec.add_development_dependency 'activemodel'
 

data/lib/flexirest/base_without_validation.rb

@@ -41,6 +41,7 @@ module Flexirest
     def _copy_from(result)
       @attributes = result._attributes
       @_status = result._status
+      _clean!
     end
 
     def dirty?

data/lib/flexirest/caching.rb

@@ -110,9 +110,12 @@ module Flexirest
       if @result.is_a?(Array)
         ri = ResultIterator.new(self)
         ri.items = @result.map{|i| @class_name.constantize.new(i)}
+        ri._clean!
         ri
       else
-        @class_name.constantize.new(@result)
+        obj = @class_name.constantize.new(@result)
+        obj._clean!
+        obj
       end
     end
   end

data/lib/flexirest/result_iterator.rb

@@ -15,6 +15,10 @@ module Flexirest
       @items << item
     end
 
+    def _clean!
+      @items.map(&:_clean!)
+    end
+
     def size
       @items.size
     end

data/lib/flexirest/version.rb

@@ -1,3 +1,3 @@
 module Flexirest
-  VERSION = "1.9.15"
+  VERSION = "1.9.16"
 end

data/spec/lib/base_without_validation_spec.rb

@@ -178,6 +178,13 @@ describe Flexirest::BaseWithoutValidation do
     expect(client).to be_dirty
   end
 
+  it "should not mark a freshly retrieved object as changed" do
+    expect_any_instance_of(Flexirest::Connection).to receive(:get).with('/find/1', anything).and_return(::FaradayResponseMock.new(OpenStruct.new(status:200, response_headers:{}, body:"{\"first_name\":\"Billy\"}")))
+    client = AlteringClientExample.find(id: 1)
+    expect(client).to_not be_changed
+    expect(client.changes).to eq({})
+  end
+
   it 'should respond_to? attributes defined in the response' do
     client = EmptyExample.new(hello: "World")
     expect(client.respond_to?(:hello)).to be_truthy

data/spec/lib/caching_spec.rb

@@ -184,6 +184,18 @@ describe Flexirest::Caching do
       expect(ret.first_name).to eq("Johnny")
     end
 
+    it "cache read objects shouldn't be marked as changed" do
+      cached_response = Flexirest::CachedResponse.new(
+        status:200,
+        result:@cached_object,
+        expires:Time.now + 30)
+      expect_any_instance_of(CachingExampleCacheStore5).to receive(:read).once.with("Person:/").and_return(Marshal.dump(cached_response))
+      expect_any_instance_of(Flexirest::Connection).not_to receive(:get)
+      ret = Person.all
+      expect(ret).to_not be_changed
+      expect(ret.changes).to eq({})
+    end
+
     it "should read from the cache store and restore to the same object" do
       cached_response = Flexirest::CachedResponse.new(
         status:200,

data/spec/spec_helper.rb

@@ -66,12 +66,12 @@ class FaradayResponseMock < ::Flexirest::FaradayResponseProxy
     @finished = false
   end
 
-  def on_complete
+  def on_complete(&block)
     if @auto_resolve
       @finished = true
       yield(@response)
     else
-      @callback = Proc.new
+      @callback = block
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flexirest
 version: !ruby/object:Gem::Version
-  version: 1.9.15
+  version: 1.9.16
 platform: ruby
 authors:
 - Andy Jeffries
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-18 00:00:00.000000000 Z
+date: 2020-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -129,6 +129,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -136,6 +139,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: typhoeus
   requirement: !ruby/object:Gem::Requirement