decidim-sortitions 0.27.4 → 0.28.0.rc5

data/config/locales/zh-TW.yml

@@ -38,7 +38,6 @@ zh-TW:
         actions:
           destroy: 取消選民隨機抽籤
           edit: 編輯
-          new: 新的抽籤
           show: 抽籤詳細資料
         models:
           sortition:
@@ -52,8 +51,6 @@ zh-TW:
               seed: 種子碼
               target_items: 選擇項目
               title: 標題
-            name:
-              other: 抽籤
         sortitions:
           confirm_destroy:
             confirm_destroy: 您確定要取消此選項嗎？
@@ -61,17 +58,16 @@ zh-TW:
             title: 取消抽籤
           create:
             error: 建立新抽籤時出現問題。
-            success: 排序成功建立
+            success: 抽籤已成功建立。
           destroy:
             error: 無法取消抽籤。
-            success: 隨機抽籤已成功取消
+            success: 抽籤取消成功。
           edit:
             title: 更新抽籤資訊
             update: 更新
           form:
             all_categories: 所有類別
             select_proposal_component: 選擇提案集
-            title: 提案新抽籤
           index:
             title: 抽籤
           new:
@@ -82,7 +78,7 @@ zh-TW:
             selected_proposals: 已選擇的提案以進行抽籤
           update:
             error: 更新抽籤時發生問題。
-            success: 抽籤成功更新
+            success: 抽籤成功更新.
       admin_log:
         sortition:
           create: "%{user_name} 在 %{space_name} 中創建了 %{resource_name} 抽籤"
@@ -97,14 +93,7 @@ zh-TW:
           all: 全部
           cancelled: 已取消
           category: 類別
-          category_prompt: 選擇一個類別
-          search: 搜尋
           state: 狀態
-        filters_small_view:
-          close_modal: 關閉視窗
-          filter: 篩選
-          filter_by: 篩選條件
-          unfold: 展開
         linked_sortitions:
           selected_proposals: 選擇的提案
         orders:
@@ -117,23 +106,21 @@ zh-TW:
         show:
           algorithm: 抽籤排序算法
           any_category: 從所有類別中
-          back: 返回列表
           cancelled: 取消的抽籤
           candidate_proposal_ids: 隨機抽籤提案的順序和 ID
           candidate_proposals_info: '該抽籤是在以下提案中進行的 (%{category_label})，以下是這些提案的 ID (選中的提案以粗體標出)  '
           category: 來自 %{category} 類別
-          dice_result: "(1) 骰子結果"
+          dice_result: (1) 骰子結果
           introduction: '本頁面包含了抽籤 %{reference} 的結果。透過這個抽籤，從下面顯示的提案集合中隨機且以等機率隨機選出了 %{target_items} 個結果。除了顯示的結果外，此頁面的資訊提供了最大化保證並重現結果所需的所有資訊。此抽籤質量的關鍵在於雙重隨機性，一方面是由證人驗證的擲骰子結果，另一方面是精確的抽籤時間提供的算法輸入以產生隨機選擇。抽籤的時間種子如此精確(秒級)，以至於人類無法控制，從而提供雙重「不可控制」輸入，以保證公平結果。  '
           mathematical_result: 結果 (1) x (2)
           proposals_selected_by_sortition: 通過抽籤選中的提案
           sortition_reproducibility_details: 抽籤可重複性詳情
-          time_seed: "(2) 時間種子"
+          time_seed: (2) 時間種子
           witnesses: 見證人
         sortition:
           random_seed: 隨機種子
           selected_proposals:
             other: 選中的提案
-          view: 檢視
         sortition_author:
           deleted: 已刪除的參與者
         sortition_cancel_author:

data/lib/decidim/sortitions/component.rb

@@ -4,12 +4,13 @@ Decidim.register_component(:sortitions) do |component|
   component.engine = Decidim::Sortitions::Engine
   component.admin_engine = Decidim::Sortitions::AdminEngine
   component.icon = "media/images/decidim_sortitions.svg"
+  component.icon_key = "billiards-line"
   # component.stylesheet = "decidim/sortitions/sortitions"
   component.permissions_class_name = "Decidim::Sortitions::Permissions"
   component.query_type = "Decidim::Sortitions::SortitionsType"
 
   component.on(:before_destroy) do |instance|
