decidim-core 0.28.0 → 0.28.2

data/config/locales/zh-TW.yml

@@ -74,10 +74,7 @@ zh-TW:
     'true': '是'
   carrierwave:
     errors:
-      file_cannot_be_processed: 無法處理檔案
-      file_resolution_too_large: 檔案解析度過大
       file_size_too_large: 檔案太大。
-      not_inside_organization: 該文件未附加到任何組織
   date:
     formats:
       decidim_short: "%d/%m/%Y"
@@ -318,7 +315,6 @@ zh-TW:
           '1': 創建您的修正案
           '2': 比較您的修正案
           '3': 完成您的修正案
-          '4': 發佈您的修正案
     anonymous_user: 匿名
     application:
       document:
@@ -464,8 +460,6 @@ zh-TW:
         description: 說明
       footer_sub_hero:
         name: 頁尾子英雄橫幅
-      hero:
-        name: 英雄圖像
       hero_settings_form:
         background_image: 背景圖片
         welcome_text: 歡迎文字
@@ -519,6 +513,7 @@ zh-TW:
       registrations:
         new:
           already_have_an_account?: 已經有帳號了嗎？
+          log_in: 登入
           newsletter: 偶爾收到包含相關信息的時事通訊。
           newsletter_title: 聯絡人權限
           sign_up: 註冊登記
@@ -824,6 +819,7 @@ zh-TW:
           filename: 檔案名稱
           remove: 移除
           replace: 替換
+          save: 儲存
           title: 標題
           title_required: 標題為必填欄位！
           uploaded: 已上傳
@@ -1106,7 +1102,6 @@ zh-TW:
         token_error: 該連結已過期。
         unsubscribe: 取消訂閱
     newsletters_opt_in:
-      unathorized: 抱歉，此連結已不再可用。
       update:
         error: 儲存通訊設定時出現問題。
         success: 成功更新電子報設定.
@@ -1168,7 +1163,6 @@ zh-TW:
         success: 您的通知設定已成功更新。
     offline:
       show:
-        message: 看起來您目前處於離線狀態，請稍後再試。
         retry: 重試
     open_data:
       not_available_yet: 開放數據檔案尚未可用，請稍後再試。
@@ -1192,11 +1186,13 @@ zh-TW:
           register: 註冊
         hero:
           participate: 參與
+          participate_title: 參與平台的流程
           welcome: 歡迎來到 %{organization}！
         statistics:
           headline: '%{organization} 的目前狀態'
         sub_hero:
           register: 註冊
+          register_title: 註冊以創建帳戶
       index:
         standalone_pages: 頁
         subheading: 瀏覽 %{name} 的幫助頁面
@@ -1570,12 +1566,16 @@ zh-TW:
       signed_up_but_unconfirmed: 確認信件已送至您的 Email 信箱，請點擊信件內連結以啓動您的帳號。
       update_needs_confirmation: 您已經成功的更新帳號資訊，但我們仍需確認您的電子信箱，請至新信箱收信並點擊連結以確認您的新電子郵件帳號。
       updated: 您的帳號已成功升級。
+    sessions:
+      new:
+        log_in: 登入
     shared:
       links:
         back: 返回
         didn_t_receive_confirmation_instructions: 沒有收到確認的說明嗎？
         didn_t_receive_unlock_instructions: 沒有收到解鎖說明？
         forgot_your_password: 忘記密碼了嗎？
+        log_in: 登入
         sign_up: 註冊登記
       minimum_password_length:
         other: "One\n(最少%{count} 個字符)\n\nOther\n(最少%{count} 個字符)"
@@ -1591,16 +1591,13 @@ zh-TW:
     button: 新增Emoji
     categories:
       activities: 活躍狀態
-      animals-nature: 動物與自然
       custom: 自訂
       flags: 旗幟
-      food-drink: 食物 & 飲料
       objects: 目標
       people-body: 人與身體
       recents: 最近使用的
       smileys-emotion: 表情符號和情感
       symbols: 符號
-      travel-places: 旅遊與地點
     error:
       load: 無法載入表情符號
     recents:
@@ -1703,9 +1700,11 @@ zh-TW:
         data_consent_settings: Cookie 設定
         decidim_logo: Decidim 商標
         download_open_data: 下載開放數據檔案
+        log_in: 登入
         made_with_open_source: 使用<a target="_blank" href="https://github.com/decidim/decidim">自由軟體</a>建立的網站。
         sign_up: 註冊
       header:
+        log_in: 登入
         main_menu: 主選單
         user_menu: 使用者選單
       impersonation_warning:

data/decidim-core.gemspec

@@ -0,0 +1,90 @@
+# frozen_string_literal: true
+
+$LOAD_PATH.push File.expand_path("lib", __dir__)
+
+# Maintain your gem's version:
+require "decidim/core/version"
+
+# Describe your gem and declare its dependencies:
+Gem::Specification.new do |s|
+  s.name = "decidim-core"
+  s.version = Decidim::Core.version
+  s.authors = ["Josep Jaume Rey Peroy", "Marc Riera Casals", "Oriol Gual Oliva"]
+  s.email = ["josepjaume@gmail.com", "mrc2407@gmail.com", "oriolgual@gmail.com"]
+  s.homepage = "https://decidim.org"
+  s.metadata = {
+    "bug_tracker_uri" => "https://github.com/decidim/decidim/issues",
+    "documentation_uri" => "https://docs.decidim.org/",
+    "funding_uri" => "https://opencollective.com/decidim",
+    "homepage_uri" => "https://decidim.org",
+    "source_code_uri" => "https://github.com/decidim/decidim"
+  }
+  s.summary = "The core of the Decidim framework."
+  s.description = "Adds core features so other engines can hook into the framework."
+  s.license = "AGPL-3.0"
+  s.required_ruby_version = "~> 3.1.0"
+
+  s.files = Dir.chdir(__dir__) do
+    `git ls-files -z`.split("\x0").select do |f|
+      (File.expand_path(f) == __FILE__) ||
+        f.start_with?(*%w(app/ config/ db/ lib/ Rakefile README.md))
+    end
+  end
+
+  s.add_dependency "active_link_to", "~> 1.0"
+  s.add_dependency "acts_as_list", "~> 1.0"
+  s.add_dependency "batch-loader", "~> 1.2"
+  s.add_dependency "browser", "~> 2.7"
+  s.add_dependency "carrierwave", "~> 2.2.5", ">= 2.2.5"
+  s.add_dependency "cells-erb", "~> 0.1.0"
+  s.add_dependency "cells-rails", "~> 0.1.3"
+  s.add_dependency "charlock_holmes", "~> 0.7"
+  s.add_dependency "date_validator", "~> 0.12.0"
+  s.add_dependency "devise", "~> 4.7"
+  s.add_dependency "devise-i18n", "~> 1.2", "< 1.11.1"
+  s.add_dependency "diffy", "~> 3.3"
+  s.add_dependency "doorkeeper", "~> 5.6", ">= 5.6.6"
+  s.add_dependency "doorkeeper-i18n", "~> 4.0"
+  s.add_dependency "file_validators", "~> 3.0"
+  s.add_dependency "fog-local", "~> 0.6"
+  s.add_dependency "foundation_rails_helper", "~> 4.0"
+  s.add_dependency "geocoder", "~> 1.8"
+  s.add_dependency "hashdiff", ">= 0.4.0", "< 2.0.0"
+  s.add_dependency "invisible_captcha", "~> 0.12"
+  s.add_dependency "kaminari", "~> 1.2", ">= 1.2.1"
+  s.add_dependency "loofah", "~> 2.19", ">= 2.19.1"
+  s.add_dependency "mime-types", ">= 1.16", "< 4.0"
+  s.add_dependency "mini_magick", "~> 4.9"
+  s.add_dependency "net-smtp", "~> 0.3.1"
+  s.add_dependency "omniauth", "~> 2.0"
+  s.add_dependency "omniauth-facebook", "~> 5.0"
+  s.add_dependency "omniauth-google-oauth2", "~> 1.0"
+  s.add_dependency "omniauth-rails_csrf_protection", "~> 1.0"
+  s.add_dependency "omniauth-twitter", "~> 1.4"
+  s.add_dependency "paper_trail", "~> 12.0"
+  s.add_dependency "pg", "~> 1.4.0", "< 2"
+  s.add_dependency "pg_search", "~> 2.2"
+  s.add_dependency "premailer-rails", "~> 1.10"
+  # We need psych 4+ in order to use the `aliases: true` option,
+  # see https://stackoverflow.com/questions/71191685/visit-psych-nodes-alias-unknown-alias-default-psychbadalias
+  # Also note that we need Rails 6.1.5+,
+  # see https://gist.github.com/yahonda/2776d8d7b6ea7045359f38c10449937b
+  s.add_dependency "psych", "~> 4.0"
+  s.add_dependency "rack", "~> 2.2", ">= 2.2.6.4"
+  s.add_dependency "rack-attack", "~> 6.0"
+  s.add_dependency "rails", "~> 6.1.7", ">=6.1.7.4"
+  s.add_dependency "rails-i18n", "~> 6.0"
+  s.add_dependency "ransack", "~> 3.2.1"
+  s.add_dependency "redis", "~> 4.1"
+  s.add_dependency "request_store", "~> 1.5.0"
+  s.add_dependency "rubyXL", "~> 3.4"
+  s.add_dependency "rubyzip", "~> 2.0"
+  s.add_dependency "seven_zip_ruby", "~> 1.3"
+  s.add_dependency "shakapacker", "~> 7.1.0"
+  s.add_dependency "valid_email2", "~> 4.0"
+  s.add_dependency "web-push", "~> 3.0"
+  s.add_dependency "wisper", "~> 2.0"
+
+  s.add_development_dependency "decidim-api", Decidim::Core.version
+  s.add_development_dependency "decidim-dev", Decidim::Core.version
+end

