decidim-core 0.6.8 → 0.7.0

data/lib/decidim/exporters/excel.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+require "spreadsheet"
+
+module Decidim
+  module Exporters
+    # Exports any serialized object (Hash) into a readable Excel file. It transforms
+    # the columns using slashes in a way that can be afterwards reconstructed
+    # into the original nested hash.
+    #
+    # For example, `{ name: { ca: "Hola", en: "Hello" } }` would result into
+    # the columns: `name/ca` and `name/es`.
+    #
+    # It will maintain types like Integers, Floats & Dates so Excel can deal with
+    # them.
+    class Excel < CSV
+      # Public: Exports a file in an Excel readable format.
+      #
+      # Returns an ExportData instance.
+      def export
+        book = Spreadsheet::Workbook.new
+        sheet = book.create_worksheet
+        sheet.name = "Export"
+
+        sheet.row(0).default_format = Spreadsheet::Format.new(
+          weight: :bold,
+          pattern: 1,
+          pattern_fg_color: :xls_color_14,
+          horizontal_align: :center
+        )
+
+        sheet.row(0).replace headers
+
+        headers.length.times.each do |index|
+          sheet.column(index).width = 20
+        end
+
+        processed_collection.each_with_index do |resource, index|
+          sheet.row(index + 1).replace headers.map { |header| resource[header] }
+        end
+
+        output = StringIO.new
+        book.write output
+
+        ExportData.new(output.string, "xls")
+      end
+    end
+  end
+end

data/lib/decidim/exporters/export_data.rb

@@ -28,7 +28,7 @@ module Decidim
       # Returns a String with the filename of the export.
       def filename(prefix = "export", options = {})
         options[:extension] = !options[:extension].nil? ? options[:extension] : true
-        result = "#{prefix}-#{I18n.localize(Date.today, format: :default)}-#{Time.now.seconds_since_midnight.to_i}"
+        result = "#{prefix}-#{I18n.localize(Time.zone.today, format: :default)}-#{Time.now.seconds_since_midnight.to_i}"
         result += ".#{extension}" if options[:extension]
         result
       end

data/lib/decidim/exporters/exporter.rb

@@ -10,7 +10,7 @@ module Decidim
       #
       # collection - An Array with the collection to be exported.
       # serializer - A Serializer to be used during the export.
-      def initialize(collection, serializer)
+      def initialize(collection, serializer = Serializer)
         @collection = collection
         @serializer = serializer
       end

data/lib/decidim/faker/localized.rb

@@ -1,6 +1,15 @@
 # frozen_string_literal: true
 
-require "faker"
+begin
+  require "faker"
+rescue LoadError => e
+  msg = <<~ERROR
+    You're trying to use decidim's faker-based seeds but you're not using `faker`.
+    Make sure you add the `faker` gem to your `Gemfile` and try again
+  ERROR
+
+  raise e, msg
+end
 
 module Decidim
   module Faker

data/lib/decidim/feature_validator.rb

@@ -6,7 +6,7 @@
 class FeatureValidator < ActiveModel::EachValidator
   # Validates the arguiments passed to the validator.
   def check_validity!
-    raise ArgumentError, "You must include a `manifest` option with the name of the manifest to validate when validating a feature" unless options[:manifest].present?
+    raise ArgumentError, "You must include a `manifest` option with the name of the manifest to validate when validating a feature" if options[:manifest].blank?
   end
 
   # The actual validator method. It is called when ActiveRecord iterates

data/lib/decidim/form_builder.rb

@@ -158,7 +158,7 @@ module Decidim
 
     # Public: Override so checkboxes are rendered before the label.
     def check_box(attribute, options = {}, checked_value = "1", unchecked_value = "0")
-      custom_label(attribute, options[:label], options[:label_options], true) do
+      custom_label(attribute, options[:label], options[:label_options], true, false) do
         options.delete(:label)
         options.delete(:label_options)
         @template.check_box(@object_name, attribute, objectify_options(options), checked_value, unchecked_value)
