sidekiq 6.5.9 → 7.0.9

data/web/views/metrics_for_job.erb

@@ -1,85 +1,66 @@
 <script type="text/javascript" src="<%= root_path %>javascripts/chart.min.js"></script>
 <script type="text/javascript" src="<%= root_path %>javascripts/chartjs-plugin-annotation.min.js"></script>
+<script type="text/javascript" src="<%= root_path %>javascripts/base-charts.js"></script>
 <script type="text/javascript" src="<%= root_path %>javascripts/metrics.js"></script>
 
 <%
   job_result = @query_result.job_results[@name]
   hist_totals = job_result.hist.values.first.zip(*job_result.hist.values[1..-1]).map(&:sum)
-  bucket_labels =Sidekiq::Metrics::Histogram::LABELS
-  bucket_intervals =Sidekiq::Metrics::Histogram::BUCKET_INTERVALS.reverse
-
-  # Replace INFINITY since it can't be represented as JSON
-  bucket_intervals[0] = bucket_intervals[1] * 2
+  bucket_labels = Sidekiq::Metrics::Histogram::LABELS
+  bucket_intervals = Sidekiq::Metrics::Histogram::BUCKET_INTERVALS
 %>
 
 <% if job_result.totals["s"] > 0 %>
-  <div class="header-with-subheader">
-    <h1>
-      <a href="<%= root_path %>/metrics"><%= t(:metrics).to_s.titleize %></a> /
-      <%= h @name %>
-    </h1>
-    <h2>Histogram summary</h2>
+  <div class="header-container">
+    <div class="page-title-container">
+      <h1>
+        <a href="<%= root_path %>metrics?period=<%= @period %>"><%= t('Metrics') %></a> /
+        <%= h @name %>
+      </h1>
+
+      <a target="blank" href="https://github.com/sidekiq/sidekiq/wiki/Metrics"><span class="info-circle" title="Click to learn more about metrics">?</span></a>
+    </div>
+
+    <%= erb :_metrics_period_select, locals: { periods: @periods, period: @period, path: "#{root_path}metrics/#{@name}" } %>
   </div>
 
   <canvas id="hist-totals-chart"></canvas>
 
   <script>
     window.histTotalsChart = new HistTotalsChart(
-      "hist-totals-chart",
+      document.getElementById("hist-totals-chart"),
       <%= Sidekiq.dump_json({
         series: hist_totals,
         labels: bucket_labels,
+        xLabel: t('ExecutionTime'),
+        yLabel: t('Jobs'),
+        units: t('Jobs').downcase,
       }) %>
     )
   </script>
 
-  <h2>Performance over time</h2>
-
   <canvas id="hist-bubble-chart"></canvas>
 
   <script>
     window.histBubbleChart = new HistBubbleChart(
-      "hist-bubble-chart",
+      document.getElementById("hist-bubble-chart"),
       <%= Sidekiq.dump_json({
         hist: job_result.hist,
         marks: @query_result.marks.map { |m| [m.bucket, m.label] },
         labels: @query_result.buckets,
         histIntervals: bucket_intervals,
+        yLabel: t('ExecutionTime'),
+        markLabel: t('Deploy'),
+        yUnits: t('Seconds').downcase,
+        zUnits: t('Jobs').downcase,
       }) %>
     )
   </script>
 
