decidim 0.0.4 → 0.0.5

data/decidim-comments/spec/types/commentable_mutation_type_spec.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+require "spec_helper"
+require "decidim/api/test/type_context"
+
+module Decidim
+  module Comments
+    describe CommentableMutationType do
+      include_context "graphql type"
+
+      let(:participatory_process) { create(:participatory_process, organization: current_organization) }
+      let(:feature) { create(:feature, participatory_process: participatory_process) }
+      let(:model) { create(:dummy_resource, feature: feature) }
+      let(:body) { "test" }
+      let(:alignment) { 1 }
+
+      describe "addComment" do
+        let(:query) {
+          "{ addComment(body: \"#{body}\", alignment: #{alignment}) { body } }"
+        }
+
+        it "calls CreateComment command" do
+          params = { "comment" => { "body" => body, "alignment" => alignment, "user_group_id" => nil } }
+          expect(Decidim::Comments::CommentForm).to receive(:from_params).with(params).and_call_original
+          expect(Decidim::Comments::CreateComment).to receive(:call).with(
+            an_instance_of(Decidim::Comments::CommentForm),
+            current_user,
+            model
+          ).and_call_original
+          expect(response["addComment"]).to include("body" => body)
+        end
+      end
+    end
+  end
+end

data/decidim-comments/spec/types/commentable_type_spec.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+require "spec_helper"
+require "decidim/api/test/type_context"
+
+module Decidim
+  module Comments
+    describe CommentableType do
+      include_context "graphql type"
+
+      let(:model) { create(:dummy_resource) }
+      let!(:comments) { create_list(:comment, 3, commentable: model) }
+
+      describe "acceptsNewComments" do
+        let(:query) { "{ acceptsNewComments }" }
+
+        it "returns the 'accepts_new_comments?' method value" do
+          expect(response).to include("acceptsNewComments" => model.accepts_new_comments?)
+        end
+      end
+
+      describe "commentsHaveAlignment" do
+        let(:query) { "{ commentsHaveAlignment }" }
+
+        it "returns the 'comments_have_alignment?' method value" do
+          expect(response).to include("commentsHaveAlignment" => model.comments_have_alignment?)
+        end
+      end
+
+      describe "commentsHaveVotes" do
+        let(:query) { "{ commentsHaveVotes }" }
+
+        it "returns the 'comments_have_votes?' method value" do
+          expect(response).to include("commentsHaveVotes" => model.comments_have_votes?)
+        end
+      end
+
+      describe "comments" do
+        let(:query) { "{ comments { id } }" }
+
+        it "returns the commentable comments" do
+          model.comments.each do |comment|
+            expect(response["comments"]).to include("id" => comment.id.to_s)
+          end
+        end
+      end
+    end
+  end
+end

data/decidim-comments/spec/types/mutation_type_spec.rb

@@ -7,31 +7,14 @@ module Decidim
     describe MutationType do
       include_context "graphql type"
 
-      describe "addComment" do
-        let!(:feature) { create(:feature, organization: current_organization)}
-        let!(:dummy_resource) { create(:dummy_resource, feature: feature) }
-
+     describe "commentable" do
+        let!(:commentable) { create(:dummy_resource) }
         let(:query) {
-          "{ addComment(commentableId: \"#{dummy_resource.id}\", commentableType: \"Decidim::DummyResource\", body: \"This is a new comment\") { id, body } }"
+          "{ commentable(id: \"#{commentable.id}\", type: \"#{commentable.commentable_type}\") { id } }"
         }
 