@@ -229,9 +229,9 @@ module Decidim
 
       if file_is_image?(file)
         template += if file.present?
-                      @template.label_tag I18n.t("current_image", scope: "decidim.forms")
+                      @template.content_tag :label, I18n.t("current_image", scope: "decidim.forms")
                     else
-                      @template.label_tag I18n.t("default_image", scope: "decidim.forms")
+                      @template.content_tag :label, 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)
@@ -250,6 +250,12 @@ module Decidim
         end
       end
 
+      if object.errors[attribute].any?
+        template += content_tag :p, class: "is-invalid-label" do
+          safe_join object.errors[attribute], "<br/>"
+        end
+      end
+
       template.html_safe
     end
 
@@ -375,15 +381,17 @@ module Decidim
     #
     # attribute - The String name of the attribute we're build the label.
     # text      - The String text to use as label.
-    # options   - An optional Hash to build the label.
+    # options   - A Hash to build the label.
     #
     # Returns a String.
-    def custom_label(attribute, text, options, field_before_label = false)
+    # rubocop:disable Metrics/CyclomaticComplexity
+    # rubocop:disable Metrics/PerceivedComplexity
+    def custom_label(attribute, text, options, field_before_label = false, show_required = true)
       return block_given? ? yield.html_safe : "".html_safe if text == false
 
       text = default_label_text(object, attribute) if text.nil? || text == true
+      text += required_for_attribute(attribute) if show_required
 
-      text += required_for_attribute(attribute)
       text = if field_before_label && block_given?
                safe_join([yield, text.html_safe])
              elsif block_given?
@@ -392,6 +400,8 @@ module Decidim
 
       label(attribute, text, options || {})
     end
+    # rubocop:enable Metrics/PerceivedComplexity
+    # rubocop:enable Metrics/CyclomaticComplexity
 
     # Private: Builds a span to be shown when there's a validation error in a field.
     # It looks for the text that will be the content in a similar way `human_attribute_name`

data/lib/decidim/page_finder.rb

@@ -33,7 +33,7 @@ module Decidim
     #
     # Returns a String.
     def clean_path
-      return super unless page.present?
+      return super if page.blank?
 
       DECIDIM_PAGE_TEMPLATE
     end

data/lib/decidim/participable.rb

@@ -13,9 +13,7 @@ module Decidim
         self.class.name.demodulize
       end
 
-      def foreign_key
-        demodulized_name.foreign_key
-      end
+      delegate :foreign_key, to: :demodulized_name
 
       def module_name
         "Decidim::#{demodulized_name.pluralize}"
@@ -38,7 +36,10 @@ module Decidim
       end
 
       def mounted_params
-        { host: organization.host, foreign_key.to_sym => id }
+        {
+          host: organization.host,
+          "#{underscored_name}_slug".to_sym => slug
+        }
       end
 
       def extension_module
@@ -72,6 +73,10 @@ module Decidim
     # rubocop:enable Metrics/BlockLength
 
     class_methods do
+      def slug_format
+        /\A[a-zA-Z]+[a-zA-Z0-9-]+\z/
+      end
+
       def participatory_space_manifest
         Decidim.find_participatory_space_manifest(name.demodulize.underscore.pluralize)
       end

data/lib/decidim/publicable.rb

@@ -35,7 +35,7 @@ module Decidim
     #
     # Returns true if the record was properly saved, false otherwise.
     def publish!
-      update_attribute(:published_at, Time.current)
+      update_attributes!(published_at: Time.current)
     end
 
     #
@@ -43,7 +43,7 @@ module Decidim
     #
     # Returns true if the record was properly saved, false otherwise.
     def unpublish!
-      update_attribute(:published_at, nil)
+      update_attributes!(published_at: nil)
     end
   end
 end

data/vendor/assets/javascripts/datepicker-locales/foundation-datepicker.ru.js

