decidim-core 0.26.0.rc1 → 0.26.1

data/config/locales/sv.yml

@@ -76,6 +76,34 @@ sv:
       decidim_with_day_and_month_name: "%A %d %b %Y"
       decidim_with_month_name: "%d %B %Y"
       decidim_with_month_name_short: "%d %b"
+  datetime:
+    distance_in_words:
+      about_x_hours:
+        one: ungefär 1 timme
+        other: ungefär %{count} timmar
+      about_x_months:
+        one: ungefär 1 månad
+        other: ungefär %{count} månader
+      half_a_minute: en halv minut
+      less_than_x_minutes:
+        one: mindre än en minut
+        other: mindre än %{count} minut
+      less_than_x_seconds:
+        one: just nu
+        other: mindre än %{count} sekunder
+      x_days:
+        one: 1 dag sedan
+        other: "%{count} dagar sedan"
+      x_hours:
+        one: 1 timme sedan
+        other: "%{count} timmar sedan"
+      x_minutes:
+        one: 1 min sedan
+        other: "%{count} min sedan"
+      x_seconds:
+        one: 1 sek. sedan
+        other: "%{count} sek. sedan"
+        zero: just nu
   decidim:
     accessibility:
       external_link: Extern länk
@@ -153,6 +181,7 @@ sv:
         block: "%{user_name} blockerade användaren %{resource_name}"
         invite: "%{user_name} bjöd in användaren %{resource_name} med rollen: %{role}"
         officialize: "%{user_name} gjorde deltagaren %{resource_name} officiell"
+        promote: "%{user_name} befordrade %{resource_name}"
         remove_from_admin: "%{user_name} tog bort deltagaren %{resource_name} med rollen: %{role}"
         show_email: "%{user_name} hämtade e-postadressen för deltagaren %{resource_name}"
         transfer: "%{user_name} överförde deltagaren %{resource_name}"
@@ -967,6 +996,7 @@ sv:
           next: Nästa
           no_conversations: Du har inga konversationer än
           title: Samtal
+          to: Till
         reply:
           placeholder: Ditt svar...
           send: Skicka
@@ -974,6 +1004,7 @@ sv:
         show:
           back: Tillbaka till alla konversationer
           chat_with: Konversation med
+          deleted_accounts: Du kan inte meddela raderade konton.
           not_allowed: Deltagaren tar inte emot direktmeddelanden.
           title: Samtal med %{usernames}
         start:
@@ -1041,6 +1072,12 @@ sv:
         greetings: Hälsningar,<br/>%{organization_name}<br/><a href="%{organization_url}">%{organization_url}</a>
         hello: Hallå,
         subject: Vill du fortsätta att få relevant information om %{organization_name}?
+    notification_mailer:
+      event_received:
+        no_translation_available: Tyvärr kunde maskinöversättningen inte hämtas när e-postmeddelandet skickades. Du kan kontrollera översättningen av originaltexten på följande länk %{link}.
+        original_text: 'Originaltext:'
+        same_language: Innehållet har skrevs i ditt valda språk (%{language}) så ingen automatisk översättning visas i detta e-post.
+        translated_text: 'Maskinöversatt text:'
     notifications:
       no_notifications: Inga meddelanden ännu.
     notifications_settings:
@@ -1048,13 +1085,13 @@ sv:
         administrators: Administratörer
         allow_public_contact: Tillåt alla att skicka direktmeddelanden till mig, även de som jag inte följer.
         direct_messages: Ta emot direktmeddelanden från alla
-        email_on_moderations: Jag vill få ett e-brev varje gång något anmäls för moderering.
-        email_on_notification: Jag vill få ett e-brev varje gång jag får ett meddelande.
+        email_on_moderations: Jag vill få ett e-post varje gång något anmäls för moderering.
+        email_on_notification: Jag vill få ett e-post varje gång jag får en notis.
         everything_followed: Allt jag följer
         newsletter_notifications: Jag vill få nyhetsbrev
         newsletters: Nyhetsbrev
         own_activity: Min egen verksamhet, som när någon kommenterar mitt förslag eller nämner mig
-        receive_notifications_about: Jag vill få meddelanden om
+        receive_notifications_about: Jag vill få notiser om
         send_notifications_by_email: Skicka meddelanden via e-post
         update_notifications_settings: Spara ändringar
       update:
