decidim-consultations 0.26.0 → 0.27.0.rc1

data/config/locales/pt-BR.yml

@@ -1,4 +1,5 @@
-pt-BR:
+---
+pt:
   activemodel:
     attributes:
       consultation:
@@ -253,7 +254,6 @@ pt-BR:
         all: Todos
         finished: Acabado
         search: Pesquisa
-        state: Estado
         upcoming: próximos
       filters_small_view:
         close_modal: Janela fechada
@@ -369,7 +369,6 @@ pt-BR:
         start_voting_date: A votação começa
       question_components:
         question_menu_item: A questão
-        unfold: Desdobrar
       question_header:
         back_to_consultation: Veja todas as consultas
         back_to_question: Voltar à pergunta

data/config/locales/pt.yml

@@ -1,3 +1,4 @@
+---
 pt:
   activemodel:
     attributes:
@@ -253,7 +254,6 @@ pt:
         all: Todos
         finished: Acabado
         search: Pesquisar
-        state: Estado
         upcoming: Próximas
       filters_small_view:
         close_modal: Fechar janela
@@ -370,7 +370,6 @@ pt:
         start_voting_date: A votação começa
       question_components:
         question_menu_item: A questão
-        unfold: Desdobrar
       question_header:
         back_to_consultation: Ver todas as consultas
         back_to_question: Retroceder à pergunta

data/config/locales/ro-RO.yml

@@ -1,3 +1,4 @@
+---
 ro:
   activemodel:
     attributes:
@@ -259,9 +260,9 @@ ro:
       filters:
         active: Activ
         all: Toate
+        date: Data
         finished: Terminat
         search: Caută
-        state: Status
         upcoming: Urmează
       filters_small_view:
         close_modal: Închide fereastra
@@ -380,7 +381,6 @@ ro:
         start_voting_date: Votarea începe
       question_components:
         question_menu_item: Întrebarea
-        unfold: Desfășurat
       question_header:
         back_to_consultation: Vezi toate consultările
         back_to_question: Înapoi la întrebare

data/config/locales/ru.yml

@@ -1,3 +1,4 @@
+---
 ru:
   activemodel:
     attributes:
@@ -203,7 +204,6 @@ ru:
         all: Все
         finished: Завершившиеся
         search: Поиск
-        state: Cостояние
         upcoming: Предстоящие
       filters_small_view:
         close_modal: Закрыть окно
@@ -276,6 +276,5 @@ ru:
         start_voting_date: Голосование начинается
       question_components:
         question_menu_item: Вопрос
-        unfold: Развернуть
       question_header:
         back_to_consultation: Просмотреть все консультации

data/config/locales/si-LK.yml

@@ -1 +1,2 @@
+---
 si:

data/config/locales/sk.yml

@@ -1,3 +1,4 @@
+---
 sk:
   activemodel:
     attributes:
@@ -266,7 +267,6 @@ sk:
         all: Všetko
         finished: Dokončené
         search: Hľadať
-        state: Stav
         upcoming: Nadchádzajúce
       filters_small_view:
         close_modal: Zavrieť okno
@@ -379,7 +379,6 @@ sk:
         start_voting_date: Hlasovanie začína
       question_components:
         question_menu_item: Otázka
-        unfold: Rozbaliť
       question_header:
         back_to_consultation: Zobraziť všetky konzultácie
         back_to_question: Späť na otázku

data/config/locales/sl.yml

@@ -1,3 +1,4 @@
+---
 sl:
   activemodel:
     attributes:

data/config/locales/so-SO.yml

@@ -1 +1,2 @@
+---
 so:

data/config/locales/sr-CS.yml

@@ -1 +1,2 @@
+---
 sr:

data/config/locales/sv.yml

@@ -1,3 +1,4 @@
+---
 sv:
   activemodel:
     attributes:
@@ -251,9 +252,9 @@ sv:
       filters:
         active: Aktiv
         all: Alla
+        date: Datum
         finished: Avslutade
         search: Sök
-        state: Status
         upcoming: Kommande
       filters_small_view:
         close_modal: Stäng fönstret
@@ -370,7 +371,6 @@ sv:
         start_voting_date: Omröstningen börjar
       question_components:
         question_menu_item: Frågan
-        unfold: Veckla ut
       question_header:
         back_to_consultation: Visa alla samråd
         back_to_question: Tillbaka till frågan

