decidim-surveys 0.11.2 → 0.12.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0be4875b9ab07672f1c189bfdebe08acba2767091c49b29d5bf3b5be1b5d42f8
-  data.tar.gz: 2009bad5150ee963366fadf976629d58cde2072ebf80adc2ccca0d83cb9c7d68
+  metadata.gz: fa90ef787f2d9e0d55a9f3e75ec4f80ff7530c7c757dfe8579465899e60b48eb
+  data.tar.gz: 64cec3d696cbbfb71c8baee70dbb8a10de4ee3f27398de591cc0f1442206361d
 SHA512:
-  metadata.gz: d1063014fa04c86e22c7c4c8f89f3cb79b8f7729b5cd4bce17740bdbde20d935cfc1a35ffd9657711b9fd2735e244cb8caa2555a1046b793186c779dec73a8a6
-  data.tar.gz: 75c02334404c53a3f5e04fa74054ed071b637eb703409174b589bc078bc61b06b2359fb030cb0eebdf3469151d4507c4d2065b9e426f3c3aea1400a77d565665
+  metadata.gz: 6f98c689bcc4384b3beab4c870db252c9e1dd5456f654274a69cc8968cb23a9ec02b5180b9305d75eb8c1ddc177088784e2f6b652911049971e89b435119b926
+  data.tar.gz: 5886539b3f65602097c7e8989c2d9cca98f97ffcef8875ae611828f01b381d99cdc7bbc90d8d4c0912f38121c9dbeef8ee524c91e4283dbd145a1d47cd2737ab

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

@@ -8,12 +8,14 @@ module Decidim
         helper_method :survey, :blank_question, :blank_answer_option, :question_types
 
         def edit
-          authorize! :edit, Survey
+          enforce_permission_to :update, :survey, survey: survey
+
           @form = form(Admin::SurveyForm).from_model(survey)
         end
 
         def update
-          authorize! :update, Survey
+          enforce_permission_to :update, :survey, survey: survey
+
           params["published_at"] = Time.current if params.has_key? "save_and_publish"
           @form = form(Admin::SurveyForm).from_params(params)
 

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

@@ -13,7 +13,8 @@ module Decidim
       end
 
       def answer
-        authorize! :answer, Survey
+        enforce_permission_to :answer, :survey
+
         @form = form(SurveyForm).from_params(params)
 
         AnswerSurvey.call(@form, current_user, survey) do

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

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Surveys
+    module Admin
+      class Permissions < Decidim::DefaultPermissions
+        def permissions
+          return permission_action unless user
+
+          return permission_action if permission_action.scope != :admin
+
+          return permission_action if permission_action.subject != :survey
+
+          case permission_action.action
+          when :export_answers, :update
+            permission_action.allow!
+          end
+
+          permission_action
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Surveys
+    class Permissions < Decidim::DefaultPermissions
+      def permissions
+        return permission_action unless user
+
+        return Decidim::Surveys::Admin::Permissions.new(user, permission_action, context).permissions if permission_action.scope == :admin
+        return permission_action if permission_action.scope != :public
+
+        return permission_action if permission_action.subject != :survey
+
+        permission_action.allow! if permission_action.action == :answer
+
+        permission_action
+      end
+    end
+  end
+end

data/app/views/decidim/surveys/admin/surveys/_form.html.erb

@@ -3,7 +3,7 @@
     <h2 class="card-title">
       <%= title %>
       <div class="button--title">
-        <%= export_dropdown %>
+        <%= export_dropdown if allowed_to? :export_answers, :survey %>
       </div>
     </h2>
   </div>

data/app/views/decidim/surveys/surveys/_answer.html.erb

@@ -9,9 +9,9 @@
 
 <% case answer.question.question_type %>
 <% when "short_answer" %>
-  <%= answer_form.text_field :body, label: false, id: field_id %>
+  <%= answer_form.text_field :body, label: false, id: field_id, disabled: disabled %>
 <% when "long_answer" %>
-  <%= answer_form.text_area :body, label: false, id: field_id, rows: 10 %>
+  <%= answer_form.text_area :body, label: false, id: field_id, rows: 10, disabled: disabled %>
 <% when "single_option" %>
   <div class="radio-button-collection">
     <% choice = answer.choices.first %>