-        it "should create a new comment for the given commentable" do
-          expect(response["addComment"]).to include("body" => "This is a new comment")
-          comment = Decidim::Comments::Comment.last
-          expect(comment.commentable).to eq(dummy_resource)
-          expect(response["addComment"]).to include("id" => comment.id.to_s)
-        end
-
-        context "if the query contains an argument alignment" do
-          let(:query) {
-            "{ addComment(commentableId: \"#{dummy_resource.id}\", commentableType: \"Decidim::DummyResource\", body: \"This is positive comment\", alignment: 1) { alignment } }"
-          }
-
-          it "should create a comment with that alignment" do
-            expect(response["addComment"]).to include("alignment" => 1)
-            comment = Decidim::Comments::Comment.last
-            expect(comment.alignment).to eq(1)
-          end
+        it "should fetch the commentable given its id and commentable_type" do
+          expect(response["commentable"]).to include("id" => commentable.id.to_s)
         end
       end
 

data/decidim-comments/spec/types/query_type_spec.rb

@@ -22,28 +22,4 @@ describe Decidim::Api::QueryType do
       end
     end
   end
-
-  describe "comments" do
-    let!(:participatory_process_1) { create(:participatory_process, organization: current_organization) }
-    let!(:comment_1) { create(:comment, commentable: participatory_process_1) }
-    let!(:comment_2) { create(:comment, commentable: participatory_process_1) }
-    let!(:participatory_process_2) { create(:participatory_process, organization: current_organization) }
-    let!(:comment_3) { create(:comment, commentable: participatory_process_2) }
-
-    let(:query) { "{ comments(commentableId: \"#{participatory_process_1.id}\", commentableType: \"Decidim::ParticipatoryProcess\") { id } }" }
-
-    it "returns comments from a commentable resource" do
-      expect(response["comments"]).to     include("id" => comment_1.id.to_s)
-      expect(response["comments"]).to     include("id" => comment_2.id.to_s)
-      expect(response["comments"]).not_to include("id" => comment_3.id.to_s)
-    end
-
-    it "returns comments ordered by creation date" do
-      comment_2.update_attribute(:created_at, 2.days.ago)
-      comment_1.update_attribute(:created_at, 1.days.ago)
-
-      expect(response["comments"][0]["id"]).to eq comment_2.id.to_s
-      expect(response["comments"][1]["id"]).to eq comment_1.id.to_s
-    end
-  end
 end

data/decidim-dev/config/i18n-tasks.yml

@@ -0,0 +1,4 @@
+base_locale: en
+locales: [en]
+ignore_unused:
+- "decidim.resource_links.test_link.*"

data/decidim-dev/decidim-dev.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
   s.add_dependency "wisper-rspec"
   s.add_dependency "listen", "~> 3.1.0"
   s.add_dependency "launchy"
-  s.add_dependency "i18n-tasks", "0.9.8"
+  s.add_dependency "i18n-tasks", "0.9.12"
   s.add_dependency "faker", "~> 1.7.3"
   s.add_dependency "poltergeist", "~> 1.13.0"
   s.add_dependency "rails-controller-testing", "~> 1.0.1"

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

@@ -2,9 +2,7 @@
 require "nokogiri"
 
 RSpec.configure do |config|
-  config.before(:each) do
-    ActionMailer::Base.deliveries.clear
-  end
+  config.before(:each) { clear_emails }
 end
 
 # A set of helpers meant to make your life easier when testing
@@ -15,12 +13,20 @@ module MailerHelpers
     ActionMailer::Base.deliveries
   end
 
+  def clear_emails
+    ActionMailer::Base.deliveries.clear
+  end
+
   def last_email
     emails.last
   end
 
   def last_email_body
-    (last_email.try(:html_part).try(:body) || last_email.body).encoded
+    email_body(last_email)
+  end
+
+  def email_body(email)
+    (email.try(:html_part).try(:body) || email.body).encoded
   end
 
   def last_email_link

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require "decidim/feature_validator"
-require "decidim/comments/comments_helper"
+require "decidim/comments"
 
 module Decidim
   # Dummy engine to be able to test components.
@@ -18,6 +18,7 @@ module Decidim
     include HasFeature
     include Resourceable
     include Authorable
+    include Decidim::Comments::Commentable
 
     feature_manifest_name "dummy"
   end
