decidim 0.0.5 → 0.0.6

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

@@ -2,4 +2,4 @@ ca:
   decidim:
     resource_links:
       test_link:
-        dummy: Element fictici relacionat
+        dummy_resource_dummy: Fictici relacionat

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

@@ -2,4 +2,4 @@ en:
   decidim:
     resource_links:
       test_link:
-        dummy: Related dummy
+        dummy_resource_dummy: Related dummy

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

@@ -2,4 +2,4 @@ es:
   decidim:
     resource_links:
       test_link:
-        dummy: Ficticio relacionado
+        dummy_resource_dummy: Ficticio relacionado

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

@@ -2,4 +2,4 @@ eu:
   decidim:
     resource_links:
       test_link:
-        dummy: Related gezurrezko
+        dummy_resource_dummy: Honekin lotutako ????

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

@@ -0,0 +1,5 @@
+fi:
+  decidim:
+    resource_links:
+      test_link:
+        dummy_resource_dummy: Liittyvät dummy

data/decidim-dev/decidim-dev.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   s.add_dependency "rspec-rails", "~> 3.5"
   s.add_dependency "rspec-repeat", "~> 1.0.2"
   s.add_dependency "byebug"
-  s.add_dependency "wisper-rspec"
+  s.add_dependency "wisper-rspec", "~> 0.0.3"
   s.add_dependency "listen", "~> 3.1.0"
   s.add_dependency "launchy"
   s.add_dependency "i18n-tasks", "0.9.12"
@@ -34,4 +34,6 @@ Gem::Specification.new do |s|
   s.add_dependency "rubocop", "~> 0.47"
   s.add_dependency "db-query-matchers", "~> 0.7.0"
   s.add_dependency "letter_opener_web", "~> 1.3.0"
+  s.add_dependency "rspec-html-matchers", "~> 0.9.1"
+  s.add_dependency "webmock", "~> 2.3.2"
 end

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

@@ -29,7 +29,6 @@ require "rails"
 require "active_support/core_ext/string"
 require "decidim/core"
 require "decidim/core/test"
-
 require "#{File.dirname(__FILE__)}/rspec_support/feature.rb"
 
 begin
@@ -40,36 +39,10 @@ rescue LoadError
   exit(-1)
 end
 
-require "rails-controller-testing"
-require "rspec/rails"
-require "factory_girl_rails"
-require "database_cleaner"
-require "byebug"
-require "cancan/matchers"
-require "rectify/rspec"
-require "wisper/rspec/stub_wisper_publisher"
-require "db-query-matchers"
-
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.
-Dir["#{File.dirname(__FILE__)}/rspec_support/**/*.rb"].each { |f| require f }
 Dir["#{engine_spec_dir}/support/**/*.rb"].each { |f| require f }
 Dir["#{engine_spec_dir}/shared/**/*.rb"].each { |f| require f }
 
-RSpec.configure do |config|
-  config.color = true
-  config.fail_fast = ENV["FAIL_FAST"] || false
-  config.infer_spec_type_from_file_location!
-  config.mock_with :rspec
-  config.raise_errors_for_deprecations!
-
-  # If you're not using ActiveRecord, or you'd prefer not to run each of your
-  # examples within a transaction, comment the following line or assign false
-  # instead of true.
-  config.use_transactional_fixtures = false
-
-  config.include TranslationHelpers
-  config.include Rectify::RSpec::Helpers
-end
-
+require_relative "spec_helper"
 require_relative "i18n_spec"

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

@@ -17,10 +17,15 @@ module Decidim
   class DummyResource < ActiveRecord::Base
     include HasFeature
     include Resourceable
+    include Reportable
     include Authorable
     include Decidim::Comments::Commentable
 
     feature_manifest_name "dummy"
+
+    def reported_content
+      title
+    end
   end
 
   class DummyResourcesController < ActionController::Base
@@ -30,6 +35,8 @@ module Decidim
     def show
       @commentable = DummyResource.find(params[:id])
       render inline: %{
+        <%= display_flash_messages %>
+        <div class="reveal" id="loginModal" data-reveal></div>
         <%= javascript_include_tag 'application' %>
         <%= inline_comments_for(@commentable) %>
       }
@@ -66,6 +73,10 @@ RSpec.configure do |config|
     unless ActiveRecord::Base.connection.data_source_exists?("decidim_dummy_resources")
       ActiveRecord::Migration.create_table :decidim_dummy_resources do |t|
         t.string :title
+        t.text :address
+        t.float :latitude
+        t.float :longitude
+
         t.references :decidim_feature, index: true
         t.references :decidim_author, index: true
 