@@ -0,0 +1,14 @@
+/**
+ * Russian translation for foundation-datepicker
+ * Dmytro Ivakhnenko <aavuso@gmail.com>
+ */
+;(function($){
+	$.fn.fdatepicker.dates['ru'] = {
+		days: ["Воскресенье", "Понедельник", "Вторник", "Среда", "Четверг", "Пятница", "Суббота", "Воскресенье"],
+		daysShort: ["Вск", "Пнд", "Втр", "Срд", "Чтв", "Птн", "Суб", "Вск"],
+		daysMin: ["Вс", "Пн", "Вт", "Ср", "Чт", "Пт", "Сб", "Вс"],
+		months: ["Январь", "Февраль", "Март", "Апрель", "Май", "Июнь", "Июль", "Август", "Сентябрь", "Октябрь", "Ноябрь", "Декабрь"],
+		monthsShort: ["Янв", "Фев", "Мар", "Апр", "Май", "Июн", "Июл", "Авг", "Сен", "Окт", "Ноя", "Дек"],
+		today: "Сегодня"
+	};
+}(jQuery));

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-core
 version: !ruby/object:Gem::Version
-  version: 0.6.8
+  version: 0.7.0
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-17 00:00:00.000000000 Z
+date: 2017-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -60,14 +60,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: invisible_captcha
   requirement: !ruby/object:Gem::Requirement
@@ -88,14 +88,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: sassc-rails
   requirement: !ruby/object:Gem::Requirement
@@ -116,14 +116,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.3.1.0
+        version: 6.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.3.1.0
+        version: 6.3.0
 - !ruby/object:Gem::Dependency
   name: autoprefixer-rails
   requirement: !ruby/object:Gem::Requirement
@@ -214,14 +214,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.3
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.3
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: high_voltage
   requirement: !ruby/object:Gem::Requirement
@@ -284,28 +284,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.9
+        version: 0.7.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.9
+        version: 0.7.10
 - !ruby/object:Gem::Dependency
   name: mini_magick
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.7.0
+        version: 4.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.7.0
+        version: 4.8.0
 - !ruby/object:Gem::Dependency
   name: file_validators
   requirement: !ruby/object:Gem::Requirement
@@ -404,20 +404,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.9.5
-- !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.7.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.7.1
 - !ruby/object:Gem::Dependency
   name: geocoder
   requirement: !ruby/object:Gem::Requirement
@@ -461,89 +447,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 4.0.3
 - !ruby/object:Gem::Dependency
-  name: decidim-api
+  name: spreadsheet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.8
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.6.8
-- !ruby/object:Gem::Dependency
-  name: decidim-dev
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.6.8
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.6.8
-- !ruby/object:Gem::Dependency
-  name: decidim-participatory_processes
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.6.8
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.6.8
-- !ruby/object:Gem::Dependency
-  name: decidim-proposals
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.6.8
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.8
+        version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: decidim-meetings
+  name: decidim-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.8
-  type: :development
+        version: 0.7.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.8
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
-  name: decidim-results
+  name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.8
+        version: 0.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.8
+        version: 0.7.0
 description: Adds core features so other engines can hook into the framework.
 email:
 - josepjaume@gmail.com
@@ -572,6 +516,7 @@ files:
 - app/assets/fonts/decidim/Source_Sans_Pro_900.woff
 - app/assets/fonts/decidim/Source_Sans_Pro_900.woff2
 - app/assets/images/decidim/cc-badge.png
+- app/assets/images/decidim/decidim-logo.svg
 - app/assets/images/decidim/default-avatar.svg
 - app/assets/images/decidim/icons.svg
 - app/assets/javascripts/decidim.js.es6
@@ -589,6 +534,7 @@ files:
 - app/assets/javascripts/decidim/orders.js.es6
 - app/assets/javascripts/decidim/select2.field.js.es6
 - app/assets/javascripts/decidim/select2.js.es6
