linked_rails 0.0.4.pre.gaa82a222d → 0.0.4.pre.gacd5f04d4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f1eb1660184a73c838c471635c7220d6f1c8b10536298ab5f2224fec72e3289b
-  data.tar.gz: 25c55e206bccd1df5bd06eed1844e45e32f139fb763bca38c88386f2f5920915
+  metadata.gz: b7e8e910730057122673f7a3e2990ae01fe4e4f29a113f2612dcdbdaac0c11ce
+  data.tar.gz: 10730a6477f855e8675884c96bb0cd3eadb50ff98fdbd928c6ca408646b4a7fb
 SHA512:
-  metadata.gz: ddaf7a1efbe247062b9c01ba940355d3b4f360e92d831b1fc40a4353ff38d3e04f32852878b33147534803db788e07f08630ffbc320d576e9a8b741157db98db
-  data.tar.gz: 2eca9f4ec3c157af965fdbc30d2ad4997a5b3e5f696870852729bc4f57390024f2a82eb64276303be34edc578ff85d0cb25af85d932043f2086dfa52eefb7604
+  metadata.gz: 7c8056f5ce99c4d35ba9ba5ea223dbcb86980d183495c9e2e875e06f946766c9e75437cb1843a6e6fb79e8ba62ff099e4c01537cb971478c6fa2cf49365cbb19
+  data.tar.gz: 705a9f1eae5d013b79e1e608bad5a96109f987ff6af91699a718dc6c779bab68e438e5981b9734d59c26496a4f2fc139728c0f7064e314e7479d3931c586f4f3

data/app/controllers/linked_rails/bulk_controller.rb

@@ -21,8 +21,11 @@ module LinkedRails
       return response_for_wrong_host(opts) if wrong_host?(opts[:iri])
 
       include = opts[:include].to_s == 'true'
+      resource = LinkedRails.iri_mapper.resource_from_iri(request_path_to_url(opts[:iri]), user_context)
 
-      response_from_request(include, RDF::URI(opts[:iri]))
+      return response_from_request(include, RDF::URI(opts[:iri])) if resource.blank?
+
+      response_from_resource(include, opts[:iri], resource)
     rescue StandardError => e
       handle_resource_error(opts, e)
     end
@@ -84,10 +87,19 @@ module LinkedRails
       false
     end
 
+    def resource_cache_control(cacheable, status, resource_policy)
+      return :private unless status == 200 && cacheable
+      return 'no-cache' unless resource_policy.try(:public_resource?)
+
+      :public
+    end
+
     def resource_params(param)
       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)
@@ -131,6 +143,17 @@ module LinkedRails
       }.merge(opts)
     end
 
+    def resource_status(resource_policy)
+      return 200 if resource_policy.show?
+
+      raise(
+        LinkedRails::Errors::Forbidden.new(
+          action_status: resource_policy.try(:action_status),
+          query: :show?
+        )
+      )
+    end
+
     def response_for_wrong_host(opts)
       iri = opts[:iri]
       term = term_from_vocab(iri)
@@ -139,6 +162,23 @@ module LinkedRails
       ontology_term_response(iri, term, opts[:include])
     end
 
