decidim-sortitions 0.27.5 → 0.27.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ade1fb25c5b4452362c016ebbb2c9a4e3459034695c6ddb984a1481f3087b984
-  data.tar.gz: 94732860aa85b4e32bc7ff7072bb194f0a51ed8edf72ffeea019da5ca7bed6b5
+  metadata.gz: d3f3f195e687563902d388e9cedbc8430378a6a072b5f998650d3068b76aec3e
+  data.tar.gz: 037313434d4200f71a148758e354b5253a4fb9b36b8d8992481c76926efa10b2
 SHA512:
-  metadata.gz: fa4b5e75927bce8920a6f555f2c9b15bbccfce814554dad1e1c8d17977671f1b2f15a5fc996d6115835992d56da95c7974bd6d0762b4e0e6032b191675ef8a4a
-  data.tar.gz: 8c7a121be6755d6c5b51ecdfec12be221fa547171a1610c1fc6a1e3965de7c6975b5d2d47f4ca31933714b6bb65d0059dfc5257f88caec713c1aaf8eb1d40957
+  metadata.gz: 86b6179b79eb8dc0d11c93d6b1ae2b9a1e35e522204acaf4963771a4dcb93fe6760e15c54d5c33cef5dbb16d85bb3d644c75341d68b4d37ea30630bdc9e2f673
+  data.tar.gz: '0902b6c5048f567ab5753be849b45f909df50ecc28fd7101683c6b81ab8b272911270d1b1f8626e929b7d37fb0f64b203f7c726f6fc7208d55f0762fa032b28f'

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

@@ -6,15 +6,25 @@ module Decidim
       helper Decidim::SanitizeHelper
       helper Sortitions::SortitionsHelper
 
+      def show
+        enforce_permission_to :embed, :sortition, sortition: model if model
+
+        super
+      end
+
       private
 
       def model
-        @model ||= Sortition.where(component: params[:component_id]).find(params[:sortition_id])
+        @model ||= Sortition.where(component: current_component).find(params[:sortition_id])
       end
 
       def iframe_url
         @iframe_url ||= sortition_widget_url(model)
       end
+
+      def permission_class_chain
+        [Decidim::Sortitions::Permissions]
+      end
     end
   end
 end

data/app/permissions/decidim/sortitions/permissions.rb

@@ -4,12 +4,26 @@ module Decidim
   module Sortitions
     class Permissions < Decidim::DefaultPermissions
       def permissions
+        allow_embed_sortition?
         return permission_action unless user
 
         return Decidim::Sortitions::Admin::Permissions.new(user, permission_action, context).permissions if permission_action.scope == :admin
 
         permission_action
       end
+
+      private
+
+      def sortition
+        @sortition ||= context.fetch(:sortition, nil) || context.fetch(:resource, nil)
+      end
+
+      # As this is a public action, we need to run this before other checks
+      def allow_embed_sortition?
+        return unless permission_action.action == :embed && permission_action.subject == :sortition && sortition
+
+        allow!
+      end
     end
   end
 end

data/config/locales/bg.yml

@@ -6,3 +6,39 @@ bg:
         additional_info: Сортиране на информация
         decidim_category_id: Категории от набора от предложения, в които искате да приложите жребий
         decidim_proposals_component_id: Предложенията са зададени
+  decidim:
+    sortitions:
+      admin:
+        sortitions:
+          create:
+            success: Жребият беше създаден успешно
+          destroy:
+            error: Жребият не може да се отмени.
+            success: Жребият беше отменен успешно
+          form:
+            title: Нов жребий за предложения
+          new:
+            confirm: Когато натиснете бутона „Напред“, системата ще запише датата и часа (с точност до секунди) и заедно с хвърлянето на зара тази информация ще се използва за генериране на избор на случаен принцип. Действието няма да може да бъде отменено — когато щракнете върху бутона, резултатът от жребия ще бъде публикуван заедно с въведените в този формуляр данни и няма да подлежи на промяна. Моля, прегледайте съдържанието внимателно
+          update:
+            success: Жребият беше актуализиран успешно
+      sortitions:
+        filters:
+          category_prompt: Изберете категория
+          search: Търсене
+        filters_small_view:
+          close_modal: Затвори прозореца
+          filter: Филтър
+          filter_by: Филтрирай по
+          unfold: Разгъване
+        results_count:
+          count:
+            one: избрано предложение
+            other: избрани предложения
+        show:
+          back: Назад към списъка
+          dice_result: "(1) Резултат от жребия"
+          mathematical_result: Резултат (1) x (2)
+          sortition_reproducibility_details: Подробности за възпроизвеждане на жребия
+          time_seed: "(2) Време за зареждане"
+        sortition:
+          view: Изглед

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

@@ -102,7 +102,7 @@ de:
           category: Kategorie
           category_prompt: Wählen Sie eine Kategorie
           search: Suche
-          state: Zustand
+          state: Status
         filters_small_view:
           close_modal: Modal schließen
           filter: Filter

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:

data/decidim-sortitions.gemspec

@@ -0,0 +1,32 @@
+# 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://github.com/decidim/decidim"
+  s.required_ruby_version = "~> 3.0.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

@@ -6,16 +6,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: skip_injection) }
     manifest_name { :sortitions }
-    participatory_space { create(:participatory_process, :with_steps, organization: organization) }
+    participatory_space { create(:participatory_process, :with_steps, organization: organization, skip_injection: 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: skip_injection) }
+    decidim_proposals_component { create(:proposal_component, organization: component.organization, skip_injection: skip_injection) }
 
-    title { generate_localized_title }
+    title { generate_localized_title(:sortition_title, skip_injection: skip_injection) }
     author do
       create(:user, :admin, organization: component.organization) if component
     end
@@ -23,15 +29,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: skip_injection) }
+    additional_info { generate_localized_description(:sortition_additional_info, skip_injection: skip_injection) }
+    selected_proposals { create_list(:proposal, target_items, component: decidim_proposals_component, skip_injection: 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: skip_injection) }
+      cancelled_by_user { create(:user, :admin, organization: component.organization, skip_injection: 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.27.5"
+      "0.27.6"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: decidim-sortitions
 version: !ruby/object:Gem::Version
-  version: 0.27.5
+  version: 0.27.6
 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.27.5
+        version: 0.27.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.5
+        version: 0.27.6
 - !ruby/object:Gem::Dependency
   name: decidim-comments
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.5
+        version: 0.27.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.5
+        version: 0.27.6
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.5
+        version: 0.27.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.5
+        version: 0.27.6
 - !ruby/object:Gem::Dependency
   name: decidim-proposals
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.5
+        version: 0.27.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.5
+        version: 0.27.6
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.5
+        version: 0.27.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.5
+        version: 0.27.6
 description: This module makes possible to select amont a set of proposal by sortition
 email:
 - jsperezg@gmail.com
@@ -144,7 +144,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
@@ -177,6 +176,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
@@ -240,6 +240,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
@@ -250,27 +251,28 @@ files:
 - lib/decidim/sortitions/engine.rb
 - lib/decidim/sortitions/test/factories.rb
 - lib/decidim/sortitions/version.rb
+- lib/tasks/decidim/.keep
 homepage: https://github.com/decidim/decidim
 licenses:
 - AGPL-3.0
 metadata: {}
-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.0'
+      version: 3.0.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.2.22
+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