@@ -1338,6 +1375,7 @@ sv:
         title_reply: Svara
       show:
         back: Visa alla samtal
+        deleted_accounts: Du kan inte meddela raderade konton.
         not_allowed: Den här användaren accepterar inte fler direkta meddelanden.
         title: Konversation med %{usernames}
       update:
@@ -1635,10 +1673,12 @@ sv:
     name: Svenska
     name_with_error: Svenska (fel!)
   password_validator:
+    blacklisted: är svartlistad
     domain_included_in_password: är för likt detta domännamn
     email_included_in_password: är för likt din e-post
     fallback: är inte giltigt
     name_included_in_password: är för likt ditt namn
+    nickname_included_in_password: är för likt ditt användarnamn
     not_enough_unique_characters: har inte tillräckligt med unika tecken
     password_not_allowed: är ej tillåtet
     password_too_common: är för vanligt
@@ -1673,6 +1713,8 @@ sv:
       day_of_week: "%a"
       day_of_week_long: "%a %e"
       day_of_year: "%d.%m.%y"
+      ddmm: "%d/%m"
+      ddmmyyyy: "%d/%m/%Y"
       decidim_day_of_year: "%d %B %Y"
       decidim_short: "%d/%m/%Y %H:%M"
       default: "%d %B %Y kl.%H:%M:%S"

data/db/seeds.rb

@@ -66,10 +66,10 @@ if !Rails.env.production? || ENV["SEED"]
       organization: organization
     )
 
-    3.times do
+    3.times do |time|
       parent = Decidim::Scope.create!(
         name: Decidim::Faker::Localized.literal(Faker::Address.unique.state),
-        code: Faker::Address.unique.country_code,
+        code: "#{Faker::Address.country_code}_#{time}",
         scope_type: province,
         organization: organization
       )

data/lib/decidim/api/functions/user_entity_finder.rb

@@ -22,7 +22,8 @@ module Decidim
           filters[argument.to_sym] = v
         end
         Decidim::UserBaseEntity
-          .where.not(confirmed_at: nil)
+          .confirmed
+          .not_blocked
           .find_by(filters)
       end
     end

data/lib/decidim/api/functions/user_entity_list.rb

@@ -19,7 +19,8 @@ module Decidim
       def call(_obj, args, ctx)
         @query = Decidim::UserBaseEntity
                  .where(organization: ctx[:current_organization])
-                 .where.not(confirmed_at: nil)
+                 .confirmed
+                 .not_blocked
                  .includes(avatar_attachment: :blob)
         add_filter_keys(args[:filter])
         add_order_keys(args[:order].to_h)

data/lib/decidim/content_renderers/link_renderer.rb

@@ -20,7 +20,7 @@ module Decidim
       def render(options = {})
         return content unless content.is_a?(String)
 
-        options = { target: "_blank", rel: "nofollow noopener" }.merge(options)
+        options = { target: "_blank", rel: "nofollow noopener noreferrer ugc" }.merge(options)
         auto_link(content, options)
       end
 

data/lib/decidim/core/engine.rb

@@ -22,6 +22,7 @@ require "omniauth"
 require "omniauth-facebook"
 require "omniauth-twitter"
 require "omniauth-google-oauth2"
+require "omniauth/rails_csrf_protection"
 require "invisible_captcha"
 require "premailer/rails"
 require "premailer/adapter/decidim"
@@ -48,6 +49,9 @@ require "decidim/api"
 require "decidim/middleware/strip_x_forwarded_host"
 require "decidim/middleware/current_organization"
 
+# Backport cookie handling extensions for Rails 6.0
+require "decidim/middleware/rails_cookies"
+
 module Decidim
   module Core
     # Decidim's core Rails Engine.
@@ -311,6 +315,7 @@ module Decidim
 
       initializer "Expire sessions" do
         Rails.application.config.session_store :cookie_store, secure: Decidim.config.force_ssl, expire_after: Decidim.config.expire_session_after
+        Rails.application.config.action_dispatch.cookies_same_site_protection = :lax
       end
 
       initializer "decidim.core.register_resources" do