+    def response_from_resource(include, iri, resource)
+      resource_policy = policy(resource)
+      status = resource_status(resource_policy)
+
+      resource_response(
+        iri,
+        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
@@ -216,7 +256,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

@@ -61,15 +61,17 @@ module LinkedRails
       end
 
       def object
-        @object = list.instance_exec(&@object) if @object.respond_to?(:call)
-
-        @object || resource
+        object_from_var || resource
       end
 
       def object_iri
         object&.iri&.anonymous? ? anonymous_object_iri : object&.iri
       end
 
+      def object_root_relative_iri
+        RDF::URI(object_iri.to_s.split(LinkedRails.iri.to_s).second)
+      end
+
       def parent
         return @parent if instance_variable_defined?(:@parent)
 
@@ -152,6 +154,12 @@ module LinkedRails
         LinkedRails.translate(:action, :label, self)
       end
 
+      def object_from_var
+        return @object unless @object.respond_to?(:call)
+
+        @object = list.instance_exec(&@object)
+      end
+
       def policy_expired?
         @policy_expired ||= policy && resource_policy.try(:expired?)
       end
@@ -187,7 +195,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/actions/object.rb

@@ -12,8 +12,8 @@ module LinkedRails
       alias parent action
       delegate :object, to: :action
 
-      def iri
-        action.object_iri
+      def root_relative_iri
+        action.object_root_relative_iri
       end
 
       class << self
@@ -30,7 +30,10 @@ module LinkedRails
 
           parent = parent_from_params!(params, user_context)
 
-          new(action: parent) if parent.object.anonymous_iri?
+          object = parent&.object
+          object.instance_variable_set(:@iri, parent.object_iri)
+          object.instance_variable_set(:@root_relative_iri, parent.object_root_relative_iri)
+          object
         end
       end
     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
@@ -75,19 +76,19 @@ module LinkedRails
       end
 
       def iris_from_scope?
-        members_query.is_a?(ActiveRecord::Relation) && !polymorphic_collection?
+        members_query.is_a?(ActiveRecord::Relation) && !polymorphic_collection?(members_query.klass)
       end
 
       def members_array
         members_query.to_a
       end
 
-      def polymorphic_collection?
-        column = association_class.inheritance_column
-        polymorphic = association_class.columns_hash.include?(column)
+      def polymorphic_collection?(klass)
+        column = klass.inheritance_column
+        polymorphic = klass.columns_hash.include?(column)
         return false unless polymorphic
 
-        return true if association_class.descends_from_active_record?
+        return true if klass.descends_from_active_record?
 
         members_query.where_values_hash.include?(column) &&
           members_query.where_values_hash[column] != association_class.to_s

data/app/models/linked_rails/form/field/file_input.rb

@@ -4,7 +4,11 @@ module LinkedRails
   class Form
     class Field
       class FileInput < Field
-        attr_accessor :max_size
+        attr_writer :max_size
+
+        def max_size
+          @max_size.respond_to?(:call) ? @max_size.call : @max_size
+        end
       end
     end
   end

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/form.rb

@@ -5,6 +5,7 @@ require 'pundit'
 module LinkedRails
   class Form # rubocop:disable Metrics/ClassLength
     include LinkedRails::Model
+    include LinkedRails::Model::Cacheable
 
     class_attribute :abstract_form, :pages, :model_class
 
@@ -119,7 +120,7 @@ module LinkedRails
 
       def has_many(key, **opts)
         opts[:input_field] = Form::Field::AssociationInput
-        opts[:max_count] = 99
+        opts[:max_count] ||= 99
         field(key, **opts)
       end
 

data/app/models/linked_rails/manifest.rb

@@ -5,6 +5,27 @@ module LinkedRails
     include ActiveModel::Model
     include LinkedRails::Model
 
+    def save
+      Storage.hset(
+        :persistent,
+        :manifest,
+        URL.as_href(LinkedRails.iri) => web_manifest.to_json
+      )
+    end
+
+    def web_manifest
+      web_manifest_base.merge(
+        ontola: web_manifest_ontola_section,
+        serviceworker: web_manifest_sw_section
+      )
+    end
+
+    private
+
+    def allowed_external_sources
+      []
+    end
+
     def app_name
       Rails.application.railtie_name.chomp('_application').humanize
     end
@@ -17,8 +38,27 @@ module LinkedRails
       '#eef0f2'
     end
 
+    def blob_preview_iri
+      return unless ActiveStorage::Blob.service.present?
+
+      "#{LinkedRails.iri(path: 'rails/active_storage/blobs/redirect')}/{signed_id}/preview"
+    end
+
+    def blob_upload_iri
+      return unless ActiveStorage::Blob.service.present?
+
+      LinkedRails.iri(path: 'rails/active_storage/direct_uploads')
+    end
+
     def css_class; end
 
+    def csp_entries
+      {
+        connectSrc: [ActiveStorage::Blob.service.try(:bucket)&.url].compact,
+        scriptSrc: [ActiveStorage::Blob.service.try(:bucket)&.url].compact
+      }
+    end
+
     def header_background
       :primary
     end
@@ -27,17 +67,16 @@ module LinkedRails
       :white
     end
 
-    def preload_iris
-      [
-        scope,
-        LinkedRails.iri(path: 'ns/core').to_s,
-        LinkedRails.iri(path: 'c_a').to_s,
-        LinkedRails.iri(path: 'menus').to_s
-      ]
+    def icons
+      []
+    end
+
+    def lang
+      :nl
     end
 
     def scope
-      @scope ||= LinkedRails.iri.to_s
+      LinkedRails.iri.to_s
     end
 
     def site_theme_color
@@ -52,43 +91,46 @@ module LinkedRails
       app_name
     end
 
+    def start_url
+      scope == '/' ? scope : "#{scope}/"
+    end
+
     def theme; end
 
     def theme_options
       {}
     end
 
-    def web_manifest
-      web_manifest_base.merge(
-        ontola: web_manifest_ontola_section,
-        serviceworker: web_manifest_sw_section
-      )
-    end
-
     def web_manifest_base # rubocop:disable Metrics/MethodLength
       {
         background_color: background_color,
         dir: :rtl,
         display: :standalone,
-        lang: :nl,
+        icons: icons,
+        lang: lang,
         name: app_name,
         scope: scope,
         short_name: app_name,
-        start_url: scope,
+        start_url: start_url,
         theme_color: site_theme_color
       }
     end
 
     def web_manifest_ontola_section # rubocop:disable Metrics/MethodLength
       {
-        css_class: css_class,
+        allowed_external_sources: allowed_external_sources,
+        blob_preview_iri:  blob_preview_iri,
+        blob_upload_iri: blob_upload_iri,
+        csp: csp_entries,
         header_background: header_background,
         header_text: header_text,
-        preload: preload_iris,
+        preconnect: preconnect,
         primary_color: site_theme_color,
         secondary_color: site_secondary_color,
+        styled_headers: styled_headers,
         theme: theme,
         theme_options: theme_options.to_query,
+        tracking: tracking,
         website_iri: LinkedRails.iri.to_s,
         websocket_path: websocket_path
       }
@@ -96,7 +138,7 @@ module LinkedRails
 
     def web_manifest_sw_section
       {
-        src: "#{scope}/sw.js?manifestLocation=#{Rack::Utils.escape("#{scope}/manifest.json")}",
+        src: "#{scope.chomp('/')}/sw.js",
         scope: scope
       }
     end
@@ -104,5 +146,37 @@ module LinkedRails
     def websocket_path
       Rails.application.config.try(:action_cable).try(:mount_path).try(:[], 1..-1)
     end
+
+    def preconnect
+      []
+    end
+
+    def styled_headers
+      false
+    end
+
+    def tracking
+      []
+    end
+
+    class << self
+      def destroy(iri)
+        Storage.hdel(:persistent, :manifest, URL.as_href(iri))
+      end
+
+      def move(from, to)
+        Storage.hset(
+          :persistent,
+          :redirect_prefix,
+          URL.as_href(from) => URL.as_href(to)
+        )
+
+        data = Storage.hget(:persistent, :manifest, URL.as_href(from))
+
+        Storage.hset(:persistent, :manifest, URL.as_href(to), data) if data
+
+        destroy(from)
+      end
+    end
   end
 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/models/linked_rails/menus/list.rb

@@ -26,7 +26,7 @@ module LinkedRails
       end
 
       def menus
-        @menus ||= available_menus.map(&method(:memoised_menu_item))
+        @menus ||= available_menus.map(&method(:memoized_menu_item))
       end
 
       def menu(tag)
@@ -49,9 +49,8 @@ module LinkedRails
       end
 
       def menu_item(tag, options) # rubocop:disable Metrics/AbcSize
-        if options[:policy].present?
-          return unless resource_policy(options[:policy_resource]).send(options[:policy], *options[:policy_arguments])
-        end
+        return unless show_menu_item?(tag, options)
+
         options[:label_params] ||= {}
         options[:label_params][:default] ||= ["menus.default.#{tag}".to_sym, tag.to_s.capitalize]
         options[:label] ||= default_label(tag, options)
@@ -60,6 +59,10 @@ module LinkedRails
         LinkedRails.menus_item_class.new(resource: resource, tag: tag, parent: self, **options)
       end
 
+      def policy_verdict(policy, options)
+        policy.send(options[:policy], *options[:policy_arguments])
+      end
+
       def resource_policy(policy_resource)
         policy_resource ||= resource
         policy_resource = instance_exec(&policy_resource) if policy_resource.respond_to?(:call)
@@ -69,6 +72,14 @@ module LinkedRails
         @resource_policy[policy_resource] ||= Pundit.policy(user_context, policy_resource)
       end
 
+      def show_menu_item?(_tag, options)
+        return true if options[:policy].blank?
+
+        policy = resource_policy(options[:policy_resource])
+
+        policy_verdict(policy, options)
+      end
+
       def iri_template
         base_template = resource.send(resource.try(:singular_resource?) ? :singular_iri_template : :iri_template)
 

data/app/models/linked_rails/ontology.rb

@@ -4,6 +4,7 @@ module LinkedRails
   class Ontology
     include ActiveModel::Model
     include LinkedRails::Model
+    include LinkedRails::Model::Cacheable
 
     def classes
       @classes ||= LinkedRails.linked_models.map do |klass|

data/app/policies/linked_rails/collection_policy.rb

@@ -8,6 +8,7 @@ module LinkedRails
       policy = Pundit.policy!(user_context, child_resource)
       verdict = policy.create?
       @message = policy.message
+      @action_status = policy.action_status
       verdict
     end
 

data/app/policies/linked_rails/form_policy.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module LinkedRails
+  class FormPolicy < LinkedRails.policy_parent_class
+    def show?
+      true
+    end
+
+    def public_resource?
+      true
+    end
+  end
+end

data/app/policies/linked_rails/ontology_policy.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module LinkedRails
+  class OntologyPolicy < LinkedRails.policy_parent_class
+    def show?
+      true
+    end
+
+    def public_resource?
+      true
+    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/app/serializers/linked_rails/collection_serializer.rb

@@ -13,6 +13,7 @@ module LinkedRails
     end
     attribute :serialized_iri_template, predicate: Vocab.ontola[:iriTemplate]
     attribute :iri_template_opts, predicate: Vocab.ontola[:iriTemplateOpts]
+    attribute :download_urls, predicate: Vocab.schema.downloadUrl
     attribute :default_type, predicate: Vocab.ontola[:defaultType], &:type
     attribute :display, predicate: Vocab.ontola[:collectionDisplay] do |object|
       Vocab.ontola["collectionDisplay/#{object.display || :default}"]

data/app/workers/linked_rails/invalidation_stream_worker.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module LinkedRails
+  class InvalidationStreamWorker < ActiveJob::Base
+    def perform(type, iri, resource_type)
+      entry = {
+        type: type,
+        resource: iri,
+        resourceType: resource_type
+      }
+      id = Storage.xadd(:stream, LinkedRails.cache_stream, entry)
+
+      raise('No message id returned, implies failure') if id.blank?
+    end
+  end
+end

data/lib/generators/linked_rails/install/templates/locales.yml

@@ -11,6 +11,8 @@ en:
       update:
         label: "Edit"
         success: 'Updated successfully'
+  errors:
+    access_denied: "You're not authorized for this action. (%{action})"
   linked_rails:
     status:
       400: "Error in request"

data/lib/linked_rails/controller/delta.rb

@@ -5,20 +5,8 @@ module LinkedRails
     module Delta
       include LinkedRails::Helpers::DeltaHelper
 
-      def changes_triples(resource) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+      def changes_triples(resource)
         resource_serializer(resource)&.send(:repository).statements
-
-        # resource.previous_changes_by_predicate.map do |predicate, (_old_value, _new_value)|
-        #   serializer_attributes = resource.class.predicate_mapping[predicate]
-        #   next if serializer_attributes.is_a?(FastJsonapi::Relationship)
-        #
-        #   attr_name = serializer_attributes.key
-        #   serialized_value =
-        #     serializer.class.attributes_to_serialize[attr_name]&.serialize(resource, serializer_params, {})
-        #   (serialized_value.is_a?(Array) ? serialized_value : [serialized_value]).map do |value|
-        #     change_triple(resource, predicate, value)
-        #   end
-        # end.compact.flatten
       end
 
       def changed_relations_triples(resource, inverted = nil) # rubocop:disable Metrics/AbcSize
@@ -35,14 +23,6 @@ module LinkedRails
 
       private
 
-      def change_triple(resource, predicate, value)
-        if value.nil?
-          RDF::Statement.new(resource.iri, predicate, Vocab.sp[:Variable], graph_name: delta_iri(:remove))
-        else
-          RDF::Statement.new(resource.iri, predicate, value, graph_name: delta_iri(:replace))
-        end
-      end
-
       def changed_relation_triples(predicate, destructed, resources, inverted)
         related_resource_invalidations =
           resources.flat_map do |resource|

data/lib/linked_rails/controller/error_handling.rb

@@ -6,6 +6,10 @@ module LinkedRails
       extend ActiveSupport::Concern
       include ActiveSupport::Rescuable
 
+      included do
+        rescue_from LinkedRails::Errors::Forbidden, with: :handle_error
+      end
+
       private
 
       def add_error_snackbar(error)
@@ -69,6 +73,7 @@ module LinkedRails
             'Doorkeeper::Errors::InvalidGrantReuse' => 422,
             'LinkedRails::Auth::Errors::Expired' => 410,
             'LinkedRails::Auth::Errors::Unauthorized' => 401,
+            'LinkedRails::Errors::Forbidden' => 403,
             'Pundit::NotAuthorizedError' => 403
           }
         end

