linked_rails 0.0.3 → 0.0.4.pre.g0ec6e30ca

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

@@ -4,13 +4,14 @@ module LinkedRails
   class Ontology
     include ActiveModel::Model
     include LinkedRails::Model
+    include LinkedRails::Model::Cacheable
 
     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 +27,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,12 +2,13 @@
 
 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)
       verdict = policy.create?
       @message = policy.message
+      @action_status = policy.action_status
       verdict
     end
 
@@ -29,7 +30,7 @@ module LinkedRails
     end
 
     def child_resource
-      record.build_child
+      record.child_resource
     end
 
     def parent_policy

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/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/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,10 @@ 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
+      has_many :members
     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

data/app/serializers/linked_rails/entry_point_serializer.rb

@@ -6,13 +6,13 @@ module LinkedRails
 
     attribute :label, predicate: Vocab.schema.name
     attribute :description, predicate: Vocab.schema.text
-    attribute :url, predicate: Vocab.schema.url
+    attribute :target_url, predicate: Vocab.schema.url
     attribute :http_method, key: :method, predicate: Vocab.schema.httpMethod do |object|
       object.http_method.upcase
     end
 
-    has_one :parent, predicate: Vocab.schema.isPartOf, polymorphic: true
-    attribute :action_body, predicate: Vocab.ll[:actionBody], polymorphic: true
+    has_one :parent, predicate: Vocab.schema.isPartOf
+    attribute :action_body, predicate: Vocab.ll[:actionBody]
     attribute :image, predicate: Vocab.schema.image do |object|
       serialize_image(object.image)
     end

data/app/serializers/linked_rails/enum_value_serializer.rb

@@ -8,5 +8,6 @@ module LinkedRails
     attribute :close_match, predicate: Vocab.skos.closeMatch
     attribute :exact_match, predicate: Vocab.skos.exactMatch
     attribute :group_by, predicate: Vocab.ontola[:groupBy]
+    attribute :identifier, predicate: Vocab.schema.identifier
   end
 end

data/app/serializers/linked_rails/form/field/association_input_serializer.rb

@@ -7,6 +7,7 @@ module LinkedRails
         attribute :nested_form, predicate: Vocab.form[:form] do |object|
           object.nested_form.form_iri
         end
+        has_one :target_class, predicate: Vocab.sh.targetClass
       end
     end
   end

data/app/serializers/linked_rails/form/field/file_input_serializer.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module LinkedRails
+  class Form
+    class Field
+      class FileInputSerializer < FieldSerializer
+        attribute :max_size, predicate: Vocab.form[:maxFileSize]
+      end
+    end
+  end
+end

data/app/serializers/linked_rails/form/field_serializer.rb

@@ -5,7 +5,9 @@ module LinkedRails
     class FieldSerializer < LinkedRails.serializer_parent_class
       attribute :name, predicate: Vocab.schema.name
       attribute :description, predicate: Vocab.schema.text
-      attribute :helper_text, predicate: Vocab.ontola[:helperText]
+      attribute :helper_text, predicate: Vocab.form[:helperText]
+      attribute :start_adornment, predicate: Vocab.form[:startAdornment]
+      attribute :placeholder, predicate: Vocab.form[:placeholder]
       attribute :default_value, predicate: Vocab.form[:defaultValue]
 
       attribute :datatype, predicate: Vocab.sh.datatype

data/app/serializers/linked_rails/form/group_serializer.rb

@@ -8,7 +8,7 @@ module LinkedRails
       attribute :collapsible, predicate: Vocab.form[:collapsible]
       attribute :hidden, predicate: Vocab.form[:hidden]
 
-      has_many :fields, predicate: Vocab.form[:fields], sequence: true, polymorphic: true
+      has_many :fields, predicate: Vocab.form[:fields], sequence: true
     end
   end
 end

data/app/serializers/linked_rails/form/page_serializer.rb

@@ -7,7 +7,7 @@ module LinkedRails
       attribute :description, predicate: Vocab.schema.text
 
       has_many :groups, predicate: Vocab.form[:groups], sequence: true, serializer: Form::GroupSerializer
-      has_one :footer_group, predicate: Vocab.form[:footerGroup], serializer: Form::GroupSerializer
+      has_one :footer_group!, predicate: Vocab.form[:footerGroup], serializer: Form::GroupSerializer
     end
   end
 end

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

@@ -13,15 +13,15 @@ module LinkedRails
       attribute :image, predicate: Vocab.schema.image do |object|
         serialize_image(object.image)
       end
-      has_one :action, predicate: Vocab.ontola[:action], polymorphic: true do |object|
+      has_one :action, predicate: Vocab.ontola[:action] do |object|
         object.action unless object.action.is_a?(RDF::Resource)
       end
       has_one :menu_sequence,
               predicate: Vocab.ontola[:menuItems],
               if: ->(o, p) { menus_present?(o, p) },
               polymorphic: true
-      has_one :parent, predicate: Vocab.ontola[:parentMenu], if: ->(o, p) { parent_menu?(o, p) }, polymorphic: true
-      has_one :resource, predicate: Vocab.schema.isPartOf, polymorphic: true
+      has_one :parent, predicate: Vocab.ontola[:parentMenu], if: ->(o, p) { parent_menu?(o, p) }
+      has_one :resource, predicate: Vocab.schema.isPartOf
 
       def self.parent_menu?(object, _params)
         object.parent.is_a?(LinkedRails.menus_item_class)

data/app/serializers/linked_rails/menus/list_serializer.rb

