linked_rails 0.0.4.pre.gfe77aae19 → 0.0.4

data/app/models/linked_rails/collection.rb

@@ -19,14 +19,14 @@ module LinkedRails
   class Collection # rubocop:disable Metrics/ClassLength
     include ActiveModel::Model
     include LinkedRails::Model::Actionable
-    include LinkedRails::Model::IRI
+    include LinkedRails::Model::Iri
     include LinkedRails::Collection::Configuration
     include LinkedRails::Collection::Filterable
-    include LinkedRails::Collection::IRI
-    include LinkedRails::Collection::IRIMapping
+    include LinkedRails::Collection::Iri
+    include LinkedRails::Collection::IriMapping
     include LinkedRails::Collection::Sortable
 
-    attr_accessor :name, :policy, :user_context
+    attr_accessor :name, :policy, :user_context, :view
     attr_writer :association_base, :views
 
     alias id iri
@@ -67,8 +67,17 @@ module LinkedRails
       super(options.merge(except: %w[association_class unfiltered_collection collection]))
     end
 
-    def child_resource
-      @child_resource ||= build_child
+    def build_child # rubocop:disable Metrics/AbcSize
+      child =
+        parent&.build_child(association_class, user_context: user_context) ||
+        association_class.build_new(parent: parent, user_context: user_context)
+
+      parser = LinkedRails::ParamsParser.new(user_context: user_context, params: {filter: @filter})
+      permitted_child_keys = Pundit.policy(user_context, child)&.permitted_attributes || []
+      permitted_attributes_from_filters = parser.attributes_from_filters(association_class).permit(permitted_child_keys)
+
+      child.assign_attributes(permitted_attributes_from_filters)
+      child
     end
 
     def columns
@@ -103,6 +112,15 @@ module LinkedRails
       self.class.new(**attrs)
     end
 
+    def preview_includes
+      {
+        default_view: default_view.preview_includes,
+        filter_fields: :options,
+        filters: [],
+        sortings: []
+      }
+    end
+
     def total_count
       @total_count ||= association_base.try(:total_count) || unscoped_association.count
     end
@@ -128,16 +146,6 @@ module LinkedRails
 
     private
 
-    def build_child
-      child =
-        parent&.build_child(association_class, user_context: user_context) ||
-        association_class.build_new(parent: parent, user_context: user_context)
-
-      child.assign_attributes(association_base.where_values_hash) if association_base.respond_to?(:where_values_hash)
-      child.assign_attributes(permitted_attributes_from_filters(child))
-      child
-    end
-
     def collection_view_class
       LinkedRails.collection_view_class
     end
@@ -156,12 +164,6 @@ module LinkedRails
       type == :paginated
     end
 
-    def permitted_attributes_from_filters(child)
-      return {} if @filter.empty?
-
-      Pundit.policy(user_context, child).try(:permitted_attributes_from_filters, @filter) || {}
-    end
-
     def title_from_translation
       plural = association_class.name.tableize
 
@@ -174,11 +176,7 @@ module LinkedRails
 
     def new_child_values
       instance_values