data/lib/linked_rails/errors/forbidden.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+module LinkedRails
+  module Errors
+    class Forbidden < StandardError
+      attr_reader :query, :record, :policy, :action, :action_status
+
+      # @param [Hash] options
+      # @option options [String] query The action of the request
+      # @option options [ActiveRecord::Base] record The record that was requested
+      # @option options [Policy] policy The policy that raised the exception
+      # @option options [String] message Override the default error message
+      # @return [String] the message
+      def initialize(**options)
+        @query  = options.fetch(:query).to_s
+        @record = options[:record]
+        @policy = options[:policy]
+        @action = @query[-1] == '?' ? @query[0..-2] : @query
+        @action_status = options[:action_status]
+        @message = options[:message]
+
+        raise StandardError if @query.blank? && @message.blank?
+
+        super(@message || default_message)
+      end
+
+      private
+
+      def default_message
+        I18n.t(
+          "pundit.#{@policy.class.to_s.underscore}.#{@query}",
+          action: @action,
+          default: I18n.t('errors.access_denied')
+        )
+      end
+    end
+  end
+end

data/lib/linked_rails/errors.rb

@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+require_relative 'errors/forbidden'

data/lib/linked_rails/helpers/delta_helper.rb

@@ -8,7 +8,9 @@ module LinkedRails
       end
 
       def invalidate_collection_delta(collection)