@@ -545,6 +550,44 @@ module Decidim
         Decidim.register_assets_path File.expand_path("app/packs", root)
       end
 
+      initializer "decidim_core.preview_mailer" do
+        # Load in mailer previews for apps to use in development.
+        # We need to make sure we call `Preview.all` before requiring our
+        # previews, otherwise any previews the app attempts to add need to be
+        # manually required.
+        if Rails.env.development? || Rails.env.test?
+          ActionMailer::Preview.all
+
+          Dir[root.join("spec/mailers/previews/**/*_preview.rb")].each do |file|
+            require_dependency file
+          end
+        end
+      end
+
+      # These are moved from initializers/devise.rb because we need to run initializers folder before
+      # setting these or Decidim.config variables have default values.
+      initializer "decidim_core.after_initializers_folder", after: "load_config_initializers" do
+        Devise.setup do |config|
+          # ==> Mailer Configuration
+          # Configure the e-mail address which will be shown in Devise::Mailer,
+          # note that it will be overwritten if you use your own mailer class
+          # with default "from" parameter.
+          config.mailer_sender = Decidim.config.mailer_sender
+
+          # A period that the user is allowed to access the website even without
+          # confirming their account. For instance, if set to 2.days, the user will be
+          # able to access the website for two days without confirming their account,
+          # access will be blocked just in the third day. Default is 0.days, meaning
+          # the user cannot access the website without confirming their account.
+          config.allow_unconfirmed_access_for = Decidim.unconfirmed_access_for
+
+          # ==> Configuration for :timeoutable
+          # The time you want to timeout the user session without activity. After this
+          # time the user will be asked for credentials again. Default is 30 minutes.
+          config.timeout_in = Decidim.config.expire_session_after
+        end
+      end
+
       config.to_prepare do
         FoundationRailsHelper::FlashHelper.include Decidim::FlashHelperExtensions
       end

data/lib/decidim/core/test/shared_examples/amendable/amendment_accepted_event_examples.rb

@@ -8,7 +8,6 @@ shared_examples "amendment accepted event" do
 
   it_behaves_like "a simple event"
 
-  let(:amendable_title) { amendable.title }
   let(:emendation_author_nickname) { "@#{emendation.creator_author.nickname}" }
   let(:emendation_path) { Decidim::ResourceLocatorPresenter.new(emendation).path }
   let(:emendation_author_path) { Decidim::UserPresenter.new(emendation.creator_author).profile_path }

data/lib/decidim/core/test/shared_examples/amendable/amendment_created_event_examples.rb

@@ -13,7 +13,6 @@ shared_examples "amendment created event" do
 
   it_behaves_like "a simple event"
 
-  let(:amendable_title) { amendable.title }
   let(:emendation_author_nickname) { "@#{emendation.creator_author.nickname}" }
   let(:emendation_path) { Decidim::ResourceLocatorPresenter.new(emendation).path }
   let(:emendation_author_path) { Decidim::UserPresenter.new(emendation.creator_author).profile_path }

data/lib/decidim/core/test/shared_examples/amendable/amendment_promoted_event_examples.rb

@@ -8,7 +8,6 @@ shared_examples "amendment promoted event" do
 
   it_behaves_like "a simple event"
 
-  let(:amendable_title) { amendable.title }
   let(:emendation_author_nickname) { "@#{emendation.creator_author.nickname}" }
   let(:emendation_path) { Decidim::ResourceLocatorPresenter.new(emendation).path }
   let(:emendation_author_path) { Decidim::UserPresenter.new(emendation.creator_author).profile_path }

data/lib/decidim/core/test/shared_examples/amendable/amendment_rejected_event_examples.rb

@@ -8,7 +8,6 @@ shared_examples "amendment rejected event" do
 
   it_behaves_like "a simple event"
 
-  let(:amendable_title) { amendable.title }
   let(:emendation_author_nickname) { "@#{emendation.creator_author.nickname}" }
   let(:emendation_path) { Decidim::ResourceLocatorPresenter.new(emendation).path }
   let(:emendation_author_path) { Decidim::UserPresenter.new(emendation.creator_author).profile_path }

data/lib/decidim/core/test/shared_examples/comments_examples.rb

@@ -132,6 +132,33 @@ shared_examples "comments" do
             end
           end
         end