data/config/locales/sw-KE.yml

@@ -1 +1,2 @@
+---
 sw:

data/config/locales/ti-ER.yml

@@ -1 +1,2 @@
+---
 ti:

data/config/locales/tr-TR.yml

@@ -1,3 +1,4 @@
+---
 tr:
   activemodel:
     attributes:
@@ -252,7 +253,6 @@ tr:
         all: Tümü
         finished: Bitti
         search: Arama
-        state: Statü
         upcoming: Yaklaşan
       filters_small_view:
         close_modal: Pencereyi kapat
@@ -365,7 +365,6 @@ tr:
         start_voting_date: Oylama başlıyor
       question_components:
         question_menu_item: Soru
-        unfold: açılmak
       question_header:
         back_to_consultation: Tüm istişarelere bakın
         back_to_question: Soruya geri dön

data/config/locales/uk.yml

@@ -1,3 +1,4 @@
+---
 uk:
   activemodel:
     attributes:
@@ -203,7 +204,6 @@ uk:
         all: Усі
         finished: Завершені
         search: Шукати
-        state: Стан
         upcoming: Прийдешні
       filters_small_view:
         close_modal: Закрити вікно
@@ -276,6 +276,5 @@ uk:
         start_voting_date: Голосування починається
       question_components:
         question_menu_item: Питання
-        unfold: Розгорнути
       question_header:
         back_to_consultation: Переглянути всі консультації

data/config/locales/val-ES.yml

@@ -1 +1,2 @@
+---
 val:

data/config/locales/vi.yml

@@ -1 +1,2 @@
+---
 vi:

data/config/locales/zh-CN.yml

@@ -1,3 +1,4 @@
+---
 zh-CN:
   activemodel:
     attributes:
@@ -244,7 +245,6 @@ zh-CN:
         all: 所有的
         finished: 已完成
         search: 搜索
-        state: 状态
         upcoming: 即将到来的
       filters_small_view:
         close_modal: 关闭窗口
@@ -353,7 +353,6 @@ zh-CN:
         start_voting_date: 投票开始
       question_components:
         question_menu_item: 问题
-        unfold: 展开...
       question_header:
         back_to_consultation: 查看所有协商
         back_to_question: 回到问题

data/config/locales/zh-TW.yml

@@ -1 +1,2 @@
+---
 zh-TW:

data/lib/decidim/consultations/participatory_space.rb

@@ -50,7 +50,7 @@ Decidim.register_participatory_space(:consultations) do |participatory_space|
       start_voting_date: Time.zone.today,
       end_voting_date: Time.zone.today + 1.month,
       organization: organization,
