linked_rails 0.0.3 → 0.0.4

data/lib/linked_rails/model/dirty.rb

@@ -28,7 +28,7 @@ module LinkedRails
 
         Hash[
           previous_changes
-            .map { |k, v| [serializer_class.attributes_to_serialize[k.to_sym]&.predicate, v] }
+            .map { |k, v| [self.class.predicate_for_key(k.to_sym), v] }
             .select { |k, _v| k.present? }
         ]
       end

data/lib/linked_rails/model/enhancements.rb

@@ -16,14 +16,13 @@ module LinkedRails
 
       module ClassMethods
         # Adds an enhancement to a model and includes the Model module.
-        def enhance(enhancement, opts = {})
+        def enhance(enhancement, **opts)
           initialize_enhancements
           already_included = enhanced_with?(enhancement)
 
           self.enhancements[enhancement] = opts
           return if already_included
 
-          enhance_routing(enhancement) if enhancement.const_defined?(:Routing) && enhanced_with?(enhancement, :Routing)
           include enhancement::Model if enhancement.const_defined?(:Model) && enhanced_with?(enhancement, :Model)
         end
 
@@ -46,10 +45,6 @@ module LinkedRails
 
         private
 
-        def enhance_routing(enhancement)
-          LinkedRails::Enhancements::RouteConcerns.add_concern(enhancement)
-        end
-
         def initialize_enhancements
           return if enhancements && method(:enhancements).owner == singleton_class
 

data/lib/linked_rails/model/filtering.rb

@@ -6,9 +6,7 @@ module LinkedRails
       extend ActiveSupport::Concern
 
       included do
-        class_attribute :default_filters, instance_accessor: false, instance_predicate: false
         class_attribute :filter_options
-        self.default_filters = {}
       end
 
       module ClassMethods
@@ -16,7 +14,7 @@ module LinkedRails
           class_variables.include?(:@@filter_options) ? super : {}
         end
 
-        def filterable(options = {})
+        def filterable(**options)
           initialize_filter_options
 
           self.filter_options = HashWithIndifferentAccess.new(options).merge(filter_options)
@@ -26,7 +24,7 @@ module LinkedRails
 
         private
 