@@ -23,7 +23,7 @@
         <%= radio_button_tag "survey[survey_answers][#{answer_idx}][choices][][body]",
                              translated_attribute(answer_option.body),
                              choice.try(:body),
-                             id: "#{choice_id}_body" %>
+                             id: "#{choice_id}_body", disabled: disabled %>
 
         <%= translated_attribute(answer_option.body) %>
 
@@ -49,7 +49,7 @@
       <%= label_tag do %>
         <%= check_box_tag "survey[survey_answers][#{answer_idx}][choices][#{idx}][body]",
                           translated_attribute(answer_option.body),
-                          choice.present? %>
+                          choice.present?, disabled: disabled %>
 
         <%= translated_attribute(answer_option.body) %>
 
@@ -71,7 +71,7 @@
       <%= label_tag do %>
         <%= check_box_tag "survey[survey_answers][#{answer_idx}][choices][#{idx}][body]",
                           translated_attribute(answer_option.body),
-                          choice.present? %>
+                          choice.present?, disabled: disabled %>
 
         <span class="position"><%= choice.try(:position) %></span>
 

data/app/views/decidim/surveys/surveys/show.html.erb

@@ -29,24 +29,33 @@
               </div>
             <% else %>
               <div class="answer-survey">
+                <% unless current_participatory_space.can_participate?(current_user) %>
+                  <div class="section">
+                    <div class="callout alert">
+                      <h5><%= t(".survey_for_private_users.title") %></h5>
+                      <p><%= t(".survey_for_private_users.body") %></p>
+                    </div>
+                  </div>
+                <% end %>
+
                 <%= decidim_form_for(@form, url: answer_survey_path(survey), method: :post, html: { class: "form answer-survey" }) do |form| %>
                   <% @form.survey_answers.each_with_index do |answer, answer_idx| %>
                     <div class="row column">
                       <%= fields_for "survey[survey_answers][#{answer_idx}]", answer do |answer_form| %>
-                        <%= render "answer", answer_form: answer_form, answer: answer, answer_idx: answer_idx %>
+                        <%= render "answer", answer_form: answer_form, answer: answer, answer_idx: answer_idx, disabled: !current_participatory_space.can_participate?(current_user) %>
                       <% end %>
                     </div>
                   <% end %>
 
                   <div class="row column tos-agreement">
-                    <%= form.check_box :tos_agreement, label: t(".tos_agreement"), id: "survey_tos_agreement" %>
+                    <%= form.check_box :tos_agreement, label: t(".tos_agreement"), id: "survey_tos_agreement", disabled: !current_participatory_space.can_participate?(current_user) %>
                     <div class="help-text">
                       <%= decidim_sanitize translated_attribute survey.tos %>
                     </div>
                   </div>
 
                   <div class="button--double form-general-submit">
-                    <%= form.submit t(".submit"), class: "button", data: { confirm: t(".are_you_sure"), disable: true } %>
+                    <%= form.submit t(".submit"), class: "button", disabled: !current_participatory_space.can_participate?(current_user), data: { confirm: t(".are_you_sure"), disable: true } %>
                   </div>
                 <% end %>
               </div>

data/config/locales/ca.yml

@@ -14,6 +14,17 @@ ca:
             choices:
               missing: no estan complets
               too_many: són massa
+    models:
+      decidim/surveys/closed_survey_event: S'ha acabat l'enquesta
+      decidim/surveys/opened_survey_event: S'ha iniciat l'enquesta
+  activerecord:
+    models:
+      decidim/surveys/survey:
+        one: Enquesta
+        other: Enquestes
+      decidim/surveys/survey_answer:
+        one: Resposta
+        other: Respostes
   decidim:
     components:
       surveys:
@@ -98,4 +109,7 @@ ca:
           survey_closed:
             body: L'enquesta està tancada i no s'hi pot participar.
             title: Enquesta tancada
