linked_rails 0.0.3 → 0.0.4

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

@@ -3,6 +3,11 @@
 module LinkedRails
   class Form
     class FieldFactory # rubocop:disable Metrics/ClassLength
+      DATABASE_ERRORS = [
+        'PG::ConnectionBad'.safe_constantize,
+        ActiveRecord::StatementInvalid,
+        ActiveRecord::ConnectionNotEstablished
+      ].compact.freeze
       MAX_STR_LEN = 255
       VALIDATOR_SELECTORS = [
         [:min_length, ActiveModel::Validations::LengthValidator, :minimum],
@@ -15,7 +20,8 @@ module LinkedRails
 
       attr_accessor :field_options, :form, :key
 
-      delegate :form_options_iri,
+      delegate :abstract_form,
+               :form_options_iri,
                :model_class,
                :model_policy!,
                :serializer_attributes,
@@ -24,6 +30,8 @@ module LinkedRails
                to: :form
 
       def condition_or_field
+        return field if abstract_form
+
         @condition_or_field ||= model_policy!.condition_for(
           key,
           field,
@@ -45,8 +53,7 @@ module LinkedRails
       end
 
       def attr_to_datatype # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength
-        name = serializer_attribute&.key&.to_s || key.to_s
-        case attribute_type(name)
+        case attribute_type
         when :string, :text
           Vocab.xsd.string
         when :integer
@@ -58,22 +65,26 @@ module LinkedRails
         when :boolean
           Vocab.xsd.boolean
         when :decimal
-          decimal_data_type(name)
+          decimal_data_type(attribute_name)
         when :file
           Vocab.ll[:blob]
         else
-          Vocab.xsd.string if model_class.try(:defined_enums)&.key?(name)
+          Vocab.xsd.string if model_class.try(:defined_enums)&.key?(attribute_name)
         end
       end
 
-      def attribute_type(name)
-        model_class.try(:attribute_types).try(:[], name)&.type
-      rescue PG::ConnectionBad, ActiveRecord::StatementInvalid, ActiveRecord::ConnectionNotEstablished
+      def attribute_name
+        serializer_attribute&.key&.to_s || key.to_s
+      end
+
+      def attribute_type
+        model_class.try(:attribute_types).try(:[], attribute_name)&.type
+      rescue *DATABASE_ERRORS
         :string
       end
 
       def attribute_validators
-        @attribute_validators ||= model_class.validators.select { |v| v.attributes.include?(model_attribute) }
+        @attribute_validators ||= model_class&.validators&.select { |v| v.attributes.include?(model_attribute) }
       end
 
       def datatype
@@ -143,7 +154,7 @@ module LinkedRails
         when Vocab.ontola['datatype/postalRange']
           return Form::Field::PostalRangeInput
         else
-          max_length && max_length > MAX_STR_LEN ? Form::Field::TextAreaInput : Form::Field::TextInput
+          attribute_type == :text ? Form::Field::TextAreaInput : Form::Field::TextInput
         end
       end
       # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity

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

@@ -6,8 +6,8 @@ module LinkedRails
       attr_accessor :fields, :collapsible, :hidden, :footer
       attr_writer :description, :key, :label
 
-      def initialize(attrs = {})
-        super(attrs)
+      def initialize(**attrs)
+        super(**attrs)
         self.fields = []
       end
 

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

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
 
@@ -85,7 +85,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,
@@ -108,10 +108,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 +120,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 +145,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

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

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

@@ -34,7 +34,7 @@ module LinkedRails
       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 menu_available?(_tag, options)
@@ -48,6 +48,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
@@ -88,7 +89,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
 

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

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

@@ -5,7 +5,7 @@ module LinkedRails
     attr_accessor :node, :member_includes, :parent, :raw_members, :scope, :user_context
     alias read_attribute_for_serialization send
 
-    def initialize(members, opts = {})
+    def initialize(members, **opts)
       self.member_includes = opts[:member_includes]
       self.node = opts[:id] || RDF::Node.new
       self.parent = opts[:parent]
@@ -14,7 +14,7 @@ module LinkedRails
       self.user_context = opts[:user_context]
     end
 
-    def iri(_opts = {})
+    def iri(**_opts)
       node
     end
     alias id iri

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

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

@@ -12,7 +12,8 @@ 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

data/app/serializers/linked_rails/collection_serializer.rb

@@ -11,8 +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 :iri_template_opts, predicate: Vocab.ontola[:iriTemplateOpts]
+    attribute :iri_template, predicate: Vocab.ontola[:iriTemplate] do |object|
+      object
+        .iri_template
+        .to_s
+        .gsub('{route_key}', object.route_key.to_s)
+        .gsub('{/parent_iri*}', object.parent&.iri&.to_s&.split('?')&.first || LinkedRails.iri)
+    end
     attribute :default_type, predicate: Vocab.ontola[:defaultType], &:type
     attribute :display, predicate: Vocab.ontola[:collectionDisplay] do |object|
       Vocab.ontola["collectionDisplay/#{object.display || :default}"]

data/app/serializers/linked_rails/entry_point_serializer.rb

@@ -6,7 +6,7 @@ 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

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

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.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 -%>