linked_rails 0.0.4.pre.g1faca9643 → 0.0.4.pre.g2c6c26e86

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7bcaf6bc87f6e88d1626c597fea7cf0361c4f1a9ee572715996fdc8d03984775
-  data.tar.gz: 23b91ff76861c82af758a145a57da5ceb1f454d846fe2a96a3b091dd70a2f725
+  metadata.gz: 625693a3e58e4d005b413c33c0d9a7a46718a2780d8e04cf700338064388e38c
+  data.tar.gz: 3425709177e527cf2e7e66eb29d68c92862aad3fea333b36afeb93a3b51aeac8
 SHA512:
-  metadata.gz: 7a0c7d898e9c886863e8ef882fc2b95a24fb6ce59fb5a9a608556d7e374741a529bc8a672f1d69367b8845c6c77ef477c7a2093591b9e9af4fe487b5c30a5511
-  data.tar.gz: fe4952657dd9897c0fd430ff679f75d1d71423ec27f9f610ab2e43fb4e77fe9885873d1756989f80dd67e0d7953cfe0e3d926bd2711a87e8b7b591258456cc4e
+  metadata.gz: e006633be69326549671449c41daba02fea267aede7f8a5488fd31e8e72287bf745cb8a515391898caca13642957bfb7602f9bd143f3e49744fad4fe533f5b09
+  data.tar.gz: 3476439c758b232542a529a1502b7bc9f8469f7841ccb4c16404195742afce86cc5d71f5f59fa4f90cfc4326bde07533e79359d12f45bf8cf81bc6b51dcbcdfc

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)

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

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
 

metadata

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