decidim-surveys 0.19.1 → 0.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c5bf3b75387df3baa5f23a051b8c6c3141e4de0b50a318b598ddf921bc16c68e
-  data.tar.gz: a49fcdd21d45cbcd42c0a8b87a97fd44e6c4ab0f5fe862ff68520fc569fd6715
+  metadata.gz: 4dd661081971e6b292d2f5e02e8cf550fdb1bda49362457e58d54c70cf9e8fe7
+  data.tar.gz: 9175ee414a9cb29703776e94d4c669eeb0832ba661d293fe020fd06dee50a6fb
 SHA512:
-  metadata.gz: 58e2ec2f61f751056ec1f0f4337a3dfe10bef9916f9c8f13c309fde6b95b3b15e3bdf9db116138ce651bb67ccda829af2bc43ea27e4d585500d706b415590396
-  data.tar.gz: 1734f209975336d6af102216a05554eb857154b2825974a67498f50c7e0373d82e5011c7b6cfcd93507fb3ecf4204ae55ff273d0d9b3ab3ff2096b009f8473af
+  metadata.gz: f3023f2d94690c36c060d16b77cc97dea7e8c4565aee66259240d2483043bf32c5eca35d0020a7f15f1388e4ccbfdb3357dc2d1059599addd26cfb7c07178d1f
+  data.tar.gz: 3083fb86f2f15ba9c260244b621e8e97f2e475b47f8c9726a02c7ee31b1634ca6bf9da969bd6b9ffaa3e53a7c76bc609e518cc54d10fb53a4d868c2a1604c043

data/app/controllers/decidim/surveys/surveys_controller.rb

@@ -7,7 +7,7 @@ module Decidim
       include Decidim::Forms::Concerns::HasQuestionnaire
       helper Decidim::Surveys::SurveyHelper
 
-      delegate :allow_answers?, to: :current_settings
+      delegate :allow_answers?, :allow_unregistered?, to: :current_settings
 
       before_action :check_permissions
 

data/app/permissions/decidim/surveys/permissions.rb

@@ -4,7 +4,7 @@ module Decidim
   module Surveys
     class Permissions < Decidim::DefaultPermissions
       def permissions
-        return permission_action unless user
+        return permission_action unless user || context[:current_settings].allow_unregistered?
 
         return Decidim::Surveys::Admin::Permissions.new(user, permission_action, context).permissions if permission_action.scope == :admin
         return permission_action if permission_action.scope != :public

data/app/serializers/decidim/surveys/data_importer.rb

@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Surveys
+    # Importer for Surveys specific data (this is, its questionnaire).
+    class DataImporter < Decidim::Importers::Importer
+      def initialize(component)
+        @component = component
+      end
+
+      # Public: Creates a new Decidim::Surveys::Survey and Decidim::Forms::Questionnaire associated to the given +component+
+      #         for each serialized survey object.
+      # It imports the whole tree of Survey->Questionnaire->questions->answer_options.
+      #
+      # serialized        - The Hash of attributes for the Questionnaire and its relations.
+      # user              - The +user+ that is performing this action
+      #
+      # Returns the ser.
+      def import(serialized, user)
+        ActiveRecord::Base.transaction do
+          # we duplicate so that we can delete without affecting the received Hash
+          serialized.dup.collect do |serialized_survey|
+            import_survey(serialized_survey, user)
+          end
+        end
+      end
+
+      private
+
+      # Returns a persisted Survey instance build from +serialized_survey+.
+      def import_survey(serialized_survey, user)
+        serialized_survey = serialized_survey.with_indifferent_access
+        survey = build_survey(serialized_survey)
+        serialized_questionnaire = serialized_survey[:questionnaire]
+        serialized_questions = serialized_questionnaire.delete(:questions)
+
+        questionnaire = build_questionnaire(survey, serialized_questionnaire)
+        Decidim.traceability.perform_action!(:create, Decidim::Surveys::Survey, user) do
+          survey.save!
+          survey
+        end
+        import_questions(questionnaire, serialized_questions)
+        survey
+      end
+
+      def build_survey(_serialized)
+        Survey.new(component: @component)
+      end
+
+      # Builds a Decidim::Forms::Questionnaire with all its questions and answer_options.
+      def build_questionnaire(survey, serialized_questionnaire)
+        survey.build_questionnaire(serialized_questionnaire.except(:id, :published_at))
+      end
+
+      def import_questions(questionnaire, serialized_questions)
+        serialized_questions.each do |serialized_question|
+          serialized_answer_options = serialized_question.delete(:answer_options)
+          question = questionnaire.questions.create!(serialized_question.except(:id, :created_at, :updated_at))
+          serialized_answer_options.each do |serialized_answer_option|
+            question.answer_options.create!(serialized_answer_option.except(:id, :created_at, :updated_at))
+          end
+        end
+      end
+    end
+  end
+end

