lhs 18.0.1 → 18.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d04ba2057e1535e9a26b924e5bc9d3e9a86ddf77e6c626f1c7375ea808d928a0
-  data.tar.gz: 25532cfc5d304b31e1d61de0e9e059d7ffe94ae147a9c362d3410e6f4979cb75
+  metadata.gz: a8fbb44e36e8084a69be5ffd72ec91f10d6d76833aa7af2051da5a75078eb1cc
+  data.tar.gz: 606eee69ad3c2672d1a47b7a0fce0fa28d53ff4ebb7cb49fefbb3417fa6e9646
 SHA512:
-  metadata.gz: 455ded1d51459437e1887c6f81ddf13d4a7f0df80f7b22dc6a7194b0d5e2a30461e410986a406fdda3d7918f639065a1d3d38314504727c6dcbd8381b106122c
-  data.tar.gz: 7d5341a694feea1b308823bc7e997128b0ae0f209ed8997473c69804babcbdd1def2d4d6eb5ccaa38ce84a97415e1e8450b9cfb0a4455dbe5d50d921bf5bc8fb
+  metadata.gz: 7de12cf03b8070bf8eacceb74f1ce517f4493d25cac3a96c3b6c7a829b1c9042a052a1569fc4e836e24efaf5e6dc24564b0e4b027d746527ba0ab515712d0e0f
+  data.tar.gz: b53a6aa74e78dbfcb55326c405c347bfe7dbb712dc740fcfc795164ca55c25018f85443ee92b7c622d1cefea50ce7a8f1aa3d6eee50abf5084f5158ab6f31819

data/lib/lhs/concerns/proxy/accessors.rb

@@ -12,6 +12,10 @@ class LHS::Proxy
 
     delegate :dig, :fetch, to: :_raw, allow_nil: true
 
+    def clear_cache!
+      @cache = nil
+    end
+
     private
 
     def set(name, value)
@@ -117,9 +121,5 @@ class LHS::Proxy
     def cache
       @cache ||= Concurrent::Map.new
     end
-
-    def clear_cache!
-      @cache = nil
-    end
   end
 end

data/lib/lhs/concerns/record/request.rb

@@ -166,6 +166,7 @@ class LHS::Record
         else
           handle_include(includes, data, nil, references[includes])
         end
+        data.clear_cache! # as we just included new nested resources
       end
 
       def handle_include(included, data, sub_includes = nil, reference = nil)

data/lib/lhs/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module LHS
-  VERSION = '18.0.1'
+  VERSION = '18.0.2'
 end

data/spec/record/has_many_spec.rb

@@ -46,7 +46,6 @@ describe LHS::Record do
   end
 
   context 'custom class_name' do
-
     before do
       module Uberall
         class Location < LHS::Record

data/spec/record/has_one_spec.rb

@@ -20,7 +20,6 @@ describe LHS::Record do
   end
 
   context 'has_one' do
-
     before do
       class Transaction < LHS::Record
         endpoint 'http://myservice/transactions'
@@ -49,23 +48,6 @@ describe LHS::Record do
       expect(user._root._raw).to eq transaction._raw
       expect(user.parent._raw).to eq transaction._raw
     end
-
-    it 'caches the relation in memory' do
-      allow(LHS::Record).to receive(:for_url).and_return(User)
-      user_object_id = transaction.user.object_id
-      expect(transaction.user.object_id).to eql(user_object_id)
-      transaction2 = Transaction.find(2)
-      expect(transaction2.user.object_id).not_to eql(user_object_id)
-    end
-
-    it 'recalculates cache for relation when it was modified' do
-      allow(LHS::Record).to receive(:for_url).and_return(Comment)
-      expect(user.comments).to be_blank
-      comments_object_id = user.comments.object_id
-      user.comments = [Comment.new]
-      expect(user.comments.object_id).not_to eql(comments_object_id)
-      expect(user.comments).not_to be_blank
-    end
   end
 
   context 'custom class_name' do

data/spec/record/relation_caching_spec.rb