+          survey_for_private_users:
+            body: L'enquesta només està disponible per a usuaris privats
+            title: Enquesta tancada
           tos_agreement: En participar en aquesta enquesta acceptes els Termes de Servei

data/config/locales/en.yml

@@ -15,6 +15,17 @@ en:
             choices:
               missing: are not complete
               too_many: are too many
+    models:
+      decidim/surveys/closed_survey_event: Survey ended
+      decidim/surveys/opened_survey_event: Survey started
+  activerecord:
+    models:
+      decidim/surveys/survey:
+        one: Survey
+        other: Surveys
+      decidim/surveys/survey_answer:
+        one: Answer
+        other: Answers
   decidim:
     components:
       surveys:
@@ -99,4 +110,7 @@ en:
           survey_closed:
             body: The survey is closed and cannot be answered.
             title: Survey closed
+          survey_for_private_users:
+            body: The survey is available only for private users
+            title: Survey closed
           tos_agreement: By participating in this survey you accept its Terms of Service

data/config/locales/es.yml

@@ -14,6 +14,17 @@ es:
             choices:
               missing: no están completos
               too_many: son demasiados
+    models:
+      decidim/surveys/closed_survey_event: Encuesta terminada
+      decidim/surveys/opened_survey_event: La encuesta ha empezado
+  activerecord:
+    models:
+      decidim/surveys/survey:
+        one: Encuesta
+        other: Encuestas
+      decidim/surveys/survey_answer:
+        one: Respuesta
+        other: Respuestas
   decidim:
     components:
       surveys:
@@ -98,4 +109,7 @@ es:
           survey_closed:
             body: La encuesta está cerrada y no se puede responder.
             title: Encuesta cerrada
+          survey_for_private_users:
+            body: La encuesta está disponible solo para usuarios privados
+            title: Encuesta cerrada
           tos_agreement: Al participar en esta encuesta, aceptas sus términos de servicio

data/config/locales/eu.yml

@@ -14,6 +14,17 @@ eu:
             choices:
               missing: ez dira osatu
               too_many: gehiegi dira
+    models:
+      decidim/surveys/closed_survey_event: Inkesta amaitu da
+      decidim/surveys/opened_survey_event: Inkesta hasi zen
+  activerecord:
+    models:
+      decidim/surveys/survey:
+        one: Inkesta
+        other: Inkestak
+      decidim/surveys/survey_answer:
+        one: Erantzuna
+        other: Erantzunak
   decidim:
     components:
       surveys:
@@ -98,4 +109,7 @@ eu:
           survey_closed:
             body: Inkesta itxita dago eta ezin da erantzun.
             title: Inkesta itxia
+          survey_for_private_users:
+            body: Iragarkia erabiltzaile pribatuentzako soilik dago erabilgarri
+            title: Inkesta itxia
           tos_agreement: Inkestan parte hartuz, Zerbitzu-baldintzak onartzen dituzu

data/config/locales/fi.yml

@@ -14,6 +14,17 @@ fi:
             choices:
               missing: eivät ole täydellisiä
               too_many: ovat liian monta
+    models:
+      decidim/surveys/closed_survey_event: Tutkimus päättyi
+      decidim/surveys/opened_survey_event: Tutkimus alkoi
+  activerecord:
+    models:
+      decidim/surveys/survey:
+        one: tutkimus
+        other: tutkimukset
+      decidim/surveys/survey_answer:
+        one: Vastaus
+        other: vastaukset
   decidim:
     components:
       surveys:
@@ -98,4 +109,7 @@ fi:
           survey_closed:
             body: Kysely on suljettu ja siihen ei voi vastata.
             title: Kysely suljettu
+          survey_for_private_users:
+            body: Kysely on käytettävissä vain yksityisille käyttäjille
+            title: Kysely on suljettu
           tos_agreement: Osallistumalla tähän kyselyyn hyväksyt sen käyttöehdot

data/config/locales/fr.yml

@@ -14,6 +14,17 @@ fr:
             choices:
               missing: ne sont pas complets
               too_many: sont trop nombreux
