decidim 0.0.5 → 0.0.6

data/decidim-meetings/db/migrate/20170215132546_add_reference_to_meetings.rb

@@ -0,0 +1,7 @@
+class AddReferenceToMeetings < ActiveRecord::Migration[5.0]
+  def change
+    add_column :decidim_meetings_meetings, :reference, :string
+    Decidim::Meetings::Meeting.find_each(&:save)
+    change_column_null :decidim_meetings_meetings, :reference, false
+  end
+end

data/decidim-meetings/decidim-meetings.gemspec

@@ -18,13 +18,11 @@ Gem::Specification.new do |s|
   s.add_dependency "date_validator", "~> 0.9"
   s.add_dependency "searchlight", "~> 4.1.0"
   s.add_dependency "kaminari", "~> 1.0.1"
-  s.add_dependency "geocoder", "~> 1.4.2"
   s.add_dependency "httparty", "~> 0.14.0"
   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 "webmock", "~> 2.3.2"
   s.add_development_dependency "decidim-results", Decidim.version
 end

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

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-require "geocoder"
 
 module Decidim
   module Meetings
@@ -22,31 +21,6 @@ module Decidim
       def load_seed
         nil
       end
-
-      initializer "decidim_meetings.geocoder" do |_app|
-        if Decidim.geocoder.present?
-          Geocoder.configure(
-            # geocoding service (see below for supported options):
-            lookup: :here,
-
-            # IP address geocoding service (see below for supported options):
-            # :ip_lookup => :maxmind,
-
-            # to use an API key:
-            api_key: [Decidim.geocoder&.fetch(:here_app_id), Decidim.geocoder&.fetch(:here_app_code)]
-
-            # geocoding service request timeout, in seconds (default 3):
-            # :timeout => 5,
-
-            # set default units to kilometers:
-            # :units => :km,
-
-            # caching (see below for details):
-            # :cache => Redis.new,
-            # :cache_prefix => "..."
-          )
-        end
-      end
     end
   end
 end

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

@@ -12,17 +12,9 @@ module Decidim
       isolate_namespace Decidim::Meetings
 
       routes do
-        resources :meetings, only: [:index, :show] do
-          member do
-            get :static_map
-          end
-        end
+        resources :meetings, only: [:index, :show]
         root to: "meetings#index"
       end
-
-      initializer "decidim_meetings.assets" do |app|
-        app.config.assets.precompile += %w(decidim_meetings_manifest.js)
-      end
     end
   end
 end

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

@@ -7,6 +7,9 @@ describe Decidim::Meetings::Admin::CreateMeeting do
   let(:scope) { create :scope, organization: organization }
   let(:category) { create :category, participatory_process: participatory_process }
   let(:address) { "address" }
+  let(:invalid) { false }
+  let(:latitude) { 40.1234 }
+  let(:longitude) { 2.1234 }
   let(:form) do
     double(
       :invalid? => invalid,
@@ -17,24 +20,13 @@ describe Decidim::Meetings::Admin::CreateMeeting do
       start_time: 1.day.from_now,
       end_time: 1.day.from_now + 1.hour,
       address: address,
+      latitude: latitude,
+      longitude: longitude,
       scope: scope,
       category: category,
       current_feature: current_feature
     )
   end
-  let(:invalid) { false }
-  let(:latitude) { 40.1234 }
-  let(:longitude) { 2.1234 }
-
-  before do
-    Decidim.geocoder = {
-      here_app_id: "1234",
-      here_app_code: "5678"
-    }
-    Geocoder::Lookup::Test.add_stub(address, [
-      { 'latitude' => latitude, 'longitude' => longitude }
-    ])
-  end
 
   subject { described_class.new(form) }
 
@@ -68,7 +60,7 @@ describe Decidim::Meetings::Admin::CreateMeeting do
       expect(meeting.feature).to eq current_feature
     end
 
