decidim 0.3.2 → 0.4.0

data/decidim-surveys/decidim-surveys.gemspec

@@ -9,8 +9,8 @@ require_relative "../decidim-core/lib/decidim/core/version"
 Gem::Specification.new do |s|
   Decidim.add_default_gemspec_properties(s)
 
-  s.name        = "decidim-surveys"
-  s.summary     = "A component for decidim's participatory processes."
+  s.name = "decidim-surveys"
+  s.summary = "A component for decidim's participatory processes."
   s.description = s.summary
 
   s.files = Dir["{app,config,db,lib}/**/*", "Rakefile", "README.md"]

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

@@ -53,7 +53,7 @@ Decidim.register_feature(:surveys) do |feature|
   end
 
   feature.seeds do
-    Decidim::ParticipatoryProcess.all.each do |process|
+    Decidim::ParticipatoryProcess.find_each do |process|
       next unless process.steps.any?
 
       feature = Decidim::Feature.create!(
@@ -77,7 +77,8 @@ Decidim.register_feature(:surveys) do |feature|
       3.times do
         Decidim::Surveys::SurveyQuestion.create!(
           survey: survey,
-          body: Decidim::Faker::Localized.paragraph
+          body: Decidim::Faker::Localized.paragraph,
+          question_type: "short_answer"
         )
       end
     end

data/decidim-surveys/spec/forms/decidim/surveys/admin/survey_question_form_spec.rb

@@ -9,7 +9,7 @@ module Decidim
         let!(:survey) { create(:survey) }
         let!(:position) { 0 }
         let!(:question_type) { SurveyQuestion::TYPES.first }
-        let!(:survey_question) { create(:survey_question, survey: survey, position: position, question_type: question_type) }
+        let!(:survey_question) { build(:survey_question, survey: survey, position: position, question_type: question_type) }
 
         subject do
           described_class.from_model(survey_question).with_context(current_feature: survey.feature)

data/decidim-surveys/spec/models/decidim/surveys/survey_question_spec.rb

@@ -6,7 +6,8 @@ module Decidim
   module Surveys
     describe SurveyQuestion do
       let(:survey) { create(:survey) }
-      let(:survey_question) { create(:survey_question, survey: survey) }
+      let(:question_type) { "short_answer" }
+      let(:survey_question) { build(:survey_question, survey: survey, question_type: question_type) }
       subject { survey_question }
 
       it { is_expected.to be_valid }
@@ -14,6 +15,11 @@ module Decidim
       it "has an association of survey" do
         expect(subject.survey).to eq(survey)
       end
+
+      context "when question type doesn't exists in allowed types" do
+        let(:question_type) { "foo" }
+        it { is_expected.not_to be_valid }
+      end
     end
   end
 end

data/decidim-surveys/spec/spec_helper.rb

@@ -1,4 +1,9 @@
 # frozen_string_literal: true
 
+require "decidim/dev"
+
 ENV["ENGINE_NAME"] = File.dirname(__dir__).split("/").last
+
+Decidim::Dev.dummy_app_path = File.expand_path(File.join("..", "spec", "decidim_dummy_app"))
+
 require "decidim/dev/test/base_spec_helper"

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

@@ -6,12 +6,12 @@ module Decidim
     class ApplicationController < ActionController::Base
       include FormFactory
       include PayloadInfo
+
       protect_from_forgery with: :exception, prepend: true
 
       helper Decidim::TranslationsHelper
       helper Decidim::DecidimFormHelper
       helper Decidim::ReplaceButtonsHelper
-
       helper Decidim::System::MenuHelper
     end
   end

data/decidim-system/app/controllers/decidim/system/devise/sessions_controller.rb

@@ -7,6 +7,7 @@ module Decidim
       # and views.
       class SessionsController < ::Devise::SessionsController
         helper Decidim::DecidimFormHelper
+
         layout "decidim/system/login"
       end
     end

data/decidim-system/app/helpers/decidim/system/menu_helper.rb

@@ -6,7 +6,7 @@ module Decidim
     module MenuHelper
       # Public: Returns the main menu presenter object
       def main_menu
-        @main_menu ||= MenuPresenter.new(:system_menu, self)
+        @main_menu ||= ::Decidim::MenuPresenter.new(:system_menu, self)
       end
     end
   end

data/decidim-system/app/views/decidim/system/shared/_notices.html.erb

@@ -0,0 +1,11 @@
+<%= display_flash_messages %>
+
+<% if Decidim::Organization.none? %>
+  <div class="flash callout warning">
+    <% guide = link_to t(".our_getting_started_guide"),
+                       "https://github.com/decidim/decidim/blob/master/docs/getting_started.md",
+                       target: :blank %>
+
+    <%= t(".no_organization_warning_html", guide: guide) %>
+  </div>
+<% end %>

data/decidim-system/app/views/layouts/decidim/system/application.html.erb

@@ -29,7 +29,7 @@
               </section>
             <% end %>
 
-            <%= display_flash_messages %>
+            <%= render "decidim/system/shared/notices" %>
             <%= yield %>
           </div>
         </div>

data/decidim-system/app/views/layouts/decidim/system/login.html.erb

@@ -9,7 +9,7 @@
     <div class="login-form-wrapper">
       <div class="login-form">
         <h1>Decidim</h1>
-        <%= display_flash_messages %>
+        <%= render "decidim/system/shared/notices" %>
         <div class="login-form-inner">
           <%= yield %>
         </div>

data/decidim-system/bin/rails

@@ -8,8 +8,8 @@ ENGINE_ROOT = File.expand_path("..", __dir__)
 ENGINE_PATH = File.expand_path("../lib/decidim/system/engine", __dir__)
 
 # Set up gems listed in the Gemfile.
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
-require "bundler/setup" if File.exist?(ENV["BUNDLE_GEMFILE"])
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile", __dir__)
+require "bundler/setup"
 
 require "rails/all"
 require "rails/engine/commands"

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

@@ -64,5 +64,9 @@ ca:
         update:
           error: S'ha produït un error en actualitzar aquesta organització.
           success: L'organització s'ha actualitzat correctament.
+      shared:
+        notices:
+          no_organization_warning_html: Has de crear una organització per començar. Assegura't de llegir %{guide} abans.
+          our_getting_started_guide: la guia d'introducció
       titles:
         dashboard: Tauler de control

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

@@ -65,5 +65,9 @@ en:
         update:
           error: There was an error when updating this organization.
           success: Organization updated successfully.
+      shared:
+        notices:
+          no_organization_warning_html: You must create an organization to get started. Make sure you read %{guide} before proceeding.
+          our_getting_started_guide: our getting started guide
       titles:
         dashboard: Dashboard

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

@@ -64,5 +64,9 @@ es:
         update:
           error: Se ha producido un error al actualizar esta organización.
           success: Organización actualizada correctamente.
+      shared:
+        notices:
+          no_organization_warning_html: Debes crear una organización para comenzar. Asegúrate de leer %{guide} antes de continuar.
+          our_getting_started_guide: nuestra guía de inicio
       titles:
         dashboard: Panel de control

data/decidim-system/db/migrate/20160919105637_devise_create_decidim_admins.rb

@@ -4,25 +4,25 @@ class DeviseCreateDecidimAdmins < ActiveRecord::Migration[5.0]
   def change
     create_table :decidim_system_admins do |t|
       ## Database authenticatable
-      t.string :email,              null: false, default: ""
+      t.string :email, null: false, default: ""
       t.string :encrypted_password, null: false, default: ""
 
       ## Recoverable
-      t.string   :reset_password_token
+      t.string :reset_password_token
       t.datetime :reset_password_sent_at
 
       ## Rememberable
       t.datetime :remember_created_at
 
       ## Lockable
-      t.integer  :failed_attempts, default: 0, null: false # Only if lock strategy is :failed_attempts
-      t.string   :unlock_token # Only if unlock strategy is :email or :both
+      t.integer :failed_attempts, default: 0, null: false # Only if lock strategy is :failed_attempts
+      t.string :unlock_token # Only if unlock strategy is :email or :both
       t.datetime :locked_at
 
       t.timestamps null: false
     end
 
-    add_index :decidim_system_admins, :email,                unique: true
+    add_index :decidim_system_admins, :email, unique: true
     add_index :decidim_system_admins, :reset_password_token, unique: true
   end
 end

data/decidim-system/db/seeds.rb

@@ -7,7 +7,7 @@ if !Rails.env.production? || ENV["SEED"]
     password_confirmation: "decidim123456"
   )
 
-  Decidim::Organization.all.each do |organization|
+  Decidim::Organization.find_each do |organization|
     Decidim::System::CreateDefaultPages.call(organization)
   end
 end

data/decidim-system/decidim-system.gemspec

@@ -9,8 +9,8 @@ require_relative "../decidim-core/lib/decidim/core/version"
 Gem::Specification.new do |s|
   Decidim.add_default_gemspec_properties(s)
 
-  s.name        = "decidim-system"
-  s.summary     = "System administration"
+  s.name = "decidim-system"
+  s.summary = "System administration"
   s.description = "System administration to create new organization in an installation."
 
   s.files = Dir["{app,config,db,lib,vendor}/**/*", "Rakefile", "README.md"]

data/decidim-system/spec/factories.rb

@@ -4,8 +4,8 @@ require "decidim/core/test/factories"
 
 FactoryGirl.define do
   factory :admin, class: Decidim::System::Admin do
-    sequence(:email)      { |n| "admin#{n}@citizen.corp" }
-    password              "password1234"
+    sequence(:email) { |n| "admin#{n}@citizen.corp" }
+    password "password1234"
     password_confirmation "password1234"
   end
 end

data/decidim-system/spec/features/manage_admins_spec.rb

@@ -22,7 +22,7 @@ describe "Manage admins", type: :feature do
       find("*[type=submit]").click
     end
 
-    within ".flash" do
+    within ".success.flash" do
       expect(page).to have_content("successfully")
     end
 
@@ -42,7 +42,7 @@ describe "Manage admins", type: :feature do
       find("*[type=submit]").click
     end
 
-    within ".flash" do
+    within ".success.flash" do
       expect(page).to have_content("successfully")
     end
 
@@ -56,7 +56,7 @@ describe "Manage admins", type: :feature do
       click_link "Destroy"
     end
 
-    within ".flash" do
+    within ".success.flash" do
       expect(page).to have_content("successfully")
     end
 

data/decidim-system/spec/spec_helper.rb

@@ -1,7 +1,11 @@
 # frozen_string_literal: true
 
+require "decidim/dev"
+
 ENV["ENGINE_NAME"] = File.dirname(__dir__).split("/").last
 
+Decidim::Dev.dummy_app_path = File.expand_path(File.join("..", "spec", "decidim_dummy_app"))
+
 require "decidim/dev/test/base_spec_helper"
 
 Dir["#{__dir__}/support/**/*.rb"].each { |f| require f }

data/decidim.gemspec

@@ -9,14 +9,14 @@ require_relative "decidim-core/lib/decidim/core/version"
 Gem::Specification.new do |spec|
   Decidim.add_default_gemspec_properties(spec)
 
-  spec.name          = "decidim"
+  spec.name = "decidim"
 
-  spec.summary       = "Citizen participation framework for Ruby on Rails."
-  spec.description   = "Citizen participation framework for Ruby on Rails."
+  spec.summary = "Citizen participation framework for Ruby on Rails."
+  spec.description = "Citizen participation framework for Ruby on Rails."
 
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features|decidim-core)/}) }
-  spec.bindir        = "bin"
-  spec.executables   = ["decidim"]
+  spec.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features|decidim-core)/}) }
+  spec.bindir = "bin"
+  spec.executables = ["decidim"]
   spec.require_paths = ["lib"]
 
   spec.add_dependency "decidim-core", Decidim.version

data/docs/how_to_create_a_plugin.md

@@ -44,8 +44,8 @@
     ENGINE_PATH = File.expand_path("..lib/decidim/<engine_name>/engine", __dir__)
 
     # Set up gems listed in the Gemfile.
-    ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
-    require "bundler/setup" if File.exist?(ENV["BUNDLE_GEMFILE"])
+    ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile", __dir__)
+    require "bundler/setup"
 
     require "rails/all"
     require "rails/engine/commands"

data/lib/generators/decidim/app_generator.rb

@@ -96,7 +96,7 @@ module Decidim
 
       def set_locales
         inject_into_file "config/application.rb", after: "class Application < Rails::Application" do
