linked_rails 0.0.4.pre.g2c6c26e86 → 0.0.4.pre.g2c53724b3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 625693a3e58e4d005b413c33c0d9a7a46718a2780d8e04cf700338064388e38c
-  data.tar.gz: 3425709177e527cf2e7e66eb29d68c92862aad3fea333b36afeb93a3b51aeac8
+  metadata.gz: bd12e0d41b6952dd04ab95017853a047956c45bd0e37f5e39f7b54f389e27d7c
+  data.tar.gz: 9bd13ba226e886b1853331f7390574da70e6753dd0f1526a5e71a3ff0addd6d6
 SHA512:
-  metadata.gz: e006633be69326549671449c41daba02fea267aede7f8a5488fd31e8e72287bf745cb8a515391898caca13642957bfb7602f9bd143f3e49744fad4fe533f5b09
-  data.tar.gz: 3476439c758b232542a529a1502b7bc9f8469f7841ccb4c16404195742afce86cc5d71f5f59fa4f90cfc4326bde07533e79359d12f45bf8cf81bc6b51dcbcdfc
+  metadata.gz: 774df3da980d69c98c27557bff628b1cfa00b25d64c522a65fc63b748c16dbefc88038743907425c51e9f2fe3e117eb178372c5b022ca1d03a1f4c4223c808ba
+  data.tar.gz: 37f483fd315b0c590efe77164f7fd5edfc7c5c5a85d91f9582d25a9259ca4872d64e03b1c5f38aa32bef5ce76c3a69463bba675f03d36b30211add53a9600cb3

data/app/controllers/linked_rails/bulk_controller.rb

@@ -21,11 +21,8 @@ module LinkedRails
       return response_for_wrong_host(opts) if wrong_host?(opts[:iri])
 
       include = opts[:include].to_s == 'true'
-      resource = LinkedRails.iri_mapper.resource_from_iri(request_path_to_url(opts[:iri]), user_context)
 
-      return response_from_request(include, RDF::URI(opts[:iri])) if resource.blank?
-
-      response_from_resource(include, opts[:iri], resource)
+      response_from_request(include, RDF::URI(opts[:iri]))
     rescue StandardError => e
       handle_resource_error(opts, e)
     end
@@ -87,19 +84,10 @@ module LinkedRails
       false
     end
 
-    def resource_cache_control(cacheable, status, resource_policy)
-      return :private unless status == 200 && cacheable
-      return 'no-cache' unless resource_policy.try(:public_resource?)
-
-      :public
-    end
-
     def resource_params(param)
       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)
@@ -143,12 +131,6 @@ module LinkedRails
       }.merge(opts)
     end
 
-    def resource_status(resource_policy)
-      raise(LinkedRails::Errors::Forbidden.new(query: :show?)) unless resource_policy.show?
-
-      200
-    end
-
     def response_for_wrong_host(opts)
       iri = opts[:iri]
       term = term_from_vocab(iri)
@@ -157,23 +139,6 @@ module LinkedRails
       ontology_term_response(iri, term, opts[:include])
     end
 