-    it "geocodes the meeting" do
+    it "sets the longitude and latitude" do
       subject.call
       last_meeting = Decidim::Meetings::Meeting.last
       expect(last_meeting.latitude).to eq(latitude)

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

@@ -6,6 +6,9 @@ describe Decidim::Meetings::Admin::UpdateMeeting do
   let(:scope) { create :scope, organization: organization }
   let(:category) { create :category, participatory_process: meeting.feature.participatory_process }
   let(:address) { meeting.address }
+  let(:invalid) { false }
+  let(:latitude) { 40.1234 }
+  let(:longitude) { 2.1234 }
   let(:form) do
     double(
       :invalid? => invalid,
@@ -17,22 +20,11 @@ describe Decidim::Meetings::Admin::UpdateMeeting do
       end_time: 1.day.from_now + 1.hour,
       scope: scope,
       category: category,
-      address: address
+      address: address,
+      latitude: latitude,
+      longitude: longitude
     )
   end
-  let(:invalid) { false }
-  let(:latitude) { 40.1234 }
-  let(:longitude) { 2.1234 }
-
-  before do
-    Decidim.geocoder = {
-      here_app_id: "1234",
-      here_app_code: "5678"
-    }
-    Geocoder::Lookup::Test.add_stub(address, [
-      { 'latitude' => latitude, 'longitude' => longitude }
-    ])
-  end
 
   subject { described_class.new(form, meeting) }
 
@@ -60,21 +52,10 @@ describe Decidim::Meetings::Admin::UpdateMeeting do
       expect(meeting.category).to eq category
     end
 
-    context "when the address has not changed" do
-      it "doesn't geocode the meeting" do
-        expect(meeting).not_to receive(:geocode)
-        subject.call
-      end
-    end
-
-    context "when the address has changed" do
-      let(:address) { "New address" }
-
-      it "geocodes the meeting" do
-        allow(form).to receive_message_chain(:errors, :add)
-        expect(meeting).to receive(:geocode)
-        subject.call
-      end
+    it "sets the latitude and longitude" do
+      subject.call
+      expect(meeting.latitude).to eq(latitude)
+      expect(meeting.longitude).to eq(longitude)
     end
   end
 end

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

@@ -9,12 +9,9 @@ describe "Explore meetings", type: :feature do
     create_list(:meeting, meetings_count, feature: feature)
   end
 
-  before do
-    visit_feature
-  end
-
   context "index" do
     it "shows all meetings for the given process" do
+      visit_feature
       expect(page).to have_selector("article.card", count: meetings_count)
 
       meetings.each do |meeting|
@@ -24,6 +21,7 @@ describe "Explore meetings", type: :feature do
 
     context "filtering" do
       it "allows searching by text" do
+        visit_feature
         within ".filters" do
           fill_in :filter_search_text, with: translated(meetings.first.title)
         end
@@ -65,6 +63,35 @@ describe "Explore meetings", type: :feature do
         expect(page).to have_css(".card--meeting", count: 1)
       end
     end
+
+    context "No upcoming meetings scheduled" do
+      let!(:meetings) do
+        create_list(:meeting, 2, feature: feature, start_time: Time.current - 4.days, end_time: Time.current - 2.days)
+      end
+
+      it "only shows the past meetings" do
+        visit_feature
+        expect(page).to have_css(".card--meeting", count: 2)
+      end
+
+      it "shows the correct warning" do
+        visit_feature
+        within ".callout" do
+          expect(page).to have_content("no scheduled meetings")
+        end
+      end
+    end
+
+    context "No meetings scheduled" do
+      let!(:meetings){ [] }
+
+      it "shows the correct warning" do
+        visit_feature
+        within ".callout" do
+          expect(page).to have_content("any meeting scheduled")
+        end
+      end
+    end
   end
 
   context "show" do
@@ -87,6 +114,7 @@ describe "Explore meetings", type: :feature do
       expect(page).to have_i18n_content(meeting.location)
       expect(page).to have_i18n_content(meeting.location_hints)
       expect(page).to have_content(meeting.address)
