decidim-consultations 0.11.2 → 0.12.0.pre

data/config/locales/uk.yml

@@ -8,6 +8,7 @@ uk:
         end_voting_date: Дата закінчення
         introductory_image: Вступне зображення
         introductory_video_url: Веб-адреса вступного відео
+        questions: Питання
         slug: Скорочена веб-адреса
         start_voting_date: Дата початку
         subtitle: Підзаголовок
@@ -35,6 +36,28 @@ uk:
       vote:
         decidim_consultations_response_id:
           not_found: Відповідь не знайдено.
+  activerecord:
+    models:
+      decidim/consultations:
+        one: Консультація
+        few: Консультації
+        many: Консультацій
+        other: Консультацій
+      decidim/consultations/question:
+        one: Питання
+        few: Питання
+        many: Питань
+        other: Питань
+      decidim/consultations/response:
+        one: Відповідь
+        few: Відповіді
+        many: Відповідей
+        other: Відповідей
+      decidim/consultations/vote:
+        one: Голос
+        few: Голоси
+        many: Голосів
+        other: Голосів
   decidim:
     admin:
       actions:
@@ -190,11 +213,8 @@ uk:
         filter: Відібрати
         filter_by: 'Відібрати за ознакою:'
         unfold: Розгорнути
-      finished:
-        active_consultations: Діючі консультації
-        past_consultations: Минулі консультації
       highlighted_questions:
-        title: Консультації з %{scope_name}
+        title: Питання з %{scope_name}
       index:
         title: Консультації
       question:
@@ -209,11 +229,25 @@ uk:
         create:
           error: При голосуванні щодо питання сталися помилки
       regular_questions:
-        title: Інші консультації
+        title: Питання цієї консультації
       show:
-        see_finished_consultations: Переглянути попередні консультації
+        badge_name:
+          finished: Завершені
+          open: Відкриті
+          open_votes: Відкрите голосування
+          published_results: Підсумки оприлюднено
+        footer_button_text:
+          debate: Обговорення
+          view: Переглянути
+          view_results: Переглянути підсумки
+          vote: Голосувати
+        unspecified: Не вказано
     menu:
       consultations: Консультації
+    pages:
+      home:
+        statistics:
+          consultations_count: Консультації
     questions:
       results:
         title: Підсумки
@@ -232,7 +266,7 @@ uk:
         starting_from: Починаючи з %{date}
         vote: Голосувати
       vote_modal:
-        contextual_help: Будь ласка, оберіть варіант. Майте на увазі, що після того, як ви підтвердите свою підтримку, її не можна буде відкликати.
+        contextual_help: Будь ласка, оберіть варіант.
         title: 'Консультація: підтримка питання'
       vote_modal_confirm:
         change: Змінити
@@ -252,7 +286,3 @@ uk:
         unfold: Розгорнути
       question_header:
         back_to_consultation: Переглянути всі консультації
-  pages:
-    home:
-      statistics:
-        consultations_count: Консультації

data/lib/decidim/consultations/admin_engine.rb

@@ -47,16 +47,6 @@ module Decidim
         end
       end
 
-      initializer "decidim_consultations.inject_abilities_to_user" do |_app|
-        Decidim.configure do |config|
-          config.admin_abilities += %w(
-            Decidim::Consultations::Abilities::Admin::ConsultationAdminAbility
-            Decidim::Consultations::Abilities::Admin::QuestionAdminAbility
-            Decidim::Consultations::Abilities::Admin::ResponseAdminAbility
-          )
-        end
-      end
-
       initializer "decidim_consultations.admin_menu" do
         Decidim.menu :admin_menu do |menu|
           menu.item I18n.t("menu.consultations", scope: "decidim.admin"),
@@ -64,7 +54,7 @@ module Decidim
                     icon_name: "comment-square",
                     position: 3.8,
                     active: :inclusive,
