linked_rails 0.0.4.pre.g58e27be7f → 0.0.4.pre.g72bb595fe

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b8ffa3a829f2c55d62661b0e4e619ee8e923a68a74bc4a48e6e052876ac61af
-  data.tar.gz: c32f19ca0b17a94237e717f04f0b277c5d21fde64e24e0a20ade4e91dca8b0c4
+  metadata.gz: 7810fdc42df9533cc1828c33aec04953486145ee0c744607b01b5f514d67dcb0
+  data.tar.gz: 9056187a625becc1c3e4c234ae7b06b77e77f0d4d3bdcb5d6c24b1249e1e21a9
 SHA512:
-  metadata.gz: b9d423962871a075e287a5c74e4d71c2e111a974efcc64362133b759c9e9decba9427c43c559311191ba3b1f6b76af4e0971e279540f74ffdfae43f2670c88b8
-  data.tar.gz: 755f741653de9d6c2889003df66ec0a43649c5bcb03365ef624b84758bbd44b33954605e88d1fed119ab6277e4a4b6744d840556075f4e70e576f153c6c41c8c
+  metadata.gz: d294b57b181d6995d88ee5967c61d9bd5c69a2a1e3dc6843848032c4f9ee36c7c762d2f163022e97cdd35219bc6d395392b0af9863ab7f0a4dcb924f5c4358ef
+  data.tar.gz: 880a18f47ab624f736ab12421c3ea8c6a4810f9602149d35efca16e5edb21e9563280bfbe9721acf0860a5c7a2602632a0f7056ca5cd7b207e9e4c7582da9f5c

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)
@@ -251,7 +249,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/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.g58e27be7f
+  version: 0.0.4.pre.g72bb595fe
 platform: ruby
 authors:
 - Arthur Dingemans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-17 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