+      expect(page).to have_content(meeting.reference)
 
       within ".section.view-side" do
         expect(page).to have_content(date.day)
@@ -154,11 +182,11 @@ describe "Explore meetings", type: :feature do
 
       before do
         meeting.link_resources(proposals, "proposals_from_meeting")
-        visit_feature
-        click_link translated(meeting.title)
       end
 
       it "shows related proposals" do
+        visit_feature
+        click_link translated(meeting.title)
         proposals.each do |proposal|
           expect(page).to have_content(proposal.title)
           expect(page).to have_content(proposal.author_name)
@@ -175,11 +203,11 @@ describe "Explore meetings", type: :feature do
 
       before do
         meeting.link_resources(results, "meetings_through_proposals")
-        visit_feature
-        click_link translated(meeting.title)
       end
 
       it "shows related results" do
+        visit_feature
+        click_link translated(meeting.title)
         results.each do |result|
           expect(page).to have_i18n_content(result.title)
         end
@@ -192,13 +220,9 @@ describe "Explore meetings", type: :feature do
     context "when the meeting is closed" do
       let!(:meeting) { create(:meeting, :closed, feature: feature) }
 
-      before do
-        meeting
+      it "shows the closing report" do
         visit_feature
         click_link translated(meeting.title)
-      end
-
-      it "shows the closing report" do
         expect(page).to have_i18n_content(meeting.closing_report)
 
         within ".definition-data" do

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

@@ -27,7 +27,9 @@ describe Decidim::Meetings::Admin::MeetingForm do
   let(:location_hints) do
     Decidim::Faker::Localized.sentence(3)
   end
-  let(:address) { Faker::Lorem.sentence(3) }
+  let(:address) { "Carrer Pare Llaurador 113, baixos, 08224 Terrassa" }
+  let(:latitude) { 40.1234 }
+  let(:longitude) { 2.1234 }
   let(:start_time) { 2.days.from_now }
   let(:end_time) { 2.days.from_now + 4.hours }
   let(:scope) { create :scope, organization: organization }
@@ -49,6 +51,12 @@ describe Decidim::Meetings::Admin::MeetingForm do
     }
   end
 
+  before do
+    Geocoder::Lookup::Test.add_stub(address, [
+      { 'latitude' => latitude, 'longitude' => longitude }
+    ])
+  end
+
   subject { described_class.from_params(attributes).with_context(context) }
 
   it { is_expected.to be_valid }
@@ -124,4 +132,10 @@ describe Decidim::Meetings::Admin::MeetingForm do
 
     it { is_expected.not_to be_valid }
   end
+
+  it "validates address and store its coordinates" do
+    expect(subject).to be_valid
+    expect(subject.latitude).to eq(latitude)
+    expect(subject.longitude).to eq(longitude)
+  end
 end

data/decidim-meetings/spec/models/meeting_spec.rb

@@ -15,6 +15,7 @@ module Decidim
       include_examples "has feature"
       include_examples "has scope"
       include_examples "has category"
+      include_examples "has reference"
 
       context "without a title" do
         let(:meeting) { build :meeting, title: nil }

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

@@ -101,6 +101,15 @@ describe Decidim::Meetings::MeetingSearch do
           expect(subject.results).to match_array [meeting1, meeting2]
         end
       end
+
+      context "when `global` is being sent" do
+        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
+          expect(subject.results).to eq [resource_without_scope]
+        end
+      end
     end
 
     context "category_id" do

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

@@ -1,6 +1,6 @@
 RSpec.shared_context "admin" do
   let(:organization) { create(:organization) }
-  let!(:user) { create(:user, :admin, :confirmed, organization: organization, email: "admin@decidim.org") }
+  let!(:user) { create(:user, :admin, :confirmed, organization: organization, email: "admin@example.org") }
   let(:participatory_process) { create(:participatory_process, organization: organization) }
   let(:process_admin) { create :user, :confirmed, organization: organization }
   let!(:user_role) { create :participatory_process_user_role, user: process_admin, participatory_process: participatory_process }

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