-  <div class="table_container">
-    <table class="table table-bordered table-striped table-hover">
-      <tbody>
-        <tr>
-          <th><%= t('Time') %></th>
-          <th><%= t('Processed') %></th>
-          <th><%= t('Failed') %></th>
-          <th><%= t('ExecutionTime') %></th>
-          <th><%= t('AvgExecutionTime') %></th>
-        </tr>
-        <% @query_result.buckets.reverse.each do |bucket| %>
-          <tr>
-            <td><%= bucket %></td>
-            <td><%= job_result.series.dig("p", bucket) %></td>
-            <td><%= job_result.series.dig("f", bucket) %></td>
-            <% if (total_sec = job_result.series.dig("s", bucket)) > 0 %>
-              <td><%= total_sec.round(2) %> seconds</td>
-              <td><%= job_result.series_avg("s")[bucket].round(2) %> seconds</td>
-            <% else %>
-              <td>&mdash;</td>
-              <td>&mdash;</td>
-            <% end %>
-          </tr>
-        <% end %>
-      </tbody>
-    </table>
-  </div>
   <p><small>Data from <%= @query_result.starts_at %> to <%= @query_result.ends_at %></small></p>
 <% else %>
   <h1>
-    <a href="<%= root_path %>/metrics"><%= t(:metrics).to_s.titleize %></a> /
+    <a href="<%= root_path %>/metrics"><%= t('Metrics') %></a> /
     <%= h @name %>
   </h1>
 

data/web/views/morgue.erb

@@ -1,14 +1,10 @@
-<header class="row">
-  <div class="col-sm-5">
-    <h3><%= t('DeadJobs') %></h3>
-  </div>
+<div class="header-container">
+  <h1><%= t('DeadJobs') %></h1>
   <% if @dead.size > 0 && @total_size > @count %>
-    <div class="col-sm-4">
-      <%= erb :_paging, locals: { url: "#{root_path}morgue" } %>
-    </div>
+    <%= erb :_paging, locals: { url: "#{root_path}morgue" } %>
   <% end %>
   <%= filtering('dead') %>
-</header>
+</div>
 
 <% if @dead.size > 0 %>
   <form action="<%= root_path %>morgue" method="post">
@@ -33,7 +29,7 @@
           <tr>
             <td class="table-checkbox">
               <label>
-                <input type='checkbox' name='key[]' value='<%= job_params(entry.item, entry.score) %>' />
+                <input type='checkbox' name='key[]' value='<%= job_params(entry.item, entry.score) %>' class='shift_clickable' />
               </label>
             </td>
             <td>

data/web/views/queue.erb

@@ -1,17 +1,13 @@
-<header class="row">
-  <div class="col-sm-5">
-    <h3>
-      <%= t('CurrentMessagesInQueue', :queue => h(@name)) %>
-      <% if @queue.paused? %>
-        <span class="label label-danger"><%= t('Paused') %></span>
-      <% end %>
-      <span class="badge badge-secondary"><%= number_with_delimiter(@total_size) %></span>
-    </h3>
-  </div>
-  <div class="col-sm-4 pull-right flip">
-    <%= erb :_paging, locals: { url: "#{root_path}queues/#{CGI.escape(@name)}" } %>
-  </div>
-</header>
+<div class="header-container">
+  <h1><%= t('CurrentMessagesInQueue', :queue => h(@name)) %>
+    <% if @queue.paused? %>
+      <span class="label label-danger"><%= t('Paused') %></span>
+    <% end %>
+    <span class="badge badge-secondary"><%= number_with_delimiter(@total_size) %></span>
+  </h1>
+  <%= erb :_paging, locals: { url: "#{root_path}queues/#{CGI.escape(@name)}" } %>
+</div>
+
 <div class="table_container">
   <table class="queue table table-hover table-bordered table-striped">
     <thead>

data/web/views/queues.erb

@@ -1,4 +1,6 @@
-<h3><%= t('Queues') %></h3>
+<div class="header-container">
+  <h1><%= t('Queues') %></h1>
+</div>
 
 <div class="table_container">
   <table class="queues table table-hover table-bordered table-striped">

data/web/views/retries.erb

@@ -1,14 +1,10 @@
-<header class="row">
-  <div class="col-sm-5">
-    <h3><%= t('Retries') %></h3>
-  </div>
+<div class="header-container">
+  <h1><%= t('Retries') %></h1>
   <% if @retries.size > 0 && @total_size > @count %>