@@ -28,12 +29,10 @@ module Decidim
 
     def show
       @commentable = DummyResource.find(params[:id])
-      @options = params.slice(:arguable, :votable)
-      @options.each { |key, val| @options[key] = val === "true" }
       render inline: %{
         <%= javascript_include_tag 'application' %>
-        <%= comments_for(@commentable, @options) %>
-      }.html_safe
+        <%= inline_comments_for(@commentable) %>
+      }
     end
   end
 end
@@ -44,11 +43,13 @@ Decidim.register_feature(:dummy) do |feature|
   feature.actions = %w(foo bar)
 
   feature.settings(:global) do |settings|
+    settings.attribute :comments_enabled, type: :boolean, default: true
     settings.attribute :dummy_global_attribute_1, type: :boolean
     settings.attribute :dummy_global_attribute_2, type: :boolean
   end
 
   feature.settings(:step) do |settings|
+    settings.attribute :comments_blocked, type: :boolean, default: false
     settings.attribute :dummy_step_attribute_1, type: :boolean
     settings.attribute :dummy_step_attribute_2, type: :boolean
   end

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

@@ -2,7 +2,6 @@
 RSpec.configure do |config|
   config.before(:suite) do
     I18n.config.enforce_available_locales = false
-    Rails.application.config.action_view.raise_on_missing_translations = true
   end
 
   config.around(:each) do |example|

data/decidim-meetings/app/assets/javascripts/decidim/meetings/map.js.es6.erb

@@ -1,6 +1,7 @@
 // = require leaflet
 // = require leaflet-tilelayer-here
 // = require leaflet-svg-icon
+// = require leaflet.markercluster
 // = require jquery-tmpl
 // = require_self
 