data/{decidim-meetings/spec/support → decidim-dev/lib/decidim/dev/test/rspec_support}/geocoder.rb

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

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

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+require "rspec-html-matchers"
+
+RSpec.configure do |config|
+  config.include RSpecHtmlMatchers
+end

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

@@ -5,6 +5,9 @@ RSpec.configure do |config|
   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

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

@@ -0,0 +1,2 @@
+require "webmock/rspec"
+WebMock.allow_net_connect!

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

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+ENV["RAILS_ENV"] ||= "test"
+
+require "rails"
+require "active_support/core_ext/string"
+require "decidim/core"
+require "decidim/core/test"
+
+require "rails-controller-testing"
+require "rspec/rails"
+require "factory_girl_rails"
+require "database_cleaner"
+require "byebug"
+require "cancan/matchers"
+require "rectify/rspec"
+require "wisper/rspec/stub_wisper_publisher"
+require "db-query-matchers"
+
+# Requires supporting files with custom matchers and macros, etc,
+# in ./support/ and its subdirectories.
+Dir["#{File.dirname(__FILE__)}/rspec_support/**/*.rb"].each { |f| require f }
+
+RSpec.configure do |config|
+  config.color = true
+  config.fail_fast = ENV["FAIL_FAST"] || false
+  config.infer_spec_type_from_file_location!
+  config.mock_with :rspec
+  config.raise_errors_for_deprecations!
+
+  # If you're not using ActiveRecord, or you'd prefer not to run each of your
+  # examples within a transaction, comment the following line or assign false
+  # instead of true.
+  config.use_transactional_fixtures = false
+
+  config.include TranslationHelpers
+  config.include Rectify::RSpec::Helpers
+end

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

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

data/decidim-dev/lib/generators/decidim/templates/autoprefixer.yml

@@ -0,0 +1,8 @@
+# Loading the autoprefixer for WebKit browsers during tests will cause some
+# tests to fail since parts of the UI are rendered differently. This is due to
+# WebKit version used in PhantomJS that does not render some of the modern CSS
+# features the same way as expected by the Foundation framework. For example,
+# some elements are overlapping other elements which causes the elements to be
+# inaccessible during the specific tests.
+browsers:
+  - "Firefox > 2"

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

@@ -0,0 +1,16 @@
+module AutoprefixerRails
+  class Sprockets
+    self.singleton_class.send(:alias_method, :call_original, :call)
+
+    def self.call(input)
+      filename = input[:name]
+
+      # 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\/.*/)
+
+      self.call_original(input)
+    end
+  end
+end

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

@@ -15,17 +15,14 @@ module Decidim
         def call
           return broadcast(:invalid) if @form.invalid?
 
-          build_meeting
-          return broadcast(:invalid) if Decidim.geocoder.present? && !geocode_meeting
-          create_meeting
-
-          broadcast(:ok)
+          create_meeting!
+          broadcast(:ok, @meeting)
         end
 
         private
 