data/app/serializers/decidim/surveys/data_serializer.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Surveys
+    # This class serializes the specific data in each Survey.
+    # This is `Questionnaire->questions->answer_options` but not `answers`
+    # and `answer_choices`.
+    class DataSerializer < Decidim::Exporters::Serializer
+      # Returns: Array of Decidim::Forms::Questionnaire as a json hash,
+      #     or nil if none exists.
+      def serialize
+        component = resource
+        surveys = Decidim::Surveys::Survey.where(component: component)
+        surveys.collect do |survey|
+          next if survey.questionnaire.nil?
+
+          json = serialize_survey(survey)
+          json.with_indifferent_access.merge(survey_id: survey.id)
+        end
+      end
+
+      def serialize_survey(survey)
+        questionnaire = survey.questionnaire
+        questionnaire_json = questionnaire.attributes.as_json
+        questionnaire_json[:questions] = serialize_questions(questionnaire.questions.order(:position))
+        json = survey.attributes.as_json
+        json[:questionnaire] = questionnaire_json
+        json
+      end
+
+      def serialize_questions(questions)
+        questions.collect do |question|
+          json = question.attributes.as_json
+          json[:answer_options] = serialize_answer_options(question.answer_options)
+          json
+        end
+      end
+
+      def serialize_answer_options(answer_options)
+        answer_options.collect do |option|
+          option.attributes.as_json
+        end
+      end
+    end
+  end
+end

data/config/locales/ar.yml

@@ -30,6 +30,7 @@ ar:
             announcement: إعلان
           step:
             allow_answers: السماح بالإجابات
+            allow_unregistered: السماح للمستخدمين غير المسجَّلِين بالإجابة على استطلاع الرأي
             announcement: إعلان
     events:
       surveys:

data/config/locales/ca.yml

@@ -22,6 +22,8 @@ ca:
             announcement: Avís
           step:
             allow_answers: Permetre respostes
+            allow_unregistered: Permet a usuaris no registrats contestar l'enquesta
+            allow_unregistered_help: Si s'activa, no caldrà identificar-se per a contestar l'enquesta. Això pot comportar que les dades siguin poc fiables i serà més vulnerable a atacs automatitzats. Utilitzeu-ho amb cura!
             announcement: Avís
     events:
       surveys:
@@ -53,4 +55,5 @@ ca:
       surveys:
         answer:
           invalid: S'ha produït un error en respondre l'enquesta.
+          spam_detected: Hi ha hagut un problema contestant el formulari. Potser has estat massa ràpid, ho pots tornar a intentar?
           success: Enquesta resposta correctament.

data/config/locales/cs.yml

@@ -26,6 +26,8 @@ cs:
             announcement: Oznámení
           step:
             allow_answers: Povolte odpovědi
+            allow_unregistered: Umožnit neregistrovaným uživatelům odpovědět na průzkum
+            allow_unregistered_help: Pokud je aktivní, nebude vyžadován žádný přihlašovací postup, aby šlo odpovědět na průzkum, což může vést k slabým nebo nespolehlivým údajům a bude náchylnější k automatizovaným útokům. Používejte obezřetně!
             announcement: Oznámení
     events:
       surveys:
@@ -57,4 +59,5 @@ cs:
       surveys:
         answer:
           invalid: Při odpovědi na průzkum došlo k chybám.
+          spam_detected: Při vyplňování formuláře došlo k potížím. Možná jste byli příliš rychlí, můžete to zkusit znovu?
           success: Průzkum úspěšně odpověděl.

data/config/locales/en.yml

@@ -23,6 +23,8 @@ en:
             announcement: Announcement
           step:
             allow_answers: Allow answers
+            allow_unregistered: Allow unregistered users to answer the survey
+            allow_unregistered_help: If active, no login will be required in order to answer the survey. This may lead to poor or unreliable data and it will be more vulnerable to automated attacks. Use with caution!
             announcement: Announcement
     events:
       surveys:
@@ -54,4 +56,5 @@ en:
       surveys:
         answer:
           invalid: There was a problem answering the survey.
+          spam_detected: There was a problem answering the form. Maybe you've been too quick, can you try again?
           success: Survey successfully answered.

data/config/locales/fi-plain.yml

@@ -22,6 +22,8 @@ fi-pl:
             announcement: Ilmoitus
           step:
             allow_answers: Salli vastaukset
