decidim-core 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f989779c4209adbf2b018283befc02b9c1982630d4136de2a54b5d3b18177884
-  data.tar.gz: b58475aa61559da81c33914954679d2db50e2d1b8f91d3cb7e235ef8beb1513d
+  metadata.gz: bb155e8d59a117cddb772f80d367de9d7abe021ea6d37af2f8d6b080a7f94bf8
+  data.tar.gz: a429cb952493c92af576ab9253dbc66884c87cbc1de2f2d4a743d5006828a027
 SHA512:
-  metadata.gz: 447f6cefe4f3c989be9fad58e509cc9aadc03260b97418a8ea3f025f8dffb4dd6756c7204d129311f05aeeb98bf96f3b9ad76f9e948a5b6de15e122ceb2243fb
-  data.tar.gz: d2a569060ec1f2697cf872b265509a2b2582f936e77f6d8a298ef8fbce76976efd0448a9e8f0640f530dd7036aa4658788e7f0f078b2ff8fdfe17444722d48c8
+  metadata.gz: 9fb306e7dcee5e6124143546150283368face417e8774244cf7893d72900316fb98a7cde6a3c66adb951eea4ae49581963a9ef79c2ebcadb534f26c9a594d01b
+  data.tar.gz: '041917204f85f7af4d8d0269934a23c06ee19a3223b26295eafb8213f22eebd44cd5bedce0df6148fe9eed59c4403dc70b78ede416531476b81af830c351bf96'

data/app/commands/decidim/invite_user.rb