-    raise StandardError, "Can't remove this component" if Decidim::Sortitions::Sortition.where(component: instance).any?
+    raise StandardError, "Cannot remove this component" if Decidim::Sortitions::Sortition.where(component: instance).any?
   end
 
   # These actions permissions can be configured in the admin panel
@@ -17,7 +18,7 @@ Decidim.register_component(:sortitions) do |component|
 
   component.settings(:global) do |settings|
     settings.attribute :comments_enabled, type: :boolean, default: true
-    settings.attribute :comments_max_length, type: :integer, required: false
+    settings.attribute :comments_max_length, type: :integer, required: true
   end
 
   # Register an optional resource that can be referenced from other resources.
@@ -33,11 +34,8 @@ Decidim.register_component(:sortitions) do |component|
   end
 
   component.seeds do |participatory_space|
-    component = Decidim::Component.create!(
-      name: Decidim::Components::Namer.new(participatory_space.organization.available_locales, :sortitions).i18n_name,
-      manifest_name: :sortitions,
-      published_at: Time.current,
-      participatory_space: participatory_space
-    )
+    require "decidim/sortitions/seeds"
+
+    Decidim::Sortitions::Seeds.new(participatory_space:).call
   end
 end

data/lib/decidim/sortitions/engine.rb

@@ -12,10 +12,15 @@ module Decidim
       isolate_namespace Decidim::Sortitions
 
       routes do
-        resources :sortitions, only: [:index, :show] do
-          resource :widget, only: :show, path: "embed"
+        resources :sortitions, only: [:index, :show]
+        scope "/sortitions" do
+          root to: "sortitions#index"
         end
-        root to: "sortitions#index"
+        get "/", to: redirect("sortitions", status: 301)
+      end
+
+      initializer "decidim_sortitions.register_icons" do
+        Decidim.icons.register(name: "seedling-line", icon: "seedling-line", category: "system", description: "", engine: :sortitions)
       end
 
       initializer "decidim_sortitions.add_cells_view_paths" do

data/lib/decidim/sortitions/seeds.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require "decidim/components/namer"
+
+module Decidim
+  module Sortitions
+    class Seeds
+      attr_reader :participatory_space
+
+      def initialize(participatory_space:)
+        @participatory_space = participatory_space
+      end
+
+      def call
+        Decidim::Component.create!(
+          name: Decidim::Components::Namer.new(participatory_space.organization.available_locales, :sortitions).i18n_name,
+          manifest_name: :sortitions,
+          published_at: Time.current,
+          participatory_space:
+        )
+      end
+    end
+  end
+end

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

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require "decidim/components/namer"
 require "decidim/faker/localized"
 require "decidim/core/test/factories"
 require "decidim/participatory_processes/test/factories"
@@ -8,7 +9,7 @@ FactoryBot.define do
   factory :sortition_component, parent: :component do
     name { Decidim::Components::Namer.new(participatory_space.organization.available_locales, :sortitions).i18n_name }
     manifest_name { :sortitions }
-    participatory_space { create(:participatory_process, :with_steps, organization: organization) }
+    participatory_space { create(:participatory_process, :with_steps, organization:) }
   end
 
   factory :sortition, class: "Decidim::Sortitions::Sortition" do

data/lib/decidim/sortitions/version.rb

@@ -3,7 +3,7 @@
 module Decidim
   module Sortitions
     def self.version
-      "0.27.4"
+      "0.28.0.rc5"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: decidim-sortitions
 version: !ruby/object:Gem::Version
-  version: 0.27.4
+  version: 0.28.0.rc5
 platform: ruby
 authors:
 - Juan Salvador Perez Garcia
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-27 00:00:00.000000000 Z
+date: 2023-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-admin
@@ -16,70 +16,70 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.4
+        version: 0.28.0.rc5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.4
+        version: 0.28.0.rc5
 - !ruby/object:Gem::Dependency
   name: decidim-comments
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.4
+        version: 0.28.0.rc5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.4
+        version: 0.28.0.rc5
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.4
+        version: 0.28.0.rc5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.4
+        version: 0.28.0.rc5
 - !ruby/object:Gem::Dependency
   name: decidim-proposals
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.4
+        version: 0.28.0.rc5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.4
+        version: 0.28.0.rc5
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.4
+        version: 0.28.0.rc5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.4
+        version: 0.28.0.rc5
 description: This module makes possible to select amont a set of proposal by sortition
 email:
 - jsperezg@gmail.com
