linked_rails 0.0.3 → 0.0.4.pre.ge1306665a

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/lib/generators/linked_rails/install/install_generator.rb

@@ -12,7 +12,6 @@ module LinkedRails
     def install # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
       template 'vocab.rb', 'lib/vocab.rb'
       template 'initializer.rb', 'config/initializers/linked_rails.rb'
-      template 'application_action_list.rb', 'app/actions/application_action_list.rb'
       template 'application_form.rb', 'app/forms/application_form.rb'
       template 'application_menu_list.rb', 'app/menus/application_menu_list.rb'
       template 'application_policy.rb', 'app/policies/application_policy.rb'
@@ -22,9 +21,12 @@ module LinkedRails
       template 'rdf_serializers_initializer.rb', 'config/initializers/rdf_serializers.rb'
       template 'locales.yml', 'config/locales/linked_rails.en.yml'
       template 'vocab.yml', 'config/locales/vocab.en.yml'
+      route 'find_tenant_route'
       route 'use_linked_rails'
       application 'config.middleware.use LinkedRails::Middleware::LinkedDataParams'
       application 'config.jwt_encryption_method = :hs512'
+      gsub_file('config/environments/development.rb', 'config.eager_load = false', 'config.eager_load = true')
+      gsub_file('config/environments/development.rb', 'config.cache_classes = false', 'config.cache_classes = true')
       inject_includes
 
       readme 'README'
@@ -37,17 +39,12 @@ module LinkedRails
       inject_model_include
     end
 
-    def inject_controller_include# rubocop:disable Metrics/MethodLength
+    def inject_controller_include
       sentinel = /class ApplicationController < ActionController::API\n/m
       in_root do
         inject_into_file(
           'app/controllers/application_controller.rb',
-          optimize_indentation(
-            "include ActionController::MimeResponds\n"\
-            "include ActiveResponse::Controller\n"\
-            'include LinkedRails::Controller',
-            2
-          ),
+          optimize_indentation('include LinkedRails::Controller', 2),
           after: sentinel
         )
       end

data/lib/generators/linked_rails/install/templates/README

@@ -2,4 +2,6 @@ Add the following to config/development.rb
   config.hosts = []
   config.hosts << 'localhost'
   config.hosts << '.svc.cluster.local'
+  config.hosts << [YOUR_LOCAL_HOSTNAME]
 
+And update the host in config/initializers/linked_rails.rb

data/lib/generators/linked_rails/install/templates/app_menu_list.rb

@@ -8,29 +8,58 @@ class AppMenuList < ApplicationMenuList
            menus: -> { user_menu_items }
 
   def iri_template
-    @iri_template ||= URITemplate.new('/menus{#fragment}')
+    @iri_template ||= LinkedRails::URITemplate.new('/menus{#fragment}')
   end
 
   private
 
