linked_rails 0.0.4.pre.g3aeec2263 → 0.0.4.pre.g3e8f5731a

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ce41ff4f34f22c35a736959cad35b9a42f3f03938449f918bf492907cdc6337
-  data.tar.gz: 86ab4fec516df9fc474a637e6ada4b6466abdbc03b565bbc46d0942026a89cac
+  metadata.gz: 76bfec9b29631dc8cd719c82274bddb1d60ef3c5e1f8bf7cecdf5083399a0b60
+  data.tar.gz: 02a6fc22c0f6e5d208ad069d8e6d0aad21ad7b3f7c1a037d3b96173178a03861
 SHA512:
-  metadata.gz: f4ab1bb7933a05fc0377f588ff8fa6340470341f0a45c977008a0fa2b3c226db5da304449b4da5a8fe20da66bc544e3928ce8aaa02d228b0ff9b6f50ed25075c
-  data.tar.gz: 0b9c3322d6fb05f2f18e8e777661b276cf9c68c4c540a5b7a66837412888c0876e19d923744d93bc10830d565af5ac0ca458da63ab5aa344ca0f645a221c8949
+  metadata.gz: d542dd3f7417f97d421359f29cfdee8a7e85e8f2f2214181ff704b2fa1bf019fb89d45d4f451c7a6291dd218b4ae78b74274c76e31bcb84c6ccfa830d304a59b
+  data.tar.gz: 25a745a273273cd82e449e899cb29c930bc2fbc1f7a4f65e4ef6f3ec9e1b3afe7f8cb0ce86f2b524fe3627dd5f36bdfaca484818e81a319703560f537955d6fb

data/app/controllers/linked_rails/bulk_controller.rb

@@ -144,14 +144,9 @@ module LinkedRails
     end
 
     def resource_status(resource_policy)
-      return 200 if resource_policy.show?
+      raise(LinkedRails::Errors::Forbidden.new(query: :show?)) unless resource_policy.show?
 
-      raise(
-        LinkedRails::Errors::Forbidden.new(
-          action_status: resource_policy.try(:action_status),
-          query: :show?
-        )
-      )
+      200
     end
 
     def response_for_wrong_host(opts)

data/app/models/linked_rails/actions/item.rb

@@ -61,17 +61,15 @@ module LinkedRails
       end
 
       def object
-        object_from_var || resource
+        @object = list.instance_exec(&@object) if @object.respond_to?(:call)
+
+        @object || resource
       end
 
       def object_iri
         object&.iri&.anonymous? ? anonymous_object_iri : object&.iri
       end
 
-      def object_root_relative_iri
-        RDF::URI(object_iri.to_s.split(LinkedRails.iri.to_s).second)
-      end
-
       def parent
         return @parent if instance_variable_defined?(:@parent)
 
@@ -154,12 +152,6 @@ module LinkedRails
         LinkedRails.translate(:action, :label, self)
       end
 
-      def object_from_var
-        return @object unless @object.respond_to?(:call)
-
-        @object = list.instance_exec(&@object)
-      end
-
       def policy_expired?
         @policy_expired ||= policy && resource_policy.try(:expired?)
       end

data/app/models/linked_rails/actions/object.rb

@@ -12,8 +12,8 @@ module LinkedRails
       alias parent action
       delegate :object, to: :action
 
-      def root_relative_iri
-        action.object_root_relative_iri
+      def iri
+        action.object_iri
       end
 
       class << self
@@ -30,10 +30,7 @@ module LinkedRails
 
           parent = parent_from_params!(params, user_context)
 
-          object = parent&.object
-          object.instance_variable_set(:@iri, parent.object_iri)
-          object.instance_variable_set(:@root_relative_iri, parent.object_root_relative_iri)
-          object
+          new(action: parent) if parent.object.anonymous_iri?
         end
       end
     end

data/app/models/linked_rails/collection/view.rb

@@ -43,7 +43,7 @@ module LinkedRails
       end
 
       def preview_includes
-        include_members ? {members: {}, member_sequence: :members} : %i[member_sequence]
+        include_members ? {member_sequence: :members} : %i[member_sequence]
       end
 
       def title
@@ -76,19 +76,19 @@ module LinkedRails
       end
 
       def iris_from_scope?
-        members_query.is_a?(ActiveRecord::Relation) && !polymorphic_collection?(members_query.klass)
+        members_query.is_a?(ActiveRecord::Relation) && !polymorphic_collection?
       end
 
       def members_array
         members_query.to_a
       end
 
-      def polymorphic_collection?(klass)
-        column = klass.inheritance_column
-        polymorphic = klass.columns_hash.include?(column)
+      def polymorphic_collection?
+        column = association_class.inheritance_column
+        polymorphic = association_class.columns_hash.include?(column)
         return false unless polymorphic
 
-        return true if klass.descends_from_active_record?
+        return true if association_class.descends_from_active_record?
 
         members_query.where_values_hash.include?(column) &&
           members_query.where_values_hash[column] != association_class.to_s

data/app/models/linked_rails/form/field/file_input.rb

