cassette 1.2.4 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6541e55b06cc97ea1e68cd330af18791328e1cc72a9b04f9e93aa6e2f1032bc3
-  data.tar.gz: 765652bf692b0dd1c8b3ef1b6bd7eaac59a2da11d0fd5569e8c565b8963aed9a
+  metadata.gz: c9ed73a897ba8ecc5a7f0133132d28388b9f4a90bc2d0e8a1fe3d1ec21f9b4b3
+  data.tar.gz: bdbe2968131cbddb9527ba973d68aaff7f5008be1b4fe6f662a26c7f5468edd1
 SHA512:
-  metadata.gz: a0d7e79d8ab928c6e3179bda6271eab2f6744662a37057b2dba53f92c1f5cc8b9486b6e86382f71cd2fddba069121ca49d392e28a7731db8b2c650e4dd77ebb0
-  data.tar.gz: 2721a7af21ff3a47ca13f495ae73c9c9e623bce36fb7d6d3418c5d69dac286760573aa2b653a791f25ab545abdaeea04e8a5824bdea9004f81f7bbca98eb4fe7
+  metadata.gz: 259b435580d9ebe186553374624dcab25e84d33b392ea00997dbc1729b0fd1fada1b1e5de3bf129aca440146c9bf5b94544525d7868c54b11509cbfc54b0e9b5
+  data.tar.gz: 02fc9b53c0a2e873b0dde28d2757e1d23f59b62d949ace7f789466c1e37f874477d9d4489d03c2e48536bf25016eef2da358e9dbe4dcb5e99943f7dd56ac94be

data/lib/cassette/client.rb

@@ -30,8 +30,9 @@ module Cassette
 
     def st(tgt_param, service, force = false)
       logger.info "Requesting ST for #{service}"
-      cache.fetch_st(service, force: force) do
-        tgt = tgt_param.respond_to?(:call) ? tgt_param[] : tgt_param
+      tgt = tgt_param.respond_to?(:call) ? tgt_param[] : tgt_param
+
+      cache.fetch_st(tgt, service, force: force) do
         response = http.post("#{tickets_path}/#{tgt}", service: service)
         response.body.tap do |st|
           logger.info "ST is #{st}"

data/lib/cassette/client/cache.rb

@@ -2,6 +2,7 @@
 
 require 'cassette/client'
 require 'cassette/cache'
+require 'digest'
 
 module Cassette
   class Client
@@ -15,15 +16,16 @@ module Cassette
       def fetch_tgt(options = {}, &_block)
         options = { expires_in: 4 * 3600, max_uses: 5000, force: false }.merge(options)
         fetch('Cassette::Client.tgt', options) do
-          self.clear_st_cache!
           logger.info 'TGT is not cached'
           yield
         end
       end
 
-      def fetch_st(service, options = {}, &_block)
+      def fetch_st(tgt, service, options = {}, &_block)
         options = { max_uses: 2000, expires_in: 252, force: false }.merge(options)
-        fetch("Cassette::Client.st(#{service})", options) do
+        hash = Digest::MD5.hexdigest(tgt)
+
+        fetch("Cassette::Client.st(#{hash}, #{service})", options) do
           logger.info "ST for #{service} is not cached"
           yield
         end
@@ -35,8 +37,7 @@ module Cassette
       end
 
       def clear_st_cache!
-        backend.delete_matched('Cassette::Client.st*')
-        backend.delete_matched("#{uses_key('Cassette::Client.st')}*")
+        # this is a noop now, since clearing the TGT "moves" ST cache keys.
       end
 
       protected

data/lib/cassette/version.rb

@@ -2,7 +2,7 @@ module Cassette
   class Version
     MAJOR = '1'
     MINOR = '2'
-    PATCH = '4'
+    PATCH = '5'
 
     def self.version
       [MAJOR, MINOR, PATCH].join('.')

data/spec/cassette/client_spec.rb

@@ -160,7 +160,7 @@ describe Cassette::Client do
 
     context 'cache control' do
       before do
-        allow(cache).to receive(:fetch_st).with(service, hash_including(force: force))
+        allow(cache).to receive(:fetch_st).with(tgt, service, hash_including(force: force))
           .and_return(st)
       end
 
@@ -170,7 +170,7 @@ describe Cassette::Client do
         it 'forwards force to the cache' do
           subject
 
-          expect(cache).to have_received(:fetch_st).with(service, hash_including(force: force))
+          expect(cache).to have_received(:fetch_st).with(tgt, service, hash_including(force: force))
         end
       end
 
@@ -198,7 +198,7 @@ describe Cassette::Client do
     context 'when tgt and st are not cached' do
       before do
         allow(cache).to receive(:fetch_tgt).with(hash_including(force: false)).and_yield
-        allow(cache).to receive(:fetch_st).with(service, hash_including(force: false)).and_yield
+        allow(cache).to receive(:fetch_st).with(tgt, service, hash_including(force: false)).and_yield
 
         allow(http).to receive(:post)
           .with(%r{/v1/tickets\z}, username: Cassette.config.username, password: Cassette.config.password)
@@ -232,7 +232,7 @@ describe Cassette::Client do
     context 'when tgt is cached but st is not' do
       before do
         allow(cache).to receive(:fetch_tgt).with(hash_including(force: false)).and_return(tgt)
-        allow(cache).to receive(:fetch_st).with(service, hash_including(force: false)).and_yield
+        allow(cache).to receive(:fetch_st).with(tgt, service, hash_including(force: false)).and_yield
 
         allow(http).to receive(:post).with(%r{/v1/tickets/#{tgt}\z}, service: service)
           .and_return(st_response)
@@ -253,7 +253,8 @@ describe Cassette::Client do
 
     context 'when st is cached' do
       before do
-        allow(cache).to receive(:fetch_st).with(service, hash_including(force: false)).and_return(st)
+        allow(cache).to receive(:fetch_st).with(tgt, service, hash_including(force: false)).and_return(st)
+        allow(cache).to receive(:fetch_tgt).and_return(tgt)
       end
 
       it 'returns the cached value' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cassette
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.5
 platform: ruby
 authors:
 - Ricardo Hermida Ruiz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-10 00:00:00.000000000 Z
+date: 2019-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday