decidim 0.2.0 → 0.3.0

data/decidim-admin/spec/shared/participatory_admin_shared_context.rb

@@ -8,14 +8,14 @@ RSpec.shared_context "participatory process admin" do
   let!(:user_role) { create :participatory_process_user_role, user: process_admin, participatory_process: participatory_process }
   let(:image1_filename) { "city.jpeg" }
   let(:image1_path) do
-    File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "..", "decidim-dev", "spec", "support", image1_filename))
+    File.expand_path(File.join(__dir__, "..", "..", "..", "decidim-dev", "spec", "support", image1_filename))
   end
   let(:image2_filename) { "city2.jpeg" }
   let(:image2_path) do
-    File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "..", "decidim-dev", "spec", "support", image2_filename))
+    File.expand_path(File.join(__dir__, "..", "..", "..", "decidim-dev", "spec", "support", image2_filename))
   end
   let(:image3_filename) { "city3.jpeg" }
   let(:image3_path) do
-    File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "..", "decidim-dev", "spec", "support", image3_filename))
+    File.expand_path(File.join(__dir__, "..", "..", "..", "decidim-dev", "spec", "support", image3_filename))
   end
 end

data/decidim-admin/spec/spec_helper.rb

@@ -1,9 +1,10 @@
 # frozen_string_literal: true
 
-ENV["ENGINE_NAME"] = File.dirname(File.dirname(__FILE__)).split("/").last
+ENV["ENGINE_NAME"] = File.dirname(__dir__).split("/").last
 
 require "decidim/dev/test/base_spec_helper"
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
+
+Dir["#{__dir__}/support/**/*.rb"].each { |f| require f }
 
 RSpec.configure do |config|
   config.include ProcessesMenuLinksHelpers

data/decidim-api/bin/rails

@@ -4,11 +4,11 @@
 # This command will automatically be run when you run "rails" with Rails gems
 # installed from the root of your application.
 
-ENGINE_ROOT = File.expand_path("../..", __FILE__)
-ENGINE_PATH = File.expand_path("../../lib/decidim/api/engine", __FILE__)
+ENGINE_ROOT = File.expand_path("..", __dir__)
+ENGINE_PATH = File.expand_path("../lib/decidim/api/engine", __dir__)
 
 # Set up gems listed in the Gemfile.
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile", __FILE__)
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
 require "bundler/setup" if File.exist?(ENV["BUNDLE_GEMFILE"])
 
 require "rails/all"

data/decidim-api/decidim-api.gemspec

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
-$LOAD_PATH.push File.expand_path("../lib", __FILE__)
+
+$LOAD_PATH.push File.expand_path("lib", __dir__)
 
 # Maintain your gem's version:
 require_relative "../decidim-core/lib/decidim/core/version"

data/decidim-api/lib/decidim/api/engine.rb

@@ -28,7 +28,7 @@ module Decidim
         GraphiQL::Rails.config.tap do |config|
           config.query_params = true
           config.initial_query = File.read(
-            File.join(File.dirname(__FILE__), "graphiql-initial-query.txt")
+            File.join(__dir__, "graphiql-initial-query.txt")
           ).html_safe
         end
       end

data/decidim-api/spec/spec_helper.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
-ENV["ENGINE_NAME"] = File.dirname(File.dirname(__FILE__)).split("/").last
+ENV["ENGINE_NAME"] = File.dirname(__dir__).split("/").last
 
 require "decidim/dev/test/base_spec_helper"
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
+
+Dir["#{__dir__}/support/**/*.rb"].each { |f| require f }

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

@@ -5,7 +5,7 @@ module Decidim
     # This controller is the abstract class from which all other controllers of
     # this engine inherit.
     #
-    # Note that it inherits from `Decidim::Components::BaseController`, which
+    # Note that it inherits from `Decidim::Features::BaseController`, which
     # override its layout and provide all kinds of useful methods.
     class ApplicationController < Decidim::Features::BaseController
     end

data/decidim-budgets/app/models/decidim/budgets/line_item.rb

@@ -8,8 +8,7 @@ module Decidim
       belongs_to :order, class_name: "Decidim::Budgets::Order", foreign_key: "decidim_order_id"
       belongs_to :project, class_name: "Decidim::Budgets::Project", foreign_key: "decidim_project_id"
 
-      validates :order, presence: true, uniqueness: { scope: :project }
-      validates :project, presence: true
+      validates :order, uniqueness: { scope: :project }
       validate :same_feature
 
       def same_feature