@@ -4,11 +4,7 @@ module LinkedRails
   class Form
     class Field
       class FileInput < Field
-        attr_writer :max_size
-
-        def max_size
-          @max_size.respond_to?(:call) ? @max_size.call : @max_size
-        end
+        attr_accessor :max_size
       end
     end
   end

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

@@ -52,7 +52,13 @@ module LinkedRails
       private
 
       def attr_column(name)
-        model_class.column_for_attribute(name)
+        column_model =
+          if model_class.is_delegated_attribute?(name)
+            model_class.class_for_delegated_attribute(name)
+          else
+            model_class
+          end
+        column_model.column_for_attribute(name)
       end
 
       def attr_to_datatype # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength

data/app/models/linked_rails/form.rb

@@ -120,7 +120,7 @@ module LinkedRails
 
       def has_many(key, **opts)
         opts[:input_field] = Form::Field::AssociationInput
-        opts[:max_count] ||= 99
+        opts[:max_count] = 99
         field(key, **opts)
       end
 

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

@@ -81,7 +81,7 @@ module LinkedRails
           parent = parent_from_params(params, user_context)
           return if parent.blank?
 
-          parent.try(:menu_sequence)
+          parent.menu_sequence
         end
       end
     end

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

@@ -49,8 +49,9 @@ module LinkedRails
       end
 
       def menu_item(tag, options) # rubocop:disable Metrics/AbcSize
-        return unless show_menu_item?(tag, options)
-
+        if options[:policy].present?
+          return unless resource_policy(options[:policy_resource]).send(options[:policy], *options[:policy_arguments])
+        end
         options[:label_params] ||= {}
         options[:label_params][:default] ||= ["menus.default.#{tag}".to_sym, tag.to_s.capitalize]
         options[:label] ||= default_label(tag, options)
@@ -59,10 +60,6 @@ module LinkedRails
         LinkedRails.menus_item_class.new(resource: resource, tag: tag, parent: self, **options)
       end
 
-      def policy_verdict(policy, options)
-        policy.send(options[:policy], *options[:policy_arguments])
-      end
-
       def resource_policy(policy_resource)
         policy_resource ||= resource
         policy_resource = instance_exec(&policy_resource) if policy_resource.respond_to?(:call)
@@ -72,14 +69,6 @@ module LinkedRails
         @resource_policy[policy_resource] ||= Pundit.policy(user_context, policy_resource)
       end
 
-      def show_menu_item?(_tag, options)
-        return true if options[:policy].blank?
-
-        policy = resource_policy(options[:policy_resource])
-
-        policy_verdict(policy, options)
-      end
-
       def iri_template
         base_template = resource.send(resource.try(:singular_resource?) ? :singular_iri_template : :iri_template)
 

data/app/policies/linked_rails/collection_policy.rb

@@ -8,7 +8,6 @@ module LinkedRails
       policy = Pundit.policy!(user_context, child_resource)
       verdict = policy.create?
       @message = policy.message
-      @action_status = policy.action_status
       verdict
     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/view_serializer.rb

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

@@ -13,7 +13,6 @@ module LinkedRails
     end
     attribute :serialized_iri_template, predicate: Vocab.ontola[:iriTemplate]
     attribute :iri_template_opts, predicate: Vocab.ontola[:iriTemplateOpts]
-    attribute :download_urls, predicate: Vocab.schema.downloadUrl
     attribute :default_type, predicate: Vocab.ontola[:defaultType], &:type
     attribute :display, predicate: Vocab.ontola[:collectionDisplay] do |object|
       Vocab.ontola["collectionDisplay/#{object.display || :default}"]

data/lib/linked_rails/errors/forbidden.rb

@@ -3,7 +3,7 @@
 module LinkedRails
   module Errors
     class Forbidden < StandardError
-      attr_reader :query, :record, :policy, :action, :action_status
+      attr_reader :query, :record, :policy, :action
 
       # @param [Hash] options
       # @option options [String] query The action of the request
@@ -16,7 +16,6 @@ module LinkedRails
         @record = options[:record]
         @policy = options[:policy]
         @action = @query[-1] == '?' ? @query[0..-2] : @query
-        @action_status = options[:action_status]
         @message = options[:message]
 
         raise StandardError if @query.blank? && @message.blank?

data/lib/linked_rails/helpers/delta_helper.rb

@@ -8,9 +8,7 @@ module LinkedRails
       end
 
       def invalidate_collection_delta(collection)
-        iri = collection.is_a?(RDF::Resource) ? collection : collection.iri
-
-        [Vocab.sp[:Variable], Vocab.ontola[:baseCollection], iri, delta_iri(:invalidate)]
+        [Vocab.sp[:Variable], Vocab.ontola[:baseCollection], collection.iri, delta_iri(:invalidate)]
       end
 
       def invalidate_parent_collections_delta(resource)

data/lib/linked_rails/model/collections.rb

@@ -46,8 +46,6 @@ module LinkedRails
         default_filters: {},
         # collection_class [Array<Hash>] The default sortings applied to the collection.
         default_sortings: [{key: Vocab.schema.dateCreated, direction: :desc}],
