linked_rails 0.0.3 → 0.0.4.pre.g9b7bc9073

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

@@ -6,13 +6,13 @@ module LinkedRails
       attr_accessor :groups, :label, :description
       attr_writer :key
 
-      def initialize(attrs = {})
-        super(attrs)
+      def initialize(**attrs)
+        super(**attrs)
         self.groups = []
       end
 
-      def add_group(opts)
-        group = Form::Group.new(opts)
+      def add_group(**opts)
+        group = Form::Group.new(**opts)
         groups << group
         group
       end
@@ -21,6 +21,10 @@ 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

@@ -6,9 +6,9 @@ module LinkedRails
   class Form # rubocop:disable Metrics/ClassLength
     include LinkedRails::Model
 
-    class_attribute :pages, :model_class
+    class_attribute :abstract_form, :pages, :model_class
 
-    def root_relative_iri(_opts = {})
+    def root_relative_iri(**_opts)
       self.class.form_iri_path
     end
 
@@ -63,10 +63,6 @@ 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
@@ -85,7 +81,7 @@ module LinkedRails
         @default_page ||= page(:default)
       end
 
-      def field(key, opts = {})
+      def field(key, **opts)
         current_group.fields << Form::FieldFactory.new(
           field_options: opts,
           form: self,
@@ -94,9 +90,10 @@ module LinkedRails
       end
 
       def find_form_class(params)
-        requested_class = [params[:module], "#{params[:id]&.singularize}_forms"].compact.join('/').classify
+        form_name = [params[:module], "#{params[:id]&.singularize}_forms"].compact.join('/').classify
+        requested_class = form_name.safe_constantize
 
-        LinkedRails::Form.descendants.detect { |klass| klass.to_s == requested_class }
+        requested_class if requested_class && requested_class < LinkedRails::Form
       end
 
       def footer
@@ -108,10 +105,10 @@ module LinkedRails
         current_page.footer_group
       end
 
-      def group(key, opts = {})
+      def group(key, **opts)
         opts[:collapsible] = true unless opts.key?(:collapsible)
         opts[:key] = key
-        group = current_page.add_group(opts)
+        group = current_page.add_group(**opts)
         @current_group = group
 
         yield if block_given?
@@ -120,26 +117,24 @@ module LinkedRails
         group
       end
 
-      # rubocop:disable Naming/PredicateName
-      def has_many(key, opts = {})
+      def has_many(key, **opts)
         opts[:input_field] = Form::Field::AssociationInput
         opts[:max_count] = 99
-        field(key, opts)
+        field(key, **opts)
       end
 
-      def has_one(key, opts = {})
+      def has_one(key, **opts)
         opts[:input_field] = Form::Field::AssociationInput
         opts[:max_count] = 1
-        field(key, opts)
+        field(key, **opts)
       end
-      # rubocop:enable Naming/PredicateName
 
       def hidden(&block)
         group(:hidden, collapsible: false, hidden: true, &block)
       end
 
-      def page(key, opts = {})
-        page = Form::Page.new(opts.merge(key: key))
+      def page(key, **opts)
+        page = Form::Page.new(**opts.merge(key: key))
         @current_page = page
         pages << @current_page
         yield if block_given?
@@ -147,9 +142,9 @@ module LinkedRails
         page
       end
 
-      def resource(key, opts = {})
+      def resource(key, **opts)
         opts[:input_field] = Form::Field::ResourceField
-        field(key, opts)
+        field(key, **opts)
       end
     end
   end

data/app/models/linked_rails/manifest.rb

@@ -79,7 +79,7 @@ module LinkedRails
       }
     end
 
-    def web_manifest_ontola_section
+    def web_manifest_ontola_section # rubocop:disable Metrics/MethodLength
       {
         css_class: css_class,
         header_background: header_background,
@@ -88,7 +88,9 @@ module LinkedRails
         primary_color: site_theme_color,
         secondary_color: site_secondary_color,
         theme: theme,
-        theme_options: theme_options.to_query
+        theme_options: theme_options.to_query,
+        website_iri: LinkedRails.iri.to_s,
+        websocket_path: websocket_path
       }
     end
 
@@ -98,5 +100,9 @@ module LinkedRails
         scope: scope
       }
     end