-        [Vocab.sp[:Variable], Vocab.ontola[:baseCollection], collection.iri, delta_iri(:invalidate)]
+        iri = collection.is_a?(RDF::Resource) ? collection : collection.iri
+
+        [Vocab.sp[:Variable], Vocab.ontola[:baseCollection], iri, delta_iri(:invalidate)]
       end
 
       def invalidate_parent_collections_delta(resource)

data/lib/linked_rails/helpers/resource_helper.rb

@@ -46,12 +46,22 @@ module LinkedRails
 
       private
 
+      def request_path_to_url(path)
+        return path unless path.present? && URI(path).relative?
+
+        port = [80, 443].include?(request.port) ? nil : request.port
+        URI::Generic.new(request.scheme, nil, request.host, port, nil, path, nil, nil, nil).to_s
+      end
+
       def build_new_resource
         controller_class.build_new(user_context: user_context)
       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/middleware/linked_data_params.rb

@@ -6,7 +6,7 @@ module LinkedRails
   module Middleware
     class LinkedDataParams
       include ::Empathy::EmpJson::Helpers::Slices
-      include ::Empathy::EmpJson::Helpers::Primitives
+      include ::Empathy::EmpJson::Helpers::Parsing
 
       def initialize(app)
         @app = app

data/lib/linked_rails/model/cacheable.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+module LinkedRails
+  module Model
+    module Cacheable
+      extend ActiveSupport::Concern
+
+      included do
+        if respond_to?(:after_commit)
+          after_commit :publish_create, on: :create, if: :should_publish_changes
+          after_commit :publish_update, on: :update, if: :should_publish_changes
+          after_commit :publish_delete, on: :destroy, if: :should_publish_changes
+        end
+      end
+
+      def cacheable?
+        true
+      end
+
+      def publish_create
+        publish_message('io.ontola.transactions.Created')
+      end
+
+      def publish_update
+        publish_message('io.ontola.transactions.Updated')
+      end
+
+      def publish_delete
+        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
+
+      def should_publish_changes
+        cacheable? && !Rails.env.test?
+      end
+    end
+  end
+end

