decidim-core 0.19.1 → 0.20.0

data/app/views/layouts/decidim/_main_footer.html.erb

@@ -0,0 +1,26 @@
+<div class="main-footer">
+  <% if current_organization.official_img_footer? %>
+    <%= link_to current_organization.official_url, class: "main-footer__badge" do %>
+      <%= image_tag current_organization.official_img_footer.url.to_s , alt: current_organization.name %>
+    <% end %>
+  <% end %>
+  <div class="row">
+    <div class="medium-8 large-6 large-offset-3 column main__footer__nav">
+        <ul class="footer-nav">
+          <% if current_organization.static_pages.any? %>
+            <% current_organization.static_page_topics.where(show_in_footer: true).each do |page_topic| %>
+              <% if page_topic.pages.any? %>
+                <li><%= link_to translated_attribute(page_topic.title), decidim.page_path(page_topic.pages.first) %></li>
+              <% end %>
+            <% end %>
+
+            <% current_organization.static_pages.where(show_in_footer: true).each do |page| %>
+              <li><%= link_to translated_attribute(page.title), decidim.page_path(page) %></li>
+            <% end %>
+          <% end %>
+          <li><%= link_to t("layouts.decidim.footer.download_open_data"), decidim.open_data_download_path %></li>
+        </ul>
+    </div>
+    <%= render partial: "layouts/decidim/social_media_links" %>
+  </div>
+</div>

data/app/views/layouts/decidim/_mini_footer.html.erb

@@ -0,0 +1,21 @@
+<div class="mini-footer">
+  <div class="row">
+    <div class="medium-3 large-4 column">
+      <a rel="license" class="cc-badge"
+         href="http://creativecommons.org/licenses/by-sa/4.0/"
+         target="_blank" rel="noopener">
+        <%= image_tag("decidim/cc-badge.png", alt: "Creative Commons License" ) %>
+      </a>
+      <%= t("layouts.decidim.footer.made_with_open_source").html_safe %>
+    </div>
+    <div class="medium-3 large-2 column">
+      <div class="decidim-logo">
+        <a rel="decidim"
+           href="https://decidim.org/"
+           target="_blank" rel="noopener">
+          <%= image_tag("decidim/decidim-logo.svg", alt: "Decidim Logo" ) %>
+        </a>
+      </div>
+    </div>
+  </div>
+</div>

data/app/views/layouts/decidim/_wrapper.html.erb

@@ -24,6 +24,8 @@ end
       <div class="hide-for-medium" data-set="nav-holder"></div>
       <div class="hide-for-medium usermenu-off-canvas-holder"
            data-set="nav-login-holder"></div>
+      <div class="hide-for-medium mt-s ml-s mr-s search-off-canvas-holder"
+           data-set="nav-search-holder"></div>
     </div>
     <div class="off-canvas-content" data-off-canvas-content>
       <div class="footer-separator">
@@ -95,54 +97,9 @@ end
           <%= display_flash_messages %>
           <%= yield %>
         </main>
-      </div><!-- /.footer-separator -->
-      <div class="main-footer">
-        <% if current_organization.official_img_footer? %>
-          <%= link_to  current_organization.official_url, class: "main-footer__badge" do %>
-            <%= image_tag current_organization.official_img_footer.url.to_s , alt: current_organization.name %>
-          <% end %>
-        <% end %>
-        <div class="row">
-          <div class="medium-8 large-6 large-offset-3 column main__footer__nav">
-              <ul class="footer-nav">
-                <% if current_organization.static_pages.any? %>
-                  <% current_organization.static_page_topics.where(show_in_footer: true).each do |page_topic| %>
-                    <% if page_topic.pages.any? %>
-                      <li><%= link_to translated_attribute(page_topic.title), decidim.page_path(page_topic.pages.first) %></li>
-                    <% end %>
-                  <% end %>
-
-                  <% current_organization.static_pages.where(show_in_footer: true).each do |page| %>
-                    <li><%= link_to translated_attribute(page.title), decidim.page_path(page) %></li>
-                  <% end %>
-                <% end %>
-                <li><%= link_to t("layouts.decidim.footer.download_open_data"), decidim.open_data_download_path %></li>
-              </ul>
-          </div>
-          <%= render partial: "layouts/decidim/social_media_links" %>
-        </div>
       </div>
