<%= content_tag(:div, "", id: "navigation_maps-map-#{form.ident}", class: "map", data: { id: form.ident, image: form.image.url, blueprint: form.blueprint }) %>
diff --git a/app/cells/decidim/navigation_maps/content_blocks/navigation_map_settings_form/_tabs.erb b/app/cells/decidim/navigation_maps/content_blocks/navigation_map_settings_form/_tabs.erb
index c212688..f02655e 100644
--- a/app/cells/decidim/navigation_maps/content_blocks/navigation_map_settings_form/_tabs.erb
+++ b/app/cells/decidim/navigation_maps/content_blocks/navigation_map_settings_form/_tabs.erb
@@ -2,5 +2,5 @@
<% tabs.each_with_index do |item, index| %>
"><%= translated_attribute(item.title).presence || "Tab #{index + 1}" %>
<% end %>
-
+ <%= t ".add" %>
+
+ <%= t("navigation_map_settings_form.add", scope: "decidim.navigation_maps.content_blocks") %>
diff --git a/app/cells/decidim/navigation_maps/content_blocks/navigation_map_settings_form/show.erb b/app/cells/decidim/navigation_maps/content_blocks/navigation_map_settings_form/show.erb
index f69d45f..f619fd8 100644
--- a/app/cells/decidim/navigation_maps/content_blocks/navigation_map_settings_form/show.erb
+++ b/app/cells/decidim/navigation_maps/content_blocks/navigation_map_settings_form/show.erb
@@ -33,3 +33,4 @@
<%= render partial: "modal" %>
<%= javascript_include_tag "decidim/navigation_maps/admin/navigation_maps" %>
<%= stylesheet_link_tag "decidim/navigation_maps/admin/navigation_maps" %>
+ <% console %>
diff --git a/app/commands/decidim/navigation_maps/save_blueprints.rb b/app/commands/decidim/navigation_maps/save_blueprints.rb
index 798440c..e64ffd5 100644
--- a/app/commands/decidim/navigation_maps/save_blueprints.rb
+++ b/app/commands/decidim/navigation_maps/save_blueprints.rb
@@ -48,6 +48,7 @@ def initialize_blueprint(form)
def update_blueprint!(form)
@blueprint.image = form.image if form.image.present?
@blueprint.title = form.title
+ @blueprint.height = form.height
@blueprint.description = form.description
@blueprint.save!
end
diff --git a/app/forms/decidim/navigation_maps/blueprint_form.rb b/app/forms/decidim/navigation_maps/blueprint_form.rb
index 02e50bf..f752e23 100644
--- a/app/forms/decidim/navigation_maps/blueprint_form.rb
+++ b/app/forms/decidim/navigation_maps/blueprint_form.rb
@@ -15,9 +15,11 @@ class BlueprintForm < Decidim::Form
attribute :image
translatable_attribute :title, String
translatable_attribute :description, String
+ attribute :height, Integer
# validate :check_image_or_blueprint
validates :title, translatable_presence: true
+ validates :height, numericality: { greater_than: 0 }
# def check_image_or_blueprint
# return if image.present? || blueprint.present?
diff --git a/app/models/decidim/navigation_maps/blueprint.rb b/app/models/decidim/navigation_maps/blueprint.rb
index 721c036..518b0f1 100644
--- a/app/models/decidim/navigation_maps/blueprint.rb
+++ b/app/models/decidim/navigation_maps/blueprint.rb
@@ -6,6 +6,8 @@ module NavigationMaps
class Blueprint < ApplicationRecord
self.table_name = "decidim_navigation_maps_blueprints"
+ attribute :height, :integer, default: 475
+
belongs_to :organization, foreign_key: :decidim_organization_id, class_name: "Decidim::Organization"
has_many :areas,
foreign_key: "decidim_navigation_maps_blueprint_id",
@@ -14,8 +16,8 @@ class Blueprint < ApplicationRecord
validates :organization, presence: true
validates :image,
- file_size: { less_than_or_equal_to: ->(_record) { Decidim.maximum_attachment_size } },
file_content_type: { allow: ["image/jpeg", "image/png", "image/svg+xml"] }
+ validates :height, numericality: { greater_than: 0 }
mount_uploader :image, Decidim::NavigationMaps::BlueprintUploader
diff --git a/config/i18n-tasks.yml b/config/i18n-tasks.yml
index 783b6b3..9382f4d 100644
--- a/config/i18n-tasks.yml
+++ b/config/i18n-tasks.yml
@@ -3,8 +3,19 @@
base_locale: en
locales: [en]
+# Read and write translations.
+data:
+ yaml:
+ write:
+ # do not wrap lines at 80 characters
+ line_width: -1
+
ignore_unused:
- - "decidim.components.navigation_maps.name"
+ - decidim.components.navigation_maps.name
+ - decidim.navigation_maps.content_blocks.name
+ - decidim.navigation_maps.content_blocks.navigation_map_settings_form.*
+ # these keys are reused from decidim core
ignore_missing:
- decidim.participatory_processes.scopes.global
+ - decidim.content_blocks.html.html_content
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 519f68c..3a26e6e 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -33,6 +33,7 @@ en:
blueprint_image: Blueprint image
description: Description
editor: Map Editor
+ height: Height (px)
id: Id
image_missing: Please add a blueprint image to start
info: General info
diff --git a/db/migrate/20210112135817_add_height_to_navigation_maps_blueprints.rb b/db/migrate/20210112135817_add_height_to_navigation_maps_blueprints.rb
new file mode 100644
index 0000000..7ba1bf1
--- /dev/null
+++ b/db/migrate/20210112135817_add_height_to_navigation_maps_blueprints.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddHeightToNavigationMapsBlueprints < ActiveRecord::Migration[5.2]
+ def change
+ add_column :decidim_navigation_maps_blueprints, :height, :integer, null: false, default: 475
+ end
+end
diff --git a/db/seeds.rb b/db/seeds.rb
new file mode 100644
index 0000000..f112e75
--- /dev/null
+++ b/db/seeds.rb
@@ -0,0 +1,103 @@
+# frozen_string_literal: true
+
+if !Rails.env.production? || ENV["SEED"]
+ print "Creating seeds for decidim_navigation maps...\n" unless Rails.env.test?
+
+ require "decidim/faker/localized"
+ seeds_root = File.join(__dir__, "seeds")
+
+ organization = Decidim::Organization.first
+
+ Decidim::ContentBlock.create(
+ decidim_organization_id: organization.id,
+ weight: 1,
+ scope_name: :homepage,
+ manifest_name: :navigation_map,
+ published_at: Time.current,
+ settings: { title: Decidim::Faker::Localized.sentence(5) }
+ )
+
+ blueprint1 = Decidim::NavigationMaps::Blueprint.create(
+ organization: organization,
+ image: File.new(File.join(seeds_root, "antarctica.png")),
+ title: Decidim::Faker::Localized.sentence(2),
+ description: Decidim::Faker::Localized.sentence(10)
+ )
+
+ Decidim::NavigationMaps::Blueprint.create(
+ organization: organization,
+ image: File.new(File.join(seeds_root, "penguins.jpg")),
+ title: Decidim::Faker::Localized.sentence(2),
+ description: Decidim::Faker::Localized.sentence(10)
+ )
+
+ Decidim::NavigationMaps::BlueprintArea.create(
+ blueprint: blueprint1,
+ area_id: "10",
+ area_type: "Feature",
+ area: {
+ type: "Polygon",
+ coordinates: [[
+ [717.21875, 277.162511],
+ [717.21875, 317.104475],
+ [758.029018, 317.104475],
+ [758.029018, 277.162511],
+ [717.21875, 277.162511]
+ ]]
+ },
+ link: "https://en.wikipedia.org/wiki/South_Pole",
+ link_type: "link",
+ color: "#ff2a00",
+ title: { en: "South Pole" },
+ description: { en: "It's cold in here" }
+ )
+
+ Decidim::NavigationMaps::BlueprintArea.create(
+ blueprint: blueprint1,
+ area_id: "11",
+ area_type: "Feature",
+ area: {
+ type: "Polygon",
+ coordinates: [[
+ [376.84375, 516.814296],
+ [384.658482, 464.716082],
+ [411.575893, 432.58885],
+ [438.493304, 416.091082],
+ [425.46875, 402.198225],
+ [436.756696, 383.095546],
+ [428.941964, 375.280814],
+ [448.912946, 358.783046],
+ [462.805804, 367.466082],
+ [486.25, 373.544207],
+ [526.191964, 416.091082],
+ [450.649554, 448.218314],
+ [401.15625, 484.687064],
+ [376.84375, 516.814296]
+ ]]
+ },
+ link: "#map1",
+ link_type: "link",
+ color: "#ffbb00",
+ title: { en: "Penguins" },
+ description: { en: "Penguins are beatiful animals" }
+ )
+
+ Decidim::NavigationMaps::BlueprintArea.create(
+ blueprint: blueprint1,
+ area_id: "12",
+ area_type: "Feature",
+ area: {
+ type: "Polygon",
+ coordinates: [[
+ [1068.013393, 418.695993],
+ [1023.729911, 412.617868],
+ [1025.466518, 343.153582],
+ [1104.482143, 324.050903],
+ [1045.4375, 379.622332],
+ [1068.013393, 418.695993]
+ ]]
+ },
+ link: "#map1",
+ link_type: "direct"
+ )
+end
diff --git a/db/seeds/antarctica.png b/db/seeds/antarctica.png
new file mode 100644
index 0000000..ef64217
Binary files /dev/null and b/db/seeds/antarctica.png differ
diff --git a/db/seeds/penguins.jpg b/db/seeds/penguins.jpg
new file mode 100644
index 0000000..12cf48d
Binary files /dev/null and b/db/seeds/penguins.jpg differ
diff --git a/decidim-navigation_maps.gemspec b/decidim-navigation_maps.gemspec
index a6ebb2f..6f14107 100644
--- a/decidim-navigation_maps.gemspec
+++ b/decidim-navigation_maps.gemspec
@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
s.email = ["ivan@platoniq.net"]
s.license = "AGPL-3.0"
s.homepage = "https://github.com/Platoniq/decidim-module-navigation_maps"
- s.required_ruby_version = ">= 2.5"
+ s.required_ruby_version = ">= 2.6"
s.name = "decidim-navigation_maps"
s.summary = "A decidim navigation_maps module"
diff --git a/examples/homepage.png b/examples/homepage.png
new file mode 100644
index 0000000..56c1d11
Binary files /dev/null and b/examples/homepage.png differ
diff --git a/lib/decidim/navigation_maps/version.rb b/lib/decidim/navigation_maps/version.rb
index 66c6349..1bb2cc8 100644
--- a/lib/decidim/navigation_maps/version.rb
+++ b/lib/decidim/navigation_maps/version.rb
@@ -3,7 +3,7 @@
module Decidim
# This holds the decidim-meetings version.
module NavigationMaps
- VERSION = "1.0.1"
- DECIDIM_VERSION = [">= 0.18.0", "< 0.22"].freeze
+ VERSION = "1.1.0"
+ DECIDIM_VERSION = [">= 0.22", "< 0.24"].freeze
end
end
diff --git a/spec/commands/save_blueprints_spec.rb b/spec/commands/save_blueprints_spec.rb
index cf4661a..5b279f3 100644
--- a/spec/commands/save_blueprints_spec.rb
+++ b/spec/commands/save_blueprints_spec.rb
@@ -21,6 +21,7 @@ module Decidim::NavigationMaps
blueprint: blueprint_object,
id: id,
title: title,
+ height: height,
description: title,
remove: remove,
image: uploaded_image
@@ -32,6 +33,7 @@ module Decidim::NavigationMaps
blueprint: blueprint_object,
id: 2,
title: title,
+ height: height,
description: nil,
remove: false,
image: nil
@@ -49,6 +51,7 @@ module Decidim::NavigationMaps
{ x: 0.5, y: 0.6 }
end
let(:title) { Decidim::Faker::Localized.sentence(2) }
+ let(:height) { 500 }
let(:id) { 1 }
let(:remove) { false }
let(:uploaded_image) do
diff --git a/spec/content_blocks/navigation_map_cell_spec.rb b/spec/content_blocks/navigation_map_cell_spec.rb
index 5b22d00..41cf25d 100644
--- a/spec/content_blocks/navigation_map_cell_spec.rb
+++ b/spec/content_blocks/navigation_map_cell_spec.rb
@@ -7,7 +7,7 @@ module Decidim::NavigationMaps::ContentBlocks
subject { cell(content_block.cell, content_block).call }
let(:organization) { create(:organization) }
- let(:content_block) { create :content_block, organization: organization, manifest_name: :navigation_map, scope: :homepage }
+ let(:content_block) { create :content_block, organization: organization, manifest_name: :navigation_map, scope_name: :homepage }
let!(:blueprint) { create(:blueprint, organization: organization) }
controller Decidim::PagesController
diff --git a/spec/content_blocks/navigation_map_settings_form_cell_spec.rb b/spec/content_blocks/navigation_map_settings_form_cell_spec.rb
index 8a9e659..1a6401c 100644
--- a/spec/content_blocks/navigation_map_settings_form_cell_spec.rb
+++ b/spec/content_blocks/navigation_map_settings_form_cell_spec.rb
@@ -7,7 +7,7 @@ module Decidim::NavigationMaps::ContentBlocks
subject { cell(content_block.cell, content_block).call }
let(:organization) { create(:organization) }
- let(:content_block) { create :content_block, organization: organization, manifest_name: :navigation_map, scope: :homepage }
+ let(:content_block) { create :content_block, organization: organization, manifest_name: :navigation_map, scope_name: :homepage }
let!(:blueprint) { create(:blueprint, organization: organization) }
let(:settings) { NavigationMapSettingsFormCell.new }
diff --git a/spec/forms/blueprint_form_spec.rb b/spec/forms/blueprint_form_spec.rb
index b17061d..2f09bea 100644
--- a/spec/forms/blueprint_form_spec.rb
+++ b/spec/forms/blueprint_form_spec.rb
@@ -10,6 +10,7 @@ module Decidim::NavigationMaps
let(:attributes) do
{
title: title,
+ height: height,
id: id,
image: image,
blueprint: {
@@ -19,6 +20,7 @@ module Decidim::NavigationMaps
}
end
let(:title) { Decidim::Faker::Localized.sentence(2) }
+ let(:height) { 500 }
let(:id) { 101 }
let(:image) { {} }
let(:context) do
@@ -27,34 +29,54 @@ module Decidim::NavigationMaps
}
end
- before do
- allow(subject.image).to receive(:url).and_return(true)
- allow(subject.image).to receive(:content_type).and_return("image/jpeg")
- end
+ context "when there is image" do
+ before do
+ allow(subject.image).to receive(:url).and_return(true)
+ allow(subject.image).to receive(:content_type).and_return("image/jpeg")
+ end
- context "when everything is OK" do
- it { is_expected.to be_valid }
+ context "when everything is OK" do
+ it { is_expected.to be_valid }
- it "ident matches id" do
- expect(subject.ident).to eq(id)
+ it "ident matches id" do
+ expect(subject.ident).to eq(id)
+ end
+
+ it "image? responds true" do
+ expect(subject.image?).to eq(true)
+ end
end
- it "image? responds true" do
- expect(subject.image?).to eq(true)
+ context "when there is no title" do
+ let(:title) { nil }
+
+ it { is_expected.not_to be_valid }
end
- end
- context "when there is no title" do
- let(:title) { nil }
+ context "when there is no height" do
+ let(:height) { nil }
- it { is_expected.not_to be_valid }
- end
+ it { is_expected.not_to be_valid }
+ end
+
+ context "when height is not a number" do
+ let(:height) { "abracadabra" }
+
+ it { is_expected.not_to be_valid }
+ end
+
+ context "when height is not positive" do
+ let(:height) { -100 }
+
+ it { is_expected.not_to be_valid }
+ end
- context "when there is no id" do
- let(:id) { nil }
+ context "when there is no id" do
+ let(:id) { nil }
- it "ident is an underscore" do
- expect(subject.ident).to eq("_")
+ it "ident is an underscore" do
+ expect(subject.ident).to eq("_")
+ end
end
end
diff --git a/spec/i18n_spec.rb b/spec/i18n_spec.rb
new file mode 100644
index 0000000..4a05e6d
--- /dev/null
+++ b/spec/i18n_spec.rb
@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require "i18n/tasks"
+
+describe "I18n sanity" do
+ let(:locales) do
+ ENV["ENFORCED_LOCALES"].presence || "en"
+ end
+
+ let(:i18n) { I18n::Tasks::BaseTask.new(locales: locales.split(",")) }
+ let(:missing_keys) { i18n.missing_keys }
+ let(:unused_keys) { i18n.unused_keys }
+ let(:non_normalized_paths) { i18n.non_normalized_paths }
+
+ it "does not have missing keys" do
+ expect(missing_keys).to be_empty, "#{missing_keys.inspect} are missing"
+ end
+
+ it "does not have unused keys" do
+ expect(unused_keys).to be_empty, "#{unused_keys.inspect} are unused"
+ end
+
+ unless ENV["SKIP_NORMALIZATION"]
+ it "is normalized" do
+ error_message = "The following files need to be normalized:\n" \
+ "#{non_normalized_paths.map { |path| " #{path}" }.join("\n")}\n" \
+ "Please run `bundle exec i18n-tasks normalize --locales #{locales}` to fix them"
+
+ expect(non_normalized_paths).to be_empty, error_message
+ end
+ end
+end
diff --git a/spec/model/blueprint_area_spec.rb b/spec/models/blueprint_area_spec.rb
similarity index 100%
rename from spec/model/blueprint_area_spec.rb
rename to spec/models/blueprint_area_spec.rb
diff --git a/spec/model/blueprint_spec.rb b/spec/models/blueprint_spec.rb
similarity index 93%
rename from spec/model/blueprint_spec.rb
rename to spec/models/blueprint_spec.rb
index b5f21e0..fee13a2 100644
--- a/spec/model/blueprint_spec.rb
+++ b/spec/models/blueprint_spec.rb
@@ -16,12 +16,8 @@ module NavigationMaps
expect(subject.organization).to eq(organization)
end
- context "when the file is too big" do
- before do
- expect(subject.image).to receive(:size).and_return(11.megabytes)
- end
-
- it { is_expected.not_to be_valid }
+ it "has a default height" do
+ expect(subject.height).to eq(475)
end
context "when the file is a malicious image" do