+            allow_unregistered: Salli rekisteröitymättömien käyttäjien vastata tähän kyselyyn
+            allow_unregistered_help: Mikäli tämä asetus on päällä, käyttäjien ei tarvitse kirjautua sisään vastatakseen kyselyyn. Tämä voi johtaa heikkolaatuiseen tai epäluotettavaan tietoon ja tekee automaattisista hyökkäyksistä helpompaa. Käytä harkiten!
             announcement: Ilmoitus
     events:
       surveys:
@@ -53,4 +55,5 @@ fi-pl:
       surveys:
         answer:
           invalid: Kyselyyn vastaaminen epäonnistui.
+          spam_detected: Kyselyn vastaamisessa tapahtui virhe. Ehkä olit liian nopea, voisitko yrittää uudestaan?
           success: Kyselyyn vastattu onnistuneesti.

data/config/locales/fi.yml

@@ -22,6 +22,8 @@ fi:
             announcement: Ilmoitus
           step:
             allow_answers: Salli vastaukset
+            allow_unregistered: Salli rekisteröitymättömien käyttäjien vastata tähän kyselyyn
+            allow_unregistered_help: Mikäli tämä asetus on päällä, käyttäjien ei tarvitse kirjautua sisään vastatakseen kyselyyn. Tämä voi johtaa heikkolaatuiseen tai epäluotettavaan tietoon ja tekee automaattisista hyökkäyksistä helpompaa. Käytä harkiten!
             announcement: Ilmoitus
     events:
       surveys:
@@ -53,4 +55,5 @@ fi:
       surveys:
         answer:
           invalid: Kyselyyn vastaaminen epäonnistui.
+          spam_detected: Kyselyn vastaamisessa tapahtui virhe. Ehkä olit liian nopea, voisitko yrittää uudestaan?
           success: Kyselyyn vastaaminen onnistui.

data/config/locales/fr.yml

@@ -22,6 +22,8 @@ fr:
             announcement: Annonce
           step:
             allow_answers: Autoriser les réponses
+            allow_unregistered: Autoriser les utilisateurs non inscrits à répondre à l'enquête
+            allow_unregistered_help: Si activé, aucun login ne sera nécessaire pour répondre à l'enquête. Cela peut conduire à des données pauvres ou non fiables et rend plus vulnérable aux attaques automatiques. A utiliser avec précaution !
             announcement: Annonce
     events:
       surveys:
@@ -53,4 +55,5 @@ fr:
       surveys:
         answer:
           invalid: Votre réponse à l'enquête comporte des erreurs.
+          spam_detected: Il y a eu un problème lors de la réponse au questionnaire. Peut-être avez-vous été trop rapide, pouvez-vous réessayer ?
           success: Votre réponse à l'enquête a bien été enregistrée.

data/config/locales/hu.yml

@@ -22,6 +22,8 @@ hu:
             announcement: Közlemény
           step:
             allow_answers: Válaszok engedélyezése
+            allow_unregistered: Nem regisztrált felhasználók számára a kérdőív kitöltésének engedélyezése
+            allow_unregistered_help: Amennyiben aktív, nem szükséges a bejelentkezés a kérdőív kitöltéséhez. Ez megbízhatatlan, kevésbé hiteles adatokhoz vezethet és sérülékenyebbé teszi a rendszert az automatizált támadásokkal szemben. Óvatosan használjuk!
             announcement: Közlemény
     events:
       surveys:
@@ -53,4 +55,5 @@ hu:
       surveys:
         answer:
           invalid: Hiba történt a felmérés megválaszolása során.
+          spam_detected: Probléma történt az űrlap megválaszolása során. Lehet, hogy túl gyorsan próbálkoztál, megpróbálnád újra?
           success: Felmérés kitöltése sikeres.

data/config/locales/it.yml

@@ -22,6 +22,8 @@ it:
             announcement: Annuncio
           step:
             allow_answers: Consenti risposte
+            allow_unregistered: Consenti agli utenti non registrati di rispondere al sondaggio
+            allow_unregistered_help: Se attivo, nessun login sarà richiesto per rispondere all'indagine. Questo può portare a dati inaffidabili e sarà più vulnerabile agli attacchi automatizzati. Utilizzare con cautela!
             announcement: Annuncio
     events:
       surveys:
@@ -53,4 +55,5 @@ it:
       surveys:
         answer:
           invalid: Ci sono stati degli errori durante il salvataggio dell'indagine.
+          spam_detected: C'è stato un problema nella risposta al modulo. Forse sei stato troppo veloce, puoi riprovare?
           success: Il questionario è stato salvato correttamente.