-    <div class="col-sm-4">
-      <%= erb :_paging, locals: { url: "#{root_path}retries" } %>
-    </div>
+    <%= erb :_paging, locals: { url: "#{root_path}retries" } %>
   <% end %>
   <%= filtering('retries') %>
-</header>
+</div>
 
 <% if @retries.size > 0 %>
   <form action="<%= root_path %>retries" method="post">
@@ -34,7 +30,7 @@
           <tr>
             <td class="table-checkbox">
               <label>
-                <input type='checkbox' name='key[]' value='<%= job_params(entry.item, entry.score) %>' />
+                <input type='checkbox' name='key[]' value='<%= job_params(entry.item, entry.score) %>' class='shift_clickable' />
               </label>
             </td>
             <td>

data/web/views/scheduled.erb

@@ -1,25 +1,22 @@
-<header class="row">
-  <div class="col-sm-5">
-    <h3><%= t('ScheduledJobs') %></h3>
-  </div>
+<div class="header-container">
+  <h1><%= t('ScheduledJobs') %></h1>
   <% if @scheduled.size > 0 && @total_size > @count %>
-    <div class="col-sm-4">
-      <%= erb :_paging, locals: { url: "#{root_path}scheduled" } %>
-    </div>
+    <%= erb :_paging, locals: { url: "#{root_path}scheduled" } %>
   <% end %>
   <%= filtering('scheduled') %>
-</header>
+</div>
 
 <% if @scheduled.size > 0 %>
-
   <form action="<%= root_path %>scheduled" method="post">
     <%= csrf_tag %>
     <div class="table_container">
       <table class="table table-striped table-bordered table-hover">
         <thead>
           <tr>
-            <th class="checkbox-column">
-              <input type="checkbox" class="check_all" />
+            <th class="table-checkbox checkbox-column">
+              <label>
+                <input type="checkbox" class="check_all" />
+              </label>
             </th>
             <th><%= t('When') %></th>
             <th><%= t('Queue') %></th>
@@ -29,8 +26,10 @@
         </thead>
         <% @scheduled.each do |entry| %>
           <tr>
-            <td>
-              <input type='checkbox' name='key[]' value='<%= job_params(entry.item, entry.score) %>' />
+            <td class="table-checkbox">
+              <label>
+                <input type='checkbox' name='key[]' value='<%= job_params(entry.item, entry.score) %>' class='shift_clickable' />
+              </label>
             </td>
             <td>
                <a href="<%= root_path %>scheduled/<%= job_params(entry.item, entry.score) %>"><%= relative_time(entry.at) %></a>

metadata

@@ -1,72 +1,74 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq
 version: !ruby/object:Gem::Version
-  version: 6.5.9
+  version: 7.0.9
 platform: ruby
 authors:
 - Mike Perham
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-25 00:00:00.000000000 Z
+date: 2023-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: redis
+  name: redis-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.5.0
+        version: 0.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.5.0
+        version: 0.11.0
 - !ruby/object:Gem::Dependency
   name: connection_pool
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.5
+        version: 2.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.5
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.2.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.2.4
+- !ruby/object:Gem::Dependency
+  name: concurrent-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2'
 description: Simple, efficient background processing for Ruby.
 email:
-- mperham@gmail.com
+- info@contribsys.com
 executables:
 - sidekiq
 - sidekiqmon
@@ -74,7 +76,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - Changes.md
-- LICENSE
+- LICENSE.txt
 - README.md
 - bin/sidekiq
 - bin/sidekiqload
@@ -85,14 +87,13 @@ files:
 - lib/generators/sidekiq/templates/job_test.rb.erb
 - lib/sidekiq.rb
 - lib/sidekiq/api.rb
+- lib/sidekiq/capsule.rb
 - lib/sidekiq/cli.rb
 - lib/sidekiq/client.rb
 - lib/sidekiq/component.rb