@@ -1,6 +1,16 @@
 # -*- coding: utf-8 -*-
 # frozen_string_literal: true
 RSpec.shared_examples "manage meetings" do
+  let(:address) { "Carrer Pare Llaurador 113, baixos, 08224 Terrassa" }
+  let(:latitude) { 40.1234 }
+  let(:longitude) { 2.1234 }
+
+  before do
+    Geocoder::Lookup::Test.add_stub(address, [
+      { 'latitude' => latitude, 'longitude' => longitude }
+    ])
+  end
+
   it "updates a meeting" do
     within find("tr", text: translated(meeting.title)) do
       click_link "Edit"
@@ -14,6 +24,7 @@ RSpec.shared_examples "manage meetings" do
         es: "Mi nuevo título",
         ca: "El meu nou títol"
       )
+      fill_in :meeting_address, with: address
 
       find("*[type=submit]").click
     end
@@ -71,7 +82,7 @@ RSpec.shared_examples "manage meetings" do
         ca: "Descripció més llarga"
       )
 
-      fill_in :meeting_address, with: "Address"
+      fill_in :meeting_address, with: address
       fill_in :meeting_start_time, with: 1.day.from_now
       fill_in :meeting_end_time, with: 1.day.from_now + 2.hours
 
@@ -112,6 +123,91 @@ RSpec.shared_examples "manage meetings" do
     end
   end
 
+  context "when geocoding is disabled" do
+    before do
+      allow(Decidim).to receive(:geocoder).and_return(nil)
+    end
+
+    it "updates a meeting" do
+      within find("tr", text: translated(meeting.title)) do
+        click_link "Edit"
+      end
+
+      within ".edit_meeting" do
+        fill_in_i18n(
+          :meeting_title,
+          "#title-tabs",
+          en: "My new title",
+          es: "Mi nuevo título",
+          ca: "El meu nou títol"
+        )
+        fill_in :meeting_address, with: address
+
+        find("*[type=submit]").click
+      end
+
+      within ".flash" do
+        expect(page).to have_content("successfully")
+      end
+
+      within "table" do
+        expect(page).to have_content("My new title")
+      end
+    end
+
+    it "creates a new meeting" do
+      find(".actions .new").click
+
+      within ".new_meeting" do
+        fill_in_i18n(
+          :meeting_title,
+          "#title-tabs",
+          en: "My meeting",
+          es: "Mi meeting",
+          ca: "El meu meeting"
+        )
+        fill_in_i18n(
+          :meeting_location,
+          "#location-tabs",
+          en: "Location",
+          es: "Location",
+          ca: "Location"
+        )
+        fill_in_i18n(
+          :meeting_location_hints,
+          "#location_hints-tabs",
+          en: "Location hints",
+          es: "Location hints",
+          ca: "Location hints"
+        )
+        fill_in_i18n_editor(
+          :meeting_description,
+          "#description-tabs",
+          en: "A longer description",
+          es: "Descripción más larga",
+          ca: "Descripció més llarga"
+        )
+
+        fill_in :meeting_address, with: address
+        fill_in :meeting_start_time, with: 1.day.from_now
+        fill_in :meeting_end_time, with: 1.day.from_now + 2.hours
+
+        select scope.name, from: :meeting_decidim_scope_id
+        select translated(category.name), from: :meeting_decidim_category_id
+
+        find("*[type=submit]").click
+      end
+
+      within ".flash" do
+        expect(page).to have_content("successfully")
+      end
+
+      within "table" do
+        expect(page).to have_content("My meeting")
+      end
+    end
+  end
+
   context "closing a meeting" do
     let(:proposal_feature) do
       create(:feature, manifest_name: :proposals, participatory_process: meeting.feature.participatory_process)