data/lib/decidim/asset_router/storage.rb

@@ -22,6 +22,8 @@ module Decidim
       def url(**options)
         if asset.is_a? ActiveStorage::Attached
           routes.rails_blob_url(asset.blob, **default_options.merge(options))
+        elsif asset.is_a? ActiveStorage::Blob
+          routes.rails_blob_url(asset, **default_options.merge(options))
         else
           representation_url(**options)
         end

data/lib/decidim/attribute_encryptor.rb

@@ -19,10 +19,12 @@ module Decidim
     end
 
     def self.cryptor
-      key = ActiveSupport::KeyGenerator.new("attribute").generate_key(
-        Rails.application.secrets.secret_key_base, ActiveSupport::MessageEncryptor.key_len
-      )
-      ActiveSupport::MessageEncryptor.new(key)
+      @cryptor ||= begin
+        key = ActiveSupport::KeyGenerator.new("attribute").generate_key(
+          Rails.application.secrets.secret_key_base, ActiveSupport::MessageEncryptor.key_len
+        )
+        ActiveSupport::MessageEncryptor.new(key)
+      end
     end
   end
 end

data/lib/decidim/attributes/time_with_zone.rb

@@ -19,7 +19,7 @@ module Decidim
         fallback = super
         return fallback unless fallback.is_a?(Time)
 
-        ActiveSupport::TimeWithZone.new(fallback, Time.zone)
+        Time.zone.parse(fallback.strftime("%F %T"))
       end
     end
   end

data/lib/decidim/core/engine.rb

@@ -379,16 +379,17 @@ module Decidim
 
       initializer "decidim_core.menu" do
         Decidim::Core::Menu.register_menu!
-      end
-
-      initializer "decidim_core.user_menu" do
         Decidim::Core::Menu.register_user_menu!
       end
 
       initializer "decidim_core.notifications" do
-        config.to_prepare do
-          Decidim::EventsManager.subscribe(/^decidim\.events\./) do |event_name, data|
-            EventPublisherJob.perform_later(event_name, data)
+        if Rails.autoloaders.zeitwerk_enabled?
+          config.after_initialize do
+            Decidim::EventsManager.subscribe_events!
+          end
+        else
+          config.to_prepare do
+            Decidim::EventsManager.subscribe_events!
           end
         end
       end