@@ -22,13 +23,13 @@ L.DivIcon.SVGIcon.DecidimIcon = L.DivIcon.SVGIcon.extend({
 const popupTemplateId = 'meeting-popup';
 $.template('meeting-popup', $(`#${popupTemplateId}`).html());
 
-const addMarkers = (meetingsData, map) => {
+const addMarkers = (meetingsData, markerClusters, map) => {
   const bounds = new L.LatLngBounds(meetingsData.map((meeting) => [meeting.latitude, meeting.longitude]));
 
   meetingsData.forEach((meeting) => {
     let marker = L.marker([meeting.latitude, meeting.longitude], {
       icon: new L.DivIcon.SVGIcon.DecidimIcon()
-    }).addTo(map);
+    });
     let node = document.createElement('div');
 
     $.tmpl('meeting-popup', meeting).appendTo(node);
@@ -39,12 +40,16 @@ const addMarkers = (meetingsData, map) => {
       keepInView: true,
       className: 'map-info'
     }).openPopup();
+
+    markerClusters.addLayer(marker);
   });
 
+  map.addLayer(markerClusters);
   map.fitBounds(bounds, { padding: [100, 100] });
 };
 
 const loadMap = (mapId, meetingsData) => {
+  let markerClusters = L.markerClusterGroup();
   const { hereAppId, hereAppCode } = window.DecidimMeetings.mapConfiguration;
 
   if (window.DecidimMeetings.currentMap) {
@@ -60,7 +65,7 @@ const loadMap = (mapId, meetingsData) => {
   }).addTo(map);
 
   if (meetingsData.length > 0) {
-    addMarkers(meetingsData, map);
+    addMarkers(meetingsData, markerClusters, map);
   } else {
     map.fitWorld();
   }

data/decidim-meetings/app/assets/stylesheets/decidim/meetings/map.css

@@ -1 +1,3 @@
-/* = require leaflet */
+/* = require leaflet */
+/* = require MarkerCluster */
+/* = require MarkerCluster.Default */

data/decidim-meetings/app/controllers/decidim/meetings/meetings_controller.rb

@@ -26,7 +26,7 @@ module Decidim
       end
 
       def meeting
-        @meeting ||= meetings.find(params[:id])
+        @meeting ||= Meeting.where(feature: current_feature).find(params[:id])
       end
 
       def search_klass
@@ -35,7 +35,7 @@ module Decidim
 
       def default_filter_params
         {
-          order_start_time: "asc",
+          date: "upcoming",
           search_text: "",
           scope_id: "",
           category_id: ""

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

@@ -15,7 +15,8 @@ module Decidim
         attribute :closed_at, DateTime, default: ->(_form, _attribute) { Time.current }
 
         validates :closing_report, translatable_presence: true
-        validates :attendees_count, :contributions_count, presence: true, numericality: { greater_than_or_equal_to: 0 }
+        validates :attendees_count, presence: true, numericality: { greater_than_or_equal_to: 0 }
+        validates :contributions_count, numericality: true, allow_blank: true
         validates :attending_organizations, presence: true
 
         # Private: Gets the proposals from the meeting and injects them to the form.

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

@@ -34,6 +34,7 @@ module Decidim
                                                                description: translated_attribute(meeting.description),
                                                                startTimeDay: l(meeting.start_time, format: "%d"),
                                                                startTimeMonth: l(meeting.start_time, format: "%B"),
+                                                               startTimeYear: l(meeting.start_time, format: "%Y"),
                                                                startTime: "#{meeting.start_time.strftime("%H:%M")} - #{meeting.end_time.strftime("%H:%M")}",
                                                                icon: icon("meetings", width: 40, height: 70, remove_icon_class: true),
                                                                location: translated_attribute(meeting.location),

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

@@ -20,9 +20,13 @@ module Decidim
           .or(query.where(localized_search_text_in(:description), text: "%#{search_text}%"))
       end
 
-      # Handle the order_start_time filter
-      def search_order_start_time
-        query.order(start_time: order_start_time)
+      # Handle the date filter
+      def search_date
+        if options[:date] == "upcoming"
+          query.where("start_time >= ? ", Time.current).order("start_time ASC")
+        elsif options[:date] == "past"
+          query.where("start_time <= ? ", Time.current).order("start_time DESC")
+        end
       end
 
       # Handle the scope_id filter

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

@@ -1,6 +1,6 @@
 <div class="card__datetime">
   <div class="card__datetime__date">
-    <%= l meeting.start_time, format: "%d" %> <span class="card__datetime__month"><%= l meeting.start_time, format: "%B" %></span>
+    <%= l meeting.start_time, format: "%d" %> <span class="card__datetime__month"><%= l meeting.start_time, format: "%B %Y" %></span>
   </div>
   <div class="card__datetime__time">
     <%= meeting.start_time.strftime("%H:%M") %> - <%= meeting.end_time.strftime("%H:%M") %>

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

@@ -2,23 +2,23 @@
   <div class="filters__section">
     <div class="filters__search">
       <div class="input-group">
-        <%= form.search_field :search_text, label: false, class: "input-group-field", placeholder: t('.search') %>
+        <%= form.search_field :search_text, label: false, class: "input-group-field", placeholder: t(".search") %>
         <div class="input-group-button">
           <button type="submit" class="button button--muted">
-            <%= icon "magnifying-glass", aria_label: t('.search') %>
+            <%= icon "magnifying-glass", aria_label: t(".search") %>
           </button>
         </div>
       </div>
     </div>
   </div>
 
-  <%= form.collection_radio_buttons :order_start_time, [["asc", t('.ascendent')], ["desc", t('.descendent')]], :first, :last, legend_title: t('.date') %>
+  <%= form.collection_radio_buttons :date, [["upcoming", t(".upcoming")], ["past", t(".past")]], :first, :last, legend_title: t(".date") %>
 
   <% if current_organization.scopes.any? %>
-    <%= form.collection_check_boxes :scope_id, current_organization.scopes, lambda {|scope| scope.id.to_s}, :name, legend_title: t('.scopes') %>
+    <%= form.collection_check_boxes :scope_id, current_organization.scopes, lambda {|scope| scope.id.to_s}, :name, legend_title: t(".scopes") %>
   <% end %>
 
   <% if current_feature.categories.any? %>
-    <%= form.categories_select :category_id, current_feature.categories, legend_title: t('.category'), disable_parents: false, label: false, include_blank: true %>
+    <%= form.categories_select :category_id, current_feature.categories, legend_title: t(".category"), disable_parents: false, label: false, include_blank: true %>
   <% end %>
 <% end %>

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

@@ -8,7 +8,7 @@
           <% end %>
           <div class="card__datetime">
             <div class="card__datetime__date">
-              <%= l meeting.start_time, format: "%d" %> <span class="card__datetime__month"><%= l meeting.start_time, format: "%B" %></span>
+              <%= l meeting.start_time, format: "%d" %> <span class="card__datetime__month"><%= l meeting.start_time, format: "%B %Y" %></span>
             </div>
             <div class="card__datetime__time">
               <%= meeting.start_time.strftime("%H:%M") %> - <%= meeting.end_time.strftime("%H:%M") %>

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

@@ -1,7 +1,3 @@
-<% add_meta_tags({
-  title: t(".meta_title", feature_name: translated_attribute(current_feature.name))
-}) %>
-
 <% if Decidim.geocoder.present? %>
   <div class="row column">
     <div class="google-map" id="meetings-map" data-meetings="<%= meetings_data_for_map(geocoded_meetings).to_json %>" data-here-app-id="<%= Decidim.geocoder[:here_app_id] %>" data-here-app-code="<%= Decidim.geocoder[:here_app_code] %>">
@@ -15,7 +11,7 @@
           <div class="map__date-adress">
             <div class="card__datetime">
               <div class="card__datetime__date">
-                ${startTimeDay} <span class="card__datetime__month">${startTimeMonth}</span>
+                ${startTimeDay} <span class="card__datetime__month">${startTimeMonth} ${startTimeYear}</span>
               </div>
               <div class="card__datetime__time">${starTime}</div>
             </div>

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

@@ -1,6 +1,6 @@
 <% provide(:title, translated_attribute(meeting.title)) %>
 
-<% add_meta_tags({
+<% add_decidim_meta_tags({
   title: translated_attribute(meeting.title),
   description: translated_attribute(meeting.description),
   url: meeting_url(meeting.id)
@@ -24,14 +24,21 @@
       </div>
       <% if meeting.closed? %>
         <div class="card card--secondary extra definition-data">
-          <div class="definition-data__item definition-data__item--double">
-            <span class="definition-data__title"><%= t(".attendees") %></span>
-            <span class="definition-data__number"><%= meeting.attendees_count %></span>
-          </div>
-          <div class="definition-data__item definition-data__item--double">
-            <span class="definition-data__title"><%= t(".contributions") %></span>
-            <span class="definition-data__number"><%= meeting.contributions_count %></span>
-          </div>
+          <% if meeting.contributions_count && meeting.contributions_count.positive? %>
+            <div class="definition-data__item definition-data__item--double">
+              <span class="definition-data__title"><%= t(".attendees") %></span>
+              <span class="definition-data__number"><%= meeting.attendees_count %></span>
+            </div>
+            <div class="definition-data__item definition-data__item--double">
+              <span class="definition-data__title"><%= t(".contributions") %></span>
+              <span class="definition-data__number"><%= meeting.contributions_count %></span>
+            </div>
+          <% else %>
+            <div class="definition-data__item">
+              <span class="definition-data__title"><%= t(".attendees") %></span>
+              <span class="definition-data__number"><%= meeting.attendees_count %></span>
+            </div>
+          <% end %>
           <div class="definition-data__item">
             <span class="definition-data__title"><%= t(".organizations") %></span>
             <span class="definition-data__text"><%= meeting.attending_organizations %></span>