@@ -41,6 +41,7 @@ module Decidim
       @user = Decidim::User.new(
         name: form.name,
         email: form.email.downcase,
+        nickname: User.nicknamize(form.name),
         organization: form.organization,
         admin: form.role == "admin",
         roles: form.role == "admin" ? [] : [form.role].compact

data/app/helpers/decidim/translations_helper.rb

@@ -3,22 +3,7 @@
 module Decidim
   # Helper that provides convenient methods to deal with translated attributes.
   module TranslationsHelper
-    # Public: Returns the translation of an attribute using the current locale,
-    # if available. Checks for the organization default locale as fallback.
-    #
-    # attribute - A Hash where keys (strings) are locales, and their values are
-    #             the translation for each locale.
-    #
-    # Returns a String with the translation.
-    def translated_attribute(attribute)
-      return "" if attribute.nil?
-      return attribute unless attribute.is_a?(Hash)
-
-      attribute[I18n.locale.to_s].presence ||
-        attribute[current_organization.default_locale].presence ||
-        attribute[attribute.keys.first].presence ||
-        ""
-    end
+    include Decidim::TranslatableAttributes
 
     # Public: Creates a translation for each available language in the list
     # given a translation key.

data/app/mailers/decidim/notification_mailer.rb

@@ -7,6 +7,8 @@ module Decidim
     helper Decidim::ResourceHelper
 
     def event_received(event, event_class_name, resource, user, extra)
+      return unless user.email
+
       with_user(user) do
         @organization = user.organization
         event_class = event_class_name.constantize

data/app/models/decidim/user.rb

@@ -28,7 +28,7 @@ module Decidim
     validates :locale, inclusion: { in: :available_locales }, allow_blank: true
     validates :tos_agreement, acceptance: true, allow_nil: false, on: :create
     validates :avatar, file_size: { less_than_or_equal_to: ->(_record) { Decidim.maximum_avatar_size } }
-    validates :email, :nickname, uniqueness: { scope: :organization }, unless: -> { deleted? || managed? }
+    validates :email, :nickname, uniqueness: { scope: :organization }, unless: -> { deleted? || managed? || nickname.blank? }
     validates :email, 'valid_email_2/email': { disposable: true }
 
     validate :all_roles_are_valid

data/app/views/decidim/notifications/_notification.html.erb

@@ -1,18 +1,20 @@
-<div class="card--list__item">
-  <div class="card--list__text">
-    <%= link_to notification.event_class_instance.resource_path do %>
-      <%= resource_icon notification.resource, class: "icon--chat card--list__icon" %>
-    <% end %>
-    <div>
-      <h5 class="card--list__heading">
-        <%= notification.event_class_instance.notification_title %>
-      </h5>
-      <span class="text-small"><%= l notification.created_at.to_date, format: :long %></span>
+<% if notification.resource %>
+  <div class="card--list__item">
+    <div class="card--list__text">
+      <%= link_to notification.event_class_instance.resource_path do %>
+        <%= resource_icon notification.resource, class: "icon--chat card--list__icon" %>
+      <% end %>
+      <div>
+        <h5 class="card--list__heading">
+          <%= notification.event_class_instance.notification_title %>
+        </h5>
+        <span class="text-small"><%= l notification.created_at.to_date, format: :long %></span>
+      </div>
+    </div>
+    <div class="card--list__data">
+      <%= link_to notification, class: "mark-as-read-button card--list__data__icon", remote: true, method: :delete do %>
+        <%= icon "check", class: "icon icon--chevron-right" %>
+      <% end %>
     </div>
   </div>
-  <div class="card--list__data">
-    <%= link_to notification, class: "mark-as-read-button card--list__data__icon", remote: true, method: :delete do %>
-      <%= icon "check", class: "icon icon--chevron-right" %>
-    <% end %>
-  </div>
-</div>
+<% end %>

data/db/migrate/20180221101934_fix_nickname_index.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+class FixNicknameIndex < ActiveRecord::Migration[5.1]
+  class User < ApplicationRecord
+    self.table_name = :decidim_users
+  end
+
+  def change
+    Decidim::User.where(nickname: nil)
+                 .where(deleted_at: nil)
+                 .where(managed: false)
+                 .find_each { |u| u.update_attributes(nickname: Decidim::User.nicknamize(u.name)) }
+
+    # rubocop:disable Rails/SkipsModelValidations
+    Decidim::User.where(nickname: nil)
+                 .update_all("nickname = ''")
+    # rubocop:enable Rails/SkipsModelValidations
+
+    change_column_default :decidim_users, :nickname, ""
+    change_column_null(:decidim_users, :nickname, false)
+  end
+end

data/lib/decidim/content_parsers/base_parser.rb

@@ -5,7 +5,7 @@ module Decidim
     # Abstract base class for content parsers, so they have the same contract
     #
     # @example How to use a content parser class
-    #   parser = Decidim::ContentParsers::CustomParser.new(content)
+    #   parser = Decidim::ContentParsers::CustomParser.new(content, context)
     #   parser.rewrite # returns the content rewritten
     #   parser.metadata # returns a Metadata object
     #
@@ -17,11 +17,16 @@ module Decidim
       # @return [String] the content to be rewritten
       attr_reader :content
 
+      # @return [Hash] with context information
+      attr_reader :context
+
       # Gets initialized with the `content` to parse
       #
       # @param content [String] already rewritten content or regular content
-      def initialize(content)
+      # @param context [Hash] arbitrary information to have a context
+      def initialize(content, context)
         @content = content || ""
+        @context = context
       end
 
       # Parse the `content` and return it modified

data/lib/decidim/content_parsers/user_parser.rb

@@ -21,13 +21,14 @@ module Decidim
       MENTION_REGEX = /(^|\s)@([a-zA-Z0-9]\w*)/
 
       # Replaces found mentions matching a nickname of an existing
-      # user with a global id. Other mentions found that doesn't
-      # match an existing user are returned as is.
+      # user in the current organization with a global id. Other
+      # mentions found that doesn't match an existing user are
+      # returned as is.
       #
       # @return [String] the content with the valid mentions replaced by a global id
       def rewrite
         content.gsub(MENTION_REGEX) do |match|
-          if (user = Decidim::User.find_by(nickname: Regexp.last_match[2]))
+          if (user = Decidim::User.where(nickname: Regexp.last_match[2], organization: context[:current_organization]).first)
             Regexp.last_match[1] + user.to_global_id.to_s
           else
             match
@@ -38,7 +39,7 @@ module Decidim
       # (see BaseParser#metadata)
       def metadata
         Metadata.new(
-          Decidim::User.where(nickname: content.scan(MENTION_REGEX).flatten)
+          Decidim::User.where(nickname: content.scan(MENTION_REGEX).flatten, organization: context[:current_organization])
         )
       end
     end

data/lib/decidim/content_processor.rb

@@ -22,7 +22,7 @@ module Decidim
   # declare the other side making it "transparent" (declaring the class and leaving it empty).
   #
   # @example How to parse a content
-  #   parsed = Decidim::ContentProcessor.parse(content)
+  #   parsed = Decidim::ContentProcessor.parse(content, context)
   #   parsed.rewrite # contains rewritten content
   #   parsed.metadata # contains the merged metadata of all parsers
   #
@@ -42,10 +42,13 @@ module Decidim
     # This calls all registered processors one after the other and collects the
     # metadata for each one and the resulting modified content
     #
+    # @param content [String] already rewritten content or regular content
+    # @param context [Hash] with information to inject to the parsers as context
+    #
     # @return [Result] a Result object with the content rewritten and the metadata
-    def self.parse(content)
+    def self.parse(content, context)
       parsed = Decidim.content_processors.each_with_object(rewrite: content, metadata: {}) do |type, result|
-        parser = parser_klass(type).constantize.new(result[:rewrite])
+        parser = parser_klass(type).constantize.new(result[:rewrite], context)
         result[:rewrite] = parser.rewrite
         result[:metadata][type] = parser.metadata
       end

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

@@ -24,11 +24,13 @@ shared_context "simple event" do
   let(:resource_path) { resource_locator(resource).path }
   let(:resource_url) { resource_locator(resource).url }
   let(:resource_title) { resource.title["en"] }
+  let(:participatory_space) { resource.participatory_space }
+  let(:participatory_space_title) { participatory_space.title["en"] }
   let(:author) { resource.author }
   let(:author_presenter) { Decidim::UserPresenter.new(author) }
 end
 
-shared_examples_for "an simple event" do
+shared_examples_for "a simple event" do
   describe "types" do
     subject { described_class }
 

data/lib/decidim/core/version.rb

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

data/lib/decidim/events/author_event.rb

@@ -13,22 +13,23 @@ module Decidim
         i18n_attributes :author_name, :author_nickname, :author_path, :author_url
 
         def author_nickname
-          author_presenter.nickname
+          author_presenter&.nickname.to_s
         end
 
         def author_name
-          author_presenter.name
+          author_presenter&.name.to_s
         end
 
         def author_path
-          author_presenter.profile_path
+          author_presenter&.profile_path.to_s
         end
 
         def author_url
-          author_presenter.profile_url
+          author_presenter&.profile_url.to_s
         end
 
         def author_presenter
+          return unless author
           @author ||= Decidim::UserPresenter.new(author)
         end
 

data/lib/decidim/events/base_event.rb

@@ -6,6 +6,8 @@ module Decidim
     # add more logic to a `Decidim::Notification` and are used to render them in the
     # notifications dashboard and to generate other notifications (emails, for example).
     class BaseEvent
+      include Decidim::TranslatableAttributes
+
       class_attribute :types
       self.types = []
 
@@ -88,7 +90,13 @@ module Decidim
       end
 
       def resource_title
-        resource.title.is_a?(Hash) ? resource.title[I18n.locale.to_s] : resource.title
+        return unless resource
+
+        if resource.respond_to?(:title)
+          translated_attribute(resource.title)
+        elsif resource.respond_to?(:name)
+          translated_attribute(resource.name)
+        end
       end
     end
   end

data/lib/decidim/events/simple_event.rb

@@ -71,9 +71,14 @@ module Decidim
           resource_path: resource_path,
           resource_title: resource_title,
           resource_url: resource_url,
+          participatory_space_title: participatory_space_title,
           scope: i18n_scope
         }
       end