+
+        it "let the emoji button works properly when there are not too much characters" do
+          if component.present?
+            component.update!(settings: { comments_max_length: 100 })
+            visit current_path
+
+            within ".add-comment form" do
+              find(:css, "textarea:enabled").set("toto")
+              expect(page).not_to have_selector(".emoji-picker__wrapper")
+              find("svg").click
+            end
+            expect(page).to have_selector(".emoji-picker__wrapper")
+          end
+        end
+
+        it "deactivate the emoji button when there are less than 4 characters left" do
+          if component.present?
+            component.update!(settings: { comments_max_length: 30 })
+            visit current_path
+
+            within ".add-comment form" do
+              find(:css, "textarea:enabled").set("0123456789012345678901234567")
+              find("svg").click
+              expect(page).not_to have_selector(".emoji-picker__wrapper")
+            end
+          end
+        end
       end
     end
 

data/lib/decidim/core/test/shared_examples/conversations_examples.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+shared_examples_for "conversation field with maximum length" do |field|
+  describe "character counter" do
+    let(:message) { "#{::Faker::Lorem.paragraph}\n#{::Faker::Lorem.paragraph}" }
+    let(:max_length) { Decidim.config.maximum_conversation_message_length }
+
+    before do
+      allow(Decidim.config).to receive(
+        :maximum_conversation_message_length
+      ).and_return(max_length)
+    end
+
+    it "shows character counter" do
+      fill_in field, with: message
+      expect(page).to have_content("#{max_length - message.length} characters left")
+    end
+  end
+end

data/lib/decidim/core/test/shared_examples/endorsable.rb

@@ -0,0 +1,69 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+shared_examples_for "endorsable" do
+  context "when endorsable" do
+    let(:user) { create(:user, organization: subject.organization) }
+
+    describe "#endorsed_by?" do
+      context "with User endorsement" do
+        it "returns false if the resource is not endorsed by the given user" do
+          expect(subject).not_to be_endorsed_by(user)
+        end
+
+        it "returns true if the resource is endorsed by the given user" do
+          create(:endorsement, resource: subject, author: user)
+          expect(subject).to be_endorsed_by(user)
+        end
+      end
+
+      context "with Organization endorsement" do
+        let!(:user_group) { create(:user_group, verified_at: Time.current, organization: user.organization) }
+        let!(:membership) { create(:user_group_membership, user: user, user_group: user_group) }
+
+        before { user_group.reload }
+
+        it "returns false if the resource is not endorsed by the given organization" do
+          expect(subject).not_to be_endorsed_by(user, user_group)
+        end
+
+        context "when there's an endorsement" do
+          let!(:endorsement) { create(:endorsement, resource: subject, author: user, user_group: user_group) }
+
+          before { user_group.reload }
+
+          it "returns false if the resource is not endorsed by the given user" do
+            expect(subject).not_to be_endorsed_by(user)
+          end
+
+          it "returns true if the resource is endorsed by the given organization" do
+            expect(subject).to be_endorsed_by(user, user_group)
+          end
+
+          context "with another user" do
+            let!(:another_user) { create(:user, :confirmed, organization: user.organization) }
+            let!(:another_membership) { create(:user_group_membership, user: another_user, user_group: user_group, role: "admin") }
+
+            before { user_group.reload }
+
+            it "returns true if the resource is endorsed by other user of the same organization" do
+              expect(subject).to be_endorsed_by(another_user, user_group)
+            end
+          end
+
+          context "with another organization" do
+            let!(:another_user_group) { create(:user_group, verified_at: Time.current, organization: user.organization) }
+            let!(:another_membership) { create(:user_group_membership, user: user, user_group: another_user_group) }
+
+            before { another_user_group.reload }
+
+            it "returns false if the resource is not endorsed by another organization of the same user" do
+              expect(subject).not_to be_endorsed_by(user)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/decidim/core/test/shared_examples/searchable_results_examples.rb

@@ -37,6 +37,40 @@ shared_examples "searchable results" do
       end
     end
 