-                    if: can?(:index, Decidim::Consultation)
+                    if: allowed_to?(:enter, :space_area, space_name: :consultations)
         end
       end
     end

data/lib/decidim/consultations/engine.rb

@@ -22,7 +22,6 @@ module Decidim
         }, constraints: { question_id: /[0-9]+/ }
 
         resources :consultations, only: [:index, :show], param: :slug, path: "consultations" do
-          get "finished", on: :collection
           resource :consultation_widget, only: :show, path: "embed"
 
           resources :questions, only: [:show], param: :slug, path: "questions", shallow: true do
@@ -50,25 +49,21 @@ module Decidim
       initializer "decidim_consultations.assets" do |app|
         app.config.assets.precompile += %w(
           decidim_consultations_manifest.js
-          decidim_consultations_manifest.scss
+          decidim_consultations_manifest.css
         )
       end
 
-      initializer "decidim_consultations.inject_abilities_to_user" do |_app|
-        Decidim.configure do |config|
-          config.abilities += %w(
-            Decidim::Consultations::Abilities::EveryoneAbility
-            Decidim::Consultations::Abilities::CurrentUserAbility
-          )
-        end
-      end
-
       initializer "decidim.stats" do
         Decidim.stats.register :consultations_count, priority: StatsRegistry::HIGH_PRIORITY do |organization, _start_at, _end_at|
           Decidim::Consultation.where(organization: organization).published.count
         end
       end
 
+      initializer "decidim_consultations.add_cells_view_paths" do
+        Cell::ViewModel.view_paths << File.expand_path("#{Decidim::Consultations::Engine.root}/app/cells")
+        Cell::ViewModel.view_paths << File.expand_path("#{Decidim::Consultations::Engine.root}/app/views") # for partials
+      end
+
       initializer "decidim_consultations.menu" do
         Decidim.menu :menu do |menu|
           menu.item I18n.t("menu.consultations", scope: "decidim"),

data/lib/decidim/consultations/participatory_space.rb

@@ -3,6 +3,8 @@
 Decidim.register_participatory_space(:consultations) do |participatory_space|
   participatory_space.icon = "decidim/consultations/icon.svg"
   participatory_space.model_class_name = "Decidim::Consultations::Question"
+  participatory_space.permissions_class_name = "Decidim::Consultations::Permissions"
+  participatory_space.stylesheet = "decidim/consultations/consultations"
 
   participatory_space.participatory_spaces do |organization|
     Decidim::Consultations::Question.where(organization: organization)
@@ -19,12 +21,17 @@ Decidim.register_participatory_space(:consultations) do |participatory_space|
     context.layout = "layouts/decidim/admin/question"
   end
 
+  participatory_space.register_resource(:consultation) do |resource|
+    resource.model_class_name = "Decidim::Consultation"
+    resource.card = "decidim/consultations/consultation"
+  end
+
   participatory_space.seeds do
     seeds_root = File.join(__dir__, "..", "..", "..", "db", "seeds")
     organization = Decidim::Organization.first
 
     # Active consultation
