decidim 0.4.3 → 0.4.4

data/decidim-comments/app/types/decidim/comments/commentable_interface.rb

@@ -26,7 +26,7 @@ module Decidim
       end
 
       field :comments do
-        type !types[CommentType]
+        type !types[!CommentType]
 
         argument :orderBy, types.String, "Order the comments"
 

data/decidim-comments/decidim-comments.gemspec

@@ -19,4 +19,5 @@ Gem::Specification.new do |s|
   s.add_dependency "jquery-rails", "~> 4.0"
 
   s.add_development_dependency "decidim-dev", Decidim.version
+  s.add_development_dependency "decidim-admin", Decidim.version
 end

data/decidim-comments/lib/decidim/comments/api/comment_mutation_type.rb

@@ -8,11 +8,11 @@ module Decidim
 
       field :id, !types.ID, "The Comment's unique ID"
 
-      field :upVote, Decidim::Comments::CommentType do
+      field :upVote, !Decidim::Comments::CommentType do
         resolve VoteCommentResolver.new(weight: 1)
       end
 
-      field :downVote, Decidim::Comments::CommentType do
+      field :downVote, !Decidim::Comments::CommentType do
         resolve VoteCommentResolver.new(weight: -1)
       end
     end

data/decidim-comments/spec/features/comments_spec.rb

@@ -7,6 +7,6 @@ describe "Comments", type: :feature, perform_enqueued: true do
   let!(:author) { create(:user, :confirmed, organization: organization) }
   let!(:commentable) { create(:dummy_resource, feature: feature, author: author) }
 
-  let(:resource_path) { decidim_dummy.dummy_resource_path(commentable, feature_id: commentable.feature, participatory_process_id: commentable.feature.participatory_process) }
+  let(:resource_path) { resource_locator(commentable).path }
   include_examples "comments"
 end

data/decidim-comments/spec/features/notifications_spec.rb

@@ -15,7 +15,7 @@ describe "Comment notifications", type: :feature do
   end
 
   it "commentable author receives an email with a link to the comment", perform_enqueued: true do
-    visit decidim_dummy.dummy_resource_path(commentable, feature_id: commentable.feature, participatory_process_id: commentable.feature.participatory_process)
+    visit resource_locator(commentable).path
     expect(page).to have_selector(".add-comment form")
 
     within ".add-comment form" do

data/decidim-comments/spec/features/report_comment_spec.rb

@@ -9,7 +9,7 @@ describe "Report Comment", type: :feature do
   let(:manifest_name) { "dummy" }
   let!(:commentable) { create(:dummy_resource, feature: feature) }
   let!(:reportable) { create(:comment, commentable: commentable) }
-  let(:reportable_path) { decidim_dummy.dummy_resource_path(commentable, feature_id: commentable.feature, participatory_process_id: commentable.feature.participatory_process) }
+  let(:reportable_path) { resource_locator(commentable).path }
 
   let!(:user) { create :user, :confirmed, organization: organization }
 

data/decidim-comments/spec/models/comment_spec.rb

@@ -26,7 +26,7 @@ module Decidim
         expect(subject.commentable).to eq(commentable)
       end
 
-      it "has an associated commentable" do
+      it "has an associated root commentable" do
         expect(subject.root_commentable).to eq(commentable)
       end
 

data/decidim-dev/lib/decidim/dev/test/base_spec_helper.rb

@@ -33,7 +33,8 @@ require "rails"
 require "active_support/core_ext/string"
 require "decidim/core"
 require "decidim/core/test"
-require "#{__dir__}/rspec_support/feature.rb"
+
+require_relative "rspec_support/feature.rb"
 
 begin
   require "#{Decidim::Dev.dummy_app_path}/config/environment"

data/decidim-dev/lib/decidim/dev/test/rspec_support/feature_context.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 RSpec.shared_context "feature" do
-  include Decidim::FeaturePathHelper
-
   let(:manifest) { Decidim.find_feature_manifest(manifest_name) }
 
   let(:user) { create :user, :confirmed, organization: organization }
