decidim-core 0.3.2 → 0.4.0

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

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+RSpec.shared_examples_for "a 404 page" do
+  before do
+    allow(Rails.application).to \
+      receive(:env_config).with(no_args).and_wrap_original do |m, *|
+        m.call.merge(
+          "action_dispatch.show_exceptions" => true,
+          "action_dispatch.show_detailed_exceptions" => false
+        )
+      end
+
+    visit target_path
+  end
+
+  it "leads to a 404" do
+    expect(page).to have_content("The page you're looking for can't be found")
+
+    expect(page).to have_http_status(:not_found)
+  end
+end

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

@@ -1,13 +1,29 @@
 # frozen_string_literal: true
 
 shared_examples_for "has reference" do
+  before do
+    allow(Decidim).to receive(:calculate_reference_method).and_return(nil)
+  end
+
   context "when the reference is nil" do
     before do
       subject[:reference] = nil
     end
 
-    it "generates a valid reference" do
-      expect(subject.reference).to match(/[A-z]+/)
+    context "when there is not a custom resource reference generator present" do
+      it "generates a valid reference" do
+        expect(subject.reference).to match(/[A-z]+/)
+      end
+    end
+
+    context "when there is a custom resource reference generator present" do
+      before do
+        allow(Decidim).to receive(:resource_reference_generator).and_return(->(resource, _feature) { "1234-#{resource.id}" })
+      end
+
+      it "generates a valid reference" do
+        expect(subject.reference).to eq("1234-#{subject.id}")
+      end
     end
   end
 

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

@@ -13,7 +13,7 @@ RSpec.shared_examples "manage moderations" do
   let!(:hidden_moderations) do
     reportables.last(1).map do |reportable|
       moderation = create(:moderation, reportable: reportable, report_count: 3, hidden_at: Time.current)
-      create_list(:report, 3, moderation: moderation)
+      create_list(:report, 3, moderation: moderation, reason: :spam)
       moderation
     end
   end
@@ -30,7 +30,7 @@ RSpec.shared_examples "manage moderations" do
       moderations.each do |moderation|
         within "tr[data-id=\"#{moderation.id}\"]" do
           expect(page).to have_content moderation.reportable.reported_content_url
-          expect(page).to have_content moderation.reports.first.reason
+          expect(page).to have_content "Spam"
         end
       end
     end

data/lib/decidim/core/version.rb

@@ -3,7 +3,7 @@
 # This holds Decidim's version and the Rails version on which it depends.
 module Decidim
   def self.version
-    "0.3.2"
+    "0.4.0"
   end
 
   def self.rails_version

data/lib/decidim/devise_failure_app.rb

@@ -6,7 +6,7 @@ module Decidim
   # introducing a bug).
   class DeviseFailureApp < ::Devise::FailureApp
     def scope_url
-      opts  = {}
+      opts = {}
 
       # Initialize script_name with nil to prevent infinite loops in
       # authenticated mounted engines in rails 4.2 and 5.0

data/lib/decidim/form_builder.rb

@@ -89,7 +89,7 @@ module Decidim
 
       content_tag(:div, class: "editor") do
         template = ""