-        .slice(
-          'iri_template',
-          *LinkedRails::Model::Collections::COLLECTION_STATIC_OPTIONS.keys.map(&:to_s),
-          *LinkedRails::Model::Collections::COLLECTION_CUSTOMIZABLE_OPTIONS.keys.map { |key| "default_#{key}" }
-        )
+        .slice('iri_template', *LinkedRails::Model::Collections::COLLECTION_STATIC_OPTIONS.keys.map(&:to_s))
         .merge(
           unfiltered_collection: filtered? ? @unfiltered_collection : self,
           user_context: user_context

data/app/models/linked_rails/enum_value.rb

@@ -5,7 +5,7 @@ module LinkedRails
     include ActiveModel::Model
     include LinkedRails::Model
 
-    attr_accessor :attr, :close_match, :exact_match, :group_by, :identifier, :key, :klass, :type
+    attr_accessor :attr, :close_match, :exact_match, :group_by, :key, :klass, :type
     attr_writer :iri, :label
 
     def label

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

@@ -9,13 +9,7 @@ module LinkedRails
         def datatype; end
 
         def nested_form
-          @nested_form ||= target_class.form_class
-        end
-
-        def target_class
-          return @target_class if @target_class
-
-          klass_name.constantize unless form.abstract_form
+          @nested_form ||= klass_name.constantize.form_class
         end
 
         private

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

@@ -4,7 +4,6 @@ module LinkedRails
   class Form
     class Field
       class FileInput < Field
-        attr_accessor :max_size
       end
     end
   end

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

@@ -2,27 +2,25 @@
 
 module LinkedRails
   class Form
-    class Field < LinkedRails::Resource # rubocop:disable Metrics/ClassLength
+    class Field < LinkedRails::Resource
       attr_writer :description,
                   :helper_text,
                   :label,
-                  :max_inclusive,
                   :max_length,
                   :min_count,
-                  :min_inclusive,
                   :min_length,
-                  :pattern,
-                  :path,
-                  :placeholder,
                   :sh_in,
-                  :start_adornment
+                  :pattern,
+                  :path
       attr_accessor :datatype,
                     :default_value,
                     :max_count,
                     :max_count_prop,
+                    :max_inclusive,
                     :max_inclusive_prop,
                     :max_length_prop,
                     :min_count_prop,
+                    :min_inclusive,
                     :min_inclusive_prop,
                     :min_length_prop,
                     :model_attribute,
@@ -42,10 +40,6 @@ module LinkedRails
         helper_text_from_attribute || helper_text_fallback
       end
 
-      def max_inclusive
-        @max_inclusive || validators[:max_inclusive]
-      end
-
       def max_length
         @max_length || validators[:max_length]
       end
@@ -54,10 +48,6 @@ module LinkedRails
         @min_count || (validators[:presence] ? 1 : nil)
       end
 
-      def min_inclusive
-        @min_inclusive || validators[:min_inclusive]
-      end
-
       def min_length
         @min_length || validators[:min_length]
       end
@@ -79,20 +69,12 @@ module LinkedRails
         true
       end
 
-      def placeholder
-        placeholder_from_attribute || placeholder_fallback
-      end
-
       def sh_in
         return validators[:sh_in] if @sh_in.blank?
 
         @sh_in.respond_to?(:call) ? @sh_in.call : @sh_in
       end
 
-      def start_adornment
-        @start_adornment.respond_to?(:call) ? @start_adornment.call : @start_adornment
-      end
-
       private
 
       def description_from_attribute
@@ -123,14 +105,6 @@ module LinkedRails
         LinkedRails.translate(:property, :label, path) if path
       end
 
-      def placeholder_from_attribute
-        @placeholder.respond_to?(:call) ? @placeholder.call : @placeholder
-      end
-
-      def placeholder_fallback
-        LinkedRails.translate(:field, :placeholder, self, false)
-      end
-
       class << self
         def iri
           Vocab.form[name.demodulize]

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

@@ -11,9 +11,7 @@ module LinkedRails
       MAX_STR_LEN = 255
       VALIDATOR_SELECTORS = [
         [:min_length, ActiveModel::Validations::LengthValidator, :minimum],
-        [:min_inclusive, ActiveModel::Validations::NumericalityValidator, :greater_than_or_equal_to],
         [:max_length, ActiveModel::Validations::LengthValidator, :maximum],
-        [:max_inclusive, ActiveModel::Validations::NumericalityValidator, :less_than_or_equal_to],
         [:pattern, ActiveModel::Validations::FormatValidator, :with],
         [:presence, ActiveModel::Validations::PresenceValidator, nil],
         [:sh_in, ActiveModel::Validations::InclusionValidator, :in]
@@ -32,27 +30,26 @@ module LinkedRails
                to: :form
 
       def condition_or_field
-        return @condition_or_field if instance_variable_defined?(:@condition_or_field)
+        return field if abstract_form
 
-        alternatives = node_shapes_for(
+        @condition_or_field ||= model_policy!.condition_for(
           key,
+          field,
           property: field_options[:if] || [],
           sh_not: field_options[:unless] || []
         )
-        @condition_or_field =
-          if alternatives.count == 1
-            Condition.new(shape: alternatives.first, pass: field)
-          elsif alternatives.count.positive?
-            Condition.new(shape: SHACL::NodeShape.new(or: alternatives), pass: field)
-          else
-            field
-          end
       end
 
       private
 
       def attr_column(name)
-        model_class.column_for_attribute(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)
       end
 
       def attr_to_datatype # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength
@@ -182,15 +179,6 @@ module LinkedRails
         @model_attribute ||= (model_class.try(:attribute_alias, key) || key).to_sym
       end
 
-      def node_shapes_for(attr, property: [], sh_not: [])
-        alternatives = abstract_form ? [] : model_policy!.condition_alternatives(attr, field.permission_required?)
-        alternatives = [[]] if alternatives.empty? && (property.any? || sh_not.any?)
-
-        alternatives.map do |props|
-          SHACL::NodeShape.new(property: props + property, sh_not: sh_not)
-        end
-      end
-
       def normalized_key(key)
         return key.to_s[0...-3].to_sym if key.to_s.ends_with?('_id')
         return key.to_s[0...-4].pluralize.to_sym if key.to_s.ends_with?('_ids')
@@ -220,15 +208,14 @@ module LinkedRails
       def validator(klass, option_key)
         matched_validator = validator_by_class(klass)
 
-        value = option_key ? matched_validator&.options.try(:[], option_key) : matched_validator.present?
-
-        value unless value.respond_to?(:call)
+        option_key ? matched_validator&.options.try(:[], option_key) : matched_validator.present?
       end
 
       def validator_by_class(klass)
-        attribute_validators&.detect do |validator|
-          validator.is_a?(klass) && validator.options[:if].blank? && validator.options[:unless].blank?
-        end
+        matched_validator = attribute_validators&.detect { |v| v.is_a?(klass) }
+        return if matched_validator.blank?
+
+        matched_validator if matched_validator.options[:if].blank? && matched_validator.options[:unless].blank?
       end
 
       def validators
@@ -236,7 +223,7 @@ module LinkedRails
           VALIDATOR_SELECTORS.map do |key, klass, option_key|
             [key, validator(klass, option_key)]
           end
-        ].compact
+        ]
       end
     end
   end

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

@@ -12,11 +12,13 @@ module LinkedRails
       end
 
       def description
-        @description.respond_to?(:call) ? @description.call : @description
+        @description = @description.call if @description.respond_to?(:call)
+        @description
       end
 
       def label
-        @label.respond_to?(:call) ? @label.call : @label
+        @label = @label.call if @label.respond_to?(:call)
+        @label
       end
 
       def rdf_type

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

@@ -21,10 +21,6 @@ module LinkedRails
         @footer_group ||= add_group(collapsible: false, footer: true, key: :footer)
       end
 
-      def footer_group!
-        @footer_group
-      end
-
       class << self
         def iri
           Vocab.form[:Page]

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
 
@@ -64,6 +63,10 @@ module LinkedRails
         @serializer_reflections ||= serializer_class&.relationships_to_serialize || {}
       end
 
+      def preview_includes
+        [pages: {groups: [fields: [:fail, :pass, shape: [:property, nested_shapes: :property]]]}]
+      end
+
       private
 
       def current_group
@@ -91,10 +94,9 @@ module LinkedRails
       end
 
       def find_form_class(params)
-        form_name = [params[:module], "#{params[:id]&.singularize}_forms"].compact.join('/').classify
-        requested_class = form_name.safe_constantize
+        requested_class = [params[:module], "#{params[:id]&.singularize}_forms"].compact.join('/').classify
 
-        requested_class if requested_class && requested_class < LinkedRails::Form
+        LinkedRails::Form.descendants.detect { |klass| klass.to_s == requested_class }
       end
 
       def footer

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

@@ -12,7 +12,7 @@ module LinkedRails
       delegate :iri_opts, to: :parent
 
       alias id iri
-      %i[action href image label iri_base].each do |method|
+      %i[action href image label menus iri_base].each do |method|
         callable_variable(method, instance: :parent)
       end
 
@@ -36,7 +36,7 @@ module LinkedRails
 
         @menu_sequence ||=
           LinkedRails::Sequence.new(
-            -> { menus },
+            -> { menus&.compact&.each { |menu| menu.parent = self } },
             id: menu_sequence_iri,
             parent: self,
             scope: false
@@ -52,12 +52,6 @@ module LinkedRails
         sequence_iri
       end
 
-      def menus
-        return @menus unless @menus.respond_to?(:call)
-
-        @menus = parent.instance_exec(&@menus).compact.each { |menu| menu.parent = self }
-      end
-
       def rdf_type
         type || Vocab.ontola[:MenuItem]
       end
@@ -73,15 +67,24 @@ module LinkedRails
       end
 
       class << self
+        def base_includes
+          [action: :target]
+        end
+
         def preview_includes
-          [menu_sequence: [members: [menu_sequence: :members]]]
+          base_includes + [
+            menu_sequence: [
+              members: base_includes +
+                [menu_sequence: [members: base_includes]]
+            ]
+          ]
         end
 
         def requested_index_resource(params, user_context)
           parent = parent_from_params(params, user_context)
           return if parent.blank?
 
-          parent.try(:menu_sequence)
+          parent.menu_sequence
         end
       end
     end

data/app/models/linked_rails/menus/list.rb

@@ -20,17 +20,15 @@ module LinkedRails
       end
 
       def iri_opts
-        return {} if resource.blank?
-
-        resource.try(:singular_resource?) ? resource.singular_iri_opts : resource.iri_opts
+        resource&.iri_opts || {}
       end
 
       def menus
-        @menus ||= available_menus.map(&method(:memoized_menu_item))
+        @menus ||= available_menus.map(&method(:menu_item))
       end
 
       def menu(tag)
-        memoized_menu_item(tag, available_menus[tag].dup) if available_menus.key?(tag)
+        menu_item(tag, available_menus[tag].dup) if available_menus.key?(tag)
       end
 
       private
@@ -39,11 +37,6 @@ module LinkedRails
         I18n.t("menus.#{resource&.class&.name&.tableize}.#{tag}", **options[:label_params])
       end
 
-      def memoized_menu_item(tag, options)
-        @memoized_menu_item ||= {}
-        @memoized_menu_item[tag] ||= menu_item(tag, options)
-      end
-
       def menu_available?(_tag, options)
         options[:condition].nil? || call_option(options[:condition], resource)
       end
@@ -70,9 +63,7 @@ module LinkedRails
       end
 
       def iri_template
-        base_template = resource.send(resource.try(:singular_resource?) ? :singular_iri_template : :iri_template)
-
-        @iri_template ||= iri_template_expand_path(base_template, '/menus')
+        @iri_template ||= iri_template_expand_path(resource.send(:iri_template), '/menus')
       end
 
       class << self
@@ -110,6 +101,7 @@ module LinkedRails
           LinkedRails::Sequence.new(
             menu_list.menus,
             id: menu_list.iri,
+            member_includes: Item.preview_includes,
             scope: false
           )
         end

data/app/models/linked_rails/ontology/base.rb

@@ -41,8 +41,6 @@ module LinkedRails
       end
 
       def include_data_statement?(statement)
-        return false if statement.subject.node? || statement.object.node?
-
         statement.predicate != Vocab.rdfs.label &&
           statement.predicate != Vocab.rdfs.range &&
           statement.predicate != Vocab.rdfs.domain

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|