+    models:
+      decidim/surveys/closed_survey_event: Enquête terminée
+      decidim/surveys/opened_survey_event: Enquête commencée
+  activerecord:
+    models:
+      decidim/surveys/survey:
+        one: Enquête
+        other: Enquêtes
+      decidim/surveys/survey_answer:
+        one: Réponse
+        other: Réponses
   decidim:
     components:
       surveys:
@@ -98,4 +109,7 @@ fr:
           survey_closed:
             body: L'enquête est terminée et n'accepte plus de réponse.
             title: Enquête terminée
+          survey_for_private_users:
+            body: L'enquête est disponible uniquement pour les utilisateurs privés
+            title: Enquête terminée
           tos_agreement: En participant à cette enquête, vous acceptez ses conditions d'utilisation

data/config/locales/gl.yml

@@ -14,6 +14,17 @@ gl:
             choices:
               missing: non están completos
               too_many: son demasiados
+    models:
+      decidim/surveys/closed_survey_event: A investigación finalizou
+      decidim/surveys/opened_survey_event: Iniciouse a enquisa
+  activerecord:
+    models:
+      decidim/surveys/survey:
+        one: Enquisa
+        other: Enquisas
+      decidim/surveys/survey_answer:
+        one: Resposta
+        other: Respostas
   decidim:
     components:
       surveys:
@@ -98,4 +109,7 @@ gl:
           survey_closed:
             body: A enquisa está pechada e non se pode responder.
             title: Enquisa pechada
+          survey_for_private_users:
+            body: A enquisa só está dispoñible para usuarios privados
+            title: Enquisa pechada
           tos_agreement: Ao participar nesta enquisa aceptas as Condicións de servizo

data/config/locales/it.yml

@@ -14,6 +14,17 @@ it:
             choices:
               missing: non sono completi
               too_many: sono troppi
+    models:
+      decidim/surveys/closed_survey_event: Sondaggio terminato
+      decidim/surveys/opened_survey_event: Sondaggio iniziato
+  activerecord:
+    models:
+      decidim/surveys/survey:
+        one: Sondaggio
+        other: indagini
+      decidim/surveys/survey_answer:
+        one: Risposta
+        other: risposte
   decidim:
     components:
       surveys:
@@ -98,4 +109,7 @@ it:
           survey_closed:
             body: L'indagine è chiusa e non è più possibile rispondere.
             title: Questionario chiuso
+          survey_for_private_users:
+            body: Il sondaggio è disponibile solo per gli utenti privati
+            title: Sondaggio chiuso
           tos_agreement: Partecipando a questo sondaggio, accetti le sue condizioni di servizio

data/config/locales/nl.yml

@@ -14,6 +14,17 @@ nl:
             choices:
               missing: zijn niet compleet
               too_many: zijn te veel
+    models:
+      decidim/surveys/closed_survey_event: Enquête beëindigd
+      decidim/surveys/opened_survey_event: Enquête is gestart
+  activerecord:
+    models:
+      decidim/surveys/survey:
+        one: Enquête
+        other: onderzoeken
+      decidim/surveys/survey_answer:
+        one: Antwoord
+        other: antwoorden
   decidim:
     components:
       surveys:
@@ -98,4 +109,7 @@ nl:
           survey_closed:
             body: De enquête is gesloten en kan niet worden beantwoord.
             title: Enquête gesloten
+          survey_for_private_users:
+            body: De enquête is alleen beschikbaar voor privé-gebruikers
+            title: Enquête gesloten
           tos_agreement: Door deel te nemen aan dit onderzoek accepteert u de gebruiksvoorwaarden

data/config/locales/pl.yml

@@ -14,6 +14,21 @@ pl:
             choices:
               missing: nie są kompletne
               too_many: jest zbyt wiele
+    models:
+      decidim/surveys/closed_survey_event: Ankieta zakończyła się
+      decidim/surveys/opened_survey_event: Rozpoczęto ankietę
+  activerecord:
+    models:
+      decidim/surveys/survey:
+        one: Ankieta
+        few: Ankiety
+        many: Ankiety
+        other: Ankiety
+      decidim/surveys/survey_answer:
+        one: Odpowiedź
+        few: Odpowiedzi
+        many: Odpowiedzi
+        other: Odpowiedzi
   decidim:
     components:
       surveys:
@@ -98,4 +113,7 @@ pl:
           survey_closed:
             body: Ankieta jest zamknięta i nie można jej odpowiedzieć.
             title: Ankieta zamknięta
+          survey_for_private_users:
+            body: Ankieta jest dostępna tylko dla użytkowników prywatnych
+            title: Ankieta została zamknięta
           tos_agreement: Uczestnicząc w tym ankiecie akceptujesz Warunki korzystania z usługi

data/config/locales/pt-BR.yml

@@ -14,6 +14,17 @@ pt-BR:
             choices:
               missing: não estão completos
               too_many: são muitos
+    models:
+      decidim/surveys/closed_survey_event: Estudo finalizado
+      decidim/surveys/opened_survey_event: Enquete iniciada
+  activerecord:
+    models:
+      decidim/surveys/survey:
+        one: Enquete
+        other: Enquetes
+      decidim/surveys/survey_answer:
+        one: Resposta
+        other: Respostas
   decidim:
     components:
       surveys:
@@ -98,4 +109,7 @@ pt-BR:
           survey_closed:
             body: A pesquisa está fechada e não pode ser respondida.
             title: Pesquisa fechada
+          survey_for_private_users:
+            body: A pesquisa está disponível apenas para usuários particulares
+            title: Inquérito encerrado
           tos_agreement: Ao participar desta pesquisa você aceita seus Termos de Serviço

data/config/locales/pt.yml

@@ -14,6 +14,17 @@ pt:
             choices:
               missing: não estão completos
               too_many: são muitos
+    models:
+      decidim/surveys/closed_survey_event: Pesquisa finalizada
+      decidim/surveys/opened_survey_event: Inquérito iniciado
+  activerecord:
+    models:
+      decidim/surveys/survey:
+        one: Pesquisa
+        other: pesquisas
+      decidim/surveys/survey_answer:
+        one: Responda
+        other: Respostas
   decidim:
     components:
       surveys:
@@ -98,4 +109,7 @@ pt:
           survey_closed:
             body: A pesquisa está fechada e não pode ser respondida.
             title: Pesquisa fechada
+          survey_for_private_users:
+            body: A pesquisa está disponível apenas para usuários particulares
+            title: Inquérito encerrado
           tos_agreement: Ao participar desta pesquisa você aceita seus Termos de Serviço

data/config/locales/ru.yml

@@ -14,6 +14,21 @@ ru:
             choices:
               missing: приведены не все
               too_many: слишком много
+    models:
+      decidim/surveys/closed_survey_event: Опрос закончился
+      decidim/surveys/opened_survey_event: Опрос начался
+  activerecord:
+    models:
+      decidim/surveys/survey:
+        one: Опрос
+        few: Опроса
+        many: Опросов
+        other: Опросов
+      decidim/surveys/survey_answer:
+        one: Ответ
+        few: Ответа
+        many: Ответов
+        other: Ответов
   decidim:
     components:
       surveys:
@@ -98,4 +113,7 @@ ru:
           survey_closed:
             body: Опрос завершен и его уже нельзя проходить.
             title: Опрос завершен
+          survey_for_private_users:
+            body: Опрос доступен только для частных участников
+            title: Опрос завершен
           tos_agreement: Участвуя в этом опросе, вы принимаете его "Условия использования"

data/config/locales/sv.yml

@@ -14,6 +14,17 @@ sv:
             choices:
               missing: är inte fullständiga
               too_many: är för många
+    models:
+      decidim/surveys/closed_survey_event: Undersökningen slutade
+      decidim/surveys/opened_survey_event: Undersökningen startade
+  activerecord:
+    models:
+      decidim/surveys/survey:
+        one: Undersökning
+        other: Undersökningar
+      decidim/surveys/survey_answer:
+        one: Svar
+        other: svar
   decidim:
     components:
       surveys:
@@ -98,4 +109,7 @@ sv:
           survey_closed:
             body: Undersökningen är stängd och kan inte besvaras.
             title: Undersökningen stängd