data/lib/linked_rails/model/collections.rb

@@ -46,6 +46,8 @@ module LinkedRails
         default_filters: {},
         # collection_class [Array<Hash>] The default sortings applied to the collection.
         default_sortings: [{key: Vocab.schema.dateCreated, direction: :desc}],
+        # download_urls [Array<URI>] URLs for downloading the content of this collection
+        download_urls: [],
         # include_members [Boolean] Whether to include the members of this collection.
         include_members: false,
         # iri_template_keys [Array<Sym>] Custom query keys for the iri template
@@ -70,7 +72,9 @@ module LinkedRails
 
       module ClassMethods
         def collection_iri(**opts)
-          LinkedRails.iri(path: collection_root_relative_iri(**opts))
+          fragment = opts.delete(:fragment)
+
+          LinkedRails.iri(path: collection_root_relative_iri(**opts), fragment: fragment)
         end
 
         # Sets the defaults for all collections for this class.

data/lib/linked_rails/model/dirty.rb

@@ -22,17 +22,6 @@ module LinkedRails
         end
       end
 
-      def previous_changes_by_predicate
-        serializer_class = RDF::Serializers.serializer_for(self)
-        return {} unless respond_to?(:previous_changes) && serializer_class
-
-        Hash[
-          previous_changes
-            .map { |k, v| [self.class.predicate_for_key(k.to_sym), v] }
-            .select { |k, _v| k.present? }
-        ]
-      end
-
       def previously_changed_relations(inverted = nil)
         serializer_class = RDF::Serializers.serializer_for(self)
         return {} unless serializer_class.try(:relationships_to_serialize)