-- lib/sidekiq/delay.rb
-- lib/sidekiq/extensions/action_mailer.rb
-- lib/sidekiq/extensions/active_record.rb
-- lib/sidekiq/extensions/class_methods.rb
-- lib/sidekiq/extensions/generic_proxy.rb
+- lib/sidekiq/config.rb
+- lib/sidekiq/deploy.rb
+- lib/sidekiq/embedded.rb
 - lib/sidekiq/fetch.rb
 - lib/sidekiq/job.rb
 - lib/sidekiq/job_logger.rb
@@ -101,7 +102,6 @@ files:
 - lib/sidekiq/launcher.rb
 - lib/sidekiq/logger.rb
 - lib/sidekiq/manager.rb
-- lib/sidekiq/metrics/deploy.rb
 - lib/sidekiq/metrics/query.rb
 - lib/sidekiq/metrics/shared.rb
 - lib/sidekiq/metrics/tracking.rb
@@ -129,17 +129,18 @@ files:
 - lib/sidekiq/web/csrf_protection.rb
 - lib/sidekiq/web/helpers.rb
 - lib/sidekiq/web/router.rb
-- lib/sidekiq/worker.rb
+- lib/sidekiq/worker_compatibility_alias.rb
 - sidekiq.gemspec
 - web/assets/images/apple-touch-icon.png
 - web/assets/images/favicon.ico
 - web/assets/images/logo.png
 - web/assets/images/status.png
 - web/assets/javascripts/application.js
+- web/assets/javascripts/base-charts.js
 - web/assets/javascripts/chart.min.js
 - web/assets/javascripts/chartjs-plugin-annotation.min.js
+- web/assets/javascripts/dashboard-charts.js
 - web/assets/javascripts/dashboard.js
-- web/assets/javascripts/graph.js
 - web/assets/javascripts/metrics.js
 - web/assets/stylesheets/application-dark.css
 - web/assets/stylesheets/application-rtl.css
@@ -155,6 +156,7 @@ files:
 - web/locales/es.yml
 - web/locales/fa.yml
 - web/locales/fr.yml
+- web/locales/gd.yml
 - web/locales/he.yml
 - web/locales/hi.yml
 - web/locales/it.yml
@@ -176,6 +178,7 @@ files:
 - web/locales/zh-tw.yml
 - web/views/_footer.erb
 - web/views/_job_info.erb
+- web/views/_metrics_period_select.erb
 - web/views/_nav.erb
 - web/views/_paging.erb
 - web/views/_poll_link.erb
@@ -199,11 +202,19 @@ licenses:
 - LGPL-3.0
 metadata:
   homepage_uri: https://sidekiq.org
-  bug_tracker_uri: https://github.com/mperham/sidekiq/issues
-  documentation_uri: https://github.com/mperham/sidekiq/wiki
-  changelog_uri: https://github.com/mperham/sidekiq/blob/main/Changes.md
-  source_code_uri: https://github.com/mperham/sidekiq
-post_install_message:
+  bug_tracker_uri: https://github.com/sidekiq/sidekiq/issues
+  documentation_uri: https://github.com/sidekiq/sidekiq/wiki
+  changelog_uri: https://github.com/sidekiq/sidekiq/blob/main/Changes.md
+  source_code_uri: https://github.com/sidekiq/sidekiq
+  rubygems_mfa_required: 'true'
+post_install_message: |2+
+
+  Welcome to Sidekiq 7.0!
+
+  1. Use `gem 'sidekiq', '<7'` in your Gemfile if you don't want this new version.
+  2. Read the release notes at https://github.com/sidekiq/sidekiq/blob/main/docs/7.0-Upgrade.md
+  3. If you have problems, search for open/closed issues at https://github.com/sidekiq/sidekiq/issues/
+
 rdoc_options: []
 require_paths:
 - lib
@@ -211,7 +222,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -223,3 +234,4 @@ signing_key:
 specification_version: 4
 summary: Simple, efficient background processing for Ruby
 test_files: []
