decidim-sortitions 0.28.0 → 0.28.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e6e67f03a182f5fb70ee117309a2fd2410acd70c4fca467f4c2898502b70fc7
-  data.tar.gz: ad7331af5e82870080a8696e99831e54ff472bf882a49f79f42706dc039c1054
+  metadata.gz: fd815f4f38a9664a11e52034d95a06d51930d6106ab3a0739524d0f64899ac18
+  data.tar.gz: b1c9ce8439a1719bea155358462b0fe32d11096042e77fb12d2c2f031b0fea77
 SHA512:
-  metadata.gz: c5554084c134e82ec1b9ce18f764d0e9599629519619cecd9e5c8b8634275b665c7f1464f24ad62f5610a81dd6866ed2bbac316aef9d03e0358fbe39b9de12b5
-  data.tar.gz: aa3e427f386178a513f760108e228fe9dc3a4b069fec4cb247de71822203decf13bc09c43f5def616634af18939492e9bd6ececb04650c821519bc7ea48bf683
+  metadata.gz: dcc87180bf91e695fe2c3daedd9ea13fd21d09ce76c46bba2096671aaacafa765acc1a3b39a0c8e1d9db3ebf8d35ce4273644ed1820f1d1117a9371760038027
+  data.tar.gz: 036303efd4d97f850d08e06f7f4f26828b562f531fd384e0bc7d9068bad19c76cecf86b50cc007b76686e2e497129b9b0fc58b6337f0a3fbca6bfcd9ef6d84a5

data/app/views/decidim/sortitions/admin/sortitions/confirm_destroy.html.erb

@@ -1,9 +1,9 @@
 <% add_decidim_page_title(t(".title")) %>
 
 <div class="item_show__header">
-  <h2 class="item_show__header-title">
+  <h1 class="item_show__header-title">
     <%= t(".title") %>
-  </h2>
+  </h1>
 </div>
 
 <div class="item__edit item__edit-1col">

data/app/views/decidim/sortitions/admin/sortitions/edit.html.erb

@@ -1,8 +1,8 @@
 <% add_decidim_page_title(translated_attribute(sortition.title)) %>
 <div class="item_show__header">
-  <h2 class="item_show__header-title">
+  <h1 class="item_show__header-title">
     <%= t ".title" %>
-  </h2>
+  </h1>
 </div>
 <div class="item__edit item__edit-1col">
   <div class="item__edit-form">

data/app/views/decidim/sortitions/admin/sortitions/index.html.erb

@@ -1,13 +1,13 @@
 <% add_decidim_page_title(t(".title")) %>
 <div class="card">
   <div class="item_show__header">
-    <h2 class="item_show__header-title">
+    <h1 class="item_show__header-title">
       <%= t(".title") %>
       <% if allowed_to? :create, :sortition %>
         <%= link_to t("actions.new_sortition", scope: "decidim.sortitions.admin"), new_sortition_path, class: "button button__sm button__secondary" %>
       <% end %>
       <%= render partial: "decidim/admin/components/resource_action" %>
-    </h2>
+    </h1>
   </div>
   <div class="table-scroll">
     <table class="table-list">

data/app/views/decidim/sortitions/admin/sortitions/new.html.erb

@@ -1,8 +1,8 @@
 <% add_decidim_page_title(t(".title")) %>
 <div class="item_show__header">
-  <h2 class="item_show__header-title">
+  <h1 class="item_show__header-title">
     <%= t ".title" %>
-  </h2>
+  </h1>
 </div>
 <div class="item__edit item__edit-1col">
   <div class="item__edit-form">

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

@@ -1,9 +1,9 @@
 <% add_decidim_page_title(translated_attribute(sortition.title)) %>
 <div class="card" id="sortition">
   <div class="item_show__header">
-    <h2 class="item_show__header-title">
+    <h1 class="item_show__header-title">
       <%= decidim_html_escape(translated_attribute(sortition.title)) %>
-    </h2>
+    </h1>
   </div>
   <div class="table-scroll">
     <table class="table-list sortition">

data/config/locales/ca.yml

@@ -31,7 +31,7 @@ ca:
       sortitions:
         sortition_created:
           email_intro: El sorteig "%{resource_title}" s'ha afegit a "%{participatory_space_title}" que segueixes.
