linked_rails 0.0.4.pre.g0ec6e30ca → 0.0.4.pre.g1faca9643

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88044c825471b62dcbe680fb40416cb75281b0fa5fbbf0fe832a0b60f2852bd0
-  data.tar.gz: ebca9688e460abdbdc2013625f594f7150c324706eea025993df1f9a030eccd6
+  metadata.gz: 7bcaf6bc87f6e88d1626c597fea7cf0361c4f1a9ee572715996fdc8d03984775
+  data.tar.gz: 23b91ff76861c82af758a145a57da5ceb1f454d846fe2a96a3b091dd70a2f725
 SHA512:
-  metadata.gz: a240412484f42640dfd1f2db7a4d7c06070b1a11e6448de752ff5c336e098e99e519bc9aef5d0ec6260a2ef6471a90820e2867ba59d7e328a89b1d79a7b86cd0
-  data.tar.gz: b20d27eb7ccd6e1843e4c2cfe6d6150bfbe8cabba53cf5d1f7081b432122f4917fcc1802d3624442d2e6d8377993b79647fc237e076dc0bebac712b130bc2d64
+  metadata.gz: 7a0c7d898e9c886863e8ef882fc2b95a24fb6ce59fb5a9a608556d7e374741a529bc8a672f1d69367b8845c6c77ef477c7a2093591b9e9af4fe487b5c30a5511
+  data.tar.gz: fe4952657dd9897c0fd430ff679f75d1d71423ec27f9f610ab2e43fb4e77fe9885873d1756989f80dd67e0d7953cfe0e3d926bd2711a87e8b7b591258456cc4e

data/app/controllers/linked_rails/bulk_controller.rb

@@ -98,8 +98,6 @@ module LinkedRails
       params = param.permit(:include, :iri)
       params[:iri] = URI(params[:iri])
       params
-    rescue URI::InvalidURIError
-      params.except(:iri)
     end
 
     def resource_response_body(iri, rack_body, status)

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

@@ -61,15 +61,13 @@ module LinkedRails
       end
 
       def object
-        object_from_var || resource
-      end
+        @object = list.instance_exec(&@object) if @object.respond_to?(:call)
 
-      def object_iri
-        iri_with_root(object_root_relative_iri)
+        @object || resource
       end
 
-      def object_root_relative_iri
-        object&.iri&.anonymous? ? anonymous_object_root_relative_iri : object&.root_relative_iri
+      def object_iri
+        object&.iri&.anonymous? ? anonymous_object_iri : object&.iri
       end
 
       def parent
@@ -140,8 +138,8 @@ module LinkedRails
 
       private
 
-      def anonymous_object_root_relative_iri
-        object_iri = root_relative_iri.dup
+      def anonymous_object_iri
+        object_iri = iri.dup
         object_iri.path += '/action_object'
         object_iri
       end
@@ -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,9 +30,7 @@ module LinkedRails
 
           parent = parent_from_params!(params, user_context)
 
-          object = parent&.object
-          object.instance_variable_set(:@iri, parent.object_iri)
-          object
+          new(action: parent) if parent.object.anonymous_iri?
         end
       end
     end

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

@@ -8,9 +8,8 @@ module LinkedRails
       include LinkedRails::Model
 
       attr_accessor :collection, :filter
-      delegate :apply_scope, :association_base, :association_class, :child_resource, :default_page_size, :display,
-               :include_members,:parent, :policy, :total_page_count, :unfiltered_collection, :user_context,
-               to: :collection
+      delegate :apply_scope, :association_base, :association_class, :default_page_size, :display, :include_members,
+               :parent, :policy, :total_page_count, :unfiltered_collection, :user_context, to: :collection
       delegate :count, to: :members
 
       alias id iri
@@ -43,7 +42,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 +75,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/manifest.rb

@@ -41,7 +41,7 @@ module LinkedRails
     def blob_preview_iri
       return unless ActiveStorage::Blob.service.present?
 
-      "#{LinkedRails.iri(path: 'rails/active_storage/blobs/redirect')}/{signed_id}/preview"
+      "#{LinkedRails.iri(path: 'rails/active_storage/blobs/redirect')}/{signed_id}/preview')"
     end
 
     def blob_upload_iri

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/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/helpers/resource_helper.rb

@@ -58,10 +58,7 @@ module LinkedRails
       end
 
       def new_resource_from_parent
-        if requested_resource.is_a?(LinkedRails.collection_class) ||
-          requested_resource.is_a?(LinkedRails.collection_view_class)
-          return requested_resource.child_resource
-        end
+        return requested_resource.child_resource if requested_resource.is_a?(Collection)
 
         parent_resource.build_child(
           controller_class,

data/lib/linked_rails/iri_mapper.rb

@@ -38,7 +38,7 @@ module LinkedRails
         params = Rails.application.routes.recognize_path(iri.to_s, method: method)
 
         route_params_to_opts(params.merge(query), iri.to_s)
-      rescue ActionController::RoutingError, SystemStackError
+      rescue ActionController::RoutingError
         EMPTY_IRI_OPTS.dup
       end
 

data/lib/linked_rails/model/collections.rb

@@ -70,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/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.g0ec6e30ca
+  version: 0.0.4.pre.g1faca9643
 platform: ruby
 authors:
 - Arthur Dingemans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-08 00:00:00.000000000 Z
+date: 2022-08-15 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