-      <div class="mini-footer">
-        <div class="row">
-          <div class="medium-3 large-4 column">
-            <a rel="license" class="cc-badge"
-               href="http://creativecommons.org/licenses/by-sa/4.0/"
-               target="_blank" rel="noopener">
-              <%= image_tag("decidim/cc-badge.png", alt: "Creative Commons License" ) %>
-            </a>
-            <%= t("layouts.decidim.footer.made_with_open_source").html_safe %>
-          </div>
-          <div class="medium-3 large-2 column">
-            <div class="decidim-logo">
-              <a rel="decidim"
-                 href="https://decidim.org/"
-                 target="_blank" rel="noopener">
-                <%= image_tag("decidim/decidim-logo.svg", alt: "Decidim Logo" ) %>
-              </a>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div><!--/.off-canvas-content-->
-  </div><!--/.off-canvas-wrapper-inner-->
-</div><!--/.off-canvas-wrapper-->
+      <%= render partial: "layouts/decidim/main_footer" %>
+      <%= render partial: "layouts/decidim/mini_footer" %>
+    </div>
+  </div>
+</div>

data/config/initializers/devise.rb

@@ -223,27 +223,27 @@ Devise.setup do |config|
   # Defines which strategy will be used to lock an account.
   # :failed_attempts = Locks an account after a number of failed attempts to sign in.
   # :none            = No lock strategy. You should handle locking by yourself.
-  # config.lock_strategy = :failed_attempts
+  config.lock_strategy = :failed_attempts
 
   # Defines which key will be used when locking and unlocking an account
-  # config.unlock_keys = [:email]
+  config.unlock_keys = [:email]
 
   # Defines which strategy will be used to unlock an account.
   # :email = Sends an unlock link to the user email
   # :time  = Re-enables login after a certain amount of time (see :unlock_in below)
   # :both  = Enables both strategies
   # :none  = No unlock strategy. You should handle unlocking by yourself.
-  # config.unlock_strategy = :both
+  config.unlock_strategy = :both
 
   # Number of authentication tries before locking an account if lock_strategy
   # is failed attempts.
-  # config.maximum_attempts = 20
+  config.maximum_attempts = 20
 
   # Time interval to unlock the account if :time is enabled as unlock_strategy.
-  # config.unlock_in = 1.hour
+  config.unlock_in = 1.hour
 
   # Warn on the last attempt before the account is locked.
-  # config.last_attempt_warning = true
+  config.last_attempt_warning = true
 
   # ==> Configuration for :recoverable
   #

data/config/locales/en.yml

@@ -600,16 +600,6 @@ en:
     gamification:
       all_badges_link: See all available badges.
       badges:
-        continuity:
-          conditions:
-          - Come here often
-          description: This badge is granted when you visit the platform in a regular way. We like having you around here!
-          description_another: This participant has connected for %{score} consecutive days at some point.
-          description_own: You have connected for %{score} consecutive days at some point.
-          name: Continuity
-          next_level_in: Connect for %{score} consecutive days to get to the next level!
-          unearned_another: This participant hasn't signed in for more than one consecutive day.
-          unearned_own: You haven't connected for more than one consecutive day.
         followers:
           conditions:
           - Being active and following other people will surely make other people follow you.

data/config/routes.rb

@@ -13,6 +13,7 @@ Decidim::Core::Engine.routes.draw do
                confirmations: "decidim/devise/confirmations",
                registrations: "decidim/devise/registrations",
                passwords: "decidim/devise/passwords",
+               unlocks: "decidim/devise/unlocks",
                omniauth_callbacks: "decidim/devise/omniauth_registrations"
              }
 

data/db/migrate/20191028135718_add_lockable_to_users.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+class AddLockableToUsers < ActiveRecord::Migration[5.2]
+  def change
+    add_column :decidim_users, :failed_attempts, :integer, default: 0, null: false # Only if lock strategy is :failed_attempts
+    add_column :decidim_users, :unlock_token, :string # Only if unlock strategy is :email or :both
+    add_column :decidim_users, :locked_at, :datetime
+    add_index :decidim_users, :unlock_token, unique: true
+  end
+end

data/db/migrate/20191118120529_add_weight_to_categories.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddWeightToCategories < ActiveRecord::Migration[5.2]
+  def change
+    add_column :decidim_categories, :weight, :integer, null: false, default: 0
+  end
+end

data/db/migrate/20191212102051_remove_continuity_badges.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class RemoveContinuityBadges < ActiveRecord::Migration[5.2]
+  class BadgeScore < ApplicationRecord
+    self.table_name = :decidim_gamification_badge_scores
+  end
+
+  def change
+    drop_table :decidim_continuity_badge_statuses
+
+    BadgeScore.where(badge_name: :continuity).delete_all
+  end
+end

data/db/seeds.rb

@@ -139,6 +139,24 @@ if !Rails.env.production? || ENV["SEED"]
     accepted_tos_version: organization.tos_version
   )
 