+
+      def participatory_space_title
+        translated_attribute(participatory_space.try(:title))
+      end
     end
   end
 end

data/lib/decidim/form_builder.rb

@@ -7,6 +7,7 @@ module Decidim
   # following the conventions set on `Decidim::TranslatableAttributes`.
   class FormBuilder < FoundationRailsHelper::FormBuilder
     include ActionView::Context
+    include Decidim::TranslatableAttributes
 
     # Public: generates a check boxes input from a collection and adds help
     # text and errors.
@@ -436,18 +437,18 @@ module Decidim
 
     def categories_for_select(scope)
       sorted_main_categories = scope.first_class.includes(:subcategories).sort_by do |category|
-        category.name[I18n.locale.to_s]
+        translated_attribute(category.name, category.participatory_space.organization)
       end
 
       sorted_main_categories.flat_map do |category|
-        parent = [[category.name[I18n.locale.to_s], category.id]]
+        parent = [[translated_attribute(category.name, category.participatory_space.organization), category.id]]
 
         sorted_subcategories = category.subcategories.sort_by do |subcategory|
-          subcategory.name[I18n.locale.to_s]
+          translated_attribute(subcategory.name, subcategory.participatory_space.organization)
         end
 
         sorted_subcategories.each do |subcategory|
-          parent << ["- #{subcategory.name[I18n.locale.to_s]}", subcategory.id]
+          parent << ["- #{translated_attribute(subcategory.name, subcategory.participatory_space.organization)}", subcategory.id]
         end
 
         parent