-      banner_image: ActiveStorage::Blob.create_after_upload!(
+      banner_image: ActiveStorage::Blob.create_and_upload!(
         io: File.open(File.join(seeds_root, "city2.jpeg")),
         filename: "banner_image.jpeg",
         content_type: "image/jpeg",
@@ -82,7 +82,7 @@ Decidim.register_participatory_space(:consultations) do |participatory_space|
       start_voting_date: Time.zone.today - 2.months,
       end_voting_date: Time.zone.today - 1.month,
       organization: organization,
-      banner_image: ActiveStorage::Blob.create_after_upload!(
+      banner_image: ActiveStorage::Blob.create_and_upload!(
         io: File.open(File.join(seeds_root, "city2.jpeg")),
         filename: "banner_image.jpeg",
         content_type: "image/jpeg",
@@ -113,7 +113,7 @@ Decidim.register_participatory_space(:consultations) do |participatory_space|
       start_voting_date: Time.zone.today + 1.month + 1.day,
       end_voting_date: Time.zone.today + 2.months,
       organization: organization,
-      banner_image: ActiveStorage::Blob.create_after_upload!(
+      banner_image: ActiveStorage::Blob.create_and_upload!(
         io: File.open(File.join(seeds_root, "city2.jpeg")),
         filename: "banner_image.jpeg",
         content_type: "image/jpeg",
@@ -148,13 +148,13 @@ Decidim.register_participatory_space(:consultations) do |participatory_space|
             Decidim::Faker::Localized.paragraph(sentence_count: 3)
           end,
           organization: organization,
-          hero_image: ActiveStorage::Blob.create_after_upload!(
+          hero_image: ActiveStorage::Blob.create_and_upload!(
             io: File.open(File.join(seeds_root, "city.jpeg")),
             filename: "hero_image.jpeg",
             content_type: "image/jpeg",
             metadata: nil
           ), # Keep after organization
-          banner_image: ActiveStorage::Blob.create_after_upload!(
+          banner_image: ActiveStorage::Blob.create_and_upload!(
             io: File.open(File.join(seeds_root, "city2.jpeg")),
             filename: "banner_image.jpeg",
             content_type: "image/jpeg",
@@ -188,7 +188,7 @@ Decidim.register_participatory_space(:consultations) do |participatory_space|
           description: Decidim::Faker::Localized.sentence(word_count: 5),
           attached_to: question,
           content_type: "image/jpeg",
-          file: ActiveStorage::Blob.create_after_upload!(
+          file: ActiveStorage::Blob.create_and_upload!(
             io: File.open(File.join(seeds_root, "city.jpeg")),
             filename: "city.jpeg",
             content_type: "image/jpeg",
@@ -201,7 +201,7 @@ Decidim.register_participatory_space(:consultations) do |participatory_space|
           description: Decidim::Faker::Localized.sentence(word_count: 5),
           attached_to: question,
           content_type: "application/pdf",
-          file: ActiveStorage::Blob.create_after_upload!(
+          file: ActiveStorage::Blob.create_and_upload!(
             io: File.open(File.join(seeds_root, "Exampledocument.pdf")),
             filename: "Exampledocument.pdf",
             content_type: "application/pdf",

data/lib/decidim/consultations/version.rb

@@ -3,7 +3,7 @@
 module Decidim
   module Consultations
     def self.version
-      "0.26.0"
+      "0.27.0.rc1"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: decidim-consultations
 version: !ruby/object:Gem::Version
-  version: 0.26.0
+  version: 0.27.0.rc1
 platform: ruby
 authors:
 - Juan Salvador Perez Garcia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-22 00:00:00.000000000 Z
+date: 2022-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-admin
@@ -16,56 +16,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.0
+        version: 0.27.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.0
+        version: 0.27.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-comments
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.0
+        version: 0.27.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.0
+        version: 0.27.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.0
+        version: 0.27.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.0
+        version: 0.27.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.0
+        version: 0.27.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.0
+        version: 0.27.0.rc1
 description: Extends Decidim adding a first level public consultation component
 email:
 - jsperezg@gmail.com
@@ -182,7 +182,6 @@ files:
 - app/queries/decidim/consultations/organization_active_consultations.rb
 - app/queries/decidim/consultations/organization_consultations.rb
 - app/queries/decidim/consultations/organization_questions.rb
-- app/services/decidim/consultations/consultation_search.rb
 - app/views/decidim/consultations/_consultation.html.erb
 - app/views/decidim/consultations/admin/consultations/_form.html.erb
 - app/views/decidim/consultations/admin/consultations/edit.html.erb
@@ -377,14 +376,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: Decidim consultations module

data/app/services/decidim/consultations/consultation_search.rb

@@ -1,51 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Consultations
-    # Service that encapsulates all logic related to filtering consultations.
-    class ConsultationSearch < Searchlight::Search
-      # Public: Initializes the service.
-      # page        - The page number to paginate the results.
-      # per_page    - The number of proposals to return per page.
-      def initialize(options = {})
-        super(options)
-      end
-
-      def base_query
-        Decidim::Consultation.where(organization: options[:organization]).published
-      end
-
-      # Handle the search_text filter
-      def search_search_text
-        query
-          .where(Arel.sql("title->>'#{current_locale}' ILIKE ?").to_s, "%#{search_text}%")
-          .or(
-            query.where(Arel.sql("description->>'#{current_locale}' ILIKE ?").to_s, "%#{search_text}%")
-          )
-          .or(
-            query.where(Arel.sql("subtitle->>'#{current_locale}' ILIKE ?").to_s, "%#{search_text}%")
-          )
-      end
-
-      # Handle the state filter
-      def search_state
-        case state
-        when "active"
-          query.active
-        when "upcoming"
-          query.upcoming
-        when "finished"
-          query.finished
-        else # Assume all
-          query
-        end
-      end
-
-      private
-
-      def current_locale
-        I18n.locale.to_s
-      end
-    end
-  end
-end