-    consultation = Decidim::Consultation.create!(
+    active_consultation = Decidim::Consultation.create!(
       slug: Faker::Internet.unique.slug(nil, "-"),
       title: Decidim::Faker::Localized.sentence(3),
       subtitle: Decidim::Faker::Localized.sentence(3),
@@ -36,57 +43,11 @@ Decidim.register_participatory_space(:consultations) do |participatory_space|
       end_voting_date: Time.zone.today + 1.month,
       banner_image: File.new(File.join(seeds_root, "city2.jpeg")),
       introductory_video_url: "https://www.youtube.com/embed/zhMMW0TENNA",
-      decidim_highlighted_scope_id: Decidim::Scope.reorder("RANDOM()").first.id,
+      decidim_highlighted_scope_id: Decidim::Scope.reorder(Arel.sql("RANDOM()")).first.id,
       organization: organization
     )
 
-    4.times do
-      question = Decidim::Consultations::Question.create!(
-        consultation: consultation,
-        slug: Faker::Internet.unique.slug(nil, "-"),
-        decidim_scope_id: Decidim::Scope.reorder("RANDOM()").first.id,
-        title: Decidim::Faker::Localized.sentence(3),
-        subtitle: Decidim::Faker::Localized.sentence(3),
-        what_is_decided: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-          Decidim::Faker::Localized.paragraph(3)
-        end,
-        question_context: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-          Decidim::Faker::Localized.paragraph(3)
-        end,
-        hero_image: File.new(File.join(seeds_root, "city.jpeg")),
-        banner_image: File.new(File.join(seeds_root, "city2.jpeg")),
-        promoter_group: Decidim::Faker::Localized.sentence(3),
-        participatory_scope: Decidim::Faker::Localized.sentence(3),
-        published_at: Time.now.utc,
-        organization: organization
-      )
-
-      2.times do
-        Decidim::Consultations::Response.create(
-          question: question,
-          title: Decidim::Faker::Localized.sentence(3)
-        )
-      end
-
-      Decidim::Comments::Seed.comments_for(question)
-
-      Decidim::Attachment.create!(
-        title: Decidim::Faker::Localized.sentence(2),
-        description: Decidim::Faker::Localized.sentence(5),
-        file: File.new(File.join(seeds_root, "city.jpeg")),
-        attached_to: question
-      )
-
-      Decidim::Attachment.create!(
-        title: Decidim::Faker::Localized.sentence(2),
-        description: Decidim::Faker::Localized.sentence(5),
-        file: File.new(File.join(seeds_root, "Exampledocument.pdf")),
-        attached_to: question
-      )
-    end
-
-    # Finished consultations
-    consultation = Decidim::Consultation.create!(
+    finished_consultation = Decidim::Consultation.create!(
       slug: Faker::Internet.unique.slug(nil, "-"),
       title: Decidim::Faker::Localized.sentence(3),
       subtitle: Decidim::Faker::Localized.sentence(3),
@@ -99,73 +60,71 @@ Decidim.register_participatory_space(:consultations) do |participatory_space|
       end_voting_date: Time.zone.today - 1.month,
       banner_image: File.new(File.join(seeds_root, "city2.jpeg")),
       introductory_video_url: "https://www.youtube.com/embed/zhMMW0TENNA",
-      decidim_highlighted_scope_id: Decidim::Scope.reorder("RANDOM()").first.id,
+      decidim_highlighted_scope_id: Decidim::Scope.reorder(Arel.sql("RANDOM()")).first.id,
       organization: organization
     )
 
-    4.times do
-      question = Decidim::Consultations::Question.create!(
-        consultation: consultation,
-        slug: Faker::Internet.unique.slug(nil, "-"),
-        decidim_scope_id: Decidim::Scope.reorder("RANDOM()").first.id,
-        title: Decidim::Faker::Localized.sentence(3),
-        subtitle: Decidim::Faker::Localized.sentence(3),
-        what_is_decided: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-          Decidim::Faker::Localized.paragraph(3)
-        end,
-        question_context: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-          Decidim::Faker::Localized.paragraph(3)
-        end,
-        banner_image: File.new(File.join(seeds_root, "city.jpeg")),
-        promoter_group: Decidim::Faker::Localized.sentence(3),
-        participatory_scope: Decidim::Faker::Localized.sentence(3),
-        hero_image: File.new(File.join(seeds_root, "city.jpeg")),
-        published_at: Time.now.utc,
-        organization: organization
-      )
+    upcoming_consultation = Decidim::Consultation.create!(
+      slug: Faker::Internet.unique.slug(nil, "-"),
+      title: Decidim::Faker::Localized.sentence(3),
+      subtitle: Decidim::Faker::Localized.sentence(3),
+      description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
+        Decidim::Faker::Localized.paragraph(3)
+      end,
+      published_at: Time.zone.today + 1.month,
+      start_voting_date: Time.zone.today + 1.month + 1.day,
+      end_voting_date: Time.zone.today + 2.months,
+      banner_image: File.new(File.join(seeds_root, "city2.jpeg")),
+      introductory_video_url: "https://www.youtube.com/embed/zhMMW0TENNA",
+      decidim_highlighted_scope_id: Decidim::Scope.reorder(Arel.sql("RANDOM()")).first.id,
+      organization: organization
+    )
 
-      2.times do |i|
-        response = Decidim::Consultations::Response.create(
-          question: question,
-          title: Decidim::Faker::Localized.sentence(3)
+    [finished_consultation, active_consultation, upcoming_consultation].each do |consultation|
+      4.times do
+        question = Decidim::Consultations::Question.create!(
+          consultation: consultation,
+          slug: Faker::Internet.unique.slug(nil, "-"),
+          decidim_scope_id: Decidim::Scope.reorder(Arel.sql("RANDOM()")).first.id,
+          title: Decidim::Faker::Localized.sentence(3),
+          subtitle: Decidim::Faker::Localized.sentence(3),
+          what_is_decided: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
+            Decidim::Faker::Localized.paragraph(3)
+          end,
+          question_context: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
+            Decidim::Faker::Localized.paragraph(3)
+          end,
+          hero_image: File.new(File.join(seeds_root, "city.jpeg")),
+          banner_image: File.new(File.join(seeds_root, "city2.jpeg")),
+          promoter_group: Decidim::Faker::Localized.sentence(3),
+          participatory_scope: Decidim::Faker::Localized.sentence(3),
+          published_at: Time.now.utc,
+          organization: organization
         )
 
-        email = "question_vote_#{question.id}_#{response.id}_#{i}@example.org"
+        2.times do
+          Decidim::Consultations::Response.create(
+            question: question,
+            title: Decidim::Faker::Localized.sentence(3)
+          )
+        end
+
+        Decidim::Comments::Seed.comments_for(question)
 
-        author = Decidim::User.find_or_initialize_by(email: email)
-        author.update!(
-          name: Faker::Name.name,
-          nickname: Faker::Twitter.unique.screen_name,
-          password: "decidim123456",
-          password_confirmation: "decidim123456",
-          organization: organization,
-          confirmed_at: Time.current,
-          locale: I18n.default_locale,
-          tos_agreement: true
+        Decidim::Attachment.create!(
+          title: Decidim::Faker::Localized.sentence(2),
+          description: Decidim::Faker::Localized.sentence(5),
+          file: File.new(File.join(seeds_root, "city.jpeg")),
+          attached_to: question
         )
 
-        Decidim::Consultations::Vote.create(
-          question: question,
-          response: response,
-          author: author
+        Decidim::Attachment.create!(
+          title: Decidim::Faker::Localized.sentence(2),
+          description: Decidim::Faker::Localized.sentence(5),
+          file: File.new(File.join(seeds_root, "Exampledocument.pdf")),
+          attached_to: question
         )
       end
-
-      Decidim::Comments::Seed.comments_for(question)
-
-      Decidim::Attachment.create!(
-        title: Decidim::Faker::Localized.sentence(2),
-        description: Decidim::Faker::Localized.sentence(5),
-        file: File.new(File.join(seeds_root, "city.jpeg")),
-        attached_to: question
-      )
-
-      Decidim::Attachment.create!(
-        title: Decidim::Faker::Localized.sentence(2),
-        description: Decidim::Faker::Localized.sentence(5),
-        file: File.new(File.join(seeds_root, "Exampledocument.pdf")),
-        attached_to: question
-      )
     end
   end
 end

data/lib/decidim/consultations/version.rb

@@ -3,7 +3,7 @@
 module Decidim
   module Consultations
     def self.version
-      "0.11.2"
+      "0.12.0.pre"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: decidim-consultations
 version: !ruby/object:Gem::Version
-  version: 0.11.2
+  version: 0.12.0.pre
 platform: ruby
 authors:
 - Juan Salvador Perez Garcia
 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-admin
@@ -16,56 +16,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-comments
   requirement: !ruby/object:Gem::Requirement
     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-core
   requirement: !ruby/object:Gem::Requirement
     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-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
 description: Extends Decidim adding a first level public consultation component
 email:
 - jsperezg@gmail.com
@@ -75,8 +75,8 @@ extra_rdoc_files: []
 files:
 - README.md
 - Rakefile
+- app/assets/config/decidim_consultations_manifest.css
 - app/assets/config/decidim_consultations_manifest.js
-- app/assets/config/decidim_consultations_manifest.scss
 - app/assets/images/decidim/consultations/icon.svg
 - app/assets/images/decidim/consultations/icon2.svg
 - app/assets/javascripts/decidim/consultations/show_more.js.es6
@@ -99,6 +99,10 @@ files:
 - app/assets/stylesheets/decidim/consultations/consultations/introductory_image.scss
 - app/assets/stylesheets/decidim/consultations/highlighted-content-banner.css.scss
 - app/assets/stylesheets/decidim/consultations/social_share.css.scss
+- app/cells/decidim/consultations/consultation_cell.rb
+- app/cells/decidim/consultations/consultation_m/data.erb
+- app/cells/decidim/consultations/consultation_m/footer.erb
+- app/cells/decidim/consultations/consultation_m_cell.rb
 - app/commands/decidim/consultations/admin/create_consultation.rb
 - app/commands/decidim/consultations/admin/create_question.rb
 - app/commands/decidim/consultations/admin/create_response.rb
@@ -132,6 +136,7 @@ files:
 - app/controllers/decidim/consultations/admin/question_publications_controller.rb
 - app/controllers/decidim/consultations/admin/questions_controller.rb
 - app/controllers/decidim/consultations/admin/responses_controller.rb
+- app/controllers/decidim/consultations/application_controller.rb
 - app/controllers/decidim/consultations/consultation_widgets_controller.rb
 - app/controllers/decidim/consultations/consultations_controller.rb
 - app/controllers/decidim/consultations/question_votes_controller.rb
@@ -147,15 +152,12 @@ files:
 - app/models/concerns/decidim/consultations/override_categorization.rb
 - app/models/concerns/decidim/consultations/publicable_results.rb
 - app/models/decidim/consultation.rb
-- app/models/decidim/consultations/abilities/admin/consultation_admin_ability.rb
-- app/models/decidim/consultations/abilities/admin/question_admin_ability.rb
-- app/models/decidim/consultations/abilities/admin/response_admin_ability.rb
-- app/models/decidim/consultations/abilities/current_user_ability.rb
-- app/models/decidim/consultations/abilities/everyone_ability.rb
 - app/models/decidim/consultations/application_record.rb
 - app/models/decidim/consultations/question.rb
 - app/models/decidim/consultations/response.rb
 - app/models/decidim/consultations/vote.rb
+- app/permissions/decidim/consultations/admin/permissions.rb
+- app/permissions/decidim/consultations/permissions.rb
 - app/presenters/decidim/consultations/question_stats_presenter.rb
 - app/queries/decidim/consultations/admin/admin_users.rb
 - app/queries/decidim/consultations/organization_active_consultations.rb
@@ -185,7 +187,6 @@ files:
 - app/views/decidim/consultations/consultations/_highlighted_questions.html.erb
 - app/views/decidim/consultations/consultations/_question.html.erb
 - app/views/decidim/consultations/consultations/_regular_questions.html.erb
-- app/views/decidim/consultations/consultations/finished.html.erb
 - app/views/decidim/consultations/consultations/index.html.erb
 - app/views/decidim/consultations/consultations/index.js.erb
 - app/views/decidim/consultations/consultations/show.html.erb
@@ -276,9 +277,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.3.1
 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