+- app/assets/javascripts/decidim/slug_form.js.es6
 - app/assets/javascripts/decidim/user_registrations.js.es6
 - app/assets/javascripts/decidim/widget.js.es6
 - app/assets/stylesheets/decidim/_decidim.scss
@@ -598,7 +544,6 @@ files:
 - app/assets/stylesheets/decidim/email.css
 - app/assets/stylesheets/decidim/extras/_add_comments.scss
 - app/assets/stylesheets/decidim/extras/_announcement.scss
-- app/assets/stylesheets/decidim/extras/_callout.scss
 - app/assets/stylesheets/decidim/extras/_collection-sort-controls.scss
 - app/assets/stylesheets/decidim/extras/_embed.scss
 - app/assets/stylesheets/decidim/extras/_impersonation-bar.scss
@@ -732,6 +677,7 @@ files:
 - app/helpers/decidim/attachments_helper.rb
 - app/helpers/decidim/authorization_form_helper.rb
 - app/helpers/decidim/cookies_helper.rb
+- app/helpers/decidim/cta_button_helper.rb
 - app/helpers/decidim/decidim_form_helper.rb
 - app/helpers/decidim/feature_path_helper.rb
 - app/helpers/decidim/feature_reference_helper.rb
@@ -893,6 +839,7 @@ files:
 - app/views/kaminari/decidim/_prev_page.html.erb
 - app/views/layouts/decidim/_application.html.erb
 - app/views/layouts/decidim/_cookie_warning.html.erb
+- app/views/layouts/decidim/_feature_authorization_modals.html.erb
 - app/views/layouts/decidim/_head.html.erb
 - app/views/layouts/decidim/_head_extra.html.erb
 - app/views/layouts/decidim/_impersonation_warning.html.erb
@@ -927,9 +874,9 @@ files:
 - config/locales/it.yml
 - config/locales/nl.yml
 - config/locales/pl.yml
+- config/locales/ru.yml
 - config/locales/uk.yml
 - config/routes.rb
-- config/secrets.yml
 - db/migrate/20160817115213_devise_create_decidim_users.rb
 - db/migrate/20160919104837_create_decidim_organizations.rb
 - db/migrate/20160920140207_devise_invitable_add_to_decidim_users.rb
@@ -997,6 +944,7 @@ files:
 - db/migrate/20170913092351_add_header_snippets_to_organizations.rb
 - db/migrate/20170914075721_remove_followable_index_from_follows.rb
 - db/migrate/20170914092116_remove_comment_and_replies_notifications_from_users.rb
+- db/migrate/20171017084546_add_cta_button_url_and_text_to_organization.rb
 - db/seeds.rb
 - db/seeds/homepage_image.jpg
 - lib/decidim/abilities.rb
@@ -1047,6 +995,7 @@ files:
 - lib/decidim/events/notification_event.rb
 - lib/decidim/exporters.rb
 - lib/decidim/exporters/csv.rb
+- lib/decidim/exporters/excel.rb
 - lib/decidim/exporters/export_data.rb
 - lib/decidim/exporters/exporter.rb
 - lib/decidim/exporters/json.rb
@@ -1094,6 +1043,7 @@ files:
 - vendor/assets/javascripts/datepicker-locales/foundation-datepicker.fr.js
 - vendor/assets/javascripts/datepicker-locales/foundation-datepicker.it.js
 - vendor/assets/javascripts/datepicker-locales/foundation-datepicker.nl.js
+- vendor/assets/javascripts/datepicker-locales/foundation-datepicker.ru.js
 - vendor/assets/javascripts/datepicker-locales/foundation-datepicker.uk.js
 - vendor/assets/javascripts/form_datepicker.js.es6
 - vendor/assets/javascripts/foundation-datepicker.js
@@ -1114,7 +1064,7 @@ files:
 - vendor/assets/stylesheets/quill.snow.css
 homepage: ''
 licenses:
-- AGPLv3
+- AGPL-3.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -1132,7 +1082,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: The core of the Decidim framework.