data/config/locales/nl.yml

@@ -22,6 +22,8 @@ nl:
             announcement: Aankondiging
           step:
             allow_answers: Antwoorden toestaan
+            allow_unregistered: Sta niet-geregistreerde gebruikers toe om de enquête te beantwoorden
+            allow_unregistered_help: Een login zal dan niet nodig zijn om de vragen te beantwoorden. De bevraging zal daardoor kwetsbaarder zijn voor geautomatiseerde aanvallen wat kan leiden tot onbetrouwbare resultaten. Wees voorzichtig ! 
             announcement: Aankondiging
     events:
       surveys:
@@ -53,4 +55,5 @@ nl:
       surveys:
         answer:
           invalid: Er zijn fouten opgetreden bij het opslaan van de pagina.
+          spam_detected: Er was een probleem bij het beantwoorden van het formulier. Misschien bent u te snel geweest, kunt u het opnieuw proberen?
           success: Enquête met succes beantwoord.

data/config/locales/no.yml

@@ -18,6 +18,8 @@
             announcement: Kunngjøring
           step:
             allow_answers: Tillat svar
+            allow_unregistered: Tillat uregistrerte brukere å svare på undersøkelsen
+            allow_unregistered_help: Hvis aktiv, er det ikke nødvendig med innlogging for å svare på undersøkelsen. Dette kan føre til dårlige eller upålitelig data, og den vil være mer sårbare for automatiserte angrep. Bruk med forsiktighet!
             announcement: Kunngjøring
     events:
       surveys:

data/lib/decidim/surveys/component.rb

@@ -8,6 +8,9 @@ Decidim.register_component(:surveys) do |component|
   component.icon = "decidim/surveys/icon.svg"
   component.stylesheet = "decidim/surveys/surveys"
   component.permissions_class_name = "Decidim::Surveys::Permissions"
+  component.serializes_specific_data = true
+  component.specific_data_serializer_class_name = "Decidim::Surveys::DataSerializer"
+  component.specific_data_importer_class_name = "Decidim::Surveys::DataImporter"
 
   component.on(:copy) do |context|
     Decidim::Surveys::CreateSurvey.call(context[:new_component]) do
@@ -44,7 +47,7 @@ Decidim.register_component(:surveys) do |component|
     answers = Decidim::Forms::Answer.where(questionnaire: surveys.map(&:questionnaire))
     answers = answers.where("created_at >= ?", start_at) if start_at.present?
     answers = answers.where("created_at <= ?", end_at) if end_at.present?
-    answers.group(:decidim_user_id).count.size
+    answers.group(:session_token).count.size
   end
 
   # These actions permissions can be configured in the admin panel
@@ -56,6 +59,7 @@ Decidim.register_component(:surveys) do |component|
 
   component.settings(:step) do |settings|
     settings.attribute :allow_answers, type: :boolean, default: false
+    settings.attribute :allow_unregistered, type: :boolean, default: false
     settings.attribute :announcement, type: :text, translated: true, editor: true
   end
 

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

@@ -11,7 +11,7 @@ FactoryBot.define do
     participatory_space { create(:participatory_process, :with_steps) }
   end
 
-  factory :survey, class: "Decidim::Surveys::Survey" do
+  factory :survey, class: Decidim::Surveys::Survey do
     questionnaire { build(:questionnaire) }
     component { build(:surveys_component) }
   end

data/lib/decidim/surveys/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-surveys version.
   module Surveys
     def self.version
-      "0.19.1"
+      "0.20.0"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-surveys
 version: !ruby/object:Gem::Version
-  version: 0.19.1
+  version: 0.20.0
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-13 00:00:00.000000000 Z
+date: 2020-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -18,70 +18,70 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.20.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.20.0
 - !ruby/object:Gem::Dependency
   name: decidim-forms
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.20.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.20.0
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.20.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.20.0
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.20.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.20.0
 - !ruby/object:Gem::Dependency
   name: decidim-participatory_processes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.20.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.20.0
 description: A surveys component for decidim's participatory spaces.
 email:
 - josepjaume@gmail.com
@@ -110,6 +110,8 @@ files:
 - app/permissions/decidim/surveys/permissions.rb
 - app/queries/decidim/surveys/metrics/answers_metric_manage.rb
 - app/queries/decidim/surveys/metrics/survey_participants_metric_measure.rb
+- app/serializers/decidim/surveys/data_importer.rb
+- app/serializers/decidim/surveys/data_serializer.rb
 - app/views/decidim/surveys/surveys/no_permission.html.erb
 - config/locales/ar-SA.yml
 - config/locales/ar.yml