linked_rails 0.0.4.pre.g661cde413 → 0.0.4.pre.g96885856b

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 845342061b2ae457765501710f98084b42c8b50e0dd31ae17deec9c7e4f58c4d
-  data.tar.gz: 55a55eec5843bc2c45a16bb4a88406fdb6212efeb4265817b52d060f37fd6d1d
+  metadata.gz: 91c75addc6ea759a73ff4fdce94549494d623fe819ee7ed0d2ea1557e7c2ac91
+  data.tar.gz: 4fcd4f439831e7aa196fa2fe610263949dfc316bb4566c9cb94562eb67e1c304
 SHA512:
-  metadata.gz: 4904d8468cadc1ee7915c8e9fb1a60ec5b161f72a1d37deb3966cb42d78c9b82039463e6f49c6aa3a189ba94dfb687ee5b3bcd252d97b8e2f654ca65263b286a
-  data.tar.gz: d548834a87749f311233501bde28f60841735ddf326c6a20da8aa3274589c3bfdb5a45e811a5b0b5554211edeef913ed38d1b0049734fb7c1aeda300c0226c9b
+  metadata.gz: ffcb80ce21ecbb28c0d42c79115b998bd859e689acbc4fcbb61ae6a494e75c09f3b906a466141412331fb5cc7076527fcf92fa227a58d00040db732d6123d350
+  data.tar.gz: e72f2247fa7ff7ca882e0644c69ed072e5ab93af8f02842f3495c3522e1fa300ce915703fcd297c21d36b1b658ccb7d0b3194aa4836fb7cf76afecec2e2bfeb0

data/app/controllers/linked_rails/bulk_controller.rb

@@ -98,6 +98,8 @@ module LinkedRails
       params = param.permit(:include, :iri)
       params[:iri] = URI(params[:iri])
       params
+    rescue URI::InvalidURIError
+      params.except(:iri)
     end
 
     def resource_response_body(iri, rack_body, status)
@@ -161,13 +163,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
@@ -245,7 +251,7 @@ module LinkedRails
 
     def sanitized_relative_path(iri) # rubocop:disable Metrics/AbcSize
       iri.path = "#{iri.path}/" unless iri.path&.ends_with?('/')
-      uri = URI(LinkedRails.iri.path.present? ? iri.to_s.split("#{LinkedRails.iri.path}/").last : iri)
+      uri = URI(LinkedRails.iri.path.chomp('/').present? ? iri.to_s.split("#{LinkedRails.iri.path}/").last : iri)
 
       [uri.path, uri.query].compact.join('?')
     end

data/app/models/linked_rails/actions/item.rb

@@ -187,7 +187,7 @@ module LinkedRails
 
       def target_url_fallback # rubocop:disable Metrics/AbcSize
         base = (resource.try(:singular_resource?) ? resource.singular_iri : resource.iri).dup
-        base.path = "#{base.path}/#{target_path}" if target_path.present?
+        base.path = "#{base.path.chomp('/')}/#{target_path}" if target_path.present?
         base.query = Rack::Utils.parse_nested_query(base.query).merge(target_query).to_param if target_query.present?
         base
       end

data/app/models/linked_rails/manifest.rb

@@ -9,7 +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
 
@@ -41,7 +41,7 @@ module LinkedRails
     def blob_preview_iri
       return unless ActiveStorage::Blob.service.present?
 
-      LinkedRails.iri(path: 'rails/active_storage/blobs/redirect/{signed_id}/preview')
+      "#{LinkedRails.iri(path: 'rails/active_storage/blobs/redirect')}/{signed_id}/preview')"
     end
 
     def blob_upload_iri
@@ -138,7 +138,7 @@ module LinkedRails
 
     def web_manifest_sw_section
       {
-        src: "#{scope}/sw.js",
+        src: "#{scope.chomp('/')}/sw.js",
         scope: scope
       }
     end
@@ -161,19 +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)
         Storage.hset(
           :persistent,
-          :redirect,
-          "#{from}*" => to
+          :redirect_prefix,
+          URL.as_href(from) => URL.as_href(to)
         )
 
-        data = Storage.hget(:persistent, :manifest, from)
+        data = Storage.hget(:persistent, :manifest, URL.as_href(from))
 
-        Storage.hset(:persistent, :manifest, to, data) if data
+        Storage.hset(:persistent, :manifest, URL.as_href(to), data) if data
 
         destroy(from)
       end

data/lib/linked_rails/iri_mapper.rb

@@ -38,7 +38,7 @@ module LinkedRails
         params = Rails.application.routes.recognize_path(iri.to_s, method: method)
 
         route_params_to_opts(params.merge(query), iri.to_s)
-      rescue ActionController::RoutingError
+      rescue ActionController::RoutingError, SystemStackError
         EMPTY_IRI_OPTS.dup
       end
 

data/lib/linked_rails/model/iri.rb

@@ -62,6 +62,7 @@ module LinkedRails
         iri = root_relative_iri.dup
         iri.scheme = LinkedRails.scheme
         iri.host = LinkedRails.host
+        iri.path = iri.path.presence || '/'
         iri
       end
 

data/lib/linked_rails/storage.rb

@@ -11,7 +11,8 @@ module LinkedRails
     }.freeze
     KEYS = {
       manifest: 'cache:Manifest',
-      redirect: 'cache:Redirect'
+      redirect_exact: 'cache:Redirect:Exact',
+      redirect_prefix: 'cache:Redirect:Prefix'
     }.freeze
 
     class << self

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

@@ -54,8 +54,10 @@ module LinkedRails
       @@scheme ||= Rails.application.routes.default_url_options[:protocol] || :http # rubocop:disable Style/ClassVars
     end
 
-    def iri(**opts)
-      RDF::URI.new(**{scheme: LinkedRails.scheme, host: LinkedRails.host}.merge(opts))
+    def iri(**args)
+      opts = {scheme: LinkedRails.scheme, host: LinkedRails.host}.merge(args)
+      opts[:path] = opts[:path].presence || '/'
+      RDF::URI.new(**opts)
     end
   end
 
@@ -106,4 +108,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.g661cde413
+  version: 0.0.4.pre.g96885856b
 platform: ruby
 authors:
 - Arthur Dingemans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-10 00:00:00.000000000 Z
+date: 2022-08-17 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