data/lib/decidim/core/seeds.rb

@@ -25,11 +25,11 @@ module Decidim
         smtp_email = ENV.fetch("SMTP_FROM_EMAIL", ::Faker::Internet.email)
 
         primary_color, secondary_color, tertiary_color = [
-          ["#e02d2d", "#155abf", "#ebc34b"],
-          ["#4caf50", "#a0309e", "#a8753e"],
-          ["#e91e63", "#1ee9a5", "#e9b61e"],
-          ["#009688", "#d12c26", "#b4a110"],
-          ["#ff9800", "#00bcd4", "#ea0094"]
+          ["#bf4044", "#09780e", "#3584e4"],
+          ["#09780e", "#4448bb", "#da565b"],
+          ["#bf4086", "#487511", "#5384ac"],
+          ["#086263", "#811380", "#abac53"],
+          ["#5340bf", "#a82c2c", "#40bf53"]
         ].sample
 
         colors = {
@@ -77,34 +77,12 @@ module Decidim
         )
 
         if organization.top_scopes.none?
-          province = Decidim::ScopeType.create!(
-            name: Decidim::Faker::Localized.literal("province"),
-            plural: Decidim::Faker::Localized.literal("provinces"),
-            organization:
-          )
-
-          municipality = Decidim::ScopeType.create!(
-            name: Decidim::Faker::Localized.literal("municipality"),
-            plural: Decidim::Faker::Localized.literal("municipalities"),
-            organization:
-          )
-
-          3.times do |time|
-            parent = Decidim::Scope.create!(
-              name: Decidim::Faker::Localized.literal(::Faker::Address.unique.state),
-              code: "#{::Faker::Address.country_code}_#{time}",
-              scope_type: province,
-              organization:
-            )
-
+          province = create_scope_type!(name: "province", plural: "provinces")
+          municipality = create_scope_type!(name: "municipality", plural: "municipalities")
+          3.times do
+            parent = create_scope!(scope_type: province, parent: nil)
             5.times do
-              Decidim::Scope.create!(
-                name: Decidim::Faker::Localized.literal(::Faker::Address.unique.city),
-                code: "#{parent.code}-#{::Faker::Address.unique.state_abbr}",
-                scope_type: municipality,
-                organization:,
-                parent:
-              )
+              create_scope!(scope_type: municipality, parent:)
             end
           end
         end
@@ -231,7 +209,7 @@ module Decidim
 
         oauth_application.organization_logo.attach(io: File.open(File.join(seeds_root, "homepage_image.jpg")), filename: "organization_logo.jpg", content_type: "image/jpeg")
 
-        Decidim::System::CreateDefaultContentBlocks.call(organization)
+        Decidim::ContentBlocksCreator.new(organization).create_default!
 
         hero_content_block = Decidim::ContentBlock.find_by(organization:, manifest_name: :hero, scope_name: :homepage)
         hero_content_block.images_container.background_image = create_blob!(seeds_file: "homepage_image.jpg", filename: "homepage_image.jpg", content_type: "image/jpeg")
@@ -242,6 +220,32 @@ module Decidim
         hero_content_block.save!
       end
       # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity, Rails/Output
+
+      private
+
+      def create_scope_type!(name:, plural:)
+        Decidim::ScopeType.create!(
+          name: Decidim::Faker::Localized.literal(name),
+          plural: Decidim::Faker::Localized.literal(plural),
+          organization:
+        )
+      end
+
+      def create_scope!(scope_type:, parent:)
+        n = rand(99_999)
+        code = parent.nil? ? "#{::Faker::Address.country_code}_#{n}" : "#{parent.code}-#{::Faker::Address.postcode}_#{n}"
+        name = [::Faker::Address.state, ::Faker::Address.city].sample
+
+        Decidim::Scope.create!(
+          name: Decidim::Faker::Localized.literal(name),
+          code:,
+          scope_type:,
+          organization:,
+          parent:
+        )
+      rescue ActiveRecord::RecordInvalid
+        retry
+      end
     end
   end
 end