+          survey_for_private_users:
+            body: Undersökningen är endast tillgänglig för privata användare
+            title: Undersökningen stängd
           tos_agreement: Genom att delta i denna undersökning accepterar du användarvillkoren

data/config/locales/uk.yml

@@ -14,6 +14,21 @@ uk:
             choices:
               missing: наведені не всі
               too_many: занадто багато
+    models:
+      decidim/surveys/closed_survey_event: Опитування закінчилося
+      decidim/surveys/opened_survey_event: Опитування почалося
+  activerecord:
+    models:
+      decidim/surveys/survey:
+        one: Опитування
+        few: Опитування
+        many: Опитувань
+        other: Опитувань
+      decidim/surveys/survey_answer:
+        one: Відповідь
+        few: Відповіді
+        many: Відповідей
+        other: Відповідей
   decidim:
     components:
       surveys:
@@ -98,4 +113,7 @@ uk:
           survey_closed:
             body: Опитування завершене, дати відповіді на нього не можна.
             title: Опитування завершене
+          survey_for_private_users:
+            body: Це опитування доступне лише для приватних учасників
+            title: Опитування завершене
           tos_agreement: Беручи участь у цьому опитуванні, ви приймаєте його умови використання

data/lib/decidim/surveys/admin_engine.rb

@@ -17,15 +17,6 @@ module Decidim
         app.config.assets.precompile += %w(admin/decidim_surveys_manifest.js)
       end
 
-      initializer "decidim_surveys.inject_abilities_to_user" do |_app|
-        Decidim.configure do |config|
-          config.admin_abilities += [
-            "Decidim::Surveys::Abilities::AdminAbility",
-            "Decidim::Surveys::Abilities::ParticipatoryProcessAdminAbility"
-          ]
-        end
-      end
-
       def load_seed
         nil
       end

data/lib/decidim/surveys/component.rb

@@ -7,6 +7,7 @@ Decidim.register_component(:surveys) do |component|
   component.admin_engine = Decidim::Surveys::AdminEngine
   component.icon = "decidim/surveys/icon.svg"
   component.stylesheet = "decidim/surveys/surveys"
+  component.permissions_class_name = "Decidim::Surveys::Permissions"
 
   component.on(:create) do |instance|
     Decidim::Surveys::CreateSurvey.call(instance) do
@@ -45,16 +46,6 @@ Decidim.register_component(:surveys) do |component|
     settings.attribute :announcement, type: :text, translated: true, editor: true
   end
 
-  # component.register_resource do |resource|
-  #   # Register a optional resource that can be references from other resources.
-  #   resource.model_class_name = "Decidim::Surveys::SomeResource"
-  #   resource.template = "decidim/surveys/some_resources/linked_some_resources"
-  # end
-
-  # component.register_stat :some_stat do |context, start_at, end_at|
-  #   # Register some stat number to the application
-  # end
-
   component.exports :survey_user_answers do |exports|
     exports.collection do |f|
       survey = Decidim::Surveys::Survey.find_by(component: f)

data/lib/decidim/surveys/engine.rb

@@ -19,12 +19,6 @@ module Decidim
         app.config.assets.precompile += %w(decidim_surveys_manifest.js)
       end
 