data/lib/decidim/nicknamizable.rb

@@ -42,7 +42,7 @@ module Decidim
         2.step do |n|
           return candidate unless exists?(nickname: candidate)
 
-          candidate = numbered_variation_of(candidate, n)
+          candidate = numbered_variation_of(name, n)
         end
       end
 

data/lib/decidim/translatable_attributes.rb

@@ -49,6 +49,30 @@ module Decidim
       end
     end
 
+    included do
+      # Public: Returns the translation of an attribute using the current locale,
+      # if available. Checks for the organization default locale as fallback.
+      #
+      # attribute - A Hash where keys (strings) are locales, and their values are
+      #             the translation for each locale.
+      #
+      # organization - An optional Organization to get the default locale from.
+      #
+      # Returns a String with the translation.
+      def translated_attribute(attribute, organization = nil)
+        return "" if attribute.nil?
+        return attribute unless attribute.is_a?(Hash)
+
+        organization ||= try(:current_organization)
+        organization_locale = organization.try(:default_locale)
+
+        attribute[I18n.locale.to_s].presence ||
+          attribute[organization_locale].presence ||
+          attribute[attribute.keys.first].presence ||
+          ""
+      end
+    end
+
     private
 
     def translatable_attribute_setter(name, locale, value)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-core
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-09 00:00:00.000000000 Z
+date: 2018-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_link_to
@@ -506,28 +506,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 0.9.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 0.9.3
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 0.9.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 0.9.3
 description: Adds core features so other engines can hook into the framework.
 email:
 - josepjaume@gmail.com
@@ -1048,6 +1048,7 @@ files:
 - db/migrate/20180123125432_add_omnipresent_banner_short_description_to_decidim_organizations.rb
 - db/migrate/20180123125452_add_omnipresent_banner_url_to_decidim_organizations.rb
 - db/migrate/20180125063433_add_highlighted_content_banner_to_decidim_organizations.rb
+- db/migrate/20180221101934_fix_nickname_index.rb
 - db/seeds.rb
 - db/seeds/homepage_image.jpg
 - lib/decidim/abilities.rb