@@ -28,7 +26,7 @@ RSpec.shared_context "feature" do
   end
 
   def visit_feature
-    page.visit feature_path(feature)
+    page.visit main_feature_path(feature)
   end
 end
 

data/decidim-dev/lib/decidim/dev/test/rspec_support/i18n.rb

@@ -3,14 +3,7 @@
 RSpec.configure do |config|
   config.before(:suite) do
     I18n.config.enforce_available_locales = false
-  end
-
-  config.around(:each) do |example|
     I18n.available_locales = %w(en ca es)
     Decidim.available_locales = %w(en ca es)
-
-    previous_locale = I18n.locale
-    example.run
-    I18n.locale = previous_locale
   end
 end

data/decidim-dev/lib/decidim/dev/test/rspec_support/phantomjs_polyfills/promise.js

@@ -5,7 +5,7 @@
   var setTimeoutFunc = setTimeout;
 
   function noop() {}
-  
+
   // Polyfill for Function.prototype.bind
   function bind(fn, thisArg) {
     return function () {
@@ -223,7 +223,7 @@
   Promise._setUnhandledRejectionFn = function _setUnhandledRejectionFn(fn) {
     Promise._unhandledRejectionFn = fn;
   };
-  
+
   if (typeof module !== 'undefined' && module.exports) {
     module.exports = Promise;
   } else if (!root.Promise) {

data/decidim-dev/lib/decidim/dev/test/rspec_support/route_helpers.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+RSpec.configure do |config|
+  config.include Decidim::FeaturePathHelper
+  config.include Decidim::ResourceHelper
+end

data/decidim-dev/lib/generators/decidim/dummy_generator.rb

@@ -48,8 +48,6 @@ module Decidim
       end
 
       def decidim_dev
-        template "decidim_dev.rb", "#{dummy_app_path}/config/initializers/decidim_dev.rb"
-
         # TODO: Remove these after PhantomJS updates WebKit version (see YML and
         #       initializer comments)
         template "autoprefixer.yml", "#{dummy_app_path}/config/autoprefixer.yml"

data/decidim-meetings/app/forms/decidim/meetings/admin/meeting_form.rb

@@ -31,6 +31,12 @@ module Decidim
         validates :scope, presence: true, if: ->(form) { form.decidim_scope_id.present? }
         validates :category, presence: true, if: ->(form) { form.decidim_category_id.present? }
 
+        def map_model(model)
+          return unless model.categorization
+
+          self.decidim_category_id = model.categorization.decidim_category_id
+        end
+
         def process_scope
           current_feature.participatory_process.scope
         end

data/decidim-meetings/app/helpers/decidim/meetings/meetings_helper.rb

@@ -6,6 +6,7 @@ module Decidim
     module MeetingsHelper
       include Decidim::ApplicationHelper
       include Decidim::TranslationsHelper
+      include Decidim::ResourceHelper
 
       # Public: truncates the meeting description
       #
@@ -14,7 +15,7 @@ module Decidim
       #
       # Returns the meeting's description truncated.
       def meeting_description(meeting, max_length = 120)
-        link = decidim_meetings.meeting_path(meeting, feature_id: meeting.feature, participatory_process_id: meeting.feature.participatory_process)
+        link = resource_locator(meeting).path
         description = translated_attribute(meeting.description)
         tail = "... #{link_to(t("read_more", scope: "decidim.meetings"), link)}".html_safe
         CGI.unescapeHTML html_truncate(description, max_length: max_length, tail: tail)

data/decidim-meetings/app/services/decidim/meetings/meeting_search.rb

@@ -24,9 +24,9 @@ module Decidim
       # Handle the date filter
       def search_date
         if options[:date] == "upcoming"
-          query.where("start_time >= ? ", Time.current).order("start_time ASC")
+          query.where("start_time >= ? ", Time.current).order(start_time: :asc)
         elsif options[:date] == "past"
-          query.where("start_time <= ? ", Time.current).order("start_time DESC")
+          query.where("start_time <= ? ", Time.current).order(start_time: :desc)
         end
       end
 

data/decidim-meetings/app/views/decidim/meetings/admin/meeting_closes/_form.html.erb

@@ -24,11 +24,11 @@
     <div class="row column">
       <% if @form.proposals %>
         <%= form.select :proposal_ids,
-                        @form.proposals.order("title ASC").pluck(:title, :id),
+                        @form.proposals.order(title: :asc).pluck(:title, :id),
                         { include_blank: true },
                         { multiple: true, class: "chosen-select" }
         %>
       <% end %>
     </div>
   </div>
-</div>
+</div>

data/decidim-meetings/app/views/decidim/meetings/admin/meetings/index.html.erb

@@ -46,7 +46,7 @@
                 </td>
               <% end %>
               <td class="table-list__actions">
-                <%= icon_link_to "eye", decidim_meetings.meeting_path(id: meeting, feature_id: current_feature, participatory_process_id: current_participatory_process), t("actions.preview", scope: "decidim.meetings"), class: "action-icon--preview", target: :blank %>
+                <%= icon_link_to "eye", resource_locator(meeting).path, t("actions.preview", scope: "decidim.meetings"), class: "action-icon--preview", target: :blank %>
 
                 <% if can? :update, current_feature %>
                   <%= icon_link_to "pencil", edit_meeting_path(meeting), t("actions.edit", scope: "decidim.meetings"), class: "action-icon--edit" %>

data/decidim-meetings/app/views/decidim/meetings/meetings/_tags.html.erb

@@ -1,10 +1,10 @@
 <% if meeting.category.present? || meeting.scope.present? %>
   <ul class="tags tags--meeting" >
     <% if meeting.category.present? %>
-      <li><%= link_to translated_attribute(meeting.category.name), decidim_meetings.meetings_path(filter: { category_id: meeting.category.id }) %></li>
+      <li><%= link_to translated_attribute(meeting.category.name), resource_locator(meeting).index(filter: { category_id: meeting.category.id }) %></li>
     <% end %>
     <% if !current_participatory_process.scope && meeting.scope.present? %>
-      <li><%= link_to meeting.scope.name, decidim_meetings.meetings_path(filter: { scope_id: [meeting.scope.id] }) %></li>
+      <li><%= link_to meeting.scope.name, resource_locator(meeting).index(filter: { scope_id: [meeting.scope.id] }) %></li>
     <% end %>
   </ul>
 <% end %>

data/decidim-meetings/decidim-meetings.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
   s.add_dependency "jquery-tmpl-rails", "~> 1.1.0"
 
   s.add_development_dependency "decidim-dev", Decidim.version
-  s.add_development_dependency "decidim-proposals", Decidim.version
   s.add_development_dependency "decidim-admin", Decidim.version
+  s.add_development_dependency "decidim-proposals", Decidim.version
   s.add_development_dependency "decidim-results", Decidim.version
 end

data/decidim-meetings/lib/decidim/meetings/feature.rb

@@ -23,47 +23,43 @@ Decidim.register_feature(:meetings) do |feature|
     meetings.count
   end
 
-  feature.seeds do
-    Decidim::ParticipatoryProcess.find_each do |process|
-      next unless process.steps.any?
+  feature.seeds do |process|
+    feature = Decidim::Feature.create!(
+      name: Decidim::Features::Namer.new(process.organization.available_locales, :meetings).i18n_name,
+      published_at: Time.current,
+      manifest_name: :meetings,
+      participatory_process: process
+    )
 
-      feature = Decidim::Feature.create!(
-        name: Decidim::Features::Namer.new(process.organization.available_locales, :meetings).i18n_name,
-        published_at: Time.current,
-        manifest_name: :meetings,
-        participatory_process: process
+    3.times do
+      meeting = Decidim::Meetings::Meeting.create!(
+        feature: feature,
+        scope: process.organization.scopes.sample,
+        category: process.categories.sample,
+        title: Decidim::Faker::Localized.sentence(2),
+        description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
+          Decidim::Faker::Localized.paragraph(3)
+        end,
+        location: Decidim::Faker::Localized.sentence,
+        location_hints: Decidim::Faker::Localized.sentence,
+        start_time: 3.weeks.from_now,
+        end_time: 3.weeks.from_now + 4.hours,
+        address: "#{Faker::Address.street_address} #{Faker::Address.zip} #{Faker::Address.city}",
+        latitude: Faker::Address.latitude,
+        longitude: Faker::Address.longitude
+      )
+      Decidim::Attachment.create!(
+        title: Decidim::Faker::Localized.sentence(2),
+        description: Decidim::Faker::Localized.sentence(5),
+        file: File.new(File.join(__dir__, "seeds", "city.jpeg")),
+        attached_to: meeting
+      )
+      Decidim::Attachment.create!(
+        title: Decidim::Faker::Localized.sentence(2),
+        description: Decidim::Faker::Localized.sentence(5),
+        file: File.new(File.join(__dir__, "seeds", "Exampledocument.pdf")),
+        attached_to: meeting
       )
-
-      3.times do
-        meeting = Decidim::Meetings::Meeting.create!(
-          feature: feature,
-          scope: process.organization.scopes.sample,
-          category: process.categories.sample,
-          title: Decidim::Faker::Localized.sentence(2),
-          description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-            Decidim::Faker::Localized.paragraph(3)
-          end,
-          location: Decidim::Faker::Localized.sentence,
-          location_hints: Decidim::Faker::Localized.sentence,
-          start_time: 3.weeks.from_now,
-          end_time: 3.weeks.from_now + 4.hours,
-          address: "#{Faker::Address.street_address} #{Faker::Address.zip} #{Faker::Address.city}",
-          latitude: Faker::Address.latitude,
-          longitude: Faker::Address.longitude
-        )
-        Decidim::Attachment.create!(
-          title: Decidim::Faker::Localized.sentence(2),
-          description: Decidim::Faker::Localized.sentence(5),
-          file: File.new(File.join(__dir__, "seeds", "city.jpeg")),
-          attached_to: meeting
-        )
-        Decidim::Attachment.create!(
-          title: Decidim::Faker::Localized.sentence(2),
-          description: Decidim::Faker::Localized.sentence(5),
-          file: File.new(File.join(__dir__, "seeds", "Exampledocument.pdf")),
-          attached_to: meeting
-        )
-      end
     end
   end
 end

data/decidim-meetings/spec/features/explore_meetings_spec.rb

@@ -123,7 +123,7 @@ describe "Explore meetings", type: :feature do
         end_time: date.end_of_day
       )
 
-      visit decidim_meetings.meeting_path(participatory_process_id: participatory_process.id, feature_id: feature.id, id: meeting.id)
+      visit resource_locator(meeting).path
     end
 
     it "shows all meeting info" do

data/decidim-meetings/spec/forms/meeting_form_spec.rb

@@ -141,4 +141,10 @@ describe Decidim::Meetings::Admin::MeetingForm do
     expect(subject.latitude).to eq(latitude)
     expect(subject.longitude).to eq(longitude)
   end
+
+  it "properly maps category id from model" do
+    meeting = create(:meeting, feature: current_feature, category: category)
+
+    expect(described_class.from_model(meeting).decidim_category_id).to eq(category_id)
+  end
 end

data/decidim-meetings/spec/shared/manage_meetings_examples.rb

@@ -47,7 +47,7 @@ RSpec.shared_examples "manage meetings" do
       end
 
       within_window @new_window do
-        expect(current_path).to eq decidim_meetings.meeting_path(id: meeting.id, participatory_process_id: participatory_process.id, feature_id: current_feature.id)
+        expect(current_path).to eq resource_locator(meeting).path
         expect(page).to have_content(translated(meeting.title))
       end
     end

data/decidim-pages/lib/decidim/pages/feature.rb

@@ -51,25 +51,21 @@ Decidim.register_feature(:pages) do |feature|
     resource.model_class_name = "Decidim::Pages::Page"
   end
 
-  feature.seeds do
-    Decidim::ParticipatoryProcess.find_each do |process|
-      next unless process.steps.any?
+  feature.seeds do |process|
+    feature = Decidim::Feature.create!(
+      name: Decidim::Features::Namer.new(process.organization.available_locales, :pages).i18n_name,
+      manifest_name: :pages,
+      published_at: Time.current,
+      participatory_process: process
+    )
 
-      feature = Decidim::Feature.create!(
-        name: Decidim::Features::Namer.new(process.organization.available_locales, :pages).i18n_name,
-        manifest_name: :pages,
-        published_at: Time.current,
-        participatory_process: process
-      )
+    page = Decidim::Pages::Page.create!(
+      feature: feature,
+      body: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
+        Decidim::Faker::Localized.paragraph(3)
+      end
+    )
 
-      page = Decidim::Pages::Page.create!(
-        feature: feature,
-        body: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-          Decidim::Faker::Localized.paragraph(3)
-        end
-      )
-
-      Decidim::Comments::Seed.comments_for(page)
-    end
+    Decidim::Comments::Seed.comments_for(page)
   end
 end

data/decidim-pages/spec/features/comments_spec.rb

@@ -6,6 +6,6 @@ describe "Comments", type: :feature, perform_enqueued: true do
   let!(:feature) { create(:page_feature, organization: organization) }
   let!(:commentable) { create(:page, feature: feature) }
 
-  let(:resource_path) { decidim_pages.page_path(commentable, feature_id: feature, participatory_process_id: feature.participatory_process) }
+  let(:resource_path) { resource_locator(commentable).path }
   include_examples "comments"
 end

data/decidim-proposals/app/forms/decidim/proposals/admin/proposal_form.rb

@@ -22,6 +22,12 @@ module Decidim
 
         delegate :categories, to: :current_feature, prefix: false
 
+        def map_model(model)
+          return unless model.categorization
+
+          self.category_id = model.categorization.decidim_category_id
+        end
+
         def organization_scopes
           current_organization.scopes
         end

data/decidim-proposals/app/forms/decidim/proposals/proposal_form.rb

@@ -26,6 +26,12 @@ module Decidim
 
       delegate :categories, to: :current_feature
 
+      def map_model(model)
+        return unless model.categorization
+
+        self.category_id = model.categorization.decidim_category_id
+      end
+
       def organization_scopes
         current_organization.scopes
       end

data/decidim-proposals/app/models/decidim/proposals/proposal.rb

@@ -33,7 +33,8 @@ module Decidim
       end
 
       def author_name
-        user_group&.name || author&.name || I18n.t("decidim.proposals.models.proposal.fields.official_proposal")
+        return I18n.t("decidim.proposals.models.proposal.fields.official_proposal") if official?
+        user_group&.name || author.name
       end
 
       def author_avatar_url
@@ -100,15 +101,22 @@ module Decidim
         ResourceLocatorPresenter.new(self).url
       end
 
+      # Public: Whether the proposal is official or not.
+      def official?
+        author.nil?
+      end
+
       # Public: Overrides the `notifiable?` Notifiable concern method.
       # When a proposal is commented the proposal's author is notified if it is not the same
       # who has commented the proposal and if the proposal's author has comment notifications enabled.
       def notifiable?(context)
+        return true if official?
         context[:author] != author && author.comments_notifications?
       end
 
       # Public: Overrides the `users_to_notify` Notifiable concern method.
       def users_to_notify
+        return Decidim::Admin::ProcessAdmins.for(feature.participatory_process) if official?
         [author]
       end
     end