-      initializer "decidim_surveys.inject_abilities_to_user" do |_app|
-        Decidim.configure do |config|
-          config.abilities += ["Decidim::Surveys::Abilities::CurrentUserAbility"]
-        end
-      end
-
       initializer "decidim_changes" do
         Decidim::SettingsChange.subscribe "surveys" do |changes|
           Decidim::Surveys::SettingsChangeJob.perform_later(

data/lib/decidim/surveys/survey_user_answers_serializer.rb

@@ -15,9 +15,15 @@ module Decidim
       # Public: Exports a hash with the serialized data for the user answers.
       def serialize
         @survey_answers.each_with_index.inject({}) do |serialized, (answer, idx)|
-          serialized.update("#{idx + 1}. #{translated_attribute(answer.question.body)}" => answer.body)
+          serialized.update("#{idx + 1}. #{translated_attribute(answer.question.body)}" => normalize_body(answer))
         end
       end
+
+      private
+
+      def normalize_body(answer)
+        answer.body || answer.choices.pluck(:body)
+      end
     end
   end
 end

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

@@ -52,4 +52,7 @@ FactoryBot.define do
   factory :survey_answer_option, class: Decidim::Surveys::SurveyAnswerOption do
     body { Decidim::Faker::Localized.sentence }
   end
+
+  factory :survey_answer_choice, class: Decidim::Surveys::SurveyAnswerChoice do
+  end
 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.11.2"
+      "0.12.0.pre"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-surveys
 version: !ruby/object:Gem::Version
-  version: 0.11.2
+  version: 0.12.0.pre
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-13 00:00:00.000000000 Z
+date: 2018-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -18,56 +18,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0.pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0.pre
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0.pre
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0.pre
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0.pre
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0.pre
 - !ruby/object:Gem::Dependency
   name: decidim-participatory_processes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0.pre
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0.pre
 description: A surveys component for decidim's participatory spaces.
 email:
 - josepjaume@gmail.com
@@ -106,15 +106,14 @@ files:
 - app/forms/decidim/surveys/survey_form.rb
 - app/helpers/decidim/surveys/admin/application_helper.rb
 - app/jobs/decidim/surveys/settings_change_job.rb
-- app/models/decidim/surveys/abilities/admin_ability.rb
-- app/models/decidim/surveys/abilities/current_user_ability.rb
-- app/models/decidim/surveys/abilities/participatory_process_admin_ability.rb
 - app/models/decidim/surveys/application_record.rb
 - app/models/decidim/surveys/survey.rb
 - app/models/decidim/surveys/survey_answer.rb
 - app/models/decidim/surveys/survey_answer_choice.rb
 - app/models/decidim/surveys/survey_answer_option.rb
 - app/models/decidim/surveys/survey_question.rb
+- app/permissions/decidim/surveys/admin/permissions.rb
+- app/permissions/decidim/surveys/permissions.rb
 - app/queries/decidim/surveys/survey_user_answers.rb
 - app/views/decidim/surveys/admin/surveys/_answer_option.html.erb
 - app/views/decidim/surveys/admin/surveys/_form.html.erb
@@ -176,9 +175,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.6

data/app/models/decidim/surveys/abilities/admin_ability.rb

@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Surveys
-    module Abilities
-      # Defines the abilities related to surveys for a logged in admin user.
-      # Intended to be used with `cancancan`.
-      class AdminAbility < Decidim::Abilities::AdminAbility
-        def define_abilities
-          super
-
-          can :manage, Survey
-        end
-      end
-    end
-  end
-end

data/app/models/decidim/surveys/abilities/current_user_ability.rb

@@ -1,47 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Surveys
-    module Abilities
-      # Defines the abilities related to surveys for a logged in user.
-      # Intended to be used with `cancancan`.
-      class CurrentUserAbility
-        include CanCan::Ability
-
-        attr_reader :user, :context
-
-        def initialize(user, context)
-          return unless user
-
-          @user = user
-          @context = context
-
-          can :answer, Survey if authorized?(:answer)
-        end
-
-        private
-
-        def authorized?(action)
-          return unless component
-
-          ActionAuthorizer.new(user, component, action).authorize.ok?
-        end
-
-        def current_settings
-          context.fetch(:current_settings, nil)
-        end
-
-        def component_settings
-          context.fetch(:component_settings, nil)
-        end
-
-        def component
-          component = context.fetch(:current_component, nil)
-          return nil unless component && component.manifest.name == :surveys
-
-          component
-        end
-      end
-    end
-  end
-end

data/app/models/decidim/surveys/abilities/participatory_process_admin_ability.rb

@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Surveys
-    module Abilities
-      # Defines the abilities related to surveys for a logged in process admin user.
-      # Intended to be used with `cancancan`.
-      class ParticipatoryProcessAdminAbility < Decidim::Abilities::ParticipatoryProcessAdminAbility
-        def define_participatory_process_abilities
-          super
-
-          can :manage, Survey do |survey|
-            can_manage_process?(survey.component.participatory_space)
-          end
-        end
-      end
-    end
-  end
-end