+
+    def websocket_path
+      Rails.application.config.try(:action_cable).try(:mount_path).try(:[], 1..-1)
+    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 menus iri_base].each do |method|
+      %i[action href image label iri_base].each do |method|
         callable_variable(method, instance: :parent)
       end
 
@@ -26,7 +26,7 @@ module LinkedRails
       def iri_template
         return parent.send(:iri_template) unless parent.is_a?(LinkedRails::Menus::List)
 
-        return URITemplate.new("#{iri_base}{/tag}{#fragment}") if iri_base
+        return LinkedRails::URITemplate.new("#{iri_base}{/tag}{#fragment}") if iri_base
 
         iri_template_expand_path(parent.send(:iri_template), '{/tag}')
       end
@@ -36,7 +36,7 @@ module LinkedRails
 
         @menu_sequence ||=
           LinkedRails::Sequence.new(
-            -> { menus&.compact&.each { |menu| menu.parent = self } },
+            -> { menus },
             id: menu_sequence_iri,
             parent: self,
             scope: false
@@ -52,6 +52,12 @@ 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
@@ -67,17 +73,8 @@ module LinkedRails
       end
 
       class << self
-        def base_includes
-          [action: :target]
-        end
-
         def preview_includes
-          base_includes + [
-            menu_sequence: [
-              members: base_includes +
-                [menu_sequence: [members: base_includes]]
-            ]
-          ]
+          [menu_sequence: [members: [menu_sequence: :members]]]
         end
 
         def requested_index_resource(params, user_context)

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

@@ -20,21 +20,28 @@ module LinkedRails
       end
 
       def iri_opts
-        resource&.iri_opts || {}
+        return {} if resource.blank?
+
+        resource.try(:singular_resource?) ? resource.singular_iri_opts : resource.iri_opts
       end
 
       def menus
-        @menus ||= available_menus.map(&method(:menu_item))
+        @menus ||= available_menus.map(&method(:memoised_menu_item))
       end
 
       def menu(tag)
-        menu_item(tag, available_menus[tag].dup) if available_menus.key?(tag)
+        memoized_menu_item(tag, available_menus[tag].dup) if available_menus.key?(tag)
       end
 
       private
 
       def default_label(tag, options)
-        I18n.t("menus.#{resource&.class&.name&.tableize}.#{tag}", options[:label_params])
+        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)
@@ -48,6 +55,7 @@ module LinkedRails
         options[:label_params] ||= {}
         options[:label_params][:default] ||= ["menus.default.#{tag}".to_sym, tag.to_s.capitalize]
         options[:label] ||= default_label(tag, options)
+        options[:action] = ontola_dialog_action(options[:href]) if options.delete(:dialog)
         options.except!(:policy_resource, :policy, :policy_arguments, :label_params)
         LinkedRails.menus_item_class.new(resource: resource, tag: tag, parent: self, **options)
       end
@@ -62,7 +70,9 @@ module LinkedRails
       end
 
       def iri_template
-        @iri_template ||= iri_template_expand_path(resource.send(:iri_template), '/menus')
+        base_template = resource.send(resource.try(:singular_resource?) ? :singular_iri_template : :iri_template)
+
+        @iri_template ||= iri_template_expand_path(base_template, '/menus')
       end
 
       class << self
@@ -88,7 +98,7 @@ module LinkedRails
           _defined_menus || {}
         end
 
-        def has_menu(tag, opts = {}) # rubocop:disable Naming/PredicateName
+        def has_menu(tag, **opts)
           defined_menus[tag] = opts
         end
 
@@ -100,7 +110,6 @@ 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

@@ -9,7 +9,7 @@ module LinkedRails
 
       def data
         data = []
-        iri.each_statement do |statement|
+        iri.try(:each_statement) do |statement|
           next unless include_data_statement?(statement)
 
           statement.graph_name = ::RDF::Serializers.config.default_graph
@@ -41,6 +41,8 @@ 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/class.rb

@@ -12,10 +12,10 @@ module LinkedRails
       end
 
       def parent_class
-        if klass.superclass == ApplicationRecord
+        if klass&.superclass == ApplicationRecord
           Vocab.schema.Thing
         else
-          klass.superclass.iri
+          klass&.superclass.try(:iri) || Vocab.schema.Thing
         end
       end
 
@@ -26,7 +26,7 @@ module LinkedRails
       end
 
       def properties
