linked_rails 0.0.4.pre.g2c53724b3 → 0.0.4.pre.g8d7195543

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd12e0d41b6952dd04ab95017853a047956c45bd0e37f5e39f7b54f389e27d7c
-  data.tar.gz: 9bd13ba226e886b1853331f7390574da70e6753dd0f1526a5e71a3ff0addd6d6
+  metadata.gz: 52592ddbab37c67682af36b68c3937b75e30ef3d2524572061c8b1e7b8b33f43
+  data.tar.gz: 93f154436fc269dcff4ad704f3813f9ec2c708bb3544a88dd902416faf6b2ac8
 SHA512:
-  metadata.gz: 774df3da980d69c98c27557bff628b1cfa00b25d64c522a65fc63b748c16dbefc88038743907425c51e9f2fe3e117eb178372c5b022ca1d03a1f4c4223c808ba
-  data.tar.gz: 37f483fd315b0c590efe77164f7fd5edfc7c5c5a85d91f9582d25a9259ca4872d64e03b1c5f38aa32bef5ce76c3a69463bba675f03d36b30211add53a9600cb3
+  metadata.gz: 7c34836c7195df7ad3de8f38f97dbcdc82eea1cd13a3928693dba0622e0d81b9ffc7b511ac10244e8199ac62874fe1f3c4a9eca3babd7403e986cc3b6c200487
+  data.tar.gz: 6ef666de7b7212f973f369b1bafbbe60ec2fe79602c7f6e9df8264f00ae2b391d097667e7314e30c9c2e924d716282cdcec0a9323fb9c08bbf37d0779b06de99

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,12 @@ module LinkedRails
       }.merge(opts)
     end
 
+    def resource_status(resource_policy)
+      raise(LinkedRails::Errors::Forbidden.new(query: :show?)) unless resource_policy.show?
+
+      200
+    end
+
     def response_for_wrong_host(opts)
       iri = opts[:iri]
       term = term_from_vocab(iri)
@@ -139,6 +157,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 +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 ? %i[members] : []
       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/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
 

data/app/models/linked_rails/manifest.rb

@@ -5,15 +5,11 @@ module LinkedRails
     include ActiveModel::Model
     include LinkedRails::Model
 
-    MANIFEST_KEY = 'cache:Manifest'
-    CACHE_DB = ENV.fetch('PERSISTENT_REDIS_DATABASE', '6')
-
     def save
-      Redis.new(db: CACHE_DB).hset(
-        MANIFEST_KEY,
-        {
-          [LinkedRails.iri] => web_manifest.to_json
-        }
+      Storage.hset(
+        :persistent,
+        :manifest,
+        URL.as_href(LinkedRails.iri) => web_manifest.to_json
       )
     end
 
@@ -45,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
@@ -142,7 +138,7 @@ module LinkedRails
 
     def web_manifest_sw_section
       {
-        src: "#{scope}/sw.js",
+        src: "#{scope.chomp('/')}/sw.js",
         scope: scope
       }
     end
@@ -162,5 +158,25 @@ module LinkedRails
     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)

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/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/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/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,37 @@
+# frozen_string_literal: true
+
+module LinkedRails
+  module Errors
+    class Forbidden < StandardError
+      attr_reader :query, :record, :policy, :action
+
+      # @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
+        @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/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/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/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/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/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/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.g2c53724b3
+  version: 0.0.4.pre.g8d7195543
 platform: ruby
 authors:
 - Arthur Dingemans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-02 00:00:00.000000000 Z
+date: 2022-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_response
@@ -299,8 +299,10 @@ 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
@@ -338,6 +340,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
@@ -387,6 +390,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
@@ -395,6 +400,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
@@ -418,10 +424,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