-        template += label(name) if options[:label] != false
+        template += label(name, options[:label].to_s || name) if options[:label] != false
         template += hidden_field(name, options)
         template += content_tag(:div, nil, class: "editor-container", data: {
                                   toolbar: options[:toolbar]
@@ -144,7 +144,7 @@ module Decidim
       iso_value = value.present? ? value.strftime("%Y-%m-%d") : ""
 
       template = ""
-      template += label(attribute, label_for(attribute))
+      template += label(attribute, label_for(attribute) + required_for_attribute(attribute))
       template += @template.text_field(
         @object_name,
         attribute,
@@ -166,7 +166,7 @@ module Decidim
         formatted_value = I18n.localize(value, format: :timepicker)
       end
       template = ""
-      template += label(attribute, label_for(attribute))
+      template += label(attribute, label_for(attribute) + required_for_attribute(attribute))
       template += @template.text_field(
         @object_name,
         attribute,
@@ -180,6 +180,49 @@ module Decidim
       template.html_safe
     end
 
+    # Public: Generates a file upload field and sets the form as multipart.
+    # If the file is an image it displays the default image if present or the current one.
+    # By default it also generates a checkbox to delete the file. This checkbox can
+    # be hidden if `options[:optional]` is passed as `false`.
+    #
+    # attribute    - The String name of the attribute to buidl the field.
+    # options      - A Hash with options to build the field.
+    #              * optional: Whether the file can be optional or not.
+    def upload(attribute, options = {})
+      self.multipart = true
+      options[:optional] = options[:optional].nil? ? true : options[:optional]
+
+      file = object.send attribute
+      template = ""
+      template += label(attribute, label_for(attribute) + required_for_attribute(attribute))
+      template += @template.file_field @object_name, attribute
+
+      if file_is_image?(file)
+        template += if file.present?
+                      @template.label_tag I18n.t("current_image", scope: "decidim.forms")
+                    else
+                      @template.label_tag I18n.t("default_image", scope: "decidim.forms")
+                    end
+        template += @template.link_to @template.image_tag(file.url), file.url, target: "_blank"
+      elsif file_is_present?(file)
+        template += @template.label_tag I18n.t("current_file", scope: "decidim.forms")
+        template += @template.link_to file.file.filename, file.url, target: "_blank"
+      end
+
+      if file_is_present?(file)
+        if options[:optional]
+          template += content_tag :div, class: "field" do
+            safe_join([
+                        @template.check_box(@object_name, "remove_#{attribute}"),
+                        label("remove_#{attribute}", label_for("remove_#{attribute}"))
+                      ])
+          end
+        end
+      end
+
+      template.html_safe
+    end
+
     private
 
     # Private: Override from FoundationRailsHelper in order to render
@@ -251,9 +294,26 @@ module Decidim
     #
     # Returns Boolean.
     def attribute_required?(attribute)
-      validator = find_validator(attribute, ActiveModel::Validations::PresenceValidator)
+      validator = find_validator(attribute, ActiveModel::Validations::PresenceValidator) ||
+                  find_validator(attribute, TranslatablePresenceValidator)
+
+      return unless validator
+
+      # Check if the if condition is present and it evaluates to true
+      if_condition = validator.options[:if]
+      validator_if_condition = if_condition.nil? ||
+                               (string_or_symbol?(if_condition) ? object.send(if_condition) : if_condition.call(object))
+
+      # Check if the unless condition is present and it evaluates to false
+      unless_condition = validator.options[:unless]
+      validator_unless_condition = unless_condition.nil? ||
+                                   (string_or_symbol?(unless_condition) ? !object.send(unless_condition) : !unless_condition.call(object))
 
-      validator && validator.options.blank?
+      validator_if_condition && validator_unless_condition
+    end
+
+    def string_or_symbol?(obj)
+      obj.is_a?(String) || obj.is_a?(Symbol)
     end
 
     # Private: Tries to find a length validator in the form object.
@@ -293,6 +353,7 @@ module Decidim
 
       text = default_label_text(object, attribute) if text.nil? || text == true
 
+      text += required_for_attribute(attribute)
       text = if field_before_label && block_given?
                safe_join([yield, text.html_safe])
              elsif block_given?
@@ -379,8 +440,31 @@ module Decidim
         options[:class] ||= ""
         options[:class] += " is-invalid-label"
       end
+      text += required_for_attribute(attribute)
 
       label(attribute, (text || "").html_safe, options)
     end
+
+    # Private: Returns whether the file is an image or not.
+    def file_is_image?(file)
+      return unless file && file.respond_to?(:url)
+      return file.content_type.start_with? "image" if file.content_type.present?
+      Mime::Type.lookup_by_extension(File.extname(file.url)[1..-1]).to_s.start_with? "image" if file.url.present?
+    end
+
+    # Private: Returns whether the file exists or not.
+    def file_is_present?(file)
+      return unless file && file.respond_to?(:url)
+      file.present?
+    end
+
+    def required_for_attribute(attribute)
+      if attribute_required?(attribute)
+        return content_tag(:abbr, "*", title: I18n.t("required", scope: "forms"),
+                                       data: { tooltip: true, disable_hover: false }, 'aria-haspopup': true,
+                                       class: "label-required").html_safe
+      end
+      "".html_safe
+    end
   end
 end

data/lib/decidim/has_reference.rb

@@ -19,25 +19,13 @@ module Decidim
 
       private
 
-      # Public: Calculates a unique reference for the model in
-      # the following format:
-      #
-      # "BCN-DPP-2017-02-6589" which in this example translates to:
-      #
-      # BCN: A setting configured at the organization to be prepended to each reference.
-      # PROP: Unique name identifier for a resource: Decidim::Proposals::Proposal (MEET for meetings or PROJ for projects).
-      # 2017-02: Year-Month of the resource creation date
-      # 6589: ID of the resource
+      # Public: Calculates a unique reference for the model using the function
+      # provided by configuration
       #
       # Returns a String.
       def calculate_reference
         return unless feature
-
-        ref = feature.participatory_process.organization.reference_prefix
-        class_identifier = self.class.name.demodulize[0..3].upcase
-        year_month = (created_at || Time.current).strftime("%Y-%m")
-
-        [ref, class_identifier, year_month, id].join("-")
+        Decidim.resource_reference_generator.call(self, feature)
       end
 
       # Internal: Sets the unique reference to the model.

data/lib/decidim/notifiable.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require "active_support/concern"
+
+module Decidim
+  # Shared behaviour for notifiable models.
+  module Notifiable
+    extend ActiveSupport::Concern
+
+    included do
+      # Public: Whether the object is notifiable or not.
+      def notifiable?(_context)
+        true
+      end
+
+      # Public: A collection of users to send the notifications.
+      def users_to_notify
+        []
+      end
+    end
+  end
+end

data/lib/devise/models/decidim_validatable.rb

@@ -27,13 +27,13 @@ module Devise
         assert_validations_api!(base)
 
         base.class_eval do
-          validates_presence_of   :email, if: :email_required?
+          validates_presence_of :email, if: :email_required?
           validates_uniqueness_of :email, allow_blank: true, if: :email_changed?, scope: :organization
-          validates_format_of     :email, with: email_regexp, allow_blank: true, if: :email_changed?
+          validates_format_of :email, with: email_regexp, allow_blank: true, if: :email_changed?
 
-          validates_presence_of     :password, if: :password_required?
+          validates_presence_of :password, if: :password_required?
           validates_confirmation_of :password, if: :password_required?
-          validates_length_of       :password, within: password_length, allow_blank: true
+          validates_length_of :password, within: password_length, allow_blank: true
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-core
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-19 00:00:00.000000000 Z
+date: 2017-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -96,6 +96,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.1
+- !ruby/object:Gem::Dependency
+  name: sass
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.4.24
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.4.24
 - !ruby/object:Gem::Dependency
   name: sassc-rails
   requirement: !ruby/object:Gem::Requirement
@@ -200,14 +214,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: 0.21.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: 0.21.0
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
@@ -452,70 +466,70 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: decidim-proposals
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: decidim-meetings
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: decidim-results
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.4.0
 description: Adds core features so other engines can hook into the framework.
 email:
 - josepjaume@gmail.com
@@ -565,10 +579,14 @@ files:
 - app/assets/stylesheets/decidim/application.scss.erb
 - app/assets/stylesheets/decidim/editor.sass
 - app/assets/stylesheets/decidim/email.css
+- app/assets/stylesheets/decidim/extras/_add_comments.scss
 - app/assets/stylesheets/decidim/extras/_embed.scss
+- app/assets/stylesheets/decidim/extras/_label-required.scss
 - app/assets/stylesheets/decidim/extras/_leaflet.scss
 - app/assets/stylesheets/decidim/extras/_quill.scss
+- app/assets/stylesheets/decidim/extras/_reference.scss
 - app/assets/stylesheets/decidim/extras/_register_form.scss
+- app/assets/stylesheets/decidim/extras/_social_icons_mini.scss
 - app/assets/stylesheets/decidim/layouts/_home.scss
 - app/assets/stylesheets/decidim/layouts/_user.scss
 - app/assets/stylesheets/decidim/layouts/_view.scss
@@ -634,6 +652,7 @@ files:
 - app/commands/decidim/update_account.rb
 - app/commands/decidim/update_notifications_settings.rb
 - app/constraints/decidim/current_feature.rb
+- app/constraints/decidim/current_participatory_process.rb
 - app/controllers/concerns/decidim/action_authorization.rb
 - app/controllers/concerns/decidim/devise_controllers.rb
 - app/controllers/concerns/decidim/feature_settings.rb
@@ -655,6 +674,7 @@ files:
 - app/controllers/decidim/devise/passwords_controller.rb
 - app/controllers/decidim/devise/registrations_controller.rb
 - app/controllers/decidim/devise/sessions_controller.rb
+- app/controllers/decidim/errors_controller.rb
 - app/controllers/decidim/features/base_controller.rb
 - app/controllers/decidim/locales_controller.rb
 - app/controllers/decidim/notifications_settings_controller.rb
@@ -683,9 +703,11 @@ files:
 - app/helpers/decidim/authorization_form_helper.rb
 - app/helpers/decidim/cookies_helper.rb
 - app/helpers/decidim/decidim_form_helper.rb
+- app/helpers/decidim/feature_path_helper.rb
 - app/helpers/decidim/feature_reference_helper.rb
 - app/helpers/decidim/filters_helper.rb
 - app/helpers/decidim/humanize_booleans_helper.rb
+- app/helpers/decidim/icon_helper.rb
 - app/helpers/decidim/language_chooser_helper.rb
 - app/helpers/decidim/layout_helper.rb
 - app/helpers/decidim/localized_locales_helper.rb
@@ -782,6 +804,9 @@ files:
 - app/views/decidim/devise/sessions/new.html.erb
 - app/views/decidim/devise/shared/_links.html.erb
 - app/views/decidim/devise/shared/_omniauth_buttons.html.erb
+- app/views/decidim/devise/shared/_omniauth_buttons_mini.html.erb
+- app/views/decidim/errors/internal_server_error.html.erb
+- app/views/decidim/errors/not_found.html.erb
 - app/views/decidim/export_mailer/export.html.erb
 - app/views/decidim/newsletter_mailer/newsletter.html.erb
 - app/views/decidim/notifications_settings/show.html.erb
@@ -844,8 +869,6 @@ files:
 - app/views/layouts/decidim/participatory_process.html.erb
 - app/views/layouts/decidim/user_profile.html.erb
 - app/views/layouts/decidim/widget.html.erb
-- app/views/pages/404.html.erb
-- app/views/pages/500.html.erb
 - app/views/pages/decidim_page.html.erb
 - app/views/pages/home.html.erb
 - app/views/pages/home/_extended.html.erb
@@ -967,6 +990,7 @@ files:
 - lib/decidim/core/test/factories.rb
 - lib/decidim/core/test/shared_examples/authorable.rb
 - lib/decidim/core/test/shared_examples/comments_examples.rb
+- lib/decidim/core/test/shared_examples/errors.rb
 - lib/decidim/core/test/shared_examples/has_attachments.rb
 - lib/decidim/core/test/shared_examples/has_category.rb
 - lib/decidim/core/test/shared_examples/has_feature.rb
@@ -1003,6 +1027,7 @@ files:
 - lib/decidim/menu.rb
 - lib/decidim/menu_item.rb
 - lib/decidim/menu_registry.rb
+- lib/decidim/notifiable.rb
 - lib/decidim/page_finder.rb
 - lib/decidim/query_extensions.rb
 - lib/decidim/reportable.rb