-        def boolean_filter(true_filter, false_filter, options = {})
+        def boolean_filter(true_filter, false_filter, **options)
           {
             filter: resolve_boolean_filter(true_filter, false_filter),
             values: [true, false]

data/lib/linked_rails/model/indexable.rb

@@ -15,14 +15,13 @@ module LinkedRails
           parent.send(collection_name, params) if collection_name
         end
 
-        def root_collection(params = {})
+        def root_collection(**params)
           return unless root_collection?
 
-          root_collection_class.collection_or_view(root_collection_opts, params)
-        end
-
-        def root_collection_class
-          LinkedRails.collection_class
+          default_collection_option(:collection_class).collection_or_view(
+            default_collection_options,
+            params
+          )
         end
 
         private
@@ -33,15 +32,6 @@ module LinkedRails
           collection_name if parent.respond_to?(collection_name, true)
         end
 
-        def grid_max_columns; end
-
-        def root_collection_opts
-          {
-            association_class: self,
-            grid_max_columns: grid_max_columns
-          }
-        end
-
         def root_collection?
           true
         end

data/lib/linked_rails/model/iri.rb

@@ -14,13 +14,17 @@ module LinkedRails
       end
 
       # @return [RDF::URI].
-      def iri(opts = {})
+      def iri(**opts)
         return anonymous_iri if anonymous_iri?
-        return iri_with_root(root_relative_iri(opts)) if opts.present?
+        return iri_with_root(root_relative_iri(**opts)) if opts.present?
 
         @iri ||= iri_with_root(root_relative_iri)
       end
 
+      def iri_elements
+        root_relative_iri.to_s&.split('?')&.first&.split('/')&.map(&:presence)&.compact&.presence
+      end
+
       # @return [Hash]
       def iri_opts
         @iri_opts ||= {
@@ -33,14 +37,14 @@ module LinkedRails
         self.class.iri
       end
 
-      def reload(_opts = {})
+      def reload(**_opts)
         @iri = nil
         super
       end
 
       # @return [RDF::URI]
-      def root_relative_iri(opts = {})
-        RDF::URI(expand_iri_template(iri_opts.merge(opts)))
+      def root_relative_iri(**opts)
+        RDF::URI(expand_iri_template(**iri_opts.merge(opts)))
       end
 
       # @return [String, Symbol]
@@ -49,7 +53,7 @@ module LinkedRails
       private
 
       # @return [String]
-      def expand_iri_template(args = {})
+      def expand_iri_template(**args)
         iri_template.expand(args)
       end
 
@@ -68,7 +72,7 @@ module LinkedRails
 
       # @return [URITemplate]
       def iri_template_expand_path(template_base, path)
-        tokens = template_base.tokens
+        tokens = (template_base.is_a?(String) ? LinkedRails::URITemplate.new(template_base) : template_base).tokens
 
         ind = tokens.find_index do |t|
           t.is_a?(URITemplate::RFC6570::Expression::FormQuery) || t.is_a?(URITemplate::RFC6570::Expression::Fragment)
@@ -76,18 +80,12 @@ module LinkedRails
 
         prefix = ind ? tokens[0...ind] : tokens
         suffix = ind ? tokens[ind..-1] : []
-        URITemplate.new([prefix, path, suffix].flatten.join)
+        LinkedRails::URITemplate.new([prefix, path, suffix].flatten.join)
       end
 
       # @return [URITemplate]
       def iri_template_with_fragment(template_base, fragment)
-        URITemplate.new("#{template_base.to_s.sub(/{#[\w]+}/, '').split('#').first}##{fragment}")
-      end
-
-      def singular_iri; end
-
-      def singular_iri_opts
-        {}
+        LinkedRails::URITemplate.new("#{template_base.to_s.sub(/{#[\w]+}/, '').split('#').first}##{fragment}")
       end
 
       module ClassMethods
@@ -99,7 +97,7 @@ module LinkedRails
           return if self == ApplicationRecord
 
           superclass.try(:iri_namespace) ||
-            (linked_rails_module? ? Vocab.ontola : LinkedRails.app_vocab)
+            (linked_rails_module? ? Vocab.ontola : Vocab.app)
         end
 
         def iri_value
@@ -107,7 +105,7 @@ module LinkedRails
         end
 
         def iri_template
-          @iri_template ||= URITemplate.new("/#{route_key}{/id}{#fragment}")
+          @iri_template ||= LinkedRails::URITemplate.new("/#{route_key}{/id}{#fragment}")
         end
 
         def linked_rails_module?

data/lib/linked_rails/model/iri_mapping.rb

@@ -10,11 +10,24 @@ module LinkedRails
           LinkedRails.iri_mapper.parent_from_params(params, user_context)
         end
 
+        def parent_from_params!(params, user_context)
+          parent_from_params(params, user_context) || raise(ActiveRecord::RecordNotFound)
+        end
+
+        def requested_action(opts, user_context)
+          action_key = opts[:params][:action_key]
+          resource = LinkedRails.iri_mapper.resource_from_iri(
+            iri_without_action(opts[:iri]),
+            user_context
+          )
+          resource&.action(action_key, user_context)
+        end
+
         def requested_index_resource(params, user_context)
           if params.key?(:parent_iri)
             collection_from_parent(index_collection_params(params, user_context))
           else
-            root_collection(index_collection_params(params, user_context))
+            root_collection(**index_collection_params(params, user_context))
           end
         end
 
@@ -25,10 +38,10 @@ module LinkedRails
         def requested_resource(opts, user_context)
           if collection_action?(opts)
             requested_index_resource(opts[:params], user_context)
+          elsif action_item_action?(opts)
+            requested_action(opts, user_context)
           elsif singular_action?(opts)
-            resource = requested_singular_resource(opts[:params], user_context)
-            resource&.singular_resource = true
-            resource
+            singular_resource(requested_singular_resource(opts[:params], user_context))
           else
             requested_single_resource(opts[:params], user_context)
           end
@@ -46,10 +59,20 @@ module LinkedRails
           requested_single_resource(params, user_context) || raise(ActiveRecord::RecordNotFound)
         end
 
+        def singular_resource(resource)
+          resource&.singular_resource = true
+          resource
+        end
+
         private
 
+        def action_item_action?(opts)
+          opts[:params][:action_key].present?
+        end
+
         def collection_action?(opts)
-          %w[index create].include?(opts[:action]) && !opts[:params][:singular_route]
+          opts[:action] == 'index' ||
+            opts[:class].action_list.defined_actions[:collection].key?(opts[:action].to_sym)
         end
 
         def index_collection_params(params, user_context)
@@ -57,7 +80,13 @@ module LinkedRails
 
           {
             user_context: user_context
-          }.merge(params_hash).with_indifferent_access
+          }.merge(params_hash).symbolize_keys
+        end
+
+        def iri_without_action(url)
+          iri = RDF::URI(url)
+          iri.path = iri.path.split('/')[0...-1].join('/')
+          iri.to_s
         end
 
         def singular_action?(opts)

data/lib/linked_rails/model/menuable.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module LinkedRails
+  module Model
+    module Menuable
+      extend ActiveSupport::Concern
+
+      def menus(user_context = nil)
+        menu_list(user_context).menus
+      end
+
+      def menu(tag, user_context = nil)
+        menu_list(user_context).menu(tag)
+      end
+
+      def menu_list(user_context = nil)
+        @menu_list = {}
+        @menu_list[user_context] ||= self.class.menu_class.new(resource: self, user_context: user_context)
+      end
+
+      module ClassMethods
+        def menu_class
+          @menu_class ||= "#{name}MenuList".safe_constantize || "#{superclass.name}MenuList".safe_constantize
+        end
+
+        def preview_includes
+          return super if menu_class.blank?
+
+          super + menu_class.defined_menus.keys.map { |tag| "#{tag}_menu" }
+        end
+      end
+    end
+  end
+end

data/lib/linked_rails/model/serialization.rb

@@ -16,15 +16,6 @@ module LinkedRails
       end
 
       module ClassMethods
-        def attributes_from_filters(filters)
-          filters.each_with_object({}) do |(key, value), hash|
-            next unless value.count == 1
-
-            attribute = predicate_mapping[key]&.key
-            hash[attribute] = value.first if attribute
-          end
-        end
-
         def include_in_collection?
           false
         end

data/lib/linked_rails/model/singularable.rb

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+module LinkedRails
+  module Model
+    module Singularable
+      extend ActiveSupport::Concern
+
+      included do
+        attr_accessor :singular_resource
+      end
+
+      def root_relative_singular_iri(**opts)
+        RDF::URI(singular_iri_template.expand(singular_iri_opts.merge(opts)))
+      end
+
+      def root_relative_iri(**opts)
+        return super unless anonymous_iri?
+
+        root_relative_singular_iri(**opts)
+      end
+
+      def singular_iri(**opts)
+        return iri_with_root(root_relative_singular_iri(**opts)) if opts.present?
+
+        @singular_iri ||= iri_with_root(root_relative_singular_iri)
+      end
+
+      def singular_iri_opts
+        {}
+      end
+
+      def singular_iri_template
+        self.class.singular_iri_template
+      end
+
+      def singular_resource?
+        singular_resource || false
+      end
+
+      class_methods do
+        def requested_singular_resource(_params, _user_context)
+          raise(NotImplementedError)
+        end
+
+        def singular_iri_template
+          @singular_iri_template ||= LinkedRails::URITemplate.new("{/parent_iri*}/#{singular_route_key}{#fragment}")
+        end
+
+        def singular_route_key
+          name.underscore
+        end
+      end
+    end
+  end
+end

data/lib/linked_rails/model/sorting.rb

@@ -5,11 +5,6 @@ module LinkedRails
     module Sorting
       extend ActiveSupport::Concern
 
-      included do
-        class_attribute :default_sortings, instance_accessor: false, instance_predicate: false
-        self.default_sortings = [{key: Vocab.schema.dateCreated, direction: :desc}]
-      end
-
       module ClassMethods
         def default_sort_column
           :created_at

data/lib/linked_rails/model/tables.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module LinkedRails
+  module Model
+    module Tables
+      extend ActiveSupport::Concern
+
+      included do
+        class_attribute :defined_columns
+      end
+
+      module ClassMethods
+        def with_columns(opts)
+          initialize_columns
+          defined_columns.merge!(opts)
+        end
+
+        def initialize_columns
+          return if defined_columns && method(:defined_columns).owner == singleton_class
+
+          self.defined_columns = superclass.try(:defined_columns)&.dup || {}
+        end
+      end
+    end
+  end
+end

data/lib/linked_rails/model.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require_relative 'model/actionable'
 require_relative 'model/collections'
 require_relative 'model/dirty'
 require_relative 'model/enhancements'
@@ -7,12 +8,16 @@ require_relative 'model/filtering'
 require_relative 'model/indexable'
 require_relative 'model/iri'
 require_relative 'model/iri_mapping'
+require_relative 'model/menuable'
 require_relative 'model/serialization'
+require_relative 'model/singularable'
 require_relative 'model/sorting'
+require_relative 'model/tables'
 
 module LinkedRails
   module Model
     extend ActiveSupport::Concern
+    include Actionable
     include Collections
     include Dirty
     include Enhancements
@@ -20,20 +25,23 @@ module LinkedRails
     include Indexable
     include Iri
     include IriMapping
+    include Menuable
     include Serialization
+    include Singularable
     include Sorting
+    include Tables
 
     def build_child(klass, user_context: nil)
       klass.build_new(parent: self, user_context: user_context)
     end
 
-    def singular_resource?
-      false
-    end
-
     module ClassMethods
       def build_new(parent: nil, user_context: nil)
-        new(attributes_for_new(parent: parent, user_context: user_context))
+        new(**attributes_for_new(parent: parent, user_context: user_context))
+      end
+
+      def controller_class
+        @controller_class ||= "#{to_s.pluralize}Controller".safe_constantize || superclass.try(:controller_class)
       end
 
       def form_class