@@ -90,9 +90,8 @@ files:
 - README.md
 - Rakefile
 - app/cells/decidim/sortitions/sortition_cell.rb
-- app/cells/decidim/sortitions/sortition_m/data.erb
-- app/cells/decidim/sortitions/sortition_m/footer.erb
-- app/cells/decidim/sortitions/sortition_m_cell.rb
+- app/cells/decidim/sortitions/sortition_l_cell.rb
+- app/cells/decidim/sortitions/sortition_metadata_cell.rb
 - app/commands/decidim/sortitions/admin/create_sortition.rb
 - app/commands/decidim/sortitions/admin/destroy_sortition.rb
 - app/commands/decidim/sortitions/admin/update_sortition.rb
@@ -101,7 +100,6 @@ files:
 - app/controllers/decidim/sortitions/admin/sortitions_controller.rb
 - app/controllers/decidim/sortitions/application_controller.rb
 - app/controllers/decidim/sortitions/sortitions_controller.rb
-- app/controllers/decidim/sortitions/widgets_controller.rb
 - app/events/decidim/sortitions/create_sortition_event.rb
 - app/forms/decidim/sortitions/admin/destroy_sortition_form.rb
 - app/forms/decidim/sortitions/admin/edit_sortition_form.rb
@@ -112,7 +110,7 @@ files:
 - app/models/decidim/sortitions/sortition.rb
 - app/packs/entrypoints/decidim_sortitions.js
 - app/packs/images/decidim/sortitions/icon.svg
-- app/packs/stylesheets/decidim/sortitions/_sortitions.scss
+- app/packs/stylesheets/sortitions.scss
 - app/permissions/decidim/sortitions/admin/permissions.rb
 - app/permissions/decidim/sortitions/permissions.rb
 - app/presenters/decidim/sortitions/admin_log/sortition_presenter.rb
@@ -126,10 +124,7 @@ files:
 - app/views/decidim/sortitions/admin/sortitions/index.html.erb
 - app/views/decidim/sortitions/admin/sortitions/new.html.erb
 - app/views/decidim/sortitions/admin/sortitions/show.html.erb
-- app/views/decidim/sortitions/sortition_widgets/show.html.erb
 - app/views/decidim/sortitions/sortitions/_count.html.erb
-- app/views/decidim/sortitions/sortitions/_filters.html.erb
-- app/views/decidim/sortitions/sortitions/_filters_small_view.html.erb
 - app/views/decidim/sortitions/sortitions/_linked_sortitions.html.erb
 - app/views/decidim/sortitions/sortitions/_proposal.html.erb
 - app/views/decidim/sortitions/sortitions/_proposal_badge.html.erb
@@ -138,7 +133,6 @@ files:
 - app/views/decidim/sortitions/sortitions/_sortition_author.html.erb
 - app/views/decidim/sortitions/sortitions/_sortition_cancel_author.html.erb
 - app/views/decidim/sortitions/sortitions/_sortitions.html.erb
-- app/views/decidim/sortitions/sortitions/_sortitions_count.html.erb
 - app/views/decidim/sortitions/sortitions/_tags.html.erb
 - app/views/decidim/sortitions/sortitions/index.html.erb
 - app/views/decidim/sortitions/sortitions/index.js.erb
@@ -211,9 +205,11 @@ files:
 - config/locales/sk.yml
 - config/locales/sl.yml
 - config/locales/so-SO.yml
+- config/locales/sq-AL.yml
 - config/locales/sr-CS.yml
 - config/locales/sv.yml
 - config/locales/sw-KE.yml
+- config/locales/th-TH.yml
 - config/locales/ti-ER.yml
 - config/locales/tr-TR.yml
 - config/locales/uk.yml
@@ -246,12 +242,18 @@ files:
 - lib/decidim/sortitions/api.rb
 - lib/decidim/sortitions/component.rb
 - lib/decidim/sortitions/engine.rb
