linked_rails 0.0.4.pre.g76dedd8ba → 0.0.4.pre.g83aa52ab3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c64c5a485e952fa401c1bcea4761f493b4f94650bbec75d7f19e9787dad1f84
-  data.tar.gz: 4616e0044f6e3fefb204a464347c2dfc5d98adc0d12d11e8ef65e074968af3e0
+  metadata.gz: bc8a8c53b8422c4f81be3dbb64c8488b6d80a659b0fb585f252c6d66842f240c
+  data.tar.gz: 83172f0d901f0ad055186902ea9f9b5e9500b16bfa2071cad5533127765b57ec
 SHA512:
-  metadata.gz: '08c5759176b7e96922b54ba4fdc60c42aa8513ea7265ac9e7e86e9b1f77726e4f113485896f891dc88f8ce056feebef844db3263dfc2d4327e43eb390e31f7f3'
-  data.tar.gz: b915500d88b3a0cdb03d9e2d8e1d5f724967a353c138e0977afaef890162c423e0f57f2303db73b03004426042066cdeb24dfe6edc169efb104575bf3324c749
+  metadata.gz: 0c00be6915256007188a56ed84b1b485dd5c56fcf6e310ab525d66488f26498b0127abb4bf39f6e6b206192d0eed9410b891ba21407794653349bbcde95fc95b
+  data.tar.gz: d1488f86b20714eb98e4cbfdf9c8a6765e84be907dae2573274c02adc22047f0a6c206dc10ce2086823ab42028517d7f440e65b121aee53e35ba84b1e57f72b6

data/app/controllers/linked_rails/bulk_controller.rb

@@ -21,11 +21,8 @@ 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)
 
-      return response_from_request(include, RDF::URI(opts[:iri])) if resource.blank?
-
-      response_from_resource(include, opts[:iri], resource)
+      response_from_request(include, RDF::URI(opts[:iri]))
     rescue StandardError => e
       handle_resource_error(opts, e)
     end
@@ -87,13 +84,6 @@ 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])
@@ -141,12 +131,6 @@ 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)
@@ -155,23 +139,6 @@ 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

data/app/models/linked_rails/form.rb

@@ -5,7 +5,6 @@ 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,27 +5,6 @@ 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
@@ -38,27 +17,8 @@ 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
@@ -67,16 +27,17 @@ module LinkedRails
       :white
     end
 
-    def icons
-      []
-    end
-
-    def lang
-      :nl
+    def preload_iris
+      [
+        scope,
+        LinkedRails.iri(path: 'ns/core').to_s,
+        LinkedRails.iri(path: 'c_a').to_s,
+        LinkedRails.iri(path: 'menus').to_s
+      ]
     end
 
     def scope
-      LinkedRails.iri.to_s
+      @scope ||= LinkedRails.iri.to_s
     end
 
     def site_theme_color
@@ -91,46 +52,43 @@ 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,
-        icons: icons,
-        lang: lang,
+        lang: :nl,
         name: app_name,
         scope: scope,
         short_name: app_name,
-        start_url: start_url,
+        start_url: scope,
         theme_color: site_theme_color
       }
     end
 
     def web_manifest_ontola_section # rubocop:disable Metrics/MethodLength
       {
-        allowed_external_sources: allowed_external_sources,
-        blob_preview_iri:  blob_preview_iri,
-        blob_upload_iri: blob_upload_iri,
-        csp: csp_entries,
+        css_class: css_class,
         header_background: header_background,
         header_text: header_text,
-        preconnect: preconnect,
+        preload: preload_iris,
         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
       }
@@ -138,7 +96,7 @@ module LinkedRails
 
     def web_manifest_sw_section
       {
-        src: "#{scope.chomp('/')}/sw.js",
+        src: "#{scope}/sw.js?manifestLocation=#{Rack::Utils.escape("#{scope}/manifest.json")}",
         scope: scope
       }
     end
@@ -146,37 +104,5 @@ 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/list.rb

@@ -26,7 +26,7 @@ module LinkedRails
       end
 
       def menus
-        @menus ||= available_menus.map(&method(:memoized_menu_item))
+        @menus ||= available_menus.map(&method(:memoised_menu_item))
       end
 
       def menu(tag)

data/app/models/linked_rails/ontology.rb

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

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

@@ -11,8 +11,6 @@ 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,10 +6,6 @@ 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)
@@ -73,7 +69,6 @@ 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/helpers/resource_helper.rb

@@ -46,13 +46,6 @@ 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

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

@@ -1,7 +1,6 @@
 # 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,10 +46,6 @@ module LinkedRails
       self.class.policy_class
     end
 
-    def public_resource?
-      false
-    end
-
     def show?
       false
     end

data/lib/linked_rails.rb

@@ -22,10 +22,6 @@ 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"
@@ -54,10 +50,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
 
@@ -90,7 +84,6 @@ 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'
@@ -108,5 +101,3 @@ 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.g76dedd8ba
+  version: 0.0.4.pre.g83aa52ab3
 platform: ruby
 authors:
 - Arthur Dingemans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-15 00:00:00.000000000 Z
+date: 2022-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_response
@@ -66,20 +66,6 @@ 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
@@ -299,10 +285,8 @@ 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
@@ -340,7 +324,6 @@ 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
@@ -390,8 +373,6 @@ 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
@@ -400,7 +381,6 @@ 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
@@ -424,12 +404,10 @@ 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/policies/linked_rails/form_policy.rb

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

@@ -1,13 +0,0 @@
-# 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/workers/linked_rails/invalidation_stream_worker.rb

@@ -1,16 +0,0 @@
-# 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/linked_rails/errors/forbidden.rb

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

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

data/lib/linked_rails/model/cacheable.rb

@@ -1,45 +0,0 @@
-# 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/storage.rb

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

@@ -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