data/lib/linked_rails/model/iri.rb

@@ -10,7 +10,7 @@ module LinkedRails
       end
 
       def anonymous_iri?
-        self.class < ActiveRecord::Base && new_record?
+        self.class < ActiveRecord::Base && new_record? && @iri.blank?
       end
 
       # @return [RDF::URI].
@@ -44,7 +44,12 @@ module LinkedRails
 
       # @return [RDF::URI]
       def root_relative_iri(**opts)
-        RDF::URI(expand_iri_template(**iri_opts.merge(opts)))
+        return @root_relative_iri if opts.blank? && @root_relative_iri.present?
+
+        root_relative_iri = RDF::URI(expand_iri_template(**iri_opts.merge(opts)))
+        @root_relative_iri = root_relative_iri if opts.blank?
+
+        root_relative_iri
       end
 
       # @return [String, Symbol]
@@ -62,6 +67,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/model.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative 'model/actionable'
+require_relative 'model/cacheable'
 require_relative 'model/collections'
 require_relative 'model/dirty'
 require_relative 'model/enhancements'

data/lib/linked_rails/params_parser.rb

@@ -3,8 +3,7 @@
 module LinkedRails
   class ParamsParser # rubocop:disable Metrics/ClassLength
     include ::Empathy::EmpJson::Helpers::Slices
-    include ::Empathy::EmpJson::Helpers::Primitives
-    include ::Empathy::EmpJson::Helpers::Values
+    include ::Empathy::EmpJson::Helpers::Parsing
 
     attr_accessor :params, :slice, :user_context
     delegate :filter_params, to: :collection_params_parser
@@ -63,11 +62,11 @@ module LinkedRails
     def associated_class_from_params(reflection, object)
       return reflection.klass unless reflection.polymorphic?
 
-      query = slice.query(subject: object, predicate: Vocab.rdfv[:type])
+      type = values_from_slice(slice, object, Vocab.rdfv[:type])
 
