decidim 0.0.8.1 → 0.1.0

data/decidim-results/spec/services/result_search_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "spec_helper"
 
 describe Decidim::Results::ResultSearch do
@@ -35,7 +36,7 @@ describe Decidim::Results::ResultSearch do
       let(:default_params) { { feature: nil } }
 
       it "raises an error" do
-        expect{ subject.results }.to raise_error(StandardError, "Missing feature")
+        expect { subject.results }.to raise_error(StandardError, "Missing feature")
       end
     end
   end
@@ -62,12 +63,12 @@ describe Decidim::Results::ResultSearch do
         let(:params) { default_params.merge(scope_id: [scope2.id, scope1.id]) }
 
         it "filters results by scope" do
-          expect(subject.results).to match_array [result1,result2]
+          expect(subject.results).to match_array [result1, result2]
         end
       end
 
       context "when `global` is being sent" do
-        let!(:resource_without_scope) { create(:result, feature: current_feature, scope: nil)}
+        let!(:resource_without_scope) { create(:result, feature: current_feature, scope: nil) }
         let(:params) { default_params.merge(scope_id: ["global"]) }
 
         it "returns resources without a scope" do

data/decidim-results/spec/services/result_stats_calculator_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "spec_helper"
 
 describe Decidim::Results::ResultStatsCalculator do

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 RSpec.shared_context "admin" do
   let(:organization) { create(:organization) }
   let!(:user) { create(:user, :admin, :confirmed, organization: organization, email: "admin@example.org") }

data/decidim-results/spec/spec_helper.rb

@@ -1,2 +1,3 @@
+# frozen_string_literal: true
 ENV["ENGINE_NAME"] = File.dirname(File.dirname(__FILE__)).split("/").last
 require "decidim/dev/test/base_spec_helper"

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

@@ -2,4 +2,67 @@ fr:
   decidim:
     system:
       actions:
-        destroy: Détruire
+        confirm_destroy: Êtes-vous sûr de vouloir supprimer cela?
+        destroy: Détruire
+        edit: Modifier
+        new: Nouveau
+        save: Sauvegarder
+        title: Actions
+      admins:
+        create:
+          error: Une erreur s'est produite lors de la création d'un nouvel administrateur.
+          success: Admin créé avec succès
+        destroy:
+          success: L'admin a détruit avec succès
+        edit:
+          title: Modifier l'administrateur
+          update: Mettre à jour
+        index:
+          title: Administrateurs
+        new:
+          create: Créer
+          title: Nouvel administrateur
+        update:
+          error: Une erreur s'est produite lors de la mise à jour de cet administrateur.
+          success: Administrateur mis à jour avec succès
+      default_pages:
+        placeholders:
+          content: Ajoutez du contenu pertinent à cette page en allant sur l'interface d'administration.
+          title: Titre par défaut pour %{page}
+      menu:
+        admins: Administrateurs
+        dashboard: Tableau de bord
+        organizations: Organisations
+      models:
+        admin:
+          fields:
+            created_at: Crée le
+            email: Courriel
+          name: Administrateur
+          validations:
+            email_uniqueness: un autre administrateur avec la même adresse email existe déjà
+        organization:
+          actions:
+            save_and_invite: Créer une organisation et inviter un administrateur
+          fields:
+            created_at: Crée le
+            name: Nom
+          name: Organisation
+        page:
+          name: Page
+      organizations:
+        create:
+          error: Une erreur s'est produite lors de la création d'une nouvelle organisation.
+          success: Organisation créée avec succès.
+        edit:
+          secondary_hosts_hint: Entrez chacun d'eux dans une nouvelle ligne
+        index:
+          title: Organisations
+        new:
+          secondary_hosts_hint: Entrez chacun d'eux dans une nouvelle ligne
+          title: Nouvelle organisation
+        update:
+          error: Une erreur s'est produite lors de la mise à jour de cette organisation.
+          success: Organisation mise à jour avec succès.
+      titles:
+        dashboard: Tableau de bord

data/decidim-system/decidim-system.gemspec

@@ -12,16 +12,16 @@ Gem::Specification.new do |s|
   s.summary     = "System administration"
   s.description = "System administration to create new organization in an installation."
 
-  s.files = Dir["{app,config,db,lib,vendor}/**/*", "LICENSE.txt", "Rakefile", "README.md"]
+  s.files = Dir["{app,config,db,lib,vendor}/**/*", "Rakefile", "README.md"]
 
   s.add_dependency "decidim-core", Decidim.version
   s.add_dependency "rails", *Decidim.rails_version
   s.add_dependency "devise", "~> 4.2"
   s.add_dependency "devise-i18n", "~> 1.1.0"
-  s.add_dependency "rectify", "~> 0.8.0"
+  s.add_dependency "rectify", "~> 0.9.1"
   s.add_dependency "devise_invitable", "~> 1.7.1"
   s.add_dependency "sassc-rails", "~> 1.3.0"
-  s.add_dependency "jquery-rails", "~> 4.2.2"
+  s.add_dependency "jquery-rails", "~> 4.3.1"
   s.add_dependency "foundation_rails_helper", "~> 3.0.0.rc"
   s.add_dependency "active_link_to", "~> 1.0.0"
 