-  def navigation_links
-    items = []
-    items << menu_item(
+  def home_menu_item
+    menu_item(
       :home,
       label: I18n.t('menus.home'),
       href: LinkedRails.iri,
       image: 'fa-home'
     )
-    items
+  end
+
+  def navigation_links
+    [home_menu_item]
   end
 
   def user_menu_items
     return [] if user_context.guest?
 
-    [user_menu_sign_out_item]
+    [
+      otp_menu_item,
+      sign_out_menu_item
+    ]
+  end
+
+  def otp_menu_item
+    if user_context.otp_active?
+      delete_otp_menu_item
+    else
+      add_otp_menu_item
+    end
+  end
+
+  def delete_otp_menu_item
+    menu_item(
+      :otp,
+      label: I18n.t('menus.delete_otp'),
+      href: LinkedRails.iri(path: 'u/otp_secret/delete')
+    )
+  end
+
+  def add_otp_menu_item
+    menu_item(
+      :otp,
+      label: I18n.t('menus.add_otp'),
+      href: LinkedRails.iri(path: 'u/otp_secret/new')
+    )
   end
 
-  def user_menu_sign_out_item
+  def sign_out_menu_item
     menu_item(
       :signout,
       action: Vocab.libro['actions/logout'],

data/lib/generators/linked_rails/install/templates/application_menu_list.rb

@@ -1,3 +1,42 @@
 # frozen_string_literal: true
 
-class ApplicationMenuList < LinkedRails::Menus::List; end
+class ApplicationMenuList < LinkedRails::Menus::List
+  include LinkedRails::Helpers::OntolaActionsHelper
+
+  private
+
+  def copy_menu_item(url)
+    menu_item(
+      :copy,
+      action: ontola_copy_action(url),
+      item_type: 'copy',
+      image: 'fa-clipboard',
+      href: url
+    )
+  end
+
+  def delete_menu_item(resource)
+    iri = resource.iri.dup
+    iri.path += '/delete'
+
+    menu_item(
+      :destroy,
+      action: ontola_dialog_action(iri),
+      href: iri,
+      image: 'fa-close',
+      policy: :destroy?
+    )
+  end
+
+  def edit_menu_item(resource)
+    iri = resource.iri.dup
+    iri.path += '/edit'
+
+    menu_item(
+      :edit,
+      image: 'fa-edit',
+      href: iri,
+      policy: :update?
+    )
+  end
+end

data/lib/generators/linked_rails/install/templates/initializer.rb

@@ -2,8 +2,7 @@
 
 require_relative '../../lib/vocab'
 
-LinkedRails.host = 'example.com'
+LinkedRails.host = raise('Enter your host. Use an ENV var if you have multiple environments')
 LinkedRails.scheme = :https
-LinkedRails.app_vocab = Vocab.example
 
 LinkedRails::Renderers.register!

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

@@ -1,4 +1,16 @@
 en:
+  actions:
+    default:
+      create:
+        label: "New %{type}"
+        success: 'Created successfully'
+      destroy:
+        label: "Delete"
+        description: "Are you sure you want to delete this %{type}?"
+        success: 'Destroyed successfully'
+      update:
+        label: "Edit"
+        success: 'Updated successfully'
   linked_rails:
     status:
       400: "Error in request"
@@ -10,3 +22,5 @@ en:
   menus:
     home: "Home"
     sign_out: "Sign out"
+    add_otp: "Enable 2fa"
+    delete_otp: "Remove 2fa"

data/lib/generators/linked_rails/install/templates/rdf_serializers_initializer.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 RDF::Serializers.configure do |config|
-  config.default_graph = Vocab.ll[:supplant]
+  config.default_graph = Vocab.ld[:supplant]
 end

data/lib/generators/linked_rails/install/templates/vocab.rb

@@ -2,4 +2,5 @@
 
 class Vocab < LinkedRails::Vocab
   register(:example, 'https://example.com/my_vocab#')
+  app_vocabulary :example
 end

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

@@ -1,10 +1,10 @@
 en:
   foaf:
     name:
-      label: "Naam"
+      label: "Name"
   ontola:
     password:
-      label: "Wachtwoord"
+      label: "Password"
     quickActions:
       label: "Actions"
   rdfv:

data/lib/generators/linked_rails/model/model_generator.rb

@@ -17,7 +17,6 @@ module LinkedRails
     end
 
     def copy_files # rubocop:disable Metrics/AbcSize
-      template 'action_list.rb', File.join('app', 'actions', class_path, "#{file_name}_action_list.rb")
       template 'controller.rb', File.join('app', 'controllers', class_path, "#{plural_file_name}_controller.rb")
       template 'form.rb', File.join('app', 'forms', class_path, "#{file_name}_form.rb")
       template 'menu_list.rb', File.join('app', 'menus', class_path, "#{file_name}_menu_list.rb")

data/lib/generators/linked_rails/model/templates/controller.rb.tt

@@ -2,6 +2,10 @@
 
 <% module_namespacing do -%>
 class <%= controller_class_name %>Controller < ApplicationController
-    active_response :show, :index
+  active_response :show, :index
+
+  has_collection_create_action
+  has_resource_update_action
+  has_resource_destroy_action
 end
 <% end -%>

data/lib/generators/linked_rails/model/templates/form.rb.tt

@@ -2,5 +2,8 @@
 
 <% module_namespacing do -%>
 class <%= class_name %>Form < ApplicationForm
+<% attributes.reject(&:reference?).each do |attribute| -%>
+  field :<%= attribute.name %>
+<% end -%>
 end
 <% end -%>

data/lib/generators/linked_rails/model/templates/menu_list.rb.tt

@@ -2,5 +2,20 @@
 
 <% module_namespacing do -%>
 class <%= class_name %>MenuList < ApplicationMenuList
+  has_menu(
+    :actions,
+    image: 'fa-ellipsis-v',
+    menus: -> { action_menu_items }
+  )
+
+  private
+
+  def action_menu_items
+    [
+      edit_menu_item(resource),
+      delete_menu_item(resource),
+      copy_menu_item(resource.iri),
+    ]
+  end
 end
 <% end -%>

data/lib/generators/linked_rails/model/templates/policy.rb.tt

@@ -2,5 +2,18 @@
 
 <% module_namespacing do -%>
 class <%= class_name %>Policy < ApplicationPolicy
+  permit_attributes %i[<%= attributes.reject(&:reference?).map { |attribute| attribute.name }.join(' ') %>]
+
+  def create?
+    false
+  end
+
+  def update?
+    false
+  end
+
+  def destroy?
+    false
+  end
 end
 <% end -%>

data/lib/generators/linked_rails/model/templates/serializer.rb.tt

@@ -3,7 +3,11 @@
 <% module_namespacing do -%>
 class <%= class_name %>Serializer < ApplicationSerializer
 <% attributes.each do |attribute| -%>
-    attribute :<%= attribute.name %>, predicate: LinkedRails.app_vocab[:<%= attribute.name %>]
+<% if attribute.reference? -%>
+  has_one :<%= attribute.name %>, predicate: Vocab.app[:<%= attribute.name.camelize(:lower) %>]
+<% else -%>
+  attribute :<%= attribute.name %>, predicate: Vocab.app[:<%= attribute.name.camelize(:lower) %>]
+<% end -%>
 <% end -%>
 end
 <% end -%>

data/lib/linked_rails/active_response/controller/collections.rb

@@ -9,7 +9,7 @@ module LinkedRails
         def index_association; end
 
         def index_includes
-          requested_resource.preview_includes
+          requested_resource!.try(:preview_includes)
         end
 
         def index_iri

data/lib/linked_rails/active_response/controller/crud_defaults.rb

@@ -10,8 +10,8 @@ module LinkedRails
           current_resource!
             .class
             .try(:reflect_on_all_associations)
-            .select(&:collection?)
-            .each { |association| current_resource!.association(association.name).reset }
+            &.select(&:collection?)
+            &.each { |association| current_resource!.association(association.name).reset }
         end
 
         def create_execute
@@ -50,7 +50,7 @@ module LinkedRails
         def requested_resource
           @requested_resource ||= controller_class.try(
             :requested_resource,
-            LinkedRails.iri_mapper.route_params_to_opts(params.dup),
+            LinkedRails.iri_mapper.route_params_to_opts(params.dup, request.original_url),
             user_context
           )
         end
@@ -80,7 +80,7 @@ module LinkedRails
         end
 
         def update_meta
-          changes_triples + changed_relations_triples
+          changes_triples(current_resource) + changed_relations_triples(current_resource)
         end
 
         def user_context

data/lib/linked_rails/active_response/controller/params.rb

@@ -11,17 +11,13 @@ module LinkedRails
         end
 
         def params_parser
-          @params_parser ||= LinkedRails::ParamsParser.new(params)
-        end
-
-        def parsed_filter_params
-          filters = params_parser.filter_params
-
-          ActionController::Parameters.new(controller_class.try(:attributes_from_filters, filters) || {})
+          @params_parser ||= LinkedRails::ParamsParser.new(params: params, user_context: user_context)
         end
 
         def permit_filter_params
-          @permit_filter_params ||= parsed_filter_params.permit(*permit_param_keys)
+          @permit_filter_params ||=
+            policy(requested_resource || new_resource)
+              .permitted_attributes_from_filters(params_parser.filter_params)
         end
 
         def permit_params
@@ -37,11 +33,15 @@ module LinkedRails
         end
 
         def permit_params_with_filters
-          permit_filter_params.merge(permit_params.to_h)
+          permitted = permit_filter_params.merge(permit_params.to_h)
+          permitted[:singular_resource] = true if params[:singular_route].to_s == 'true'
+          permitted
         end
 
         def resource_params
-          return ActionController::Parameters.new if !params.key?(permit_param_key) && allow_empty_params?
+          empty_params = !params.key?(permit_param_key) || params[permit_param_key] == {}
+
+          return ActionController::Parameters.new if empty_params && allow_empty_params?
 
           params.require(permit_param_key)
         end

data/lib/linked_rails/active_response/controller.rb

@@ -8,30 +8,20 @@ require_relative 'controller/params'
 
 module LinkedRails
   module Controller
-    include Pundit
+    include Pundit::Authorization
     include LinkedRails::ActiveResponse::Controller::Collections
     include LinkedRails::ActiveResponse::Controller::CrudDefaults
     include LinkedRails::ActiveResponse::Controller::Params
 
-    def _render_with_renderer_json(record, options)
-      self.content_type = Mime[:json]
-
-      return record if record.is_a?(String)
-      return record.to_json if record.is_a?(Hash)
-
-      serializer_opts = RDF::Serializers::Renderers.transform_opts(
-        options,
-        serializer_params
-      )
-
-      serializer = RDF::Serializers.serializer_for(record)&.new(record, serializer_opts)
-      return record.to_json unless serializer
-
-      Oj.dump(serializer.serializable_hash, mode: :compat)
+    def success_message_translation_key
+      "actions.#{Translate.translation_key(controller_class)}.#{action_name}.success"
     end
 
-    def serializer_params
-      {}
+    def success_message_translation_opts
+      {
+        default: [:"actions.default.#{action_name}.success", ''],
+        type: I18n.t("#{controller_class.model_name.collection}.type").capitalize
+      }
     end
   end
 end