decidim 0.0.8.1 → 0.1.0

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

@@ -2,7 +2,6 @@
 ENV["RAILS_ENV"] ||= "test"
 
 root_path = File.join(Dir.pwd, "..")
-engine_name = ENV["ENGINE_NAME"]
 engine_spec_dir = File.join(Dir.pwd, "spec")
 dummy_app_path = File.expand_path(File.join(root_path, "spec", "decidim_dummy_app"))
 
@@ -46,4 +45,3 @@ Dir["#{engine_spec_dir}/support/**/*.rb"].each { |f| require f }
 Dir["#{engine_spec_dir}/shared/**/*.rb"].each { |f| require f }
 
 require_relative "spec_helper"
-require_relative "i18n_spec"

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

@@ -1,11 +1,12 @@
+# frozen_string_literal: true
 RSpec.configure do |config|
   config.before(:each) do
     # Set geocoder configuration in test mode
     Decidim.geocoder = {
       static_map_url: "http://www.example.org",
-      here_app_id: '1234',
-      here_app_code: '5678'
+      here_app_id: "1234",
+      here_app_code: "5678"
     }
     Geocoder.configure(lookup: :test)
   end
-end
+end

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

@@ -5,8 +5,8 @@ RSpec.configure do |config|
   end
 
   config.around(:each) do |example|
-    I18n.available_locales = %w{en ca es}
-    Decidim.available_locales = %w{en ca es}
+    I18n.available_locales = %w(en ca es)
+    Decidim.available_locales = %w(en ca es)
 
     previous_locale = I18n.locale
     example.run

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

@@ -1,2 +1,3 @@
+# frozen_string_literal: true
 require "webmock/rspec"
 WebMock.allow_net_connect!

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

@@ -61,7 +61,7 @@ module Decidim
 
       def test_env
         gsub_file "#{dummy_app_path}/config/environments/test.rb",
-          /allow_forgery_protection = (.*)/, 'allow_forgery_protection = true'
+                  /allow_forgery_protection = (.*)/, "allow_forgery_protection = true"
       end
 
       private

data/decidim-dev/lib/generators/decidim/templates/autoprefixer_initializer.rb

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
 module AutoprefixerRails
   class Sprockets
-    self.singleton_class.send(:alias_method, :call_original, :call)
+    singleton_class.send(:alias_method, :call_original, :call)
 
     def self.call(input)
       filename = input[:name]
@@ -8,9 +9,9 @@ module AutoprefixerRails
       # Disable autoprefixer for the graphiql-rails gem's assets because it
       # breaks some of the API tests when the '-webkit' prefixes are applied to
       # its CSS.
-      return if filename.match(/^graphiql\/.*/)
+      return if filename =~ %r{^graphiql/.*}
 
-      self.call_original(input)
+      call_original(input)
     end
   end
 end

data/decidim-dev/lib/tasks/test_app.rake

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "generators/decidim/dummy_generator"
 
 namespace :decidim do

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Decidim
   module Meetings
     class MeetingWidgetsController < Decidim::WidgetsController

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

@@ -11,14 +11,14 @@ module Decidim
       helper_method :meetings, :geocoded_meetings, :meeting
 
       def index
-        if search.results.empty? && params.dig("filter", "date") != "past"
-          @past_meetings = search_klass.new(search_params.merge(date: "past"))
-          unless @past_meetings.results.empty?
-            params[:filter] ||= {}
-            params[:filter][:date] = "past"
-            @forced_past_meetings = true
-            @search = @past_meetings
-          end
+        return unless search.results.empty? && params.dig("filter", "date") != "past"
+
+        @past_meetings = search_klass.new(search_params.merge(date: "past"))
+        unless @past_meetings.results.empty?
+          params[:filter] ||= {}
+          params[:filter][:date] = "past"
+          @forced_past_meetings = true
+          @search = @past_meetings
         end
       end
 

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

@@ -9,15 +9,15 @@ module Decidim
       def meetings_data_for_map(geocoded_meetings)
         geocoded_meetings.map do |meeting|
           meeting.slice(:latitude, :longitude, :address).merge(title: translated_attribute(meeting.title),
-                                                                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),
-                                                                locationHints: translated_attribute(meeting.location_hints),
-                                                                link: meeting_path(meeting))
+                                                               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),
+                                                               locationHints: translated_attribute(meeting.location_hints),
+                                                               link: meeting_path(meeting))
         end
       end
     end

data/decidim-meetings/app/models/decidim/meetings/meeting.rb

@@ -16,7 +16,7 @@ module Decidim
 
       validates :title, presence: true
 
-      geocoded_by :address, http_headers: lambda { |proposal| { "Referer" => proposal.feature.organization.host } }
+      geocoded_by :address, http_headers: ->(proposal) { { "Referer" => proposal.feature.organization.host } }
 
       def closed?
         closed_at.present?

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

@@ -1,18 +1,9 @@
-<div class="column">
-  <article class="card card--meeting">
-    <div class="card__content">
-      <%= link_to model, class: "card__link" do %>
-        <h5 class="card__title"><%= translated_attribute model.title %></h5>
-      <% end %>
-      <%= render partial: "decidim/meetings/meetings/datetime", locals: { meeting: model } %>
-      <%== translated_attribute model.description %>
-      <%= render partial: "decidim/meetings/meetings/tags", locals: { meeting: model } %>
-      <div class="address card__extra">
-        <div class="address__icon">
-          <%= icon "meetings", remove_icon_class: true, width: 40, height: 70 %>
-        </div>
-        <%= render partial: "decidim/shared/address_details", locals: { icon_name: "meetings", geolocalizable: model } %>
-      </div>
-    </div>
-  </article>
+<%= content_for(:title, translated_attribute(model.title)) %>
+<%= render partial: "decidim/meetings/meetings/datetime", locals: { meeting: model } %>
+<%== translated_attribute model.description %>
+<div class="address card__extra">
+  <div class="address__icon">
+    <%= icon "meetings", remove_icon_class: true, width: 40, height: 70 %>
+  </div>
+  <%= render partial: "decidim/shared/address_details", locals: { icon_name: "meetings", geolocalizable: model } %>
 </div>

data/decidim-meetings/config/locales/fr.yml

@@ -2,4 +2,98 @@ fr:
   activemodel:
     attributes:
       close_meeting:
-        attendees_count: Nombre de participants
+        attendees_count: Nombre de participants
+        attending_organizations: Liste des organisations qui ont assisté à la rencontre
+        closing_report: Signaler
+        contributions_count: Nombre de contributions
+        proposal_ids: Propositions créées lors de la rencontre
+      meeting:
+        address: Adresse
+        decidim_category_id: Catégorie
+        decidim_scope_id: Domaine d'application
+        description: Description
+        end_time: Heure de fin
+        location: Lieu
+        location_hints: Indicateurs d’emplacement
+        start_time: Heure de début
+        title: Titre
+  decidim:
+    features:
+      meetings:
+        name: Rencontres
+    meetings:
+      actions:
+        attachments: Documents liés
+        close: Fermer
+        confirm_destroy: Êtes-vous sûr de vouloir supprimer cette rencontre?
+        destroy: Supprimer
+        edit: Modifier
+        new: Nouveau
+        preview: Aperçu
+        title: Actions
+      admin:
+        meeting_closes:
+          edit:
+            close: Fermer
+            title: Clore la rencontre
+        meetings:
+          close:
+            invalid: Il y a eu un problème au moment de clore cette réunion
+            success: Rencontre cloturée avec succès
+          create:
+            invalid: Il y a eu un problème lors de la création de cette rencontre
+            success: Rencontre créée avec succès
+          destroy:
+            success: La rencontre a été supprimée avec succès
+          edit:
+            update: Mettre à jour
+          index:
+            title: Rencontres
+          new:
+            create: Créer
+            title: Créer une rencontre
+          update:
+            invalid: Il y a eu un problème lors de la mise à jour de cette rencontre
+            success: Réncontre mise à jour avec succès
+        models:
+          meeting:
+            name: Rencontre
+      meetings:
+        filters:
+          category: Catégorie
+          category_prompt: Sélectionner une catégorie
+          date: Date
+          past: Passées
+          scopes: Domaines d'application
+          search: Rechercher
+          upcoming: À venir
+        filters_small_view:
+          close_modal: Fermer la fenêtre de dialogue
+          filter: Filtrer
+          filter_by: Filtrer par
+          unfold: Déplier
+        index:
+          view_meeting: Voir la rencontre
+        meetings:
+          no_meetings_warning: Aucune rencontre ne correspond à vos critères de recherche ou aucune rencontre n'est prévue.
+          upcoming_meetings_warning: À l'heure actuelle, il n'y a pas de rencontre planifiées, mais ici, vous trouverez une liste de toutes les réunions passées.
+        show:
+          attendees: Nombre de participants
+          contributions: Décompte des contributions
+          meeting_report: Compte rendu de la rencontre
+          organizations: Organisations participantes
+      models:
+        meeting:
+          fields:
+            closed: Clos
+            end_time: Heure de fin
+            map: Carte
+            start_time: Date de début
+            title: Titre
+    resource_links:
+      meetings_through_proposals:
+        meeting_results: 'Résultats associés :'
+        result_meetings: 'Rencontres connexes :'
+      proposals_from_meeting:
+        meeting_proposals: 'Propositions connexes :'
+        proposal_meetings: 'Rencontre connexes :'

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

@@ -16,6 +16,13 @@ Decidim.register_feature(:meetings) do |feature|
     resource.template = "decidim/meetings/meetings/linked_meetings"
   end
 
+  feature.register_stat :meetings_count, primary: true, priority: Decidim::StatsRegistry::MEDIUM_PRIORITY do |features, start_at, end_at|
+    meetings = Decidim::Meetings::Meeting.where(feature: features)
+    meetings = meetings.where("created_at >= ?", start_at) if start_at.present?
+    meetings = meetings.where("created_at <= ?", end_at) if end_at.present?
+    meetings.count
+  end
+
   feature.seeds do
     Decidim::ParticipatoryProcess.all.each do |process|
       next unless process.steps.any?

data/decidim-meetings/spec/commands/close_meeting_spec.rb

@@ -1,10 +1,11 @@
+# frozen_string_literal: true
 require "spec_helper"
 
 describe Decidim::Meetings::Admin::CloseMeeting do
   let(:meeting) { create :meeting }
   let(:form) do
     double(
-      :invalid? => invalid,
+      invalid?: invalid,
       closing_report: { en: "Great meeting" },
       attendees_count: 10,
       contributions_count: 15,

data/decidim-meetings/spec/commands/create_meeting_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "spec_helper"
 
 describe Decidim::Meetings::Admin::CreateMeeting do
@@ -12,11 +13,11 @@ describe Decidim::Meetings::Admin::CreateMeeting do
   let(:longitude) { 2.1234 }
   let(:form) do
     double(
-      :invalid? => invalid,
-      title: {en: "title"},
-      description: {en: "description"},
-      location: {en: "location"},
-      location_hints: {en: "location_hints"},
+      invalid?: invalid,
+      title: { en: "title" },
+      description: { en: "description" },
+      location: { en: "location" },
+      location_hints: { en: "location_hints" },
       start_time: 1.day.from_now,
       end_time: 1.day.from_now + 1.hour,
       address: address,

data/decidim-meetings/spec/commands/update_meeting_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "spec_helper"
 
 describe Decidim::Meetings::Admin::UpdateMeeting do
@@ -11,11 +12,11 @@ describe Decidim::Meetings::Admin::UpdateMeeting do
   let(:longitude) { 2.1234 }
   let(:form) do
     double(
-      :invalid? => invalid,
-      title: {en: "title"},
-      description: {en: "description"},
-      location: {en: "location"},
-      location_hints: {en: "location_hints"},
+      invalid?: invalid,
+      title: { en: "title" },
+      description: { en: "description" },
+      location: { en: "location" },
+      location_hints: { en: "location_hints" },
       start_time: 1.day.from_now,
       end_time: 1.day.from_now + 1.hour,
       scope: scope,

data/decidim-meetings/spec/factories.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "decidim/core/test/factories"
 require "decidim/admin/test/factories"
 require "decidim/proposals/test/factories"

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "spec_helper"
 
 describe "Explore meetings", type: :feature do
@@ -83,7 +84,7 @@ describe "Explore meetings", type: :feature do
     end
 
     context "No meetings scheduled" do
-      let!(:meetings){ [] }
+      let!(:meetings) { [] }
 
       it "shows the correct warning" do
         visit_feature

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

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+# frozen_string_literal: true
 # frozen_literal_string: true
 
 require "spec_helper"

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # frozen_literal_string: true
 
 require "spec_helper"
@@ -52,9 +53,10 @@ describe Decidim::Meetings::Admin::MeetingForm do
   end
 
   before do
-    Geocoder::Lookup::Test.add_stub(address, [
-      { 'latitude' => latitude, 'longitude' => longitude }
-    ])
+    Geocoder::Lookup::Test.add_stub(
+      address,
+      [{ "latitude" => latitude, "longitude" => longitude }]
+    )
   end
 
   subject { described_class.from_params(attributes).with_context(context) }

data/decidim-meetings/spec/services/meeting_search_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "spec_helper"
 
 describe Decidim::Meetings::MeetingSearch do
@@ -39,7 +40,7 @@ describe Decidim::Meetings::MeetingSearch do
       let(:default_params) { { feature: nil } }
 
       it "raises an error" do
-        expect{ subject.results }.to raise_error(StandardError, "Missing feature")
+        expect { subject.results }.to raise_error(StandardError, "Missing feature")
       end
     end
   end
@@ -103,7 +104,7 @@ describe Decidim::Meetings::MeetingSearch do
       end
 
       context "when `global` is being sent" do
-        let!(:resource_without_scope) { create(:meeting, feature: current_feature, scope: nil)}
+        let!(:resource_without_scope) { create(:meeting, feature: current_feature, scope: nil) }
         let(:params) { default_params.merge(scope_id: ["global"]) }
 
         it "returns resources without a scope" do

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 RSpec.shared_context "admin" do
   let(:organization) { create(:organization) }
   let!(:user) { create(:user, :admin, :confirmed, organization: organization, email: "admin@example.org") }

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "decidim/admin/test/manage_attachments_examples"
 
 RSpec.shared_examples "manage meetings attachments" do
@@ -8,7 +9,6 @@ RSpec.shared_examples "manage meetings attachments" do
     login_as user, scope: :user
     visit decidim_admin.manage_feature_path(participatory_process_id: participatory_process, feature_id: current_feature)
     within find("tr", text: translated(meeting.title)) do
-
       find("a.action-icon--attachments").click
     end
   end

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

@@ -6,14 +6,15 @@ RSpec.shared_examples "manage meetings" do
   let(:longitude) { 2.1234 }
 
   before do
-    Geocoder::Lookup::Test.add_stub(address, [
-      { 'latitude' => latitude, 'longitude' => longitude }
-    ])
+    Geocoder::Lookup::Test.add_stub(
+      address,
+      [{ "latitude" => latitude, "longitude" => longitude }]
+    )
   end
 
   it "updates a meeting" do
     within find("tr", text: translated(meeting.title)) do
-      page.find('a.action-icon--edit').click
+      page.find("a.action-icon--edit").click
     end
 
     within ".edit_meeting" do
@@ -86,14 +87,14 @@ RSpec.shared_examples "manage meetings" do
     fill_in :meeting_address, with: address
 
     page.execute_script("$('#datetime_field_meeting_start_time').focus()")
-    page.find('.datepicker-dropdown .day', text: '12').click
-    page.find('.datepicker-dropdown .hour', text: '10:00').click
-    page.find('.datepicker-dropdown .minute', text: '10:50').click
+    page.find(".datepicker-dropdown .day", text: "12").click
+    page.find(".datepicker-dropdown .hour", text: "10:00").click
+    page.find(".datepicker-dropdown .minute", text: "10:50").click
 
     page.execute_script("$('#datetime_field_meeting_end_time').focus()")
-    page.find('.datepicker-dropdown .day', text: '12').click
-    page.find('.datepicker-dropdown .hour', text: '12:00').click
-    page.find('.datepicker-dropdown .minute', text: '12:50').click
+    page.find(".datepicker-dropdown .day", text: "12").click
+    page.find(".datepicker-dropdown .hour", text: "12:00").click
+    page.find(".datepicker-dropdown .minute", text: "12:50").click
 
     select scope.name, from: :meeting_decidim_scope_id
     select translated(category.name), from: :meeting_decidim_category_id
@@ -120,7 +121,7 @@ RSpec.shared_examples "manage meetings" do
 
     it "deletes a meeting" do
       within find("tr", text: translated(meeting2.title)) do
-        page.find('a.action-icon--remove').click
+        page.find("a.action-icon--remove").click
       end
 
       within ".callout-wrapper" do
@@ -140,7 +141,7 @@ RSpec.shared_examples "manage meetings" do
 
     it "updates a meeting" do
       within find("tr", text: translated(meeting.title)) do
-        page.find('a.action-icon--edit').click
+        page.find("a.action-icon--edit").click
       end
 
       within ".edit_meeting" do
@@ -199,14 +200,14 @@ RSpec.shared_examples "manage meetings" do
 
       fill_in :meeting_address, with: address
       page.execute_script("$('#datetime_field_meeting_start_time').focus()")
-      page.find('.datepicker-dropdown .day', text: '12').click
-      page.find('.datepicker-dropdown .hour', text: '10:00').click
-      page.find('.datepicker-dropdown .minute', text: '10:50').click
+      page.find(".datepicker-dropdown .day", text: "12").click
+      page.find(".datepicker-dropdown .hour", text: "10:00").click
+      page.find(".datepicker-dropdown .minute", text: "10:50").click
 
       page.execute_script("$('#datetime_field_meeting_end_time').focus()")
-      page.find('.datepicker-dropdown .day', text: '12').click
-      page.find('.datepicker-dropdown .hour', text: '12:00').click
-      page.find('.datepicker-dropdown .minute', text: '12:50').click
+      page.find(".datepicker-dropdown .day", text: "12").click
+      page.find(".datepicker-dropdown .hour", text: "12:00").click
+      page.find(".datepicker-dropdown .minute", text: "12:50").click
 
       select scope.name, from: :meeting_decidim_scope_id
       select translated(category.name), from: :meeting_decidim_category_id
@@ -233,7 +234,7 @@ RSpec.shared_examples "manage meetings" do
 
     it "closes a meeting with a report" do
       within find("tr", text: translated(meeting.title)) do
-        page.find('a.action-icon--close').click
+        page.find("a.action-icon--close").click
       end
 
       within ".edit_close_meeting" do
@@ -267,7 +268,7 @@ RSpec.shared_examples "manage meetings" do
 
       it "can update the information" do
         within find("tr", text: translated(meeting.title)) do
-          page.find('a.action-icon--close').click
+          page.find("a.action-icon--close").click
         end
 
         within ".edit_close_meeting" do