-        @properties ||= klass.predicate_mapping.keys.map { |key| LinkedRails.ontology_property_class.new(iri: key) }
+        @properties ||= klass&.predicate_mapping&.keys&.map { |key| LinkedRails.ontology_property_class.new(iri: key) }
       end
 
       class << self

data/app/models/linked_rails/ontology.rb

@@ -6,11 +6,11 @@ module LinkedRails
     include LinkedRails::Model
 
     def classes
-      @classes ||= ApplicationRecord.descendants.map do |klass|
+      @classes ||= LinkedRails.linked_models.map do |klass|
         iri = klass.iri.is_a?(Array) ? klass.iri.first : klass.iri
 
-        LinkedRails.ontology_class_class.new(klass: klass, iri: iri)
-      end
+        LinkedRails.ontology_class_class.new(klass: klass, iri: iri) if iri
+      end.compact
     end
 
     def properties
@@ -26,8 +26,8 @@ module LinkedRails
         %i[classes properties]
       end
 
-      def requested_resource(_opts, _user_context)
-        LinkedRails.ontology_class.new
+      def requested_resource(opts, _user_context)
+        LinkedRails.ontology_class.new if opts[:iri].include?(new.root_relative_iri)
       end
     end
   end

data/app/models/linked_rails/property_query.rb

@@ -2,6 +2,8 @@
 
 module LinkedRails
   class PropertyQuery < SHACL::PropertyShape
+    attr_accessor :force_render
+
     class << self
       def iri
         Vocab.ontola[:PropertyQuery]

data/app/models/linked_rails/sequence.rb

@@ -2,11 +2,10 @@
 
 module LinkedRails
   class Sequence
-    attr_accessor :node, :member_includes, :parent, :raw_members, :scope, :user_context
+    attr_accessor :node, :parent, :raw_members, :scope, :user_context
     alias read_attribute_for_serialization send
 
-    def initialize(members, opts = {})
-      self.member_includes = opts[:member_includes]
+    def initialize(members, **opts)
       self.node = opts[:id] || RDF::Node.new
       self.parent = opts[:parent]
       self.raw_members = members
@@ -14,7 +13,7 @@ module LinkedRails
       self.user_context = opts[:user_context]
     end
 
-    def iri(_opts = {})
+    def iri(**_opts)
       node
     end
     alias id iri
@@ -26,21 +25,13 @@ module LinkedRails
     end
 
     def preview_includes
-      [members: member_includes]
+      [:members]
     end
 
     def rdf_type
       self.class.iri
     end
 
-    def sequence
-      return [] unless members
-
-      members.map.with_index do |item, index|
-        [iri, RDF["_#{index}"], item_iri(item), Vocab.ll[:supplant]]
-      end
-    end
-
     private
 
     def apply_scope(association)

data/app/models/linked_rails/shacl/property_shape.rb

@@ -35,7 +35,7 @@ module LinkedRails
       )
       attr_writer :has_value, :sh_in
 
-      def has_value # rubocop:disable Naming/PredicateName
+      def has_value
         @has_value.respond_to?(:call) ? @has_value.call : @has_value
       end
 

data/app/models/linked_rails/web_page.rb

@@ -13,10 +13,6 @@ module LinkedRails
       def iri
         Vocab.schema.WebPage
       end
-
-      def preview_includes
-        super + [:includes, widget_sequence: {members: LinkedRails::Widget.preview_includes}]
-      end
     end
   end
 end

data/app/models/linked_rails/web_site.rb

@@ -8,10 +8,6 @@ module LinkedRails
       def iri
         Vocab.schema.WebSite
       end
-
-      def preview_includes
-        super + [homepage: LinkedRails::WebPage.preview_includes]
-      end
     end
   end
 end

data/app/models/linked_rails/widget.rb

@@ -8,7 +8,7 @@ module LinkedRails
     attr_writer :resources, :size
     attr_accessor :parent, :topology
 
-    def iri(_opts = {})
+    def iri(**_opts)
       @iri ||= RDF::Node.new
     end
 
@@ -19,12 +19,9 @@ module LinkedRails
     end
 
     def resource_sequence
-      @resource_sequence ||=
-        LinkedRails::Sequence.new(
-          @resources.map { |iri, predicate| predicate.present? ? property_shape(iri, predicate).iri : RDF::URI(iri) },
-          parent: self,
-          scope: false
-        )
+      @resource_sequence ||= @resources.map do |iri, predicate|
+        predicate.present? ? property_shape(iri, predicate) : RDF::URI(iri)
+      end
     end
 
     def size