@@ -0,0 +1,121 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe LHS::Record do
+  context 'cache' do
+    let(:transaction) { Transaction.find(1) }
+    let(:user) { transaction.user }
+
+    before do
+      class Transaction < LHS::Record
+        endpoint 'http://myservice/transactions'
+        endpoint 'http://myservice/transactions/{id}'
+        has_one :user
+      end
+
+      class User < LHS::Record
+        has_many :comments
+
+        def email
+          self[:email_address]
+        end
+      end
+
+      class Comment < LHS::Record
+      end
+
+      [1, 2].each do |id|
+        stub_request(:get, "http://myservice/transactions/#{id}")
+          .to_return(body: {
+            user: {
+              email_address: 'steve@local.ch',
+              comments: []
+            }
+          }.to_json)
+      end
+    end
+
+    it 'caches the relation in memory' do
+      allow(LHS::Record).to receive(:for_url).and_return(User)
+      user_object_id = transaction.user.object_id
+      expect(transaction.user.object_id).to eql(user_object_id)
+      transaction2 = Transaction.find(2)
+      expect(transaction2.user.object_id).not_to eql(user_object_id)
+    end
+
+    it 'recalculates cache for relation when it was modified' do
+      allow(LHS::Record).to receive(:for_url).and_return(Comment)
+      expect(user.comments).to be_blank
+      comments_object_id = user.comments.object_id
+      user.comments = [Comment.new]
+      expect(user.comments.object_id).not_to eql(comments_object_id)
+      expect(user.comments).not_to be_blank
+    end
+  end
+
+  context 'clear cache' do
+    before do
+      class Place < LHS::Record
+        endpoint 'https://datastore/places/{id}', followlocation: true, headers: { 'Prefer' => 'redirect-strategy=redirect-over-not-found' }
+        has_many :available_assets
+      end
+
+      class AvailableAsset < LHS::Record
+      end
+
+      stub_request(:get, "http://datastore/places/#{place_id}/available-assets?limit=100")
+        .to_return(body: {
+          total: available_assets.size,
+          items: available_assets
+        }.to_json)
+    end
+
+    let(:place_id) { SecureRandom.urlsafe_base64 }
+
+    let(:place_hash) do
+      {
+        href: "https://datastore/places/#{place_id}",
+        id: place_id,
+        available_assets: { href: "http://datastore/places/#{place_id}/available-assets?offset=0&limit=10" }
+      }
+    end
+
+    let(:available_asset_hash) do
+      { asset_code: 'OPENING_HOURS' }
+    end
+
+    let(:available_assets) { [available_asset_hash] }
+
+    it 'clears the cache when using find' do
+      stub_request(:get, place_hash[:href])
+        .to_return(body: place_hash.to_json)
+      place = Place
+        .options(auth: { bearer: 'XYZ' })
+        .includes_all(:available_assets)
+        .find(place_id)
+      expect(place.available_assets.first).to be_a(AvailableAsset)
+    end
+
+    it 'clears the cache when using where' do
+      stub_request(:get, place_hash[:href])
+        .to_return(body: place_hash.to_json)
+      place = Place
+        .options(auth: { bearer: 'XYZ' })
+        .includes_all(:available_assets)
+        .where(id: place_id)
+      expect(place.available_assets.first).to be_a(AvailableAsset)
+    end
+
+    it 'clears the cache when using find_by' do
+      stub_request(:get, "https://datastore/places/#{place_id}?limit=1")
+        .to_return(body: place_hash.to_json)
+      place = Place
+        .options(auth: { bearer: 'XYZ' })
+        .includes_all(:available_assets)
+        .find_by(id: place_id)
+      expect(place.available_assets.first).to be_a(AvailableAsset)
+    end
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhs
 version: !ruby/object:Gem::Version
-  version: 18.0.1
+  version: 18.0.2
 platform: ruby
 authors:
 - https://github.com/local-ch/lhs/graphs/contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-04 00:00:00.000000000 Z
+date: 2019-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -427,6 +427,7 @@ files:
 - spec/record/pagination_spec.rb
 - spec/record/persisted_spec.rb
 - spec/record/references_spec.rb
+- spec/record/relation_caching_spec.rb
 - spec/record/reload_by_id_spec.rb
 - spec/record/reload_spec.rb
 - spec/record/request_spec.rb
@@ -626,6 +627,7 @@ test_files:
 - spec/record/pagination_spec.rb
 - spec/record/persisted_spec.rb
 - spec/record/references_spec.rb
+- spec/record/relation_caching_spec.rb
 - spec/record/reload_by_id_spec.rb
 - spec/record/reload_spec.rb
 - spec/record/request_spec.rb