-      raise("No type given for '#{object}' referenced by polymorphic association '#{reflection.name}'") if query.empty?
+      raise("No type given for '#{object}' referenced by polymorphic association '#{reflection.name}'") if type.blank?
 
-      iri_to_class(query.first.object)
+      iri_to_class(type)
     end
 
     def collection_params_parser
@@ -78,11 +77,11 @@ module LinkedRails
       options = serializer_field(klass, predicate)
       return unless value.count == 1 && options.present?
 
-      parsed_value = value.first.start_with?('http') ? RDF::URI(value.first) : RDF::Literal(value.first)
+      parsed_value = value.first.start_with?('http') ? RDF::URI(value.first) : value.first
       parse_param(
         klass,
         options.predicate,
-        parsed_value
+        object_to_value(parsed_value)
       )
     end
 
@@ -119,9 +118,13 @@ module LinkedRails
     end
 
     def parse_attribute(klass, field_options, value)
-      parsed_value = parse_enum_attribute(klass, field_options.key, value) || value
+      [field_options.key, parse_attribute_value(klass, field_options, value)]
+    end
+
+    def parse_attribute_value(klass, field_options, value)
+      return nil if value == Vocab.libro[:null]
 
-      [field_options.key, parsed_value.to_s]
+      (parse_enum_attribute(klass, field_options.key, value) || value).to_s
     end
 
     def parse_enum_attribute(klass, key, value)
@@ -134,9 +137,15 @@ module LinkedRails
 
     def parse_iri_param(iri, reflection)
       key = foreign_key_for_reflection(reflection)
-      value = parse_iri_param_value(iri, reflection) if key
+      return unless key
 
-      [key, value.to_s] if value
+      if iri == Vocab.libro[:null]
+        [key, nil]
+      else
+        value = parse_iri_param_value(iri, reflection)
+
+        [key, value.to_s] if value
+      end
     end
 
     def parse_iri_param_value(iri, reflection)

data/lib/linked_rails/policy.rb

@@ -46,6 +46,10 @@ module LinkedRails
       self.class.policy_class
     end
 
+    def public_resource?
+      false
+    end
+
     def show?
       false
     end

data/lib/linked_rails/serializer/actionable.rb

@@ -15,10 +15,10 @@ module LinkedRails
 
       module ClassMethods
         def action_triples(object, _params)
-          if object.iri.anonymous? && !object.try(:singular_resource?)
-            []
-          else
+          if named_object?(object) || object.try(:singular_resource?)
             object.try(:action_triples) || []
+          else
+            []
           end
         end
       end

data/lib/linked_rails/serializer.rb

@@ -115,7 +115,13 @@ module LinkedRails
         collection_name = "#{name.to_s.singularize}_collection"
         opts[:association] ||= name
         opts[:polymorphic] ||= true
-        opts[:if] ||= method(:named_object?)
+
+        action_object = opts.delete(:action_object)
+        opts[:if] ||= -> (object) {
+          return action_object if object.iri.try(:path)&.end_with?('/action_object')
+
+          named_object?(object)
+        }
 
         collection_opts = {}
         collection_opts[:page_size] = opts.delete(:page_size) if opts.key?(:page_size)

data/lib/linked_rails/storage.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require 'redis'
+
+module LinkedRails
+  class Storage
+    REDIS_DB = {
+      cache: LinkedRails.cache_redis_database,
+      persistent: LinkedRails.persistent_redis_database,
+      stream: LinkedRails.stream_redis_database
+    }.freeze
+    KEYS = {
+      manifest: 'cache:Manifest',
+      redirect_exact: 'cache:Redirect:Exact',
+      redirect_prefix: 'cache:Redirect:Prefix'
+    }.freeze
+
+    class << self
+      %i[xadd].each do |method|
+        define_method(method) do |db, *args|
+          Redis.new(db: REDIS_DB.fetch(db)).send(method, *args)
+        end
+      end
+
+      %i[hset hdel hget].each do |method|
+        define_method(method) do |db, key, *args|
+          Redis.new(db: REDIS_DB.fetch(db)).send(method, KEYS.fetch(key), *args)
+        end
+      end
+    end
+  end
+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

@@ -22,6 +22,10 @@ module LinkedRails
 
   mattr_accessor :whitelisted_spi_ips
   mattr_writer :host, :scheme
