decidim 0.0.2 → 0.0.3

data/decidim-comments/spec/forms/comment_form_spec.rb

@@ -6,12 +6,15 @@ module Decidim
     describe CommentForm do
       let(:body) { "This is a new comment" }
       let(:alignment) { 1 }
+      let(:user_group) { create(:user_group, :verified) }
+      let(:user_group_id) { user_group.id }
 
       let(:attributes) do
         {
           "comment" => {
             "body" => body,
-            "alignment" => alignment
+            "alignment" => alignment,
+            "user_group_id" => user_group_id
           }
         }
       end
@@ -34,14 +37,14 @@ module Decidim
 
       context "when alignment is not present" do
         let(:alignment) { nil }
-        
+
         it { is_expected.to be_valid }
       end
 
       context "when alignment is present and it is different from 0, 1 and -1" do
         let(:alignment) { 2 }
 
-        it { is_expected.not_to be_valid }      
+        it { is_expected.not_to be_valid }
       end
     end
   end

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

@@ -10,87 +10,80 @@ module Decidim
       let!(:up_vote) { create(:comment_vote, :up_vote, comment: comment) }
       let!(:down_vote) { create(:comment_vote, :down_vote, comment: comment) }
 
-      it "is valid" do
-        expect(comment).to be_valid
-      end
+      subject { comment }
 
-      it "has an associated author" do
-        expect(comment.author).to be_a(Decidim::User)
+      include_examples "authorable"
+
+      it "is valid" do
+        expect(subject).to be_valid
       end
 
       it "has an associated commentable" do
-        expect(comment.commentable).to be_a(Decidim::ParticipatoryProcess)
+        expect(subject.commentable).to eq(commentable)
       end
 
       it "has a replies association" do
-        expect(comment.replies).to match_array(replies)
+        expect(subject.replies).to match_array(replies)
       end
 
       it "has a up_votes association returning comment votes with weight 1" do
-        expect(comment.up_votes.count).to eq(1)
+        expect(subject.up_votes.count).to eq(1)
       end
 
       it "has a down_votes association returning comment votes with weight -1" do
-        expect(comment.down_votes.count).to eq(1)
+        expect(subject.down_votes.count).to eq(1)
       end
 
       it "is not valid if its parent is a comment and cannot have replies" do
-        expect(comment).to receive(:can_have_replies?).and_return false
+        expect(subject).to receive(:can_have_replies?).and_return false
         expect(replies[0]).not_to be_valid
       end
 
       it "should compute its depth before saving the model" do
-        expect(comment.depth).to eq(0)
+        expect(subject.depth).to eq(0)
         comment.replies.each do |reply|
           expect(reply.depth).to eq(1)
         end
       end
 
-      it "is not valid if the author organization is different" do
-        foreign_user = build(:user)
-        comment = build(:comment, author: foreign_user)
-
-        expect(comment).to_not be_valid
-      end
-
       describe "#can_have_replies?" do
         it "should return true if the comment's depth is below MAX_DEPTH" do
-          comment.depth = Comment::MAX_DEPTH - 1
-          expect(comment.can_have_replies?).to be_truthy
+          subject.depth = Comment::MAX_DEPTH - 1
+          expect(subject.can_have_replies?).to be_truthy
         end
 
         it "should return false if the comment's depth is equal or greater than MAX_DEPTH" do
-          comment.depth = Comment::MAX_DEPTH
-          expect(comment.can_have_replies?).to be_falsy          
+          subject.depth = Comment::MAX_DEPTH
+          expect(subject.can_have_replies?).to be_falsy
         end
       end
 
       it "is not valid if alignment is not 0, 1 or -1" do
-        comment.alignment = 2
-        expect(comment).not_to be_valid
+        subject.alignment = 2
+        expect(subject).not_to be_valid
       end
 
       describe "#up_voted_by?" do
-        let(:user) { create(:user, organization: comment.organization) }
+        let(:user) { create(:user, organization: subject.organization) }
         it "should return true if the given user has upvoted the comment" do