@@ -46,10 +43,6 @@ module LinkedRails
       def iri
         Vocab.ontola[:Widget]
       end
-
-      def preview_includes
-        %i[resource_sequence property_shapes]
-      end
     end
   end
 end

data/app/policies/linked_rails/actions/object_policy.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module LinkedRails
+  module Actions
+    class ObjectPolicy < LinkedRails.policy_parent_class
+      def show?
+        parent_policy.blank? ? true : parent_policy.show?
+      end
+    end
+  end
+end

data/app/policies/linked_rails/collection_policy.rb

@@ -2,7 +2,7 @@
 
 module LinkedRails
   class CollectionPolicy < LinkedRails.policy_parent_class
-    delegate :permitted_attributes, to: :child_policy
+    delegate :permitted_attributes, :permitted_attributes_from_filters, to: :child_policy
 
     def create_child?
       policy = Pundit.policy!(user_context, child_resource)
@@ -29,7 +29,7 @@ module LinkedRails
     end
 
     def child_resource
-      record.build_child
+      record.child_resource
     end
 
     def parent_policy

data/app/serializers/linked_rails/actions/item_serializer.rb

@@ -12,17 +12,17 @@ module LinkedRails
       end
       attribute :action_status, predicate: Vocab.schema.actionStatus
       attribute :favorite, predicate: Vocab.ontola[:favoriteAction]
-      attribute :url, predicate: Vocab.schema.url do |object|
+      attribute :one_click, predicate: Vocab.ontola[:oneClick]
+      attribute :target_url, predicate: Vocab.schema.url do |object|
         object.target[:id] if object.target.is_a?(Hash)
       end
       attribute :error, predicate: Vocab.schema.error
 
-      has_one :parent, predicate: Vocab.schema.isPartOf, polymorphic: true do |object|
+      has_one :parent, predicate: Vocab.schema.isPartOf do |object|
         object.parent unless object.parent.try(:anonymous_iri?)
       end
-      has_one :object, predicate: Vocab.schema.object, polymorphic: true
-      has_one :target, predicate: Vocab.schema.target, polymorphic: true
-      has_one :included_object, polymorphic: true
+      attribute :object_iri, predicate: Vocab.schema.object
+      has_one :target, predicate: Vocab.schema.target
     end
   end
 end

data/app/serializers/linked_rails/actions/object_serializer.rb

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

data/app/serializers/linked_rails/collection/filter_field_serializer.rb

@@ -5,8 +5,9 @@ module LinkedRails
     class FilterFieldSerializer < LinkedRails.serializer_parent_class
       attribute :key, predicate: Vocab.ontola[:filterKey]
       attribute :options_in, predicate: Vocab.ontola[:filterOptionsIn]
-      has_one :collection, predicate: Vocab.schema.isPartOf, polymorphic: true
-      has_many :options, predicate: Vocab.ontola[:filterOptions], polymorphic: true
+      attribute :visible?, predicate: Vocab.ontola[:visible]
+      has_one :collection, predicate: Vocab.schema.isPartOf
+      has_many :options, predicate: Vocab.ontola[:filterOptions]
     end
   end
 end

data/app/serializers/linked_rails/collection/filter_option_serializer.rb

@@ -6,7 +6,7 @@ module LinkedRails
       attribute :count, predicate: Vocab.ontola[:filterCount]
       attribute :key, predicate: Vocab.ontola[:filterKey]
       attribute :value, predicate: Vocab.ontola[:filterValue]
-      has_one :collection, predicate: Vocab.schema[:isPartOf], polymorphic: true
+      has_one :collection, predicate: Vocab.schema[:isPartOf]
     end
   end
 end

data/app/serializers/linked_rails/collection/filter_serializer.rb

@@ -7,7 +7,7 @@ module LinkedRails
 
       attribute :key, predicate: Vocab.ontola[:filterKey]
       attribute :value, predicate: Vocab.ontola[:filterValue]
-      has_one :collection, predicate: Vocab.schema.isPartOf, polymorphic: true
+      has_one :collection, predicate: Vocab.schema.isPartOf
     end
   end
 end

data/app/serializers/linked_rails/collection/sorting_serializer.rb