-          "\n    config.i18n.available_locales = %w(en ca es)\n    config.i18n.default_locale = :en"
+          "\n    config.i18n.available_locales = Decidim.available_locales\n    config.i18n.default_locale = Decidim.default_locale"
         end
       end
 

data/lib/generators/decidim/install_generator.rb

@@ -67,39 +67,47 @@ module Decidim
       def smtp_environment
         inject_into_file "config/environments/production.rb",
                          after: "config.log_formatter = ::Logger::Formatter.new" do
-          %(
-
-  config.action_mailer.smtp_settings = {
-    :address        => Rails.application.secrets.smtp_address,
-    :port           => Rails.application.secrets.smtp_port,
-    :authentication => Rails.application.secrets.smtp_authentication,
-    :user_name      => Rails.application.secrets.smtp_username,
-    :password       => Rails.application.secrets.smtp_password,
-    :domain         => Rails.application.secrets.smtp_domain,
-    :enable_starttls_auto => Rails.application.secrets.smtp_starttls_auto,
-    :openssl_verify_mode => 'none'
-  }
-
-  if Rails.application.secrets.sendgrid
-    config.action_mailer.default_options = {
-      "X-SMTPAPI" => {
-        filters:  {
-          clicktrack: { settings: { enable: 0 } },
-          opentrack:  { settings: { enable: 0 } }
-        }
-      }.to_json
-    }
-  end
-          )
+          <<~RUBY.gsub(/^ *\|/, "")
+            |
+            |  config.action_mailer.smtp_settings = {
+            |    :address        => Rails.application.secrets.smtp_address,
+            |    :port           => Rails.application.secrets.smtp_port,
+            |    :authentication => Rails.application.secrets.smtp_authentication,
+            |    :user_name      => Rails.application.secrets.smtp_username,
+            |    :password       => Rails.application.secrets.smtp_password,
+            |    :domain         => Rails.application.secrets.smtp_domain,
+            |    :enable_starttls_auto => Rails.application.secrets.smtp_starttls_auto,
+            |    :openssl_verify_mode => 'none'
+            |  }
+            |
+            |  if Rails.application.secrets.sendgrid
+            |    config.action_mailer.default_options = {
+            |      "X-SMTPAPI" => {
+            |        filters:  {
+            |          clicktrack: { settings: { enable: 0 } },
+            |          opentrack:  { settings: { enable: 0 } }
+            |        }
+            |      }.to_json
+            |    }
+            |  end
+          RUBY
         end
       end
 
       def letter_opener_web
+        route <<~RUBY.gsub(/^ *\|/, "")
+          |
+          |  if Rails.env.development?
+          |   mount LetterOpenerWeb::Engine, at: "/letter_opener"
+          |  end
+        RUBY
+
         inject_into_file "config/environments/development.rb",
                          after: "config.action_mailer.raise_delivery_errors = false" do
-          %(
-
-  config.action_mailer.delivery_method = :letter_opener_web)
+          <<~RUBY.gsub(/^ *\|/, "")
+            |
+            |  config.action_mailer.delivery_method = :letter_opener_web
+          RUBY
         end
       end
 

data/lib/generators/decidim/templates/Gemfile.erb

@@ -32,6 +32,7 @@ group :development do
   gem 'listen', '~> 3.1.0'
   gem 'spring'
   gem 'spring-watcher-listen', '~> 2.0.0'
+  gem 'letter_opener_web', '~> 1.3.0'
 end
 
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem

data/lib/generators/decidim/templates/initializer.rb

@@ -3,7 +3,7 @@
 
 Decidim.configure do |config|
   config.application_name = "My Application Name"
-  config.mailer_sender    = "change-me@domain.org"
+  config.mailer_sender = "change-me@domain.org"
   config.authorization_handlers = [ExampleAuthorizationHandler]
 
   # Uncomment this lines to set your preferred locales
@@ -16,6 +16,12 @@ Decidim.configure do |config|
   #   here_app_code: Rails.application.secrets.geocoder[:here_app_code]
   # }
 
+  # Custom calculate reference method
+  # config.calculate_reference_method = lambda do |resource|
+  #   # Implement your custom method to generate resources references
+  #   "1234-#{resource.id}"
+  # end
+
   # Currency unit
   # config.currency_unit = "€"