linked_rails 0.0.4.pre.g9b7bc9073 → 0.0.4.pre.g14b377f91

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d86a69fbe49260dc07acefa64442a1a3a886a9d1b45cab169fc4e514ffe27b75
-  data.tar.gz: 2bd8aa4736a567bbb045889c96b3c5f8c02bcfbab7bbd90b8374c86d614599d0
+  metadata.gz: ad7cb510016bb7b42c2b472031bb0eebcd976cd93f0a20cfca9f70b87271a4c9
+  data.tar.gz: 5965b0ffb3715273ed446f29d3544124145b06162a66c866f899731c85819acb
 SHA512:
-  metadata.gz: e907be3993d7b5a334649d29f5b8703a0a3bccb5ca0c8a747b96c93e8a1e27fe30c5ae110f3cab02c80ae75e69fc5e59a33abeee0a22e6e87e030fa7d03a6410
-  data.tar.gz: ec7768a12f8801cccf9e2ff3b95ce295bd5257cc4d888ab010a436ec74469ec53b9f910043ef094b10239d4c2672310b4e45b08aff57a44f1a4f30af6fb5004a
+  metadata.gz: 7f82190e18c85082737f30ff5ed4b5ef1e13cf90b5a3b2c8941589a8812eb79dbf34948005a28895c6aa12884134c66e869258374759506bb7b1642829072773
+  data.tar.gz: 3abb5a9fe9fedde3040d55d89f2a3af74d13e97f93b07dca126a6dcbebcfd27309cee9548b0b95b09dec84cdc6519acd6f44c8e11a4d978e47eca82c4ee88cca

data/app/models/linked_rails/manifest.rb

@@ -5,6 +5,31 @@ module LinkedRails
     include ActiveModel::Model
     include LinkedRails::Model
 
+    MANIFEST_KEY = 'cache:Manifest'
+    CACHE_DB = ENV.fetch('PERSISTENT_REDIS_DATABASE', '6')
+
+    def save
+      self.class.redis_client.hset(
+        MANIFEST_KEY,
+        {
+          LinkedRails.iri.to_s => 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 +42,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 +71,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 +95,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 +142,7 @@ module LinkedRails
 
     def web_manifest_sw_section
       {
-        src: "#{scope}/sw.js?manifestLocation=#{Rack::Utils.escape("#{scope}/manifest.json")}",
+        src: "#{scope}/sw.js",
         scope: scope
       }
     end
@@ -104,5 +150,35 @@ 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)
+        redis_client.hdel(MANIFEST_KEY, iri)
+      end
+
+      def move(from, to)
+        data = redis_client.hget(MANIFEST_KEY, from)
+
+        redis_client.hset(MANIFEST_KEY, to, data) if data
+
+        destroy(from)
+      end
+
+      def redis_client
+        @redis_client = Redis.new(db: CACHE_DB)
+      end
+    end
   end
 end

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: linked_rails
 version: !ruby/object:Gem::Version
-  version: 0.0.4.pre.g9b7bc9073
+  version: 0.0.4.pre.g14b377f91
 platform: ruby
 authors:
 - Arthur Dingemans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-02 00:00:00.000000000 Z
+date: 2022-08-08 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