@@ -7,7 +7,7 @@ module LinkedRails
 
       attribute :key, predicate: Vocab.ontola[:sortKey]
       attribute :direction, predicate: Vocab.ontola[:sortDirection]
-      has_one :collection, predicate: Vocab.schema.isPartOf, polymorphic: true
+      has_one :collection, predicate: Vocab.schema.isPartOf
     end
   end
 end

data/app/serializers/linked_rails/collection/view_serializer.rb

@@ -14,9 +14,9 @@ module LinkedRails
         attribute attr, predicate: Vocab.as[attr]
       end
 
-      has_one :collection, predicate: Vocab.as.partOf, polymorphic: true
-      has_one :unfiltered_collection, predicate: Vocab.ontola[:baseCollection], polymorphic: true
-      has_one :member_sequence, predicate: Vocab.as.items, polymorphic: true
+      has_one :collection, predicate: Vocab.as.partOf
+      has_one :unfiltered_collection, predicate: Vocab.ontola[:baseCollection]
+      has_one :member_sequence, predicate: Vocab.as.items
     end
   end
 end

data/app/serializers/linked_rails/collection_serializer.rb

@@ -11,12 +11,13 @@ module LinkedRails
     attribute :total_count, predicate: Vocab.as.totalItems do |object|
       object.total_count if object.type == :paginated
     end
-    attribute :iri_template, predicate: Vocab.ontola[:iriTemplate]
+    attribute :serialized_iri_template, predicate: Vocab.ontola[:iriTemplate]
     attribute :iri_template_opts, predicate: Vocab.ontola[:iriTemplateOpts]
     attribute :default_type, predicate: Vocab.ontola[:defaultType], &:type
     attribute :display, predicate: Vocab.ontola[:collectionDisplay] do |object|
       Vocab.ontola["collectionDisplay/#{object.display || :default}"]
     end
+    attribute :call_to_action, predicate: Vocab.ontola[:callToAction]
     attribute :columns, predicate: Vocab.ontola[:columns]
     attribute :collection_type, predicate: Vocab.ontola[:collectionType] do |object|
       Vocab.ontola["collectionType/#{object.type || :paginated}"]
@@ -25,17 +26,17 @@ module LinkedRails
     attribute :sort_options, predicate: Vocab.ontola[:sortOptions]
     attribute :view, predicate: Vocab.ll[:view]
 
-    has_one :unfiltered_collection, predicate: Vocab.ontola[:baseCollection], polymorphic: true
-    has_one :part_of, predicate: Vocab.schema.isPartOf, polymorphic: true do |object|
+    has_one :unfiltered_collection, predicate: Vocab.ontola[:baseCollection]
+    has_one :part_of, predicate: Vocab.schema.isPartOf do |object|
       object.part_of unless object.part_of.try(:anonymous_iri?)
     end
-    has_one :default_view, predicate: Vocab.ontola[:pages], polymorphic: true
+    has_one :default_view, predicate: Vocab.ontola[:pages]
 
-    has_many :filter_fields, predicate: Vocab.ontola[:filterFields], polymorphic: true, sequence: true
-    has_many :filters, predicate: Vocab.ontola[:collectionFilter], polymorphic: true do |object|
+    has_many :filter_fields, predicate: Vocab.ontola[:filterFields], sequence: true
+    has_many :filters, predicate: Vocab.ontola[:activeFilters] do |object|
       object.filters.reject(&:default_filter)
     end
-    has_many :sortings, polymorphic: true, predicate: Vocab.ontola[:collectionSorting]
+    has_many :sortings, predicate: Vocab.ontola[:collectionSorting]
 
     %i[first last].each do |attr|
       attribute attr, predicate: Vocab.as[attr]

data/app/serializers/linked_rails/condition_serializer.rb

@@ -2,8 +2,8 @@
 
 module LinkedRails
   class ConditionSerializer < LinkedRails.serializer_parent_class
-    has_one :fail, predicate: Vocab.ontola[:fail], polymorphic: true
-    has_one :pass, predicate: Vocab.ontola[:pass], polymorphic: true
-    has_one :shape, predicate: Vocab.sh.node, polymorphic: true
+    has_one :fail, predicate: Vocab.ontola[:fail]
+    has_one :pass, predicate: Vocab.ontola[:pass]
+    has_one :shape, predicate: Vocab.sh.node
   end
 end