+...

data/lib/sidekiq/delay.rb

@@ -1,43 +0,0 @@
-# frozen_string_literal: true
-
-module Sidekiq # :nodoc:
-  module Extensions
-    def self.enable_delay!
-      warn "Sidekiq's Delayed Extensions will be removed in Sidekiq 7.0", uplevel: 1
-
-      if defined?(::ActiveSupport)
-        require "sidekiq/extensions/active_record"
-        require "sidekiq/extensions/action_mailer"
-
-        # Need to patch Psych so it can autoload classes whose names are serialized
-        # in the delayed YAML.
-        Psych::Visitors::ToRuby.prepend(Sidekiq::Extensions::PsychAutoload)
-
-        ActiveSupport.on_load(:active_record) do
-          include Sidekiq::Extensions::ActiveRecord
-        end
-        ActiveSupport.on_load(:action_mailer) do
-          extend Sidekiq::Extensions::ActionMailer
-        end
-      end
-
-      require "sidekiq/extensions/class_methods"
-      Module.__send__(:include, Sidekiq::Extensions::Klass)
-    end
-
-    module PsychAutoload
-      def resolve_class(klass_name)
-        return nil if !klass_name || klass_name.empty?
-        # constantize
-        names = klass_name.split("::")
-        names.shift if names.empty? || names.first.empty?
-
-        names.inject(Object) do |constant, name|
-          constant.const_defined?(name) ? constant.const_get(name) : constant.const_missing(name)
-        end
-      rescue NameError
-        super
-      end
-    end
-  end
-end

data/lib/sidekiq/extensions/action_mailer.rb

@@ -1,48 +0,0 @@
-# frozen_string_literal: true
-
-require "sidekiq/extensions/generic_proxy"
-
-module Sidekiq
-  module Extensions
-    ##
-    # Adds +delay+, +delay_for+ and +delay_until+ methods to ActionMailer to offload arbitrary email
-    # delivery to Sidekiq.
-    #
-    # @example
-    #    UserMailer.delay.send_welcome_email(new_user)
-    #    UserMailer.delay_for(5.days).send_welcome_email(new_user)
-    #    UserMailer.delay_until(5.days.from_now).send_welcome_email(new_user)
-    class DelayedMailer
-      include Sidekiq::Worker
-
-      def perform(yml)
-        (target, method_name, args) = YAML.load(yml)
-        msg = target.public_send(method_name, *args)
-        # The email method can return nil, which causes ActionMailer to return
-        # an undeliverable empty message.
-        if msg
-          msg.deliver_now
-        else
-          raise "#{target.name}##{method_name} returned an undeliverable mail object"
-        end
-      end
-    end
-
-    module ActionMailer
-      def sidekiq_delay(options = {})
-        Proxy.new(DelayedMailer, self, options)
-      end
-
-      def sidekiq_delay_for(interval, options = {})
-        Proxy.new(DelayedMailer, self, options.merge("at" => Time.now.to_f + interval.to_f))
-      end
-
-      def sidekiq_delay_until(timestamp, options = {})
-        Proxy.new(DelayedMailer, self, options.merge("at" => timestamp.to_f))
-      end
-      alias_method :delay, :sidekiq_delay
-      alias_method :delay_for, :sidekiq_delay_for
-      alias_method :delay_until, :sidekiq_delay_until
-    end
-  end
-end

data/lib/sidekiq/extensions/active_record.rb