-          email_outro: Has rebut aquesta notificació perquè estàs seguint "%{participatory_space_title}". Pots deixar de seguir-lo des de l'enllaç anterior.
+          email_outro: Has rebut aquesta notificació perquè estàs seguint l'espai "%{participatory_space_title}". Pots deixar de seguir-lo des de l'enllaç anterior.
           email_subject: Nou sorteig afegit a %{participatory_space_title}
           notification_title: El sorteig <a href="%{resource_path}">%{resource_title}</a> s'ha afegit a %{participatory_space_title}
     sortitions:

data/config/locales/de.yml

@@ -96,7 +96,7 @@ de:
           all: Alle
           cancelled: Abgebrochen
           category: Kategorie
-          state: Zustand
+          state: Status
         index:
           empty: Es gibt noch keine Sortierungen.
         linked_sortitions:

data/config/locales/he-IL.yml

@@ -0,0 +1 @@
+he:

data/config/locales/pt-BR.yml

@@ -11,7 +11,7 @@ pt-BR:
         title: Título
         witnesses: Testemunhas
     models:
-      decidim/sortitions/create_sortition_event: Sorteio
+      decidim/sortitions/create_sortition_event: Classificação
   activerecord:
     models:
       decidim/sortitions/sortition:
@@ -20,6 +20,8 @@ pt-BR:
   decidim:
     components:
       sortitions:
+        actions:
+          comment: Comentário
         name: Sorteios
         settings:
           global:
@@ -37,6 +39,7 @@ pt-BR:
         actions:
           destroy: Cancelar a classificação
           edit: Editar
+          new_sortition: Novo Sorteio
           show: Detalhes da classificação
         models:
           sortition:
@@ -57,6 +60,10 @@ pt-BR:
             title: Cancelamento da classificação
           create:
             error: Ocorreu um erro ao criar uma nova classificação.
+            success: Sorteio criado com sucesso.
+          destroy:
+            error: Não é possível cancelar o sorteio.
+            success: Sorteio cancelado com sucesso.
           edit:
             title: Atualizar as informações sobre a classificação
             update: Atualizar
@@ -73,6 +80,7 @@ pt-BR:
             selected_proposals: Propostas selecionadas para sorteio
           update:
             error: Houve um erro ao atualizar a classificação.
+            success: Sorteio atualizado com sucesso.
       admin_log:
         sortition:
           create: "%{user_name} criou a classificação %{resource_name} em %{space_name}"
@@ -89,6 +97,8 @@ pt-BR:
           cancelled: Cancelado
           category: Categoria
           state: Estado
+        index:
+          empty: Ainda não há sorteios ainda.
         linked_sortitions:
           selected_proposals: Propostas selecionadas
         orders:

data/decidim-sortitions.gemspec

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+$LOAD_PATH.push File.expand_path("lib", __dir__)
+
+require "decidim/sortitions/version"
+
+Gem::Specification.new do |s|
+  s.version = Decidim::Sortitions.version
+  s.authors = ["Juan Salvador Perez Garcia"]
+  s.email = ["jsperezg@gmail.com"]
+  s.license = "AGPL-3.0"
+  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.required_ruby_version = "~> 3.1.0"
+
+  s.name = "decidim-sortitions"
+  s.summary = "Decidim sortitions module"
+  s.description = "This module makes possible to select amont a set of proposal by sortition"
+
+  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 "decidim-admin", Decidim::Sortitions.version
+  s.add_dependency "decidim-comments", Decidim::Sortitions.version
+  s.add_dependency "decidim-core", Decidim::Sortitions.version
+  s.add_dependency "decidim-proposals", Decidim::Sortitions.version
+
+  s.add_development_dependency "decidim-dev", Decidim::Sortitions.version
+end

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

@@ -7,16 +7,22 @@ require "decidim/participatory_processes/test/factories"
 
 FactoryBot.define do
   factory :sortition_component, parent: :component do
-    name { Decidim::Components::Namer.new(participatory_space.organization.available_locales, :sortitions).i18n_name }
+    transient do
+      skip_injection { false }
+    end
+    name { generate_component_name(participatory_space.organization.available_locales, :sortitions, skip_injection:) }
     manifest_name { :sortitions }
-    participatory_space { create(:participatory_process, :with_steps, organization:) }
+    participatory_space { create(:participatory_process, :with_steps, organization:, skip_injection:) }
   end
 
   factory :sortition, class: "Decidim::Sortitions::Sortition" do
