linked_rails 0.0.4.pre.g7123943aa → 0.0.4.pre.gb254a2893

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 24aa1f95dca21df7152b6be6499f57d84a5fe37ac3944a0275b55d382a02f662
-  data.tar.gz: 1cfe8deb84e11ec8ec5fa0f2b088a60fe3078f8abe07c2c12fb0fd0e210bed9c
+  metadata.gz: 3a9f365ba2a3373bce2eaeaa94f02a9c00f7210c5daa4d1793be61bb235c15a6
+  data.tar.gz: a95518605eccf13bf50eb4eaa86ff37b8d397c0c6d074f064b1835054cac9298
 SHA512:
-  metadata.gz: 668e32f354c65baeafd91e3e4f5521bcef0c9b9194389afca075e0eb0b078e248e6ec3206df63799e0dbce29f7425e9b6c654e2847bfdba5f6a052476175868f
-  data.tar.gz: 75835d167f14a03c94f24bf56fe8c13021ae2250b152637847cf0df295ddda9de827c0ae9a586ec6b1ac7fc8c2e7a62655e1bf00c1907a067a906a2e835b3f00
+  metadata.gz: '0629170f7ef4b431900c358f7aa5e3ce78c2345ada4a472f3385884973051cc81aa73fe3211b19e4c9d1be03fc2e42555426fa0d31d5b9e9d53c748a98527615'
+  data.tar.gz: 29cc55d690cd807975a4b04e2e1b6e8b2f6de81a957382a1bcc49feca9b42f17a25655c7a9552c52584257a4dc1412587838a8fe272866c7cd10b902fe8e0de2

data/app/controllers/linked_rails/bulk_controller.rb

@@ -98,6 +98,8 @@ 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)
@@ -249,7 +251,7 @@ module LinkedRails
 
     def sanitized_relative_path(iri) # rubocop:disable Metrics/AbcSize
       iri.path = "#{iri.path}/" unless iri.path&.ends_with?('/')
-      uri = URI(LinkedRails.iri.path.present? ? iri.to_s.split("#{LinkedRails.iri.path}/").last : iri)
+      uri = URI(LinkedRails.iri.path.chomp('/').present? ? iri.to_s.split("#{LinkedRails.iri.path}/").last : iri)
 
       [uri.path, uri.query].compact.join('?')
     end

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

@@ -187,7 +187,7 @@ module LinkedRails
 
       def target_url_fallback # rubocop:disable Metrics/AbcSize
         base = (resource.try(:singular_resource?) ? resource.singular_iri : resource.iri).dup
-        base.path = "#{base.path}/#{target_path}" if target_path.present?
+        base.path = "#{base.path.chomp('/')}/#{target_path}" if target_path.present?
         base.query = Rack::Utils.parse_nested_query(base.query).merge(target_query).to_param if target_query.present?
         base
       end

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

@@ -8,8 +8,9 @@ module LinkedRails
       include LinkedRails::Model
 
       attr_accessor :collection, :filter
-      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 :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 :count, to: :members
 
       alias id iri
@@ -42,7 +43,7 @@ module LinkedRails
       end
 
       def preview_includes
-        include_members ? {member_sequence: :members} : %i[member_sequence]
+        include_members ? {members: {}, member_sequence: :members} : %i[member_sequence]
       end
 
       def title

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

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

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

@@ -52,13 +52,7 @@ module LinkedRails
       private
 
       def attr_column(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)
+        model_class.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
@@ -138,7 +138,7 @@ module LinkedRails
 
     def web_manifest_sw_section
       {
-        src: "#{scope}/sw.js",
+        src: "#{scope.chomp('/')}/sw.js",
         scope: scope
       }
     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.menu_sequence
+          parent.try(:menu_sequence)
         end
       end
     end

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

@@ -49,9 +49,8 @@ module LinkedRails
       end
 
       def menu_item(tag, options) # rubocop:disable Metrics/AbcSize
-        if options[:policy].present?
-          return unless resource_policy(options[:policy_resource]).send(options[:policy], *options[:policy_arguments])
-        end
+        return unless show_menu_item?(tag, options)
+
         options[:label_params] ||= {}
         options[:label_params][:default] ||= ["menus.default.#{tag}".to_sym, tag.to_s.capitalize]
         options[:label] ||= default_label(tag, options)
@@ -60,6 +59,10 @@ 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)
@@ -69,6 +72,14 @@ 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,6 +8,7 @@ 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/collection/view_serializer.rb

@@ -17,6 +17,7 @@ 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/resource_helper.rb

@@ -58,7 +58,10 @@ module LinkedRails
       end
 
       def new_resource_from_parent
-        return requested_resource.child_resource if requested_resource.is_a?(Collection)
+        if requested_resource.is_a?(LinkedRails.collection_class) ||
+          requested_resource.is_a?(LinkedRails.collection_view_class)
+          return requested_resource.child_resource
+        end
 
         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
+      rescue ActionController::RoutingError, SystemStackError
         EMPTY_IRI_OPTS.dup
       end
 

data/lib/linked_rails/model/iri.rb

@@ -62,6 +62,7 @@ module LinkedRails
         iri = root_relative_iri.dup
         iri.scheme = LinkedRails.scheme
         iri.host = LinkedRails.host
+        iri.path = iri.path.presence || '/'
         iri
       end
 

data/lib/linked_rails/params_parser.rb

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

data/lib/linked_rails.rb

@@ -54,8 +54,10 @@ module LinkedRails
       @@scheme ||= Rails.application.routes.default_url_options[:protocol] || :http # rubocop:disable Style/ClassVars
     end
 
-    def iri(**opts)
-      RDF::URI.new(**{scheme: LinkedRails.scheme, host: LinkedRails.host}.merge(opts))
+    def iri(**args)
+      opts = {scheme: LinkedRails.scheme, host: LinkedRails.host}.merge(args)
+      opts[:path] = opts[:path].presence || '/'
+      RDF::URI.new(**opts)
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: linked_rails
 version: !ruby/object:Gem::Version
-  version: 0.0.4.pre.g7123943aa
+  version: 0.0.4.pre.gb254a2893
 platform: ruby
 authors:
 - Arthur Dingemans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-12 00:00:00.000000000 Z
+date: 2022-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_response