+    context "when moderation is involved" do
+      it "not contains these searchables" do
+        expect(searchables).not_to be_empty
+        expect(term).not_to be_empty
+
+        fill_in "term", with: term
+        find("input#term").native.send_keys :enter
+
+        expect(page).to have_current_path decidim.search_path, ignore_query: true
+        expect(page).to have_content(/results for the search: "#{term}"/i)
+        expect(page).to have_selector(".filters__section")
+        expect(page.find("#search-count .section-heading").text.to_i).to be_positive
+
+        searchables.each do |searchable|
+          next unless searchable.is_a?(Decidim::Reportable)
+
+          create(:moderation, reportable: searchable, hidden_at: Time.current)
+          # rubocop:disable Rails/SkipsModelValidations
+          searchable.reload.touch
+          # rubocop:enable Rails/SkipsModelValidations
+        end
+
+        visit decidim.root_path
+
+        fill_in "term", with: term
+        find("input#term").native.send_keys :enter
+
+        expect(page).to have_current_path decidim.search_path, ignore_query: true
+        expect(page).to have_content(/results for the search: "#{term}"/i)
+        expect(page).to have_selector(".filters__section")
+        expect(page.find("#search-count .section-heading").text.to_i).not_to be_positive
+      end
+    end
+
     context "when participatory space is not visible" do
       shared_examples_for "no searchs found" do
         it "not contains these searchables" do

data/lib/decidim/core/test.rb

@@ -4,6 +4,7 @@ require "decidim/core/test/shared_examples/acts_as_author_examples"
 require "decidim/core/test/shared_examples/admin_log_presenter_examples"
 require "decidim/core/test/shared_examples/authorable"
 require "decidim/core/test/shared_examples/coauthorable"
+require "decidim/core/test/shared_examples/endorsable"
 require "decidim/core/test/shared_examples/publicable"
 require "decidim/core/test/shared_examples/localised_email"
 require "decidim/core/test/shared_examples/logo_email"
@@ -69,3 +70,4 @@ require "decidim/core/test/shared_examples/share_link_examples"
 require "decidim/core/test/shared_examples/categories_container_examples"
 require "decidim/core/test/shared_examples/assembly_announcements_examples"
 require "decidim/core/test/shared_examples/translated_event_examples"
+require "decidim/core/test/shared_examples/conversations_examples"

data/lib/decidim/core/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-core version.
   module Core
     def self.version
-      "0.26.0.rc1"
+      "0.26.1"
     end
   end
 end

data/lib/decidim/endorsable.rb

@@ -18,7 +18,11 @@ module Decidim
       #
       # Returns Boolean.
       def endorsed_by?(user, user_group = nil)
-        endorsements.where(author: user, user_group: user_group).any?
+        if user_group
+          endorsements.where(user_group: user_group).any?
+        else
+          endorsements.where(author: user, user_group: nil).any?
+        end
       end
     end
   end

data/lib/decidim/map/autocomplete.rb

@@ -57,11 +57,7 @@ module Decidim
             @template.snippets.add(:head, @template.snippets.for(:geocoding))
           end
 
-          options[:value] ||= object.send(attribute) if object.respond_to?(attribute)
-          if object.respond_to?(:latitude) && object.respond_to?(:longitude)
-            point = [object.latitude, object.longitude]
-            options["data-coordinates"] ||= point.join(",")
-          end
+          options = merge_geocoding_options(attribute, options)
 
           field(attribute, options) do |opts|
             builder.geocoding_field(
@@ -71,6 +67,17 @@ module Decidim
             )
           end
         end
+
+        private
+
+        def merge_geocoding_options(attribute, options)
+          options[:value] ||= object.send(attribute) if object.respond_to?(attribute)
+          if object.respond_to?(:latitude) && object.respond_to?(:longitude) && object.latitude.present? && object.longitude.present?
+            point = [object.latitude, object.longitude]
+            options["data-coordinates"] ||= point.join(",")
+          end
+          options
+        end
       end
     end
   end

data/lib/decidim/middleware/rails_cookies.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+# This is a backport for Rails 6.0 for the Same-Site option for the cookies
+# because this option was added in Rails 6.1.
+#
+# See:
+# https://github.com/decidim/decidim/pull/9051
+# https://github.com/rails/rails/issues/35822
+# https://github.com/rails/rails/commit/7ccaa125ba396d418aad1b217b63653d06044680
+module ActionDispatch
+  class Cookies
+    class CookieJar #:nodoc:
+      alias handle_options_original handle_options
+
+      def handle_options(options)
+        handle_options_original(options)
+
+        options[:same_site] ||= Rails.application.config.action_dispatch.cookies_same_site_protection || :lax
+        options[:same_site] = false if options[:same_site] == :none
+      end
+    end
+  end
+end

