linked_rails 0.0.4.pre.gc866c1806 → 0.0.4.pre.gd8464437f

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c7b4b4fa0d60ccdcc20d5a6d8ef0349f5297df898edbe43b1e01b60ecbac0c1d
-  data.tar.gz: 2bfa506972dcd36d90eae54db4042894b5ef93555d54a4b8e3c74182f85fbd60
+  metadata.gz: d0469495fc05ef96aed75db4a9a3f1cf7e1ed7dfed36760c6960d370369515c1
+  data.tar.gz: f3ed8428a3ca3421c43cb6e702a3353eedfb5bcc09db67a85670ebf37cbd8aaa
 SHA512:
-  metadata.gz: 95a82ed0863b9073d1103338e6945984fb3e8743b500a3358e90b9092e394d8fad34584d0d0f86da1c8ffac25c4539544066de4c0e7adc59a8758ccf590923fc
-  data.tar.gz: a6143d72aac114b0892e20bd22d992c823fd98d9670f3cf46000aadff007b6d95c448a1388ea8432a98146931b4962e062b41a976c0dadffa1d86d1ab34290d3
+  metadata.gz: 52a4634ca24036a3281671d4829ba527ccc5790c6e4c6d87bfc2b3208f88c3d00ca8db0370b4aeffc8d77da8629058999a6677923a002c5f5680a30d4cd89f1e
+  data.tar.gz: 4d48f8396c5a5209fbf9373362cca8efc693493ec650034359119d9a39809a9ba2511af80aa8820c3439aaf5156f143608e4361b3def860cc33119db180cb93c

data/app/controllers/linked_rails/bulk_controller.rb

@@ -98,8 +98,6 @@ 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)
@@ -163,17 +161,13 @@ module LinkedRails
 
       resource_response(
         iri,
-        body: response_from_resource_body(include, iri, resource, status),
+        body: include && status == 200 ? resource_body(resource) : nil,
         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
@@ -251,7 +245,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.chomp('/').present? ? iri.to_s.split("#{LinkedRails.iri.path}/").last : iri)
+      uri = URI(LinkedRails.iri.path.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.chomp('/')}/#{target_path}" if target_path.present?
+        base.path = "#{base.path}/#{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/collection/view.rb

@@ -8,9 +8,8 @@ module LinkedRails
       include LinkedRails::Model
 
       attr_accessor :collection, :filter
-      delegate :apply_scope, :association_base, :association_class, :child_resource, :default_page_size, :display,
-               :include_members,:parent, :policy, :total_page_count, :unfiltered_collection, :user_context,
-               to: :collection
+      delegate :apply_scope, :association_base, :association_class, :default_page_size, :display, :include_members,
+               :parent, :policy, :total_page_count, :unfiltered_collection, :user_context, to: :collection
       delegate :count, to: :members
 
       alias id iri

data/app/models/linked_rails/manifest.rb

@@ -9,7 +9,7 @@ module LinkedRails
       Storage.hset(
         :persistent,
         :manifest,
-        URL.as_href(LinkedRails.iri) => web_manifest.to_json
+        LinkedRails.iri.to_s => 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.chomp('/')}/sw.js",
+        src: "#{scope}/sw.js",
         scope: scope
       }
     end
@@ -161,19 +161,19 @@ module LinkedRails
 
     class << self
       def destroy(iri)
-        Storage.hdel(:persistent, :manifest, URL.as_href(iri))
+        Storage.hdel(:persistent, :manifest, iri)
       end
 
       def move(from, to)
         Storage.hset(
           :persistent,
           :redirect_prefix,
-          URL.as_href(from) => URL.as_href(to)
+          from => to
         )
 
-        data = Storage.hget(:persistent, :manifest, URL.as_href(from))
+        data = Storage.hget(:persistent, :manifest, from)
 
-        Storage.hset(:persistent, :manifest, URL.as_href(to), data) if data
+        Storage.hset(:persistent, :manifest, to, data) if data
 
         destroy(from)
       end

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

@@ -81,7 +81,7 @@ module LinkedRails
           parent = parent_from_params(params, user_context)
           return if parent.blank?
 
-          parent.try(:menu_sequence)
+          parent.menu_sequence
         end
       end
     end

data/lib/linked_rails/helpers/resource_helper.rb

@@ -58,10 +58,7 @@ module LinkedRails
       end
 
       def new_resource_from_parent
-        if requested_resource.is_a?(LinkedRails.collection_class) ||
-          requested_resource.is_a?(LinkedRails.collection_view_class)
-          return requested_resource.child_resource
-        end
+        return requested_resource.child_resource if requested_resource.is_a?(Collection)
 
         parent_resource.build_child(
           controller_class,

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, SystemStackError
+      rescue ActionController::RoutingError
         EMPTY_IRI_OPTS.dup
       end
 

data/lib/linked_rails/model/iri.rb

@@ -62,7 +62,6 @@ 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.rb

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

data/lib/linked_rails/url.rb

@@ -1,11 +0,0 @@
-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