linked_rails 0.0.4.pre.g792a1b887 → 0.0.4.pre.g92825d924

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '08ba6004f613d790e9e72373ab195c75e48cfbdc0b077ef2002a4407c1e6a4fb'
-  data.tar.gz: 40b65c9ae53172a0104b23f011f5852f105977b2f1061838cc3f70c0176b0992
+  metadata.gz: 2dfbd0d96709d5036bcfcb422c88bf39e1c8c006ae4a4e5d6c8dfabc7d45cbb7
+  data.tar.gz: b5629f658ccf27bcd7ca9605d001668f55df2d5b311ce170a20c68a7cc895057
 SHA512:
-  metadata.gz: c2cabf624d87d9cce473d3c7ccceb278c7b00caf46532e2a71a2ab814d0d0a9b69bbeceff6a23bb9d2532f8aba654133bb2f94f420bfe8be1e201ee19bf3dcae
-  data.tar.gz: 8d6863da3650c6261802d1045e908a4d58adda4bce0f6d5db2833677aea6a69052e2025d461ee92d6d64361c34c18dfa13dd70efcbbff03b51e965b3d60be8a4
+  metadata.gz: bd523b32c77f3836257b1821b0a70fe4fcd9e6ab75bf39366501e75104aed3fe92ab9a690468051aacdace53ae5b79182642d3a55147da0d409f107fa47e1e7f
+  data.tar.gz: 220bac95f7fc0f3ca454e4dc7e6ca9953afc60e0e8230c497c22a8751cdc78a1c654760fa57908f2b4c716b382e308a371f104b8b48db027d081f4e1db3e8f3b

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)
@@ -163,17 +161,13 @@ module LinkedRails
 
       resource_response(
         iri,
-        body: response_from_resource_body(include, iri, resource, status),
+        body: include && status == 200 ? resource_body(resource) : nil,
         cache: resource_cache_control(resource.try(:cacheable?), status, resource_policy),
         language: I18n.locale,
         status: status
       )
     end
 
-    def response_from_resource_body(include, _iri, resource, status)
-      include && status == 200 ? resource_body(resource) : nil
-    end
-
     def term_from_vocab(iri)
       vocab = Vocab.for(iri)
       tag = iri.to_s.split(vocab.to_s).last
@@ -251,7 +245,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.chomp('/').present? ? iri.to_s.split("#{LinkedRails.iri.path}/").last : iri)
+      uri = URI(LinkedRails.iri.path.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

@@ -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
@@ -195,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.chomp('/')}/#{target_path}" if target_path.present?
+        base.path = "#{base.path}/#{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/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

@@ -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/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/manifest.rb

@@ -9,7 +9,9 @@ module LinkedRails
       Storage.hset(
         :persistent,
         :manifest,
-        URL.as_href(LinkedRails.iri) => web_manifest.to_json
+        {
+          LinkedRails.iri.to_s => web_manifest.to_json
+        }
       )
     end
 
@@ -41,7 +43,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 +140,7 @@ module LinkedRails
 
     def web_manifest_sw_section
       {
-        src: "#{scope.chomp('/')}/sw.js",
+        src: "#{scope}/sw.js",
         scope: scope
       }
     end
@@ -161,19 +163,13 @@ module LinkedRails
 
     class << self
       def destroy(iri)
-        Storage.hdel(:persistent, :manifest, URL.as_href(iri))
+        Storage.hdel(:persistent, :manifest, iri)
       end
 
       def move(from, to)
-        Storage.hset(
-          :persistent,
-          :redirect_prefix,
-          URL.as_href(from) => URL.as_href(to)
-        )
+        data = Storage.hget(:persistent, :manifest, from)
 
-        data = Storage.hget(:persistent, :manifest, URL.as_href(from))
-
-        Storage.hset(:persistent, :manifest, URL.as_href(to), data) if data
+        Storage.hset(:persistent, :manifest, to, data) if data
 
         destroy(from)
       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/workers/linked_rails/invalidation_stream_worker.rb

@@ -8,7 +8,7 @@ module LinkedRails
         resource: iri,
         resourceType: resource_type
       }
-      id = Storage.xadd(:stream, LinkedRails.cache_stream, entry)
+      id = Storage.xadd(:stream, entry)
 
       raise('No message id returned, implies failure') if id.blank?
     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/cacheable.rb

@@ -17,6 +17,8 @@ module LinkedRails
         true
       end
 
+      private
+
       def publish_create
         publish_message('io.ontola.transactions.Created')
       end
@@ -29,14 +31,14 @@ module LinkedRails
         publish_message('io.ontola.transactions.Deleted')
       end
 
-      private
-
       def publish_message(type)
         LinkedRails::InvalidationStreamWorker.perform_now(type, iri.to_s, self.class.iri.to_s)
       rescue StandardError
         LinkedRails::InvalidationStreamWorker.perform_later(type, iri.to_s, self.class.iri.to_s)
       end
 
+      private
+
       def should_publish_changes
         cacheable? && !Rails.env.test?
       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/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]
@@ -67,7 +62,6 @@ 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,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)

data/lib/linked_rails/storage.rb

@@ -4,27 +4,26 @@ require 'redis'
 
 module LinkedRails
   class Storage
-    REDIS_DB = {
-      cache: LinkedRails.cache_redis_database,
-      persistent: LinkedRails.persistent_redis_database,
-      stream: LinkedRails.stream_redis_database
+    CLIENT = {
+      cache: Redis.new(db: LinkedRails.cache_redis_database),
+      persistent: Redis.new(db: LinkedRails.persistent_redis_database),
+      stream: Redis.new(db: LinkedRails.stream_redis_database)
     }.freeze
     KEYS = {
       manifest: 'cache:Manifest',
-      redirect_exact: 'cache:Redirect:Exact',
-      redirect_prefix: 'cache:Redirect:Prefix'
+      redirect: 'cache:Redirect'
     }.freeze
 
     class << self
       %i[xadd].each do |method|
         define_method(method) do |db, *args|
-          Redis.new(db: REDIS_DB.fetch(db)).send(method, *args)
+          CLIENT.fetch(db).send(method, *args)
         end
       end
 
       %i[hset hdel hget].each do |method|
         define_method(method) do |db, key, *args|
-          Redis.new(db: REDIS_DB.fetch(db)).send(method, KEYS.fetch(key), *args)
+          CLIENT.fetch(db).send(method, KEYS.fetch(key), *args)
         end
       end
     end

data/lib/linked_rails.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: linked_rails
 version: !ruby/object:Gem::Version
-  version: 0.0.4.pre.g792a1b887
+  version: 0.0.4.pre.g92825d924
 platform: ruby
 authors:
 - Arthur Dingemans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-09 00:00:00.000000000 Z
+date: 2022-08-09 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
@@ -428,7 +429,6 @@ files:
 - lib/linked_rails/translate.rb
 - lib/linked_rails/types/iri_type.rb
 - lib/linked_rails/uri_template.rb
-- lib/linked_rails/url.rb
 - lib/linked_rails/version.rb
 - lib/linked_rails/vocab.rb
 - lib/nill_class_renderer.rb

data/lib/linked_rails/url.rb

@@ -1,11 +0,0 @@
-module LinkedRails
-  class URL
-    class << self
-      def as_href(url)
-        uri = URI(url)
-        uri.path = uri.path.presence || '/'
-        uri.to_s
-      end
-    end
-  end
-end