linked_rails 0.0.4.pre.g72bb595fe → 0.0.4.pre.g76dedd8ba

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7810fdc42df9533cc1828c33aec04953486145ee0c744607b01b5f514d67dcb0
-  data.tar.gz: 9056187a625becc1c3e4c234ae7b06b77e77f0d4d3bdcb5d6c24b1249e1e21a9
+  metadata.gz: 8c64c5a485e952fa401c1bcea4761f493b4f94650bbec75d7f19e9787dad1f84
+  data.tar.gz: 4616e0044f6e3fefb204a464347c2dfc5d98adc0d12d11e8ef65e074968af3e0
 SHA512:
-  metadata.gz: d294b57b181d6995d88ee5967c61d9bd5c69a2a1e3dc6843848032c4f9ee36c7c762d2f163022e97cdd35219bc6d395392b0af9863ab7f0a4dcb924f5c4358ef
-  data.tar.gz: 880a18f47ab624f736ab12421c3ea8c6a4810f9602149d35efca16e5edb21e9563280bfbe9721acf0860a5c7a2602632a0f7056ca5cd7b207e9e4c7582da9f5c
+  metadata.gz: '08c5759176b7e96922b54ba4fdc60c42aa8513ea7265ac9e7e86e9b1f77726e4f113485896f891dc88f8ce056feebef844db3263dfc2d4327e43eb390e31f7f3'
+  data.tar.gz: b915500d88b3a0cdb03d9e2d8e1d5f724967a353c138e0977afaef890162c423e0f57f2303db73b03004426042066cdeb24dfe6edc169efb104575bf3324c749

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
 
@@ -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_prefix,
-          from => to
+          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/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/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.g72bb595fe
+  version: 0.0.4.pre.g76dedd8ba
 platform: ruby
 authors:
 - Arthur Dingemans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-10 00:00:00.000000000 Z
+date: 2022-08-15 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