+  locked_user = Decidim::User.find_or_initialize_by(email: "locked_user@example.org")
+
+  locked_user.update!(
+    name: Faker::Name.name,
+    nickname: Faker::Twitter.unique.screen_name,
+    password: "decidim123456",
+    password_confirmation: "decidim123456",
+    confirmed_at: Time.current,
+    locale: I18n.default_locale,
+    organization: organization,
+    tos_agreement: true,
+    personal_url: Faker::Internet.url,
+    about: Faker::Lorem.paragraph(2),
+    accepted_tos_version: organization.tos_version
+  )
+
+  locked_user.lock_access!
+
   Decidim::Messaging::Conversation.start!(
     originator: admin,
     interlocutors: [regular_user],

data/lib/decidim/acts_as_author.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Decidim
+  # This concern contains the logic related to being an author.
+  #
+  # it mainly declares abstract methods to be implemented by artifacts
+  # including it in its inheritance hierarchy.
+  #
+  module ActsAsAuthor
+    extend ActiveSupport::Concern
+
+    included do
+      # Authors of Authorables must provide its presenters.
+      #
+      # Return: The presenter for the current author.
+      def presenter
+        raise NotImlementedError, "Authors must return an instance of its Presenter via this method."
+      end
+    end
+  end
+end

data/lib/decidim/component_manifest.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require "decidim/settings_manifest"
-require "decidim/components/export_manifest"
+require "decidim/exporters/export_manifest"
 
 module Decidim
   # This class handles all the logic associated to configuring a component
@@ -58,6 +58,25 @@ module Decidim
     # probably have the form of `Decidim::<MyComponent>::Permissions`.
     attribute :permissions_class_name, String, default: "Decidim::DefaultPermissions"
 
+    # Does this component have specific data to serialize and import?
+    # Beyond the attributes in decidim_component table.
+    attribute :serializes_specific_data, Boolean, default: false
+
+    # The class to be used to serialize specific data for the current component.
+    # Should be a kind of `Decidim::Exporters::Serializer`.
+    #
+    # Note that this class will be initialized with the component as argument.
+    # Then it makes no sense to use the base Decidim::Exporters::Serializer because it
+    # will serialize the component itself, not the specific data depending on it.
+    # Thus you will always be setting a subclass of `Decidim::Exporters::Serializer`.
+    #
+    attribute :specific_data_serializer_class_name, String
+
+    # The class to be used to import specific data for the current component.
+    # Should be a kind of `Decidim::Importers::Importer`.
+    #
+    attribute :specific_data_importer_class_name, String
+
     validates :name, presence: true
 
     # Public: Registers a hook to this manifest. Hooks get fired when some
@@ -134,7 +153,7 @@ module Decidim
     end
 
     # Public: Registers an export artifact with a name and its properties
-    # defined in `Decidim::Components::ExportManifest`.
+    # defined in `Decidim::Exporters::ExportManifest`.
     #
     # Export artifacts provide an unified way for components to register
     # exportable collections serialized via a `Serializer` than eventually
@@ -156,15 +175,19 @@ module Decidim
     # Pubic: Returns a collection of previously registered export manifests
     # for this component.
     #
-    # Returns an Array<Decidim::Components::ExportManifest>.
+    # Returns an Array<Decidim::Exporters::ExportManifest>.
     def export_manifests
       @export_manifests ||= Array(@exports).map do |(name, block)|
-        Decidim::Components::ExportManifest.new(name, self).tap do |manifest|
+        Decidim::Exporters::ExportManifest.new(name, self).tap do |manifest|
           block.call(manifest)
         end
       end
     end
 
+    def serializes_specific_data?
+      serializes_specific_data
+    end
+
     # Public: Stores an instance of StatsRegistry
     def stats
       @stats ||= StatsRegistry.new
@@ -192,6 +215,24 @@ module Decidim
       permissions_class_name&.constantize
     end
 
+    # Public: Finds the specific data serializer class from its name, using the
+    # `specific_data_serializer_class_name` attribute. If the class does not exist,
+    # it raises an exception. If the class name is not set, it returns nil.
+    #
+    # Returns a Decidim::Exporters::Serializer subclass or nil.
+    def specific_data_serializer_class
+      specific_data_serializer_class_name&.constantize
+    end
+
+    # Public: Finds the specific data importer class from its name, using the
+    # `specific_data_importerer_class_name` attribute. If the class does not exist,
+    # it raises an exception. If the class name is not set, it returns nil.
+    #
+    # Returns a Decidim::Importers::Importer subclass or nil.
+    def specific_data_importer_class
+      specific_data_importer_class_name&.constantize
+    end
+
     # Public: Registers a resource. Exposes a DSL defined by
     # `Decidim::ResourceManifest`. Automatically sets the component manifest
     # for that resource to the current one.

data/lib/decidim/core.rb

@@ -5,6 +5,7 @@ require "decidim/core/api"
 require "decidim/core/version"
 # Decidim configuration.
 module Decidim
+  autoload :ActsAsAuthor, "decidim/acts_as_author"
   autoload :TranslatableAttributes, "decidim/translatable_attributes"
   autoload :JsonbAttributes, "decidim/jsonb_attributes"
   autoload :FormBuilder, "decidim/form_builder"

data/lib/decidim/core/engine.rb

@@ -379,10 +379,6 @@ module Decidim
           badge.levels = [1, 15, 30, 60, 100]
           badge.reset = ->(user) { user.followers.count }
         end
-
-        Decidim::Gamification.register_badge(:continuity) do |badge|
-          badge.levels = [2, 10, 30, 60, 180, 365]
-        end
       end
 
       initializer "nbspw" do

data/lib/decidim/core/test.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require "decidim/core/test/shared_examples/acts_as_author_examples"
 require "decidim/core/test/shared_examples/authorable"
 require "decidim/core/test/shared_examples/coauthorable"
 require "decidim/core/test/shared_examples/publicable"
@@ -42,4 +43,6 @@ require "decidim/core/test/shared_examples/amendable/amendment_accepted_event_ex
 require "decidim/core/test/shared_examples/amendable/amendment_rejected_event_examples"
 require "decidim/core/test/shared_examples/amendable/amendment_promoted_event_examples"
 require "decidim/core/test/shared_examples/uncommentable_component_examples"
+require "decidim/core/test/shared_examples/searchable_resources_shared_context"
+require "decidim/core/test/shared_examples/searchable_participatory_space_examples"
 require "decidim/core/test/shared_examples/has_private_users"

data/lib/decidim/core/test/factories.rb

@@ -55,6 +55,7 @@ FactoryBot.define do
   factory :category, class: "Decidim::Category" do
     name { generate_localized_title }
     description { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }
+    weight { 0 }
 
     association :participatory_space, factory: :participatory_process
   end
@@ -339,6 +340,10 @@ FactoryBot.define do
         }
       end
     end