+- lib/decidim/sortitions/seeds.rb
 - lib/decidim/sortitions/test/factories.rb
 - lib/decidim/sortitions/version.rb
-homepage: https://github.com/decidim/decidim
+homepage: https://decidim.org
 licenses:
 - AGPL-3.0
-metadata: {}
+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
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -260,14 +262,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.0'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.4.22
 signing_key:
 specification_version: 4
 summary: Decidim sortitions module

data/app/cells/decidim/sortitions/sortition_m/data.erb

@@ -1,15 +0,0 @@
-<div class="card__icondata">
-  <ul class="card-data">
-    <li class="card-data__item">
-      <%= icon "random-seed", class: "icon--big", aria_label: t("decidim.sortitions.sortitions.sortition.random_seed"), role: "img" %>
-    </li>
-    <li class="card-data__item">
-      <div class="text-left">
-        <strong class="heading4">
-          <%= model.seed %>
-        </strong>
-        &nbsp;<small aria-hidden="true"><%= t("decidim.sortitions.sortitions.sortition.random_seed") %></small>
-      </div>
-    </li>
-  </ul>
-</div>

data/app/cells/decidim/sortitions/sortition_m/footer.erb

@@ -1,13 +0,0 @@
-<div class="card__footer">
-  <div class="card__support">
-    <div>
-      <strong class="text-large">
-        <%= proposals_count %>
-      </strong>
-      <small class="text-medium">
-        <%= t("decidim.sortitions.sortitions.sortition.selected_proposals", count: proposals_count) %>
-      </small>
-    </div>
-    <%= link_to t("decidim.sortitions.sortitions.sortition.view"), resource_path, class: "card__button button--sc button small secondary light" %>
-  </div>
-</div>

data/app/cells/decidim/sortitions/sortition_m_cell.rb

@@ -1,55 +0,0 @@
-# frozen_string_literal: true
-
-require "cell/partial"
-
-module Decidim
-  module Sortitions
-    # This cell renders a sortition with its M-size card.
-    class SortitionMCell < Decidim::CardMCell
-      include Decidim::Sortitions::Engine.routes.url_helpers
-
-      private
-
-      def has_author?
-        false
-      end
-
-      def has_state?
-        true
-      end
-
-      # Even though we need to render the badge, we can't do it in the normal
-      # way, because the paragraph comes from a user input and contains HTML.
-      # This causes the badge and the paragraph to appear in different lines.
-      # In order to fix it, check the `description` method.
-      def has_badge?
-        false
-      end
-
-      def badge_name
-        return t("filters.cancelled", scope: "decidim.sortitions.sortitions") if model.cancelled?
-
-        t("filters.active", scope: "decidim.sortitions.sortitions")
-      end
-
-      def state_classes
-        return ["muted"] if model.cancelled?
-
-        ["success"]
-      end
-
-      def proposals_count
-        @proposals_count = model.proposals.count
-      end
-
-      # In order to render the badge inline with the paragraph text we need to
-      # find the opening `<p>` tag and include the badge right after it. This
-      # makes the layout look good.
-      def description
-        text = decidim_sanitize_editor(translated_attribute(model.additional_info), strip_tags: true)
-        text.sub!(/<p>/, "<p>#{render :badge}")
-        html_truncate(text, length: 100)
-      end
-    end
-  end
-end

data/app/controllers/decidim/sortitions/widgets_controller.rb

@@ -1,20 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Sortitions
-    class WidgetsController < Decidim::WidgetsController
-      helper Decidim::SanitizeHelper
-      helper Sortitions::SortitionsHelper
-
-      private
-
-      def model
-        @model ||= Sortition.where(component: params[:component_id]).find(params[:sortition_id])
-      end
-
-      def iframe_url
-        @iframe_url ||= sortition_widget_url(model)
-      end
-    end
-  end
-end

data/app/packs/stylesheets/decidim/sortitions/_sortitions.scss

