linked_rails 0.0.4.pre.ge09501794 → 0.0.4.pre.gfabf7e9f5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44eff5276df3db721ed2fc9af75cbe30654a5a39eced5d2d5fc43ee3edf8c565
-  data.tar.gz: 83f29fa2699f9de8f76e96638cadc37769a175ddadb074058a7cf390925aa5d3
+  metadata.gz: d12d8552b0abb2f55672ba9a5b2ae4e2c82b8b0ecd9a58b034cd71065991918f
+  data.tar.gz: be43a26a2c5fcae83ac4811b0e79fb9903bdba722e45e9e385a90a1e4c6534de
 SHA512:
-  metadata.gz: dea2b33a380c08e58594fe8b97da2c85c02ab40cef2c489e91ac03798391daa1b645b218286d534bf97e57a7f9574cad8158454281c31fdcfb92926c19f634af
-  data.tar.gz: 056a449612b7c80ebce2b127e8f6242bd5b3738a58a374e5760b70f65d380a8d7fd6b3d2bd30737e20308deab63b953d359de0836f199c1f143df6222e973d05
+  metadata.gz: 4db097ca23b358535b5d6db20c947046633e347a7e9cd68402bb1bf6ed4ad4d8b05290a59d1ff53523c77d7c0b1c42ad93b9cfbf468c86d60adbd2aa52be9870
+  data.tar.gz: 3e5c0add9dd97d2ab2764043231a0999af174e92ea197c59c68cbbc35c916edbe7169dc32d4e45d90f17e9dd77513f52c99352825c2193a1db50ba74767c2490

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/collection/view.rb

@@ -8,8 +8,9 @@ module LinkedRails
       include LinkedRails::Model
 
       attr_accessor :collection, :filter
-      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 :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 :count, to: :members
 
       alias id iri
@@ -42,7 +43,7 @@ module LinkedRails
       end
 
       def preview_includes
-        include_members ? {member_sequence: :members} : %i[member_sequence]
+        include_members ? {members: {}, member_sequence: :members} : %i[member_sequence]
       end
 
       def title

data/app/models/linked_rails/form/field_factory.rb

@@ -52,13 +52,7 @@ module LinkedRails
       private
 
       def attr_column(name)
-        column_model =
-          if model_class.is_delegated_attribute?(name)
-            model_class.class_for_delegated_attribute(name)
-          else
-            model_class
-          end
-        column_model.column_for_attribute(name)
+        model_class.column_for_attribute(name)
       end
 
       def attr_to_datatype # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength

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/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.menu_sequence
+          parent.try(:menu_sequence)
         end
       end
     end

data/app/serializers/linked_rails/collection/view_serializer.rb

@@ -17,6 +17,7 @@ module LinkedRails
       has_one :collection, predicate: Vocab.as.partOf
       has_one :unfiltered_collection, predicate: Vocab.ontola[:baseCollection]
       has_one :member_sequence, predicate: Vocab.as.items
+      has_many :members
     end
   end
 end

data/lib/linked_rails/helpers/resource_helper.rb

@@ -58,7 +58,10 @@ module LinkedRails
       end
 
       def new_resource_from_parent
-        return requested_resource.child_resource if requested_resource.is_a?(Collection)
+        if requested_resource.is_a?(LinkedRails.collection_class) ||
+          requested_resource.is_a?(LinkedRails.collection_view_class)
+          return requested_resource.child_resource
+        end
 
         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
+      rescue ActionController::RoutingError, SystemStackError
         EMPTY_IRI_OPTS.dup
       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/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.ge09501794
+  version: 0.0.4.pre.gfabf7e9f5
 platform: ruby
 authors:
 - Arthur Dingemans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-10 00:00:00.000000000 Z
+date: 2022-08-25 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