-    component { create(:sortition_component) }
-    decidim_proposals_component { create(:proposal_component, organization: component.organization) }
+    transient do
+      skip_injection { false }
+    end
+    component { create(:sortition_component, skip_injection:) }
+    decidim_proposals_component { create(:proposal_component, organization: component.organization, skip_injection:) }
 
-    title { generate_localized_title }
+    title { generate_localized_title(:sortition_title, skip_injection:) }
     author do
       create(:user, :admin, organization: component.organization) if component
     end
@@ -24,15 +30,15 @@ FactoryBot.define do
     dice { Faker::Number.between(from: 1, to: 6).to_i }
     target_items { Faker::Number.between(from: 1, to: 5).to_i }
     request_timestamp { Time.now.utc }
-    witnesses { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }
-    additional_info { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }
-    selected_proposals { create_list(:proposal, target_items, component: decidim_proposals_component).pluck(:id) }
+    witnesses { generate_localized_description(:sortition_witnesses, skip_injection:) }
+    additional_info { generate_localized_description(:sortition_additional_info, skip_injection:) }
+    selected_proposals { create_list(:proposal, target_items, component: decidim_proposals_component, skip_injection:).pluck(:id) }
     candidate_proposals { selected_proposals }
 
     trait :cancelled do
       cancelled_on { Time.now.utc }
-      cancel_reason { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }
-      cancelled_by_user { create(:user, :admin, organization: component.organization) if component }
+      cancel_reason { generate_localized_description(:sortition_cancel_reason, skip_injection:) }
+      cancelled_by_user { create(:user, :admin, organization: component.organization, skip_injection:) if component }
     end
   end
 end

data/lib/decidim/sortitions/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: decidim-sortitions
 version: !ruby/object:Gem::Version
-  version: 0.28.0
+  version: 0.28.1
 platform: ruby
 authors:
 - Juan Salvador Perez Garcia
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-12-20 00:00:00.000000000 Z
+date: 2024-04-30 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.28.0
+        version: 0.28.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.0
+        version: 0.28.1
 - !ruby/object:Gem::Dependency
   name: decidim-comments
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.0
+        version: 0.28.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.0
+        version: 0.28.1
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.0
+        version: 0.28.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.0
+        version: 0.28.1
 - !ruby/object:Gem::Dependency
   name: decidim-proposals
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.0
+        version: 0.28.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.0
+        version: 0.28.1
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.0
+        version: 0.28.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.0
+        version: 0.28.1
 description: This module makes possible to select amont a set of proposal by sortition
 email:
 - jsperezg@gmail.com
@@ -138,7 +138,6 @@ files:
 - app/views/decidim/sortitions/sortitions/index.js.erb
 - app/views/decidim/sortitions/sortitions/show.html.erb
 - config/assets.rb
-- config/environment.rb
 - config/locales/am-ET.yml
 - config/locales/ar-SA.yml
 - config/locales/ar.yml
@@ -171,6 +170,7 @@ files:
 - config/locales/ga-IE.yml
 - config/locales/gl.yml
 - config/locales/gn-PY.yml
+- config/locales/he-IL.yml
 - config/locales/hr-HR.yml
 - config/locales/hr.yml
 - config/locales/hu.yml
@@ -234,6 +234,7 @@ files:
 - db/migrate/20181017110803_make_sortitions_authors_polymorphic.rb
 - db/migrate/20200320105926_index_foreign_keys_in_decidim_sortitions_sortitions.rb
 - db/migrate/20200827154036_add_commentable_counter_cache_to_sortitions.rb
+- decidim-sortitions.gemspec
 - lib/decidim/api/sortition_type.rb
 - lib/decidim/api/sortitions_type.rb
 - lib/decidim/sortitions.rb
@@ -245,6 +246,7 @@ files:
 - lib/decidim/sortitions/seeds.rb
 - lib/decidim/sortitions/test/factories.rb
 - lib/decidim/sortitions/version.rb
+- lib/tasks/decidim/.keep
 homepage: https://decidim.org
 licenses:
 - AGPL-3.0
@@ -254,23 +256,23 @@ metadata:
   funding_uri: https://opencollective.com/decidim
   homepage_uri: https://decidim.org
   source_code_uri: https://github.com/decidim/decidim
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '3.1'
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.22
-signing_key:
+rubygems_version: 3.5.9
+signing_key: 
 specification_version: 4
 summary: Decidim sortitions module
 test_files: []

data/config/environment.rb

@@ -1,3 +0,0 @@
-# frozen_string_literal: true
-
-# Empty line for playing nice with tpope/vim-rails