linked_rails 0.0.4.pre.g92825d924 → 0.0.4.pre.g7123943aa

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2dfbd0d96709d5036bcfcb422c88bf39e1c8c006ae4a4e5d6c8dfabc7d45cbb7
-  data.tar.gz: b5629f658ccf27bcd7ca9605d001668f55df2d5b311ce170a20c68a7cc895057
+  metadata.gz: 24aa1f95dca21df7152b6be6499f57d84a5fe37ac3944a0275b55d382a02f662
+  data.tar.gz: 1cfe8deb84e11ec8ec5fa0f2b088a60fe3078f8abe07c2c12fb0fd0e210bed9c
 SHA512:
-  metadata.gz: bd523b32c77f3836257b1821b0a70fe4fcd9e6ab75bf39366501e75104aed3fe92ab9a690468051aacdace53ae5b79182642d3a55147da0d409f107fa47e1e7f
-  data.tar.gz: 220bac95f7fc0f3ca454e4dc7e6ca9953afc60e0e8230c497c22a8751cdc78a1c654760fa57908f2b4c716b382e308a371f104b8b48db027d081f4e1db3e8f3b
+  metadata.gz: 668e32f354c65baeafd91e3e4f5521bcef0c9b9194389afca075e0eb0b078e248e6ec3206df63799e0dbce29f7425e9b6c654e2847bfdba5f6a052476175868f
+  data.tar.gz: 75835d167f14a03c94f24bf56fe8c13021ae2250b152637847cf0df295ddda9de827c0ae9a586ec6b1ac7fc8c2e7a62655e1bf00c1907a067a906a2e835b3f00

data/app/controllers/linked_rails/bulk_controller.rb

@@ -161,13 +161,17 @@ module LinkedRails
 
       resource_response(
         iri,
-        body: include && status == 200 ? resource_body(resource) : nil,
+        body: response_from_resource_body(include, iri, resource, status),
         cache: resource_cache_control(resource.try(:cacheable?), status, resource_policy),
         language: I18n.locale,
         status: status
       )
     end
 
+    def response_from_resource_body(include, _iri, resource, status)
+      include && status == 200 ? resource_body(resource) : nil
+    end
+
     def term_from_vocab(iri)
       vocab = Vocab.for(iri)
       tag = iri.to_s.split(vocab.to_s).last

data/app/models/linked_rails/manifest.rb

@@ -9,9 +9,7 @@ module LinkedRails
       Storage.hset(
         :persistent,
         :manifest,
-        {
-          LinkedRails.iri.to_s => web_manifest.to_json
-        }
+        URL.as_href(LinkedRails.iri) => web_manifest.to_json
       )
     end
 
@@ -163,13 +161,19 @@ module LinkedRails
 
     class << self
       def destroy(iri)
-        Storage.hdel(:persistent, :manifest, iri)
+        Storage.hdel(:persistent, :manifest, URL.as_href(iri))
       end
 
       def move(from, to)
-        data = Storage.hget(:persistent, :manifest, from)
+        Storage.hset(
+          :persistent,
+          :redirect_prefix,
+          URL.as_href(from) => URL.as_href(to)
+        )
 
-        Storage.hset(:persistent, :manifest, to, data) if data
+        data = Storage.hget(:persistent, :manifest, URL.as_href(from))
+
+        Storage.hset(:persistent, :manifest, URL.as_href(to), data) if data
 
         destroy(from)
       end

data/app/workers/linked_rails/invalidation_stream_worker.rb

@@ -8,7 +8,7 @@ module LinkedRails
         resource: iri,
         resourceType: resource_type
       }
-      id = Storage.xadd(:stream, entry)
+      id = Storage.xadd(:stream, LinkedRails.cache_stream, entry)
 
       raise('No message id returned, implies failure') if id.blank?
     end

data/lib/linked_rails/model/cacheable.rb

@@ -17,8 +17,6 @@ module LinkedRails
         true
       end
 
-      private
-
       def publish_create
         publish_message('io.ontola.transactions.Created')
       end
@@ -31,14 +29,14 @@ module LinkedRails
         publish_message('io.ontola.transactions.Deleted')
       end
 
+      private
+
       def publish_message(type)
         LinkedRails::InvalidationStreamWorker.perform_now(type, iri.to_s, self.class.iri.to_s)
       rescue StandardError
         LinkedRails::InvalidationStreamWorker.perform_later(type, iri.to_s, self.class.iri.to_s)
       end
 
-      private
-
       def should_publish_changes
         cacheable? && !Rails.env.test?
       end

data/lib/linked_rails/storage.rb

@@ -4,26 +4,27 @@ require 'redis'
 
 module LinkedRails
   class Storage
-    CLIENT = {
-      cache: Redis.new(db: LinkedRails.cache_redis_database),
-      persistent: Redis.new(db: LinkedRails.persistent_redis_database),
-      stream: Redis.new(db: LinkedRails.stream_redis_database)
+    REDIS_DB = {
+      cache: LinkedRails.cache_redis_database,
+      persistent: LinkedRails.persistent_redis_database,
+      stream: LinkedRails.stream_redis_database
     }.freeze
     KEYS = {
       manifest: 'cache:Manifest',
-      redirect: 'cache:Redirect'
+      redirect_exact: 'cache:Redirect:Exact',
+      redirect_prefix: 'cache:Redirect:Prefix'
     }.freeze
 
     class << self
       %i[xadd].each do |method|
         define_method(method) do |db, *args|
-          CLIENT.fetch(db).send(method, *args)
+          Redis.new(db: REDIS_DB.fetch(db)).send(method, *args)
         end
       end
 
       %i[hset hdel hget].each do |method|
         define_method(method) do |db, key, *args|
-          CLIENT.fetch(db).send(method, KEYS.fetch(key), *args)
+          Redis.new(db: REDIS_DB.fetch(db)).send(method, KEYS.fetch(key), *args)
         end
       end
     end

data/lib/linked_rails/url.rb

@@ -0,0 +1,11 @@
+module LinkedRails
+  class URL
+    class << self
+      def as_href(url)
+        uri = URI(url)
+        uri.path = uri.path.presence || '/'
+        uri.to_s
+      end
+    end
+  end
+end

data/lib/linked_rails.rb

@@ -106,4 +106,5 @@ require 'linked_rails/routes'
 require 'linked_rails/serializer'
 require 'linked_rails/translate'
 require 'linked_rails/railtie'
+require 'linked_rails/url'
 require 'linked_rails/storage'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: linked_rails
 version: !ruby/object:Gem::Version
-  version: 0.0.4.pre.g92825d924
+  version: 0.0.4.pre.g7123943aa
 platform: ruby
 authors:
 - Arthur Dingemans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-09 00:00:00.000000000 Z
+date: 2022-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_response
@@ -429,6 +429,7 @@ files:
 - lib/linked_rails/translate.rb
 - lib/linked_rails/types/iri_type.rb
 - lib/linked_rails/uri_template.rb
+- lib/linked_rails/url.rb
 - lib/linked_rails/version.rb
 - lib/linked_rails/vocab.rb
 - lib/nill_class_renderer.rb