@@ -5,7 +5,7 @@ module LinkedRails
     class ListSerializer < LinkedRails.serializer_parent_class
       include LinkedRails::Serializer
 
-      has_many :menus, predicate: Vocab.ontola[:menus], polymorphic: true do |object|
+      has_many :menus, predicate: Vocab.ontola[:menus] do |object|
         object.menus&.compact
       end
     end

data/app/serializers/linked_rails/ontology_serializer.rb

@@ -2,7 +2,7 @@
 
 module LinkedRails
   class OntologySerializer < LinkedRails.serializer_parent_class
-    has_many :classes
-    has_many :properties
+    has_many :classes, serializer: LinkedRails::Ontology::ClassSerializer
+    has_many :properties, serializer: LinkedRails::Ontology::PropertySerializer
   end
 end

data/app/serializers/linked_rails/property_query_serializer.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module LinkedRails
+  class PropertyQuerySerializer < SHACL::PropertyShapeSerializer
+    attribute :force_render, predicate: Vocab.ll[:forceRender]
+  end
+end

data/app/serializers/linked_rails/sequence_serializer.rb

@@ -4,11 +4,8 @@ module LinkedRails
   class SequenceSerializer < LinkedRails.serializer_parent_class
     include LinkedRails::Serializer
 
-    statements :sequence
-    has_many :members, polymorphic: true
-
-    def self.sequence(object, _params)
-      object.sequence
+    has_many :members, predicate: ->(relationship, index) do
+      RDF["_#{index}"]
     end
   end
 end

data/app/serializers/linked_rails/shacl/node_shape_serializer.rb

@@ -6,7 +6,7 @@ module LinkedRails
       attribute :closed, predicate: Vocab.sh.closed
       attribute :ignored_properties, predicate: Vocab.sh.ignoredProperties
       attribute :sparql, predicate: Vocab.sh.sparql
-      has_many :property, predicate: Vocab.sh.property, polymorphic: true
+      has_many :property, predicate: Vocab.sh.property
     end
   end
 end

data/app/serializers/linked_rails/shacl/property_shape_serializer.rb

@@ -32,7 +32,7 @@ module LinkedRails
       attribute :qualified_min_count, predicate: Vocab.sh.qualifiedMinCount
       attribute :qualified_value_shape, predicate: Vocab.sh.qualifiedValueShape
 
-      has_many :path, predicate: Vocab.sh.path, sequence: true, polymorphic: true
+      has_many :path, predicate: Vocab.sh.path, sequence: true
     end
   end
 end

data/app/serializers/linked_rails/shacl/shape_serializer.rb

@@ -13,11 +13,11 @@ module LinkedRails
       attribute :target_node, predicate: Vocab.sh.targetNode
       attribute :target_objects_of, predicate: Vocab.sh.targetObjectsOf
       attribute :target_subjects_of, predicate: Vocab.sh.targetSubjectsOf
-      has_one :sh_not, predicate: Vocab.sh.not, polymorphic: true
-      has_many :and, predicate: Vocab.sh.and, polymorphic: true
-      has_many :or, predicate: Vocab.sh.or, polymorphic: true
-      has_many :xone, predicate: Vocab.sh.xone, polymorphic: true
-      has_many :nested_shapes, polymorphic: true do |object|
+      has_one :sh_not, predicate: Vocab.sh.not
+      has_many :and, predicate: Vocab.sh.and
+      has_many :or, predicate: Vocab.sh.or
+      has_many :xone, predicate: Vocab.sh.xone
+      has_many :nested_shapes do |object|
         [object.and, object.or, object.sh_not, object.xone].flatten.compact
       end
     end

data/app/serializers/linked_rails/web_page_serializer.rb

@@ -2,9 +2,9 @@
 
 module LinkedRails
   class WebPageSerializer < CreativeWorkSerializer
-    has_one :cover_photo, predicate: Vocab.ontola[:coverPhoto], polymorphic: true
-    has_one :widget_sequence, predicate: Vocab.ontola[:widgets], polymorphic: true
-    has_many :includes, polymorphic: true
+    has_one :cover_photo, predicate: Vocab.ontola[:coverPhoto]
+    has_one :widget_sequence, predicate: Vocab.ontola[:widgets]
+    has_many :includes
     attribute :hide_header, predicate: Vocab.ontola[:hideHeader]
   end
 end

data/app/serializers/linked_rails/web_site_serializer.rb

@@ -2,7 +2,7 @@
 
 module LinkedRails
   class WebSiteSerializer < CreativeWorkSerializer
-    has_one :homepage, predicate: Vocab.foaf.homepage, polymorphic: true
+    has_one :homepage, predicate: Vocab.foaf.homepage
     attribute :image, predicate: Vocab.schema.image do |object|
       serialize_image(object.image)
     end

data/app/serializers/linked_rails/widget_serializer.rb

@@ -6,9 +6,9 @@ module LinkedRails
 
     attribute :size, predicate: Vocab.ontola[:widgetSize]
     attribute :topology, predicate: Vocab.ontola[:topology]
-    has_one :resource_sequence, predicate: Vocab.ontola[:widgetResource], polymorphic: true
-    has_one :parent, predicate: Vocab.schema.isPartOf, polymorphic: true
-    has_many :property_shapes, polymorphic: true do |object|
+    has_one :parent, predicate: Vocab.schema.isPartOf
+    has_many :resource_sequence, predicate: Vocab.ontola[:widgetResource], sequence: true
+    has_many :property_shapes do |object|
       object.property_shapes.values
     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