data/decidim-system/spec/factories.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "decidim/core/test/factories"
 
 FactoryGirl.define do

data/decidim-system/spec/spec_helper.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 ENV["ENGINE_NAME"] = File.dirname(File.dirname(__FILE__)).split("/").last
 require "decidim/dev/test/base_spec_helper"
 

data/docs/how_to_create_a_plugin.md

@@ -1,183 +1,161 @@
 # How to create a Decidim engine
 
-1. Run the following command:
-```bash
-- rails plugin new decidim-<engine_name>
-```
-
-2. Change the `decidim-<engine_name>.gemspec` file:
-
-> Change this:
-
-```ruby
-$:.push File.expand_path("../lib", __FILE__)
-```
-
-> Into this:
-
-```ruby
-# frozen_string_literal: true
-$LOAD_PATH.push File.expand_path("../lib", __FILE__)
-```
-
----
-
-> Change this:
-
-```ruby
-require "decidim/<engine_name>/version"
-```
-
-> Into this:
-
-```ruby
-require_relative "../decidim-core/lib/decidim/core/version"
-```
-
----
-
-> Add this:
+## Standard way
 
-```ruby
-Gem::Specification.new do |s|
-  Decidim.add_default_gemspec_properties(s)
-
-  s.files = Dir["{app,config,db,lib,vendor}/**/*", "LICENSE.txt", "Rakefile", "README.md"]
-```
+1. Run the following command:
 
----
+    ```
+    rails plugin new decidim-<engine_name> --skip-gemfile --skip-test --skip-gemspec
+    ```
 
-> Remove this:
+1. Create a `decidim-<engine_name>.gemspec` file with this content:
 
-```ruby
-s.version     = Decidim::<EngineName>::VERSION
-s.authors     = [""]
-s.email       = [""]
-s.homepage    = "TODO"
-s.license     = "MIT"
-```
+    ```ruby
+    # frozen_string_literal: true
+    $LOAD_PATH.push File.expand_path("../lib", __FILE__)
 
----
+    require_relative "../decidim-core/lib/decidim/core/version"
 
-> Add this:
+    Gem::Specification.new do |s|
+      Decidim.add_default_gemspec_properties(s)
 
-```ruby
-s.add_dependency "decidim-core", Decidim.version
-```
+      s.files = Dir["{app,config,db,lib,vendor}/**/*", "Rakefile", "README.md"]
 
----
+      s.add_dependency "decidim-core", Decidim.version
+      s.add_dependency "rails", *Decidim.rails_version
 
-> Remove this:
+      s.add_development_dependency "decidim-dev", Decidim.version
 
-```ruby
-s.add_dependency "rails", "~> 5.0.0", ">= 5.0.0.1"
-s.add_development_dependency "sqlite3"
-```
+      # Add more dependencies as needed:
+      s.add_dependency "foundation-rails", "~> 6.2.4.0"
+      s.add_dependency "autoprefixer-rails", ["~> 6.7", ">= 6.7.4"]
+      s.add_dependency "sass-rails", "~> 5.0.0"
+      s.add_dependency "jquery-rails", "~> 4.0"
+      s.add_dependency "foundation_rails_helper", "~> 2.0.0"
+    end
+    ```
 
-> And add this instead:
+1. Remove `bin/test` and add `bin/rails` with this content:
 
-```ruby
-s.add_dependency "rails", *Decidim.rails_version
-s.add_development_dependency "decidim-dev", Decidim.version
-```
+    ```ruby
+    #!/usr/bin/env ruby
+    # frozen_string_literal: true
+    # 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/<engine_name>/engine", __FILE__)
 
-> Add more dependencies as needed:
+    # Set up gems listed in the Gemfile.
+    ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile", __FILE__)
+    require "bundler/setup" if File.exist?(ENV["BUNDLE_GEMFILE"])
 
-```ruby
-s.add_dependency "foundation-rails", "~> 6.2.4.0"
-s.add_dependency "autoprefixer-rails", ["~> 6.7", ">= 6.7.4"]
-s.add_dependency "sass-rails", "~> 5.0.0"
-s.add_dependency "jquery-rails", "~> 4.0"
-s.add_dependency "foundation_rails_helper", "~> 2.0.0"
-```
+    require "rails/all"
+    require "rails/engine/commands"
+    ```
 
----
+1. Change `lib/decidim/<engine_name>.rb`
 
-3. Replace `Gemfile` content with this:
+    Add this
 
-```ruby
-source 'https://rubygems.org'
+    ```ruby
+    # frozen_string_literal: true
+    require "decidim/<engine_name>/engine"
+    ```
 
-gem 'decidim', path: '..'
-gemspec
+1. Remove `lib/decidim/<engine_name>/version.rb`
 
-eval(File.read(File.join(File.dirname(__FILE__), "..", "Gemfile.common")))
-```
+1. Add `lib/decidim/<engine_name>/engine.rb` with this:
 