-        # download_urls [Array<URI>] URLs for downloading the content of this collection
-        download_urls: [],
         # include_members [Boolean] Whether to include the members of this collection.
         include_members: false,
         # iri_template_keys [Array<Sym>] Custom query keys for the iri template
@@ -72,9 +70,7 @@ module LinkedRails
 
       module ClassMethods
         def collection_iri(**opts)
-          fragment = opts.delete(:fragment)
-
-          LinkedRails.iri(path: collection_root_relative_iri(**opts), fragment: fragment)
+          LinkedRails.iri(path: collection_root_relative_iri(**opts))
         end
 
         # Sets the defaults for all collections for this class.

data/lib/linked_rails/model/iri.rb

@@ -10,7 +10,7 @@ module LinkedRails
       end
 
       def anonymous_iri?
-        self.class < ActiveRecord::Base && new_record? && @iri.blank?
+        self.class < ActiveRecord::Base && new_record?
       end
 
       # @return [RDF::URI].
@@ -44,12 +44,7 @@ module LinkedRails
 
       # @return [RDF::URI]
       def root_relative_iri(**opts)
-        return @root_relative_iri if opts.blank? && @root_relative_iri.present?
-
-        root_relative_iri = RDF::URI(expand_iri_template(**iri_opts.merge(opts)))
-        @root_relative_iri = root_relative_iri if opts.blank?
-
-        root_relative_iri
+        RDF::URI(expand_iri_template(**iri_opts.merge(opts)))
       end
 
       # @return [String, Symbol]

data/lib/linked_rails/model/menuable.rb

@@ -6,16 +6,16 @@ module LinkedRails
       extend ActiveSupport::Concern
 
       def menus(user_context = nil)
-        menu_list(user_context)&.menus
+        menu_list(user_context).menus
       end
 
       def menu(tag, user_context = nil)
-        menu_list(user_context)&.menu(tag)
+        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)
+        @menu_list[user_context] ||= self.class.menu_class.new(resource: self, user_context: user_context)
       end
 
       module ClassMethods

data/lib/linked_rails/params_parser.rb

@@ -118,13 +118,9 @@ module LinkedRails
     end
 
     def parse_attribute(klass, field_options, value)
-      [field_options.key, parse_attribute_value(klass, field_options, value)]
-    end
-
-    def parse_attribute_value(klass, field_options, value)
-      return nil if value == Vocab.libro[:null]
+      parsed_value = parse_enum_attribute(klass, field_options.key, value) || value
 
-      (parse_enum_attribute(klass, field_options.key, value) || value).to_s
+      [field_options.key, parsed_value.to_s]
     end
 
     def parse_enum_attribute(klass, key, value)
@@ -137,15 +133,9 @@ module LinkedRails
 
     def parse_iri_param(iri, reflection)
       key = foreign_key_for_reflection(reflection)
-      return unless key
+      value = parse_iri_param_value(iri, reflection) if key
 
-      if iri == Vocab.libro[:null]
-        [key, nil]
-      else
-        value = parse_iri_param_value(iri, reflection)
-
-        [key, value.to_s] if value
-      end
+      [key, value.to_s] if value
     end
 
     def parse_iri_param_value(iri, reflection)

data/lib/linked_rails/serializer/actionable.rb

@@ -15,10 +15,10 @@ module LinkedRails
 
       module ClassMethods
         def action_triples(object, _params)
-          if named_object?(object) || object.try(:singular_resource?)
-            object.try(:action_triples) || []
-          else
+          if object.iri.anonymous? && !object.try(:singular_resource?)
             []
+          else
+            object.try(:action_triples) || []
           end
         end
       end

data/lib/linked_rails/serializer.rb

@@ -115,13 +115,7 @@ module LinkedRails
         collection_name = "#{name.to_s.singularize}_collection"
         opts[:association] ||= name
         opts[:polymorphic] ||= true
-
-        action_object = opts.delete(:action_object)
-        opts[:if] ||= -> (object) {
-          return action_object if object.iri.try(:path)&.end_with?('/action_object')
-
-          named_object?(object)
-        }
+        opts[:if] ||= method(:named_object?)
 
         collection_opts = {}
         collection_opts[:page_size] = opts.delete(:page_size) if opts.key?(:page_size)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: linked_rails
 version: !ruby/object:Gem::Version
-  version: 0.0.4.pre.g3aeec2263
+  version: 0.0.4.pre.g3e8f5731a
 platform: ruby
 authors:
 - Arthur Dingemans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-14 00:00:00.000000000 Z
+date: 2022-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_response
@@ -305,6 +305,7 @@ files:
 - app/policies/linked_rails/ontology_policy.rb
 - app/policies/linked_rails/sequence_policy.rb
 - app/serializers/linked_rails/actions/item_serializer.rb
+- app/serializers/linked_rails/actions/object_serializer.rb
 - app/serializers/linked_rails/collection/filter_field_serializer.rb
 - app/serializers/linked_rails/collection/filter_option_serializer.rb
 - app/serializers/linked_rails/collection/filter_serializer.rb