@@ -1,43 +0,0 @@
-# frozen_string_literal: true
-
-require "sidekiq/extensions/generic_proxy"
-
-module Sidekiq
-  module Extensions
-    ##
-    # Adds +delay+, +delay_for+ and +delay_until+ methods to ActiveRecord to offload instance method
-    # execution to Sidekiq.
-    #
-    # @example
-    #   User.recent_signups.each { |user| user.delay.mark_as_awesome }
-    #
-    # Please note, this is not recommended as this will serialize the entire
-    # object to Redis.  Your Sidekiq jobs should pass IDs, not entire instances.
-    # This is here for backwards compatibility with Delayed::Job only.
-    class DelayedModel
-      include Sidekiq::Worker
-
-      def perform(yml)
-        (target, method_name, args) = YAML.load(yml)
-        target.__send__(method_name, *args)
-      end
-    end
-
-    module ActiveRecord
-      def sidekiq_delay(options = {})
-        Proxy.new(DelayedModel, self, options)
-      end
-
-      def sidekiq_delay_for(interval, options = {})
-        Proxy.new(DelayedModel, self, options.merge("at" => Time.now.to_f + interval.to_f))
-      end
-
-      def sidekiq_delay_until(timestamp, options = {})
-        Proxy.new(DelayedModel, self, options.merge("at" => timestamp.to_f))
-      end
-      alias_method :delay, :sidekiq_delay
-      alias_method :delay_for, :sidekiq_delay_for
-      alias_method :delay_until, :sidekiq_delay_until
-    end
-  end
-end

data/lib/sidekiq/extensions/class_methods.rb

@@ -1,43 +0,0 @@
-# frozen_string_literal: true
-
-require "sidekiq/extensions/generic_proxy"
-
-module Sidekiq
-  module Extensions
-    ##
-    # Adds `delay`, `delay_for` and `delay_until` methods to all Classes to offload class method
-    # execution to Sidekiq.
-    #
-    # @example
-    #   User.delay.delete_inactive
-    #   Wikipedia.delay.download_changes_for(Date.today)
-    #
-    class DelayedClass
-      include Sidekiq::Worker
-
-      def perform(yml)
-        (target, method_name, args) = YAML.load(yml)
-        target.__send__(method_name, *args)
-      end
-    end
-
-    module Klass
-      def sidekiq_delay(options = {})
-        Proxy.new(DelayedClass, self, options)
-      end
-
-      def sidekiq_delay_for(interval, options = {})
-        Proxy.new(DelayedClass, self, options.merge("at" => Time.now.to_f + interval.to_f))
-      end
-
-      def sidekiq_delay_until(timestamp, options = {})
-        Proxy.new(DelayedClass, self, options.merge("at" => timestamp.to_f))
-      end
-      alias_method :delay, :sidekiq_delay
-      alias_method :delay_for, :sidekiq_delay_for
-      alias_method :delay_until, :sidekiq_delay_until
-    end
-  end
-end
-
-Module.__send__(:include, Sidekiq::Extensions::Klass) unless defined?(::Rails)

data/lib/sidekiq/extensions/generic_proxy.rb

@@ -1,33 +0,0 @@
-# frozen_string_literal: true
-
-require "yaml"
-
-module Sidekiq
-  module Extensions
-    SIZE_LIMIT = 8_192
-
-    class Proxy < BasicObject
-      def initialize(performable, target, options = {})
-        @performable = performable
-        @target = target
-        @opts = options.transform_keys(&:to_s)
-      end
-
-      def method_missing(name, *args)
-        # Sidekiq has a limitation in that its message must be JSON.
-        # JSON can't round trip real Ruby objects so we use YAML to
-        # serialize the objects to a String.  The YAML will be converted
-        # to JSON and then deserialized on the other side back into a
-        # Ruby object.
-        obj = [@target, name, args]
-        marshalled = ::YAML.dump(obj)
-        if marshalled.size > SIZE_LIMIT
-          ::Sidekiq.logger.warn { "#{@target}.#{name} job argument is #{marshalled.bytesize} bytes, you should refactor it to reduce the size" }
-        end
-        @performable.client_push({"class" => @performable,
-                                  "args" => [marshalled],
-                                  "display_class" => "#{@target}.#{name}"}.merge(@opts))
-      end
-    end
-  end
-end