data/lib/decidim/resourceable.rb

@@ -51,6 +51,7 @@ module Decidim
 
         scope = manifest.resource_scope(component)
         scope = scope.where("#{self.class.table_name}.id != ?", id) if manifest.model_class == self.class
+        scope = scope.not_hidden if manifest.model_class.respond_to?(:not_hidden)
         scope.includes(:component).where.not(decidim_components: { published_at: nil })
       end
 

data/lib/decidim/searchable.rb

@@ -54,11 +54,12 @@ module Decidim
         end
       end
 
+      after_touch do |searchable|
+        remove_from_index(searchable) if searchable.respond_to?(:hidden?) && searchable.hidden?
+      end
+
       after_destroy do |searchable|
-        if self.class.search_resource_fields_mapper
-          org = self.class.search_resource_fields_mapper.retrieve_organization(searchable)
-          searchable.searchable_resources.by_organization(org.id).destroy_all
-        end
+        remove_from_index(searchable) if self.class.search_resource_fields_mapper
       end
       # after_create and after_update callbacks are dynamically setted in `searchable_fields` method.
 
@@ -70,6 +71,11 @@ module Decidim
         add_to_index_as_search_resource
       end
 
+      def remove_from_index(searchable)
+        org = self.class.search_resource_fields_mapper.retrieve_organization(searchable)
+        searchable.searchable_resources.by_organization(org.id).destroy_all
+      end
+
       # Forces the model to be indexed for the first time.
       def add_to_index_as_search_resource
         fields = self.class.search_resource_fields_mapper.mapped(self)

data/lib/decidim/social_share/service.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module Decidim
+  module SocialShare
+    # This class represents an abstract social network.
+    class Service
+      include Decidim::AttributeObject::Model
+      include ActiveModel::Validations
+
+      # The name of the social networking service.
+      attribute :name, String
+
+      # The icon of the social networking service.
+      attribute :icon, String
+
+      # The share_url of the social networking service.
+      attribute :share_uri, String
+
+      # TODO validate #{url} in share_url
+
+      def formatted_share_uri(title, **args)
+        format(share_uri, title: title, **args)
+      end
+
+      # Public: Returns an image of the icon for this social network.
+      #
+      # Returns a String with the icon.
+      def icon_path
+        ActionController::Base.helpers.asset_pack_path("media/images/#{icon}")
+      end
+    end
+  end
+end

data/lib/decidim/social_share/service_registry.rb

@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+module Decidim
+  module SocialShare
+    # This class represents a repository of social networking services. New services can be
+    # registered thanks to its DSL and will be validated prior to being
+    # inserted.
+    #
+    class ServiceRegistry
+      # Public: Initializes the social networking service.
+      def initialize
+        @services = {}
+      end
+
+      # Public: Returns all the registered social networking services.
+      #
+      # Returns Array<Service>.
+      def all
+        @services.values
+      end
+
+      # Public: Finds a social networking services given its name.
+      #
+      # name - The name of the service to find.
+      #
+      # Returns a Service if found or nil otherwise.
+      def find(name)
+        @services[name.to_s]
+      end
+
+      # Public: Registers a new social networking service.
+      #
+      # name   - The name of the social network to register.
+      # &block - A block that gets the new social network as argument.
+      #
+      # Example:
+      #     register(:fake){ |service| service.image = "twitter.svg" }
+      #
+      # Returns a Service when registered successfully, raises an exception
+      # otherwise.
+      def register(name, &block)
+        name = name.to_s
+
+        service = Service.new(name: name).tap do |object|
+          object.instance_eval(&block)
+        end
+
+        service.validate!
+
+        @services[name] = service
+      end
+
+      # Public: Unregisters a previously registered social network.
+      #
+      # name - The name of the social network to unregister.
+      #
+      # Returns the deleted Service if found, nil otherwise.
+      def unregister(name)
+        @services.delete(name.to_s)
+      end
+    end
+  end
+end