@@ -1,49 +0,0 @@
-#sortition-details{
-  margin-bottom: 1.5rem;
-}
-
-.sortition-details{
-  padding: 0;
-  display: flex;
-  flex-flow: row wrap;
-  justify-content: flex-start;
-  align-items: stretch;
-  align-content: stretch;
-
-  .sortition-details-item{
-    width: 33.3%;
-
-    @include breakpoint(large down){
-      width: 33.3%;
-    }
-
-    @include breakpoint(medium down){
-      width: 49.9%;
-    }
-
-    @include breakpoint(smallmedium down){
-      width: 100%;
-    }
-
-    display: inline-block;
-    padding: 1em;
-    border: $border;
-    background: $white;
-
-    .sortition-details-title{
-      margin-right: .5rem;
-      font-weight: bolder;
-    }
-
-    .sortition-details-text{
-      letter-spacing: .03em;
-      font-size: 90%;
-      text-transform: uppercase;
-      color: #3d393c;
-      font-weight: 600;
-      line-height: 1;
-      vertical-align: middle;
-      height: 1.5em;
-    }
-  }
-}

data/app/views/decidim/sortitions/sortition_widgets/show.html.erb

@@ -1,4 +0,0 @@
-<% content_for(:title, decidim_html_escape(translated_attribute(model.title))) %>
-<p>
-  <%= decidim_sanitize_editor html_truncate(translated_attribute(model.additional_info), length: 100, separator: "...") %>
-</p>

data/app/views/decidim/sortitions/sortitions/_filters.html.erb

@@ -1,39 +0,0 @@
-<%= render partial: "decidim/shared/filter_form_help", locals: { skip_to_id: "sortitions" } %>
-
-<%= filter_form_for filter do |form| %>
-  <div class="filters__section">
-    <div class="filters__search">
-      <div class="input-group">
-        <%= form.search_field :search_text_cont, label: false, class: "input-group-field", placeholder: t(".search"), title: t(".search"), "aria-label": t(".search"), data: { disable_dynamic_change: true } %>
-        <div class="input-group-button">
-          <button type="submit" class="button" aria-controls="sortitions">
-            <%= icon "magnifying-glass", aria_label: t(".search"), role: "img" %>
-          </button>
-        </div>
-      </div>
-    </div>
-  </div>
-
-  <% if current_participatory_space.categories.any? %>
-    <%= form.categories_select :with_category,
-                               current_participatory_space.categories,
-                               {
-                                 legend_title: t(".category"),
-                                 disable_parents: false,
-                                 label: "",
-                                 include_blank: t(".category_prompt"),
-                                 aria_label: t(".category")
-                               },
-                               "aria-label": t(".category"),
-                               "aria-controls": "sortitions" %>
-  <% end %>
-
-  <%= form.collection_radio_buttons :with_any_state,
-                                    [["all", t(".all")], ["active", t(".active")], ["cancelled", t(".cancelled")]],
-                                    :first,
-                                    :last,
-                                    { legend_title: t(".state") },
-                                    "aria-controls": "sortitions" %>
-
-  <%= hidden_field_tag :order, order, id: nil, class: "order_filter" %>
-<% end %>

data/app/views/decidim/sortitions/sortitions/_filters_small_view.html.erb

@@ -1,18 +0,0 @@
-<div class="filters-controls hide-for-mediumlarge">
-  <button data-open="filter-box" class="filters-controls__trigger" aria-controls="filter-box" aria-haspopup="dialog">
-    <%= t ".filter" %>
-    <%= icon "caret-bottom", class: "icon--small float-right", aria_label: t(".unfold"), role: "img" %>
-  </button>
-</div>
-
-<div class="reveal" id="filter-box" data-reveal role="dialog" aria-modal="true" aria-labelledby="filter-box-label">
-  <div class="reveal__header">
-    <h3 id="filter-box-label" class="reveal__title"><%= t ".filter_by" %>:</h3>
-    <button class="close-button" data-close aria-label="<%= t(".close_modal") %>" type="button">
-      <span aria-hidden="true">&times;</span>
-    </button>
-  </div>
-  <div class="filters">
-    <%= render partial: "filters", locals: { type: :small } %>
-  </div>
-</div>

data/app/views/decidim/sortitions/sortitions/_sortitions_count.html.erb

@@ -1 +0,0 @@
-<%= t(".count", count: @sortitions.total_count) %>