-    def response_from_resource(include, iri, resource)
-      resource_policy = policy(resource)
-      status = resource_status(resource_policy)
-
-      resource_response(
-        iri,
-        body: response_from_resource_body(include, iri, resource, status),
-        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 +216,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

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

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

@@ -5,7 +5,6 @@ require 'pundit'
 module LinkedRails
   class Form # rubocop:disable Metrics/ClassLength
     include LinkedRails::Model
-    include LinkedRails::Model::Cacheable
 
     class_attribute :abstract_form, :pages, :model_class
 

data/app/models/linked_rails/manifest.rb

@@ -5,11 +5,15 @@ module LinkedRails
     include ActiveModel::Model
     include LinkedRails::Model
 
+    MANIFEST_KEY = 'cache:Manifest'
+    CACHE_DB = ENV.fetch('PERSISTENT_REDIS_DATABASE', '6')
+
     def save
-      Storage.hset(
-        :persistent,
-        :manifest,
-        URL.as_href(LinkedRails.iri) => web_manifest.to_json
+      Redis.new(db: CACHE_DB).hset(
+        MANIFEST_KEY,
+        {
+          [LinkedRails.iri] => web_manifest.to_json
+        }
       )
     end
 
@@ -41,7 +45,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 +142,7 @@ module LinkedRails
 
     def web_manifest_sw_section
       {
-        src: "#{scope.chomp('/')}/sw.js",
+        src: "#{scope}/sw.js",
         scope: scope
       }
     end
@@ -158,25 +162,5 @@ module LinkedRails
     def tracking
       []
     end
-
-    class << self
-      def destroy(iri)
-        Storage.hdel(:persistent, :manifest, URL.as_href(iri))
-      end
-
-      def move(from, to)
-        Storage.hset(
-          :persistent,
-          :redirect_prefix,
-          URL.as_href(from) => URL.as_href(to)
-        )
-
-        data = Storage.hget(:persistent, :manifest, URL.as_href(from))
-
-        Storage.hset(:persistent, :manifest, URL.as_href(to), data) if data
-
-        destroy(from)
-      end
-    end
   end
 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

@@ -26,7 +26,7 @@ module LinkedRails
       end
 
       def menus
-        @menus ||= available_menus.map(&method(:memoized_menu_item))
+        @menus ||= available_menus.map(&method(:memoised_menu_item))
       end
 
       def menu(tag)
@@ -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/models/linked_rails/ontology.rb

@@ -4,7 +4,6 @@ module LinkedRails
   class Ontology
     include ActiveModel::Model
     include LinkedRails::Model
-    include LinkedRails::Model::Cacheable
 
     def classes
       @classes ||= LinkedRails.linked_models.map do |klass|

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/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/generators/linked_rails/install/templates/locales.yml

@@ -11,8 +11,6 @@ en:
       update:
         label: "Edit"
         success: 'Updated successfully'
-  errors:
-    access_denied: "You're not authorized for this action. (%{action})"
   linked_rails:
     status:
       400: "Error in request"

data/lib/linked_rails/controller/error_handling.rb

@@ -6,10 +6,6 @@ module LinkedRails
       extend ActiveSupport::Concern
       include ActiveSupport::Rescuable
 
-      included do
-        rescue_from LinkedRails::Errors::Forbidden, with: :handle_error
-      end
-
       private
 
       def add_error_snackbar(error)
@@ -73,7 +69,6 @@ module LinkedRails
             'Doorkeeper::Errors::InvalidGrantReuse' => 422,
             'LinkedRails::Auth::Errors::Expired' => 410,
             'LinkedRails::Auth::Errors::Unauthorized' => 401,
-            'LinkedRails::Errors::Forbidden' => 403,
             'Pundit::NotAuthorizedError' => 403
           }
         end

data/lib/linked_rails/helpers/resource_helper.rb

@@ -46,22 +46,12 @@ module LinkedRails
 
       private
 
-      def request_path_to_url(path)
-        return path unless path.present? && URI(path).relative?
-
-        port = [80, 443].include?(request.port) ? nil : request.port
-        URI::Generic.new(request.scheme, nil, request.host, port, nil, path, nil, nil, nil).to_s
-      end
-
       def build_new_resource
         controller_class.build_new(user_context: user_context)
       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/iri.rb

@@ -62,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/model.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require_relative 'model/actionable'
-require_relative 'model/cacheable'
 require_relative 'model/collections'
 require_relative 'model/dirty'
 require_relative 'model/enhancements'

data/lib/linked_rails/policy.rb

@@ -46,10 +46,6 @@ module LinkedRails
       self.class.policy_class
     end
 
-    def public_resource?
-      false
-    end
-
     def show?
       false
     end

data/lib/linked_rails.rb

@@ -22,10 +22,6 @@ module LinkedRails
 
   mattr_accessor :whitelisted_spi_ips
   mattr_writer :host, :scheme
-  mattr_accessor :persistent_redis_database, default: ENV['PERSISTENT_REDIS_DATABASE'].presence || 6
-  mattr_accessor :stream_redis_database, default: ENV['STREAM_REDIS_DATABASE'].presence || 7
-  mattr_accessor :cache_redis_database, default: ENV['CACHE_REDIS_DATABASE'].presence || 8
-  mattr_accessor :cache_stream, default: ENV['CACHE_STREAM'].presence || 'transactions'
 
   def self.configurable_class(parent, klass, default: nil, reader: nil) # rubocop:disable Metrics/AbcSize
     method = :"#{[parent, klass.to_s.downcase].compact.join('_')}_class"
@@ -54,10 +50,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
 
@@ -90,7 +84,6 @@ ActiveSupport::Inflector.inflections do |inflect|
   inflect.acronym 'SHACL'
 end
 
-require 'linked_rails/errors'
 require 'linked_rails/uri_template'
 require 'linked_rails/vocab'
 require 'linked_rails/cache'
@@ -108,5 +101,3 @@ 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.g2c6c26e86
+  version: 0.0.4.pre.g2c53724b3
 platform: ruby
 authors:
 - Arthur Dingemans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-26 00:00:00.000000000 Z
+date: 2022-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_response
@@ -299,10 +299,8 @@ files:
 - app/policies/linked_rails/collection/view_policy.rb
 - app/policies/linked_rails/collection_policy.rb
 - app/policies/linked_rails/enum_value_policy.rb
-- app/policies/linked_rails/form_policy.rb
 - app/policies/linked_rails/menus/item_policy.rb
 - app/policies/linked_rails/menus/list_policy.rb
-- 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
@@ -340,7 +338,6 @@ files:
 - app/serializers/linked_rails/web_page_serializer.rb
 - app/serializers/linked_rails/web_site_serializer.rb
 - app/serializers/linked_rails/widget_serializer.rb
-- app/workers/linked_rails/invalidation_stream_worker.rb
 - config/initializers/inflections.rb
 - lib/generators/linked_rails/install/install_generator.rb
 - lib/generators/linked_rails/install/templates/README
@@ -390,8 +387,6 @@ files:
 - lib/linked_rails/enhancements/destroyable/controller.rb
 - lib/linked_rails/enhancements/updatable/controller.rb
 - lib/linked_rails/enhancements/updatable/serializer.rb
-- lib/linked_rails/errors.rb
-- lib/linked_rails/errors/forbidden.rb
 - lib/linked_rails/helpers/delta_helper.rb
 - lib/linked_rails/helpers/ontola_actions_helper.rb
 - lib/linked_rails/helpers/resource_helper.rb
@@ -400,7 +395,6 @@ files:
 - lib/linked_rails/middleware/linked_data_params.rb
 - lib/linked_rails/model.rb
 - lib/linked_rails/model/actionable.rb
-- lib/linked_rails/model/cacheable.rb
 - lib/linked_rails/model/collections.rb
 - lib/linked_rails/model/dirty.rb
 - lib/linked_rails/model/enhancements.rb
@@ -424,12 +418,10 @@ files:
 - lib/linked_rails/serializer/actionable.rb
 - lib/linked_rails/serializer/menuable.rb
 - lib/linked_rails/serializer/singularable.rb
-- lib/linked_rails/storage.rb
 - lib/linked_rails/test_methods.rb
 - 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/app/policies/linked_rails/form_policy.rb

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-module LinkedRails
-  class FormPolicy < LinkedRails.policy_parent_class
-    def show?
-      true
-    end
-
-    def public_resource?
-      true
-    end
-  end
-end

data/app/policies/linked_rails/ontology_policy.rb

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-module LinkedRails
-  class OntologyPolicy < LinkedRails.policy_parent_class
-    def show?
-      true
-    end
-
-    def public_resource?
-      true
-    end
-  end
-end

data/app/workers/linked_rails/invalidation_stream_worker.rb

@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-
-module LinkedRails
-  class InvalidationStreamWorker < ActiveJob::Base
-    def perform(type, iri, resource_type)
-      entry = {
-        type: type,
-        resource: iri,
-        resourceType: resource_type
-      }
-      id = Storage.xadd(:stream, LinkedRails.cache_stream, entry)
-
-      raise('No message id returned, implies failure') if id.blank?
-    end
-  end
-end

data/lib/linked_rails/errors/forbidden.rb

@@ -1,37 +0,0 @@
-# frozen_string_literal: true
-
-module LinkedRails
-  module Errors
-    class Forbidden < StandardError
-      attr_reader :query, :record, :policy, :action
-
-      # @param [Hash] options
-      # @option options [String] query The action of the request
-      # @option options [ActiveRecord::Base] record The record that was requested
-      # @option options [Policy] policy The policy that raised the exception
-      # @option options [String] message Override the default error message
-      # @return [String] the message
-      def initialize(**options)
-        @query  = options.fetch(:query).to_s
-        @record = options[:record]
-        @policy = options[:policy]
-        @action = @query[-1] == '?' ? @query[0..-2] : @query
-        @message = options[:message]
-
-        raise StandardError if @query.blank? && @message.blank?
-
-        super(@message || default_message)
-      end
-
-      private
-
-      def default_message
-        I18n.t(
-          "pundit.#{@policy.class.to_s.underscore}.#{@query}",
-          action: @action,
-          default: I18n.t('errors.access_denied')
-        )
-      end
-    end
-  end
-end

data/lib/linked_rails/errors.rb

@@ -1,3 +0,0 @@
-# frozen_string_literal: true
-
-require_relative 'errors/forbidden'

data/lib/linked_rails/model/cacheable.rb

@@ -1,45 +0,0 @@
-# frozen_string_literal: true
-
-module LinkedRails
-  module Model
-    module Cacheable
-      extend ActiveSupport::Concern
-
-      included do
-        if respond_to?(:after_commit)
-          after_commit :publish_create, on: :create, if: :should_publish_changes
-          after_commit :publish_update, on: :update, if: :should_publish_changes
-          after_commit :publish_delete, on: :destroy, if: :should_publish_changes
-        end
-      end
-
-      def cacheable?
-        true
-      end
-
-      def publish_create
-        publish_message('io.ontola.transactions.Created')
-      end
-
-      def publish_update
-        publish_message('io.ontola.transactions.Updated')
-      end
-
-      def publish_delete
-        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
-
-      def should_publish_changes
-        cacheable? && !Rails.env.test?
-      end
-    end
-  end
-end

data/lib/linked_rails/storage.rb

@@ -1,32 +0,0 @@
-# frozen_string_literal: true
-
-require 'redis'
-
-module LinkedRails
-  class Storage
-    REDIS_DB = {
-      cache: LinkedRails.cache_redis_database,
-      persistent: LinkedRails.persistent_redis_database,
-      stream: LinkedRails.stream_redis_database
-    }.freeze
-    KEYS = {
-      manifest: 'cache:Manifest',
-      redirect_exact: 'cache:Redirect:Exact',
-      redirect_prefix: 'cache:Redirect:Prefix'
-    }.freeze
-
-    class << self
-      %i[xadd].each do |method|
-        define_method(method) do |db, *args|
-          Redis.new(db: REDIS_DB.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)
-        end
-      end
-    end
-  end
-end

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