-4. Remove `test` folder
+    ```ruby
+    # frozen_string_literal: true
+    require "rails"
+    require "active_support/all"
 
-5. Remove `bin/test` and add `bin/rails` with this content:
+    require "decidim/core"
+    require "jquery-rails"
+    require "sass-rails"
+    require "foundation-rails"
+    require "foundation_rails_helper"
+    require "autoprefixer-rails"
 
-```ruby
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-# This command will automatically be run when you run "rails" with Rails gems
-# installed from the root of your application.
+    module Decidim
+      module <EngineName>
+        # Decidim's core Rails Engine.
+        class Engine < ::Rails::Engine
+          isolate_namespace Decidim::<EngineName>
 
-ENGINE_ROOT = File.expand_path("../..", __FILE__)
-ENGINE_PATH = File.expand_path("../../lib/decidim/<engine_name>/engine", __FILE__)
+          initializer "decidim_<engine_name>.assets" do |app|
+            app.config.assets.precompile += %w(decidim_<engine_name>_manifest.js)
+          end
+        end
+      end
+    end
+    ```
 
-# Set up gems listed in the Gemfile.
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile", __FILE__)
-require "bundler/setup" if File.exist?(ENV["BUNDLE_GEMFILE"])
+1. Add `lib/decidim/<engine_name>/feature.rb` with this:
 
-require "rails/all"
-require "rails/engine/commands"
-```
+    ```ruby
+    # frozen_string_literal: true
 
-6. Change `lib/decidim/<engine_name>.rb`
+    require_dependency "decidim/features/namer"
 
-> Add this
+    Decidim.register_feature(:<engine_name>) do |feature|
+      feature.engine = Decidim::<EngineName>::Engine
+      feature.admin_engine = Decidim::<EngineName>::AdminEngine
+      feature.icon = "decidim/<engine_name>/icon.svg"
 
-```ruby
-# frozen_string_literal: true
-require "decidim/<engine_name>/engine"
-```
+      feature.on(:before_destroy) do |instance|
+        # Code executed before removing the feature
+      end
 
-7. Remove `lib/decidim/<engine_name>/version.rb`
+      # These actions permissions can be configured in the admin panel
+      feature.actions = %w()
 
-8. Add `lib/decidim/<engine_name>/engine.rb` with this:
+      feature.settings(:global) do |settings|
+        # Add your global settings
+        # Available types: :integer, :boolean
+        # settings.attribute :vote_limit, type: :integer, default: 0
+      end
 
-```ruby
-# frozen_string_literal: true
-require "rails"
-require "active_support/all"
+      feature.settings(:step) do |settings|
+        # Add your settings per step
+      end
 
-require "decidim/core"
-require "jquery-rails"
-require "sass-rails"
-require "foundation-rails"
-require "foundation_rails_helper"
-require "autoprefixer-rails"
+      feature.register_resource do |resource|
+        # Register a optional resource that can be references from other resources.
+        # resource.model_class_name = "Decidim::<EngineName>::<ResourceName>"
+        # resource.template = "decidim/<engine_name>/<resource_view_folder>/linked_<resource_name_plural>"
+      end
 
-module Decidim
-  module <EngineName>
-    # Decidim's core Rails Engine.
-    class Engine < ::Rails::Engine
-      isolate_namespace Decidim::<EngineName>
+      feature.register_stat :some_stat do |features, start_at, end_at|
+        # Register some stat number to the application
+      end
 
-      initializer "decidim_<engine_name>.assets" do |app|
-        app.config.assets.precompile += %w(decidim_<engine_name>_manifest.js)
+      feature.seeds do
+        # Add some seeds for this feature
       end
     end
-  end
-end
-```
+    ```
+
+1. Replace `Rakefile` with:
+
+    ```ruby
+    # frozen_string_literal: true
+    require "decidim/common_rake"
+    ```
 
-9. Replace `Rakefile` with:
+1. Remove `MIT-LICENSE` and change `README`
 
-```ruby
-# frozen_string_literal: true
-require "decidim/common_rake"
-```
+1. Add `spec/spec_helper.rb` with:
 
-10. Remove `license` and change `README`
+    ```ruby
+    ENV["ENGINE_NAME"] = File.dirname(File.dirname(__FILE__)).split("/").last
+    require "decidim/test/base_spec_helper"
+    ```
 
-11. Add `spec/spec_helper.rb` with:
+## Experimental way
 
-```ruby
-ENV["ENGINE_NAME"] = File.dirname(File.dirname(__FILE__)).split("/").last
-require "decidim/test/base_spec_helper"
-```
+Plugin creation is being automated in
+[decidim-generators](https://github.com/codegram/decidim-generators). It's in an
+early stage, but you might want to give it a try.

data/lib/generators/decidim/install_generator.rb

@@ -54,7 +54,7 @@ Decidim.seed!
 
       def append_assets
         append_file "app/assets/javascripts/application.js", "//= require decidim"
-        gsub_file "app/assets/javascripts/application.js", /\/\/= require turbolinks\n/, ""
+        gsub_file "app/assets/javascripts/application.js", %r{//= require turbolinks\n}, ""
         inject_into_file "app/assets/stylesheets/application.css",
                          before: "*= require_tree ." do
           "*= require decidim\n "