+
+    trait :with_permissions do
+      settings { { Random.rand => Random.new.bytes(5) } }
+    end
   end
 
   factory :scope_type, class: "Decidim::ScopeType" do

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

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+# users of this test should delare the `subject` variable.
+shared_examples "acts as author" do
+  describe "presenter" do
+    it "returns an instance of the presenter for this author" do
+      expect(subject.presenter).to be_present
+    end
+  end
+end

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

@@ -193,13 +193,12 @@ shared_examples "comments" do
       end
     end
 
-    describe "mentions" do
+    describe "mentions drop-down", :slow do
       before do
         visit resource_path
 
         within ".add-comment form" do
           fill_in "add-comment-#{commentable.commentable_type}-#{commentable.id}", with: content
-          click_button "Send"
         end
       end
 
@@ -207,6 +206,46 @@ shared_examples "comments" do
         let!(:mentioned_user) { create(:user, :confirmed, organization: organization) }
         let(:content) { "A valid user mention: @#{mentioned_user.nickname}" }
 
+        context "when text finish with a mention" do
+          it "shows the tribute container" do
+            expect(page).to have_selector(".tribute-container", text: mentioned_user.name)
+          end
+        end
+
+        context "when text contains a mention" do
+          let(:content) { "A valid user mention: @#{mentioned_user.nickname}." }
+
+          it "shows the tribute container" do
+            expect(page).not_to have_selector(".tribute-container", text: mentioned_user.name)
+          end
+        end
+      end
+
+      context "when mentioning a non valid user" do
+        let!(:mentioned_user) { create(:user, organization: organization) }
+        let(:content) { "A unconfirmed user mention: @#{mentioned_user.nickname}" }
+
+        it "do not show the tribute container" do
+          expect(page).not_to have_selector(".tribute-container")
+        end
+      end
+    end
+
+    describe "mentions", :slow do
+      before do
+        visit resource_path
+
+        within ".add-comment form" do
+          fill_in "add-comment-#{commentable.commentable_type}-#{commentable.id}", with: content
+          click_button "Send"
+        end
+      end
+
+      context "when mentioning a valid user" do
+        let!(:mentioned_user) { create(:user, :confirmed, organization: organization) }
+        # do not finish with the mention to avoid trigger the drop-down
+        let(:content) { "A valid user mention: @#{mentioned_user.nickname}." }
+
         it "replaces the mention with a link to the user's profile" do
           expect(page).to have_comment_from(user, "A valid user mention: @#{mentioned_user.nickname}")
           expect(page).to have_link "@#{mentioned_user.nickname}", href: "/profiles/#{mentioned_user.nickname}"