-        def build_meeting
-          @meeting = Meeting.new(
+        def create_meeting!
+          @meeting = Meeting.create!(
             scope: @form.scope,
             category: @form.category,
             title: @form.title,
@@ -33,21 +30,13 @@ module Decidim
             end_time: @form.end_time,
             start_time: @form.start_time,
             address: @form.address,
+            latitude: @form.latitude,
+            longitude: @form.longitude,
             location: @form.location,
             location_hints: @form.location_hints,
             feature: @form.current_feature
           )
         end
-
-        def geocode_meeting
-          result = @meeting.geocode
-          @form.errors.add :address, :invalid unless result
-          result
-        end
-
-        def create_meeting
-          @meeting.save!
-        end
       end
     end
   end

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

@@ -20,17 +20,14 @@ module Decidim
         def call
           return broadcast(:invalid) if @form.invalid?
 
-          change_meeting
-          return broadcast(:invalid) if Decidim.geocoder.present? && @meeting.address_changed? && !geocode_meeting
-          update_meeting
-
-          broadcast(:ok)
+          update_meeting!
+          broadcast(:ok, @meeting)
         end
 
         private
 
-        def change_meeting
-          @meeting.assign_attributes(
+        def update_meeting!
+          @meeting.update_attributes!(
             scope: @form.scope,
             category: @form.category,
             title: @form.title,
@@ -38,6 +35,8 @@ module Decidim
             end_time: @form.end_time,
             start_time: @form.start_time,
             address: @form.address,
+            latitude: @form.latitude,
+            longitude: @form.longitude,
             location: @form.location,
             location_hints: @form.location_hints
           )

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

@@ -8,6 +8,7 @@ module Decidim
     # Note that it inherits from `Decidim::Components::BaseController`, which
     # override its layout and provide all kinds of useful methods.
     class ApplicationController < Decidim::Features::BaseController
+      helper Decidim::Meetings::ApplicationHelper
     end
   end
 end

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

@@ -8,15 +8,24 @@ module Decidim
 
       helper_method :meetings, :geocoded_meetings, :meeting
 
-      def index; end
-
-      def static_map
-        @meeting = Meeting.where(feature: current_feature).find(params[:id])
-        send_data StaticMapGenerator.new(@meeting).data, type: "image/jpeg", disposition: "inline"
+      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
+        end
       end
 
       private
 
+      def meeting
+        @meeting ||= Meeting.where(feature: current_feature).find(params[:id])
+      end
+
       def meetings
         @meetings ||= search.results.page(params[:page]).per(12)
       end
@@ -25,10 +34,6 @@ module Decidim
         @geocoded_meetings ||= search.results.select(&:geocoded?)
       end
 
-      def meeting
-        @meeting ||= Meeting.where(feature: current_feature).find(params[:id])
-      end
-
       def search_klass
         MeetingSearch
       end

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

@@ -11,6 +11,8 @@ module Decidim
         translatable_attribute :location, String
         translatable_attribute :location_hints, String
         attribute :address, String
+        attribute :latitude, Float
+        attribute :longitude, Float
         attribute :start_time, Decidim::Attributes::TimeWithZone
         attribute :end_time, Decidim::Attributes::TimeWithZone
         attribute :decidim_scope_id, Integer
@@ -20,6 +22,7 @@ module Decidim
         validates :description, translatable_presence: true
         validates :location, translatable_presence: true
         validates :address, presence: true
+        validates :address, geocoding: true, if: -> { Decidim.geocoder.present? }
         validates :start_time, presence: true, date: { before: :end_time }
         validates :end_time, presence: true, date: { after: :start_time }
 
@@ -27,15 +30,23 @@ 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 process_scope
+          current_feature.participatory_process.scope
+        end
+
         def scope
           return unless current_feature
-          @scope ||= current_feature.scopes.where(id: decidim_scope_id).first
+          @scope ||= process_scope || current_feature.scopes.where(id: decidim_scope_id).first
         end
 
         def category
           return unless current_feature
           @category ||= current_feature.categories.where(id: decidim_category_id).first
         end
+
+        def feature
+          current_feature
+        end
       end
     end
   end

data/decidim-meetings/app/helpers/decidim/meetings/admin/application_helper.rb

@@ -5,7 +5,7 @@ module Decidim
       # Custom helpers, scoped to the meetings admin engine.
       #
       module ApplicationHelper
-        include MapHelper
+        include Decidim::MapHelper
       end
     end
   end

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

@@ -5,7 +5,8 @@ module Decidim
     #
     module ApplicationHelper
       include PaginateHelper
-      include MapHelper
+      include Decidim::MapHelper
+      include Decidim::Meetings::MapHelper
     end
   end
 end

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

@@ -1,45 +1,23 @@
 # frozen_string_literal: true
 module Decidim
   module Meetings
-    # This helper include some methods for rendering meetings static and dynamic maps.
+    # This helper include some methods for rendering meetings dynamic maps.
     module MapHelper
-      # Renders a link to openstreetmaps with the meeting latitude and longitude.
-      # The link's content is a static map image.
-      #
-      # meeting - A Decidim::Meetings::Meeting object
-      # options - An optional hash of options (default: { zoom: 17 })
-      #           * zoom: A number to represent the zoom value of the map
-      def static_map_link(meeting, options = {})
-        if meeting.geocoded?
-          zoom = options[:zoom] || 17
-          latitude = meeting.latitude
-          longitude = meeting.longitude
-
-          map_url = "https://www.openstreetmap.org/?mlat=#{latitude}&mlon=#{longitude}#map=#{zoom}/#{latitude}/#{longitude}"
-
-          link_to map_url, target: "_blank" do
-            image_tag decidim_meetings.static_map_meeting_path(feature_id: meeting.feature,
-                                                               participatory_process_id: meeting.feature.participatory_process,
-                                                               id: meeting)
-          end
-        end
-      end
-
       # Serialize a collection of geocoded meetings to be used by the dynamic map component
       #
       # geocoded_meetings - A collection of geocoded meetings
       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