data/decidim-budgets/app/models/decidim/budgets/order.rb

@@ -11,10 +11,10 @@ module Decidim
 
       belongs_to :user, class_name: "Decidim::User", foreign_key: "decidim_user_id"
 
-      has_many :projects, through: :line_items, class_name: "Decidim::Budgets::Project", foreign_key: "decidim_project_id"
       has_many :line_items, class_name: "Decidim::Budgets::LineItem", foreign_key: "decidim_order_id", dependent: :destroy
+      has_many :projects, through: :line_items, class_name: "Decidim::Budgets::Project", foreign_key: "decidim_project_id"
 
-      validates :user, presence: true, uniqueness: { scope: :feature }
+      validates :user, uniqueness: { scope: :feature }
       validate :user_belongs_to_organization
 
       validates :total_budget, numericality: {

data/decidim-budgets/app/views/decidim/budgets/projects/_linked_projects.html.erb

@@ -2,7 +2,7 @@
   <% resources.each do |project| %>
     <div class="card--list__item">
       <%= icon "actions", class: "card--list__icon", remove_icon_class: true %>
-      <%= link_to decidim_resource_path(project), class: "card--list__text card__link card__link--block" do %>
+      <%= link_to resource_locator(project).path, class: "card--list__text card__link card__link--block" do %>
         <h5 class="card--list__heading">
           <%= translated_attribute(project.title) %>
         </h5>

data/decidim-budgets/bin/rails

@@ -4,11 +4,11 @@
 # This command will automatically be run when you run "rails" with Rails gems
 # installed from the root of your application.
 
-ENGINE_ROOT = File.expand_path("../..", __FILE__)
-ENGINE_PATH = File.expand_path("../../lib/decidim/budgets/engine", __FILE__)
+ENGINE_ROOT = File.expand_path("..", __dir__)
+ENGINE_PATH = File.expand_path("../lib/decidim/budgets/engine", __dir__)
 
 # Set up gems listed in the Gemfile.
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile", __FILE__)
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
 require "bundler/setup" if File.exist?(ENV["BUNDLE_GEMFILE"])
 
 require "rails/all"

data/decidim-budgets/config/locales/it.yml

@@ -0,0 +1,126 @@
+it:
+  activemodel:
+    attributes:
+      project:
+        decidim_category_id: Categoria
+        decidim_scope_id: Visibilità/ambito
+        description: Descrizione
+        proposal_ids: Proposte correlate
+        title: Titolo
+  decidim:
+    budgets:
+      actions:
+        attachments: Allegati
+        confirm_destroy: Sei certo di voler cancellare questo progetto?
+        destroy: Cancella
+        edit: Modifica
+        new: Nuovo
+        preview: Anteprima
+        title: Azioni
+      admin:
+        models:
+          project:
+            name: Progetto
+        projects:
+          create:
+            invalid: C'è stato un problema durante la creazione di questo progetto.
+            success: OK, progetto creato.
+          destroy:
+            success: OK, progetto eliminato.
+          edit:
+            title: Modifica il progetto
+            update: Aggiorna
+          index:
+            finished_orders: Ordini terminati.
+            pending_orders: Ordini pendenti.
+            title: Progetti
+          new:
+            create: Crea
+            title: Nuovo risultato
+          update:
+            invalid: C'è stato un problema durante l'aggiornamento di questo progetto.
+            success: OK, progetto aggiornato.
+      models:
+        project:
+          fields:
+            title: Titolo
+      projects:
+        budget_confirm:
+          are_you_sure: Sei d'accordo? Dopo che avrai confermato il tuo voto non potrai più modificarlo
+          cancel: Annulla
+          confirm: Conferma
+          description: Questi sono i progetti per i quali hai scelto di partecipare al budget.
+          title: Conferma il voto
+        budget_excess:
+          close: Chiudi
+          description: Questo progetto supera il budget e non può essere aggiunto. Se vuoi puoi cancellare un progetto che hai già scelto di aggiungere, oppure votare in base alle tue preferenze.
+          title: Budget superato
+        budget_summary:
+          are_you_sure: Sei certo di voler cancellare il tuo voto?
+          assigned: 'Assegnato:'
+          cancel_order: Cancella il tuo voto e ricomincia.
+          checked_out:
+            description: Hai già votato per il budget. Se hai cambiato idea puoi %{cancel_link}.
+            title: Voto di budget completato.
+          description: Per quali progetti pensi che dovremmo allocare del budget? Indica un budget minimo di %{minimum_budget} ai progetti che vuoi votare e vota con le tue preferenze per definire il budget.
+          title: Tu decidi il budget
+        count:
+          projects_count:
+            one: 1 progetto
+            other: "%{count} progetti"
+        filters:
+          category: Categoria
+          category_prompt: Scegli una categoria
+          scopes: Visibilità/ambito
+          search: Cerca
+        filters_small_view:
+          close_modal: Chiudi modalità
+          filter: Filtra
+          filter_by: Filtra per
+          unfold: Espandi
+        order_progress:
+          vote: Vota
+        order_selected_projects:
+          remove: Rimuovi
+          selected_projects:
+            one: Progetto scelto
+            other: Progetti scelti
+          view: Visualizza
+        project:
+          add: Aggiungi
+          count:
+            one: 1 supporto/voto
+            other: "%{count} supportati/voti"
+          remove: Elimina
+        project_budget_button:
+          add: Aggiungi
+          added: Aggiunto
+        show:
+          view_all_projects: Visualizza tutti i progetti
+    features:
+      budgets:
+        actions:
+          vote: Votazione
+        name: Investimenti
+        settings:
+          global:
+            comments_enabled: Commenti abilitati
+            total_budget: Budget totale
+            vote_threshold_percent: Soglia voti (percentuale)
+          step:
+            comments_blocked: Commenti bloccati
+            show_votes: Visualizza voti
+            votes_enabled: Voti abilitati
+    orders:
+      checkout:
+        error: C'è stato un errore durante l'acquisizione del voto.
+        success: OK, il tuo voto è stato acquisito.
+      destroy:
+        error: C'è stato un errore durante la cancellazione del voto.
+        success: OK, il tuo voto è stato cancellato.
+    resource_links:
+      included_proposals:
+        project_proposals: 'Proposte incluse in questo progetto:'
+  index:
+    confirmed_orders_count: Conteggio ordini
+  total_budget: Budget totale

data/decidim-budgets/db/migrate/20170127114122_create_projects.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CreateProjects < ActiveRecord::Migration[5.0]
   def change
     create_table :decidim_budgets_projects do |t|

data/decidim-budgets/db/migrate/20170130095615_create_orders.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CreateOrders < ActiveRecord::Migration[5.0]
   def change
     create_table :decidim_budgets_orders do |t|

data/decidim-budgets/db/migrate/20170130101825_create_line_items.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CreateLineItems < ActiveRecord::Migration[5.0]
   def change
     create_table :decidim_budgets_line_items do |t|

data/decidim-budgets/db/migrate/20170207101750_remove_short_description_from_decidim_projects.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class RemoveShortDescriptionFromDecidimProjects < ActiveRecord::Migration[5.0]
   def change
     remove_column :decidim_budgets_projects, :short_description

data/decidim-budgets/db/migrate/20170215132708_add_reference_to_projects.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddReferenceToProjects < ActiveRecord::Migration[5.0]
   def change
     add_column :decidim_budgets_projects, :reference, :string

data/decidim-budgets/db/migrate/20170410074214_remove_not_null_reference_budgets.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class RemoveNotNullReferenceBudgets < ActiveRecord::Migration[5.0]
   def change
     change_column_null :decidim_budgets_projects, :reference, true

data/decidim-budgets/db/migrate/20170612101846_migrate_projects_category.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class MigrateProjectsCategory < ActiveRecord::Migration[5.1]
+  def change
+    # Create categorizations ensuring database integrity
+    execute('
+      INSERT INTO decidim_categorizations(decidim_category_id, categorizable_id, categorizable_type, created_at, updated_at)
+        SELECT decidim_category_id, decidim_budgets_projects.id, \'Decidim::Budgets::Project\', NOW(), NOW()
+        FROM decidim_budgets_projects
+        INNER JOIN decidim_categories ON decidim_categories.id = decidim_budgets_projects.decidim_category_id
+    ')
+    # Remove unused column
+    remove_column :decidim_budgets_projects, :decidim_category_id
+  end
+end

data/decidim-budgets/decidim-budgets.gemspec

@@ -1,4 +1,6 @@
-$:.push File.expand_path("../lib", __FILE__)
+# frozen_string_literal: true
+
+$LOAD_PATH.push File.expand_path("lib", __dir__)
 
 # Maintain your gem's version:
 require_relative "../decidim-core/lib/decidim/core/version"

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

@@ -65,13 +65,13 @@ Decidim.register_feature(:budgets) do |feature|
         Decidim::Attachment.create!(
           title: Decidim::Faker::Localized.sentence(2),
           description: Decidim::Faker::Localized.sentence(5),
-          file: File.new(File.join(File.dirname(__FILE__), "seeds", "city.jpeg")),
+          file: File.new(File.join(__dir__, "seeds", "city.jpeg")),
           attached_to: project
         )
         Decidim::Attachment.create!(
           title: Decidim::Faker::Localized.sentence(2),
           description: Decidim::Faker::Localized.sentence(5),
-          file: File.new(File.join(File.dirname(__FILE__), "seeds", "Exampledocument.pdf")),
+          file: File.new(File.join(__dir__, "seeds", "Exampledocument.pdf")),
           attached_to: project
         )
         Decidim::Comments::Seed.comments_for(project)

data/decidim-budgets/spec/features/admin_manages_project_attachments_spec.rb

@@ -1,10 +1,12 @@
 # frozen_string_literal: true
 
 require "spec_helper"
-require_relative "../shared/admin_shared_context"
-require_relative "../shared/manage_attachments_examples"
 
 describe "Admin manages project attachments", type: :feature do
-  include_context "admin"
+  let(:manifest_name) { "budgets" }
+  let!(:project) { create :project, scope: scope, feature: current_feature }
+
+  include_context "feature admin"
+
   it_behaves_like "manage project attachments"
 end

data/decidim-budgets/spec/features/admin_manages_projects_spec.rb

@@ -3,12 +3,10 @@
 require "spec_helper"
 
 describe "Admin manages projects", type: :feature do
-  include_context "admin"
-  it_behaves_like "manage projects"
+  let(:manifest_name) { "budgets" }
+  let!(:project) { create :project, scope: scope, feature: current_feature }
+
+  include_context "feature admin"
 
-  before do
-    switch_to_host(organization.host)
-    login_as user, scope: :user
-    visit decidim_admin.manage_feature_path(participatory_process_id: participatory_process, feature_id: current_feature)
-  end
+  it_behaves_like "manage projects"
 end

data/decidim-budgets/spec/features/process_admin_manages_project_attachments_spec.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
 require "spec_helper"
-require_relative "../shared/admin_shared_context"
-require_relative "../shared/manage_attachments_examples"
 
 describe "Process admin manages project attachments", type: :feature do
-  include_context "admin"
-  let(:user) { process_admin }
+  let(:manifest_name) { "budgets" }
+  let!(:project) { create :project, scope: scope, feature: current_feature }
+
+  include_context "feature process admin"
 
   it_behaves_like "manage project attachments"
 end

data/decidim-budgets/spec/features/process_admin_manages_projects_spec.rb

@@ -3,13 +3,10 @@
 require "spec_helper"
 
 describe "Process admin manages projects", type: :feature do
-  include_context "admin"
-  let(:user) { process_admin }
-  it_behaves_like "manage projects"
+  let(:manifest_name) { "budgets" }
+  let!(:project) { create :project, scope: scope, feature: current_feature }
+
+  include_context "feature process admin"
 
-  before do
-    switch_to_host(organization.host)
-    login_as user, scope: :user
-    visit decidim_admin.manage_feature_path(participatory_process_id: participatory_process, feature_id: current_feature)
-  end
+  it_behaves_like "manage projects"
 end

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

@@ -6,10 +6,6 @@ RSpec.shared_examples "manage project attachments" do
   let(:attached_to) { project }
 
   before do
-    switch_to_host(organization.host)
-    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(project.title)) do
       find("a.action-icon--attachments").click
     end

data/decidim-budgets/spec/shared/manage_projects_examples.rb

@@ -10,7 +10,7 @@ RSpec.shared_examples "manage projects" do
     within ".edit_project" do
       fill_in_i18n(
         :project_title,
-        "#title-tabs",
+        "#project-title-tabs",
         en: "My new title",
         es: "Mi nuevo título",
         ca: "El meu nou títol"
@@ -69,14 +69,14 @@ RSpec.shared_examples "manage projects" do
     within ".new_project" do
       fill_in_i18n(
         :project_title,
-        "#title-tabs",
+        "#project-title-tabs",
         en: "My project",
         es: "Mi proyecto",
         ca: "El meu projecte"
       )
       fill_in_i18n_editor(
         :project_description,
-        "#description-tabs",
+        "#project-description-tabs",
         en: "A longer description",
         es: "Descripción más larga",
         ca: "Descripció més llarga"