+  mattr_accessor :persistent_redis_database, default: ENV['PERSISTENT_REDIS_DATABASE'].presence || 6
+  mattr_accessor :stream_redis_database, default: ENV['STREAM_REDIS_DATABASE'].presence || 7
+  mattr_accessor :cache_redis_database, default: ENV['CACHE_REDIS_DATABASE'].presence || 8
+  mattr_accessor :cache_stream, default: ENV['CACHE_STREAM'].presence || 'transactions'
 
   def self.configurable_class(parent, klass, default: nil, reader: nil) # rubocop:disable Metrics/AbcSize
     method = :"#{[parent, klass.to_s.downcase].compact.join('_')}_class"
@@ -50,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
 
@@ -84,6 +90,7 @@ ActiveSupport::Inflector.inflections do |inflect|
   inflect.acronym 'SHACL'
 end
 
+require 'linked_rails/errors'
 require 'linked_rails/uri_template'
 require 'linked_rails/vocab'
 require 'linked_rails/cache'
@@ -101,3 +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.gaa82a222d
+  version: 0.0.4.pre.gacd5f04d4
 platform: ruby
 authors:
 - Arthur Dingemans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-02 00:00:00.000000000 Z
+date: 2022-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_response
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: kaminari-activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: redis
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rdf
   requirement: !ruby/object:Gem::Requirement
@@ -285,11 +299,12 @@ files:
 - app/policies/linked_rails/collection/view_policy.rb
 - app/policies/linked_rails/collection_policy.rb
 - app/policies/linked_rails/enum_value_policy.rb
+- app/policies/linked_rails/form_policy.rb
 - app/policies/linked_rails/menus/item_policy.rb
 - app/policies/linked_rails/menus/list_policy.rb
+- app/policies/linked_rails/ontology_policy.rb
 - app/policies/linked_rails/sequence_policy.rb
 - app/serializers/linked_rails/actions/item_serializer.rb
-- app/serializers/linked_rails/actions/object_serializer.rb
 - app/serializers/linked_rails/collection/filter_field_serializer.rb
 - app/serializers/linked_rails/collection/filter_option_serializer.rb
 - app/serializers/linked_rails/collection/filter_serializer.rb
@@ -324,6 +339,7 @@ files:
 - app/serializers/linked_rails/web_page_serializer.rb
 - app/serializers/linked_rails/web_site_serializer.rb
 - app/serializers/linked_rails/widget_serializer.rb
+- app/workers/linked_rails/invalidation_stream_worker.rb
 - config/initializers/inflections.rb
 - lib/generators/linked_rails/install/install_generator.rb
 - lib/generators/linked_rails/install/templates/README
@@ -373,6 +389,8 @@ files:
 - lib/linked_rails/enhancements/destroyable/controller.rb
 - lib/linked_rails/enhancements/updatable/controller.rb
 - lib/linked_rails/enhancements/updatable/serializer.rb
+- lib/linked_rails/errors.rb
+- lib/linked_rails/errors/forbidden.rb
 - lib/linked_rails/helpers/delta_helper.rb
 - lib/linked_rails/helpers/ontola_actions_helper.rb
 - lib/linked_rails/helpers/resource_helper.rb
@@ -381,6 +399,7 @@ files:
 - lib/linked_rails/middleware/linked_data_params.rb
 - lib/linked_rails/model.rb
 - lib/linked_rails/model/actionable.rb
+- lib/linked_rails/model/cacheable.rb
 - lib/linked_rails/model/collections.rb
 - lib/linked_rails/model/dirty.rb
 - lib/linked_rails/model/enhancements.rb
@@ -404,10 +423,12 @@ files:
 - lib/linked_rails/serializer/actionable.rb
 - lib/linked_rails/serializer/menuable.rb
 - lib/linked_rails/serializer/singularable.rb
+- lib/linked_rails/storage.rb
 - lib/linked_rails/test_methods.rb
 - 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/app/serializers/linked_rails/actions/object_serializer.rb

@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-module LinkedRails
-  module Actions
-    class ObjectSerializer < LinkedRails.serializer_parent_class
-      has_one :object, predicate: Vocab.owl.sameAs
-    end
-  end
-end