-          create(:comment_vote, comment: comment, author: user, weight: 1)
-          expect(comment.up_voted_by?(user)).to be_truthy
+          create(:comment_vote, comment: subject, author: user, weight: 1)
+          expect(subject.up_voted_by?(user)).to be_truthy
         end
 
         it "should return false if the given user has not upvoted the comment" do
-          expect(comment.up_voted_by?(user)).to be_falsy
+          expect(subject.up_voted_by?(user)).to be_falsy
         end
       end
 
       describe "#down_voted_by?" do
-        let(:user) { create(:user, organization: comment.organization) }
+        let(:user) { create(:user, organization: subject.organization) }
         it "should return true if the given user has downvoted the comment" do
-          create(:comment_vote, comment: comment, author: user, weight: -1)
-          expect(comment.down_voted_by?(user)).to be_truthy
+          create(:comment_vote, comment: subject, author: user, weight: -1)
+          expect(subject.down_voted_by?(user)).to be_truthy
         end
 
         it "should return false if the given user has not downvoted the comment" do
-          expect(comment.down_voted_by?(user)).to be_falsy
+          expect(subject.down_voted_by?(user)).to be_falsy
         end
       end
     end

data/decidim-comments/spec/queries/comments_with_replies_spec.rb

@@ -20,7 +20,7 @@ describe Decidim::Comments::CommentsWithReplies do
       expect(comment.author.name).to be_present
       expect(comment.up_votes.size).to eq(0)
       expect(comment.down_votes.size).to eq(0)        
-    }.to_not make_database_queries
+    }.not_to make_database_queries
   end
 
   it "eager loads a comment tree based on the MAX_DEPTH" do
@@ -39,7 +39,7 @@ describe Decidim::Comments::CommentsWithReplies do
       expect(comment.author.name).to be_present
       expect(comment.up_votes.size).to eq(0)
       expect(comment.down_votes.size).to eq(0)
-    }.to_not make_database_queries
+    }.not_to make_database_queries
   end
 
   it "return the comments ordered by created_at asc by default" do

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

@@ -32,7 +32,7 @@ module Decidim
 
       describe "canHaveReplies" do
         let (:query) { "{ canHaveReplies }" }
-        
+
         it "returns the return value of can_have_replies? method" do
           expect(response).to include("canHaveReplies" => model.can_have_replies?)
         end
@@ -49,7 +49,7 @@ module Decidim
           replies.each do |reply|
             expect(response["replies"]).to include("id" => reply.id.to_s)
           end
-          expect(response["replies"]).to_not include("id" => random_comment.id.to_s)
+          expect(response["replies"]).not_to include("id" => random_comment.id.to_s)
         end
 
         it "return comment's replies ordered by date" do

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

@@ -5,12 +5,12 @@ require "decidim/api/test/type_context"
 describe Decidim::Api::QueryType do
   include_context "graphql type"
 
-  describe "currentUser" do
-    let(:query) { "{ currentUser { name } } " }
+  describe "session" do
+    let(:query) { "{ session { user { name } } }" }
 
     context "When the user is logged in" do
       it "return current user data" do
-        expect(response["currentUser"]).to include("name" => current_user.name)
+        expect(response["session"]).to include({ "user" => { "name" => current_user.name } })
       end
     end
 
@@ -18,7 +18,7 @@ describe Decidim::Api::QueryType do
       let!(:current_user) { nil }
 
       it "return a nil object" do
-        expect(response["currentUser"]).to be_nil
+        expect(response["session"]).to be_nil
       end
     end
   end
@@ -35,7 +35,7 @@ describe Decidim::Api::QueryType do
     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"]).to_not include("id" => comment_3.id.to_s)
+      expect(response["comments"]).not_to include("id" => comment_3.id.to_s)
     end
 
     it "returns comments ordered by creation date" do

data/decidim-dev/app/views/decidim/dummy_resource/_linked_dummys.html.erb

@@ -0,0 +1,5 @@
+<ul>
+  <% resources.each do |dummy| %>
+    <li><%= dummy.title %></li>
+  <% end %>
+</ul>

data/decidim-dev/config/locales/en.yml

@@ -0,0 +1,5 @@
+en:
+  decidim:
+    resource_links:
+      test_link:
+        dummy: Related dummy

data/decidim-dev/decidim-dev.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.add_dependency "decidim", Decidim.version
   s.add_dependency "factory_girl_rails"
   s.add_dependency "database_cleaner", "~> 1.5.0"
-  s.add_dependency "capybara", "~> 2.11.0"
+  s.add_dependency "capybara", "~> 2.12.0"
   s.add_dependency "capybara-screenshot", "~> 1.0.14"
   s.add_dependency "rspec-rails", "~> 3.5"
   s.add_dependency "rspec-repeat", "~> 1.0.2"
@@ -27,9 +27,9 @@ Gem::Specification.new do |s|
   s.add_dependency "launchy"
   s.add_dependency "i18n-tasks", "0.9.8"
   s.add_dependency "faker", "~> 1.7.2"
-  s.add_dependency "poltergeist", "~> 1.12.0"
+  s.add_dependency "poltergeist", "~> 1.13.0"
   s.add_dependency "rails-controller-testing", "~> 1.0.1"
-  s.add_dependency "simplecov", "~> 0.12"
+  s.add_dependency "simplecov", "~> 0.13"
   s.add_dependency "codecov", "~> 0.1.9"
   s.add_dependency "rubocop", "~> 0.47"
   s.add_dependency "db-query-matchers", "~> 0.7.0"

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

@@ -27,6 +27,7 @@ end
 require "rails"
 require "active_support/core_ext/string"
 require "decidim/core"
+require "decidim/core/test"
 
 require "#{File.dirname(__FILE__)}/rspec_support/feature.rb"
 

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

@@ -20,7 +20,7 @@ module MailerHelpers
   end
 
   def last_email_body
-    (last_email.body || last_email.html_part.body).encoded
+    (last_email.try(:html_part).try(:body) || last_email.body).encoded
   end
 
   def last_email_link

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

@@ -9,15 +9,19 @@ module Decidim
       begin
         engine = (ENV["ENGINE_NAME"].to_s.split("-").map(&:capitalize).join("::") + "::Engine").constantize
 
-        if engine.respond_to?(:routes)
-          routes do
-            engine.routes
-          end
-        end
+        load_routes engine if engine.respond_to?(:routes)
       rescue NameError => _exception
         puts "Failed to automatically inject routes for engine #{ENV["ENGINE_NAME"]}"
       end
     end
+
+    class_methods do
+      def load_routes(klass)
+        routes do
+          klass.routes
+        end
+      end
+    end
   end
 end
 

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

@@ -7,8 +7,15 @@ module Decidim
 
     routes do
       root to: proc { [200, {}, ["DUMMY ENGINE"]] }
+      resources :dummy_resource
     end
   end
+
+  class DummyResource < ActiveRecord::Base
+    include Resourceable
+    belongs_to :feature, foreign_key: "decidim_feature_id", class_name: "Decidim::Feature"
+    has_one :organization, through: :feature
+  end
 end
 
 Decidim.register_feature(:dummy) do |feature|
@@ -23,9 +30,26 @@ Decidim.register_feature(:dummy) do |feature|
     settings.attribute :dummy_step_attribute_1, type: :boolean
     settings.attribute :dummy_step_attribute_2, type: :boolean
   end
+
+  feature.register_resource do |resource|
+    resource.name = :dummy
+    resource.model_class_name = "Decidim::DummyResource"
+    resource.template = "decidim/dummy_resource/linked_dummys"
+  end
 end
 
 RSpec.configure do |config|
+  config.before(:suite) do
+    unless ActiveRecord::Base.connection.data_source_exists?("decidim_dummy_resources")
+      ActiveRecord::Migration.create_table :decidim_dummy_resources do |t|
+        t.string :title
+        t.references :decidim_feature, index: true
+
+        t.timestamps
+      end
+    end
+  end
+
   config.before(:each) do
     Decidim.find_feature_manifest(:dummy).reset_hooks!
   end

data/decidim-meetings/app/assets/config/decidim_meetings_manifest.js

@@ -0,0 +1,2 @@
+//= link decidim/meetings/map.js
+//= link decidim/meetings/map.css

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

@@ -0,0 +1,92 @@
+// = require leaflet
+// = require leaflet-tilelayer-here
+// = require leaflet-svg-icon
+// = require jquery-tmpl
+// = require_self
+
+/* globals L */
+
+L.DivIcon.SVGIcon.DecidimIcon = L.DivIcon.SVGIcon.extend({
+  options: {
+    fillColor: '#ef604d',
+    opacity: 0
+  },
+  _createPathDescription: function() {
+    return 'M14 1.17a11.685 11.685 0 0 0-11.685 11.685c0 11.25 10.23 20.61 10.665 21a1.5 1.5 0 0 0 2.025 0c0.435-.435 10.665-9.81 10.665-21A11.685 11.685 0 0 0 14 1.17Zm0 17.415A5.085 5.085 0 1 1 19.085 13.5 5.085 5.085 0 0 1 14 18.585Z';
+  },
+  _createCircle: function() {
+    return ""
+  }
+});
+
+const popupTemplateId = 'meeting-popup';
+$.template('meeting-popup', $(`#${popupTemplateId}`).html());
+
+const addMarkers = (meetingsData, 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);
+
+    marker.bindPopup(node, {
+      maxwidth: 640,
+      minWidth: 500,
+      keepInView: true,
+      className: 'map-info'
+    }).openPopup();
+  });
+
+  map.fitBounds(bounds, { padding: [100, 100] });
+};
+
+const loadMap = (mapId, meetingsData) => {
+  const { hereAppId, hereAppCode } = window.DecidimMeetings.mapConfiguration;
+
+  if (window.DecidimMeetings.currentMap) {
+    window.DecidimMeetings.currentMap.remove();
+    window.DecidimMeetings.currentMap = null;
+  }
+
+  const map = L.map(mapId);
+
+  L.tileLayer.here({
+    appId: hereAppId,
+    appCode: hereAppCode,
+  }).addTo(map);
+
+  if (meetingsData.length > 0) {
+    addMarkers(meetingsData, map);
+  } else {
+    map.fitWorld();
+  }
+
+  map.scrollWheelZoom.disable();
+
+  return map;
+};
+
+window.DecidimMeetings = {
+  loadMap,
+  currentMap: null,
+  mapConfiguration: {}
+};
+
+$(() => {
+  const mapId = 'meetings-map';
+  const $map = $(`#${mapId}`);
+
+  const meetingsData = $map.data('meetings');
+  const hereAppId = $map.data('here-app-id');
+  const hereAppCode = $map.data('here-app-code');
+
+  window.DecidimMeetings.mapConfiguration = { hereAppId, hereAppCode };
+
+  if ($map.length > 0) {
+    window.DecidimMeetings.currentMap = loadMap(mapId, meetingsData);
+  }
+});

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

@@ -0,0 +1 @@
+/* = require leaflet */

data/decidim-meetings/app/commands/decidim/meetings/admin/close_meeting.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+module Decidim
+  module Meetings
+    module Admin
+      # This command is executed when the user closes a Meeting from the admin
+      # panel.
+      class CloseMeeting < Rectify::Command
+        # Initializes a CloseMeeting Command.
+        #
+        # form - The form from which to get the data.
+        # meeting - The current instance of the page to be closed.
+        def initialize(form, meeting)
+          @form = form
+          @meeting = meeting
+        end
+
+        # Closes the meeting if valid.
+        #
+        # Broadcasts :ok if successful, :invalid otherwise.
+        def call
+          return broadcast(:invalid) if @form.invalid?
+
+          transaction do
+            close_meeting
+            link_proposals
+          end
+
+          broadcast(:ok)
+        end
+
+        private
+
+        def close_meeting
+          @meeting.update_attributes!(
+            closing_report: @form.closing_report,
+            attendees_count: @form.attendees_count,
+            contributions_count: @form.contributions_count,
+            attending_organizations: @form.attending_organizations,
+            closed_at: @form.closed_at
+          )
+        end
+
+        def proposals
+          @meeting.sibling_scope(:proposals).where(id: @form.proposal_ids)
+        end
+
+        def link_proposals
+          @meeting.link_resources(proposals, "proposals_from_meeting")
+        end
+      end
+    end
+  end
+end