decidim 0.0.5 → 0.0.6

data/decidim-system/app/views/decidim/system/organizations/edit.html.erb

@@ -7,6 +7,16 @@
     <%= f.text_field :host %>
   </div>
 
+  <div class="field">
+    <%= f.text_area :secondary_hosts %>
+    <p class="help-text"><%= t(".secondary_hosts_hint") %></p>
+  </div>
+
+  <div class="field">
+    <%= f.label :available_authorizations %>
+    <%= f.collection_check_boxes :available_authorizations, Decidim.authorization_handlers, :name, :name %>
+  </div>
+
   <div class="actions">
     <%= f.submit t("decidim.system.actions.save") %>
   </div>

data/decidim-system/app/views/decidim/system/organizations/new.html.erb

@@ -7,10 +7,19 @@
     <%= f.text_field :name, autofocus: true %>
   </div>
 
+  <div class="field">
+    <%= f.text_field :reference_prefix %>
+  </div>
+
   <div class="field">
     <%= f.text_field :host %>
   </div>
 
+  <div class="field">
+    <%= f.text_area :secondary_hosts %>
+    <p class="help-text"><%= t(".secondary_hosts_hint") %></p>
+  </div>
+
   <div class="field">
     <%= f.text_field :organization_admin_name %>
   </div>
@@ -20,29 +29,34 @@
   </div>
 
   <%= f.fields_for :locales do |fields| %>
-  <div class="field">
-    <%= f.label :organization_locales, '', class: @form.respond_to?(:errors) && @form.errors[:default_locale].present? ? "is-invalid-label" : "" %>
-    <table>
-      <thead>
-        <tr>
-          <td>Locale</td>
-          <td>Enabled <%= f.error_for(:available_locales) %></td>
-          <td>Default? <%= f.error_for(:default_locale) %></td>
-        </tr>
-      </thead>
-      <tbody>
-        <% localized_locales.each do |locale| %>
+    <div class="field">
+      <%= f.label :organization_locales, '', class: @form.respond_to?(:errors) && @form.errors[:default_locale].present? ? "is-invalid-label" : "" %>
+      <table>
+        <thead>
           <tr>
-            <td><%= locale.name %></td>
-            <td><%= check_box_tag "organization[available_locales][#{locale.id}]", locale.id, @form.available_locales.include?(locale.id) %></td>
-            <td><%= radio_button_tag "organization[default_locale]", locale.id, @form.default_locale == locale.id %></td>
+            <td>Locale</td>
+            <td>Enabled <%= f.error_for(:available_locales) %></td>
+            <td>Default? <%= f.error_for(:default_locale) %></td>
           </tr>
-        <% end %>
-      </tbody>
-    </table>
-  </div>
+        </thead>
+        <tbody>
+          <% localized_locales.each do |locale| %>
+            <tr>
+              <td><%= locale.name %></td>
+              <td><%= check_box_tag "organization[available_locales][#{locale.id}]", locale.id, @form.available_locales.include?(locale.id) %></td>
+              <td><%= radio_button_tag "organization[default_locale]", locale.id, @form.default_locale == locale.id %></td>
+            </tr>
+          <% end %>
+        </tbody>
+      </table>
+    </div>
   <% end %>
 
+  <div class="field">
+    <%= f.label :available_authorizations %>
+    <%= f.collection_check_boxes :available_authorizations, Decidim.authorization_handlers, :name, :name %>
+  </div>
+
   <div class="actions">
     <%= f.submit t("decidim.system.models.organization.actions.save_and_invite") %>
   </div>

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

@@ -54,9 +54,12 @@ ca:
         create:
           error: S'ha produït un error en crear una nova organització.
           success: L'organització s'ha creat correctament.
+        edit:
+          secondary_hosts_hint: Introdueix cada un d'ells en una nova línia
         index:
           title: Organitzacions
         new:
+          secondary_hosts_hint: Introdueix cada un d'ells en una nova línia
           title: Nova organització
         update:
           error: S'ha produït un error en actualitzar aquesta organització.

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

@@ -55,9 +55,12 @@ en:
         create:
           error: There was an error when creating a new organization.
           success: Organization created successfully.
+        edit:
+          secondary_hosts_hint: Enter each one of them in a new line
         index:
           title: Organizations
         new:
+          secondary_hosts_hint: Enter each one of them in a new line
           title: New organization
         update:
           error: There was an error when updating this organization.

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

@@ -54,9 +54,12 @@ es:
         create:
           error: Se ha producido un error al crear una nueva organización.
           success: Organización creada correctamente.
+        edit:
+          secondary_hosts_hint: Introduce cada uno de ellos en una nueva línea
         index:
           title: Organizaciones
         new:
+          secondary_hosts_hint: Introduce cada uno de ellos en una nueva línea
           title: Nueva organización
         update:
           error: Se ha producido un error al actualizar esta organización.

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

@@ -1,6 +1,9 @@
 eu:
   decidim:
     system:
+      admins:
+        create:
+          success: Admin sortu da
       models:
         admin:
           fields:

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

@@ -0,0 +1,68 @@
+fi:
+  decidim:
+    system:
+      actions:
+        confirm_destroy: Haluatko varmasti poistaa tämän?
+        destroy: Poista
+        edit: Muokkaa
+        new: Uusi %{name}
+        save: Tallenna
+        title: Toiminnot
+      admins:
+        create:
+          error: Uuden hallinnoijan luonnissa tapahtui virhe.
+          success: Hallinnoija luotu onnistuneesti
+        destroy:
+          success: Hallinnoija poistettu onnistuneesti
+        edit:
+          title: Muokkaa hallinnoijaa
+          update: Päivitä hallinnoija
+        index:
+          title: Hallinnoijat
+        new:
+          create: Luo hallinnoija
+          title: Uusi hallinnoija
+        update:
+          error: Hallinnoijan päivityksessä tapahtui virhe.
+          success: Hallinnoija päivitetty onnistuneesti
+      default_pages:
+        placeholders:
+          content: Lisää sisältöä tälle sivulle hallintapaneelista.
+          title: Oletusotsikko sivulle %{page}
+      menu:
+        admins: Hallinnoijat
+        dashboard: Hallintapaneeli
+        organizations: Organisaatiot
+      models:
+        admin:
+          fields:
+            created_at: Luotu
+            email: Sähköposti
+          name: Hallinnoija
+          validations:
+            email_uniqueness: toinen hallinnointikäyttäjä on jo olemassa samalla sähköpostilla
+        organization:
+          actions:
+            save_and_invite: Luo organisaatioita ja kutsu hallinnointikäyttäjiä
+          fields:
+            created_at: Luotu
+            name: Nimi
+          name: Organisaatio
+        page:
+          name: Sivu
+      organizations:
+        create:
+          error: Uuden organisaation luonnissa tapahtui virhe.
+          success: Organisaatio luotu onnistuneesti.
+        edit:
+          secondary_hosts_hint: Syötä jokainen niistä omalle rivilleen
+        index:
+          title: Organisaatiot
+        new:
+          secondary_hosts_hint: Syötä jokainen niistä omalle rivilleen
+          title: Uusi organisaatio
+        update:
+          error: Organisaation päivityksessä tapahtui virhe.
+          success: Organisaatio päivitetty onnistuneesti.
+      titles:
+        dashboard: Hallintapaneeli

data/decidim-system/db/seeds.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 if !Rails.env.production? || ENV["SEED"]
   Decidim::System::Admin.create!(
-    email: "system@decidim.org",
+    email: "system@example.org",
     password: "decidim123456",
     password_confirmation: "decidim123456"
   )

data/decidim-system/decidim-system.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.add_dependency "devise", "~> 4.2"
   s.add_dependency "devise-i18n", "~> 1.1.0"
   s.add_dependency "rectify", "~> 0.8.0"
-  s.add_dependency "devise_invitable", "~> 1.7.0"
+  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 "foundation_rails_helper", "~> 3.0.0.rc"

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

@@ -9,6 +9,7 @@ require "jquery-rails"
 require "sassc-rails"
 require "foundation-rails"
 require "foundation_rails_helper"
+require "autoprefixer-rails"
 require "rectify"
 
 module Decidim

data/decidim-system/spec/commands/decidim/system/register_organization_spec.rb

@@ -16,6 +16,8 @@ module Decidim
             {
               name: "Gotham City",
               host: "decide.gotham.gov",
+              secondary_hosts: "foo.gotham.gov\r\n\r\nbar.gotham.gov",
+              reference_prefix: "JKR",
               organization_admin_name: "Fiorello Henry La Guardia",
               organization_admin_email: "f.laguardia@gotham.gov",
               available_locales: ["en"],
@@ -33,6 +35,7 @@ module Decidim
 
             expect(organization.name).to eq("Gotham City")
             expect(organization.host).to eq("decide.gotham.gov")
+            expect(organization.secondary_hosts).to match_array(["foo.gotham.gov", "bar.gotham.gov"])
           end
 
           it "invites a user as organization admin" do

data/decidim-system/spec/commands/decidim/system/update_organization_spec.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+require "spec_helper"
+
+module Decidim
+  module System
+    describe UpdateOrganization, :db do
+      describe "call" do
+        let(:form) do
+          UpdateOrganizationForm.new(params)
+        end
+        let(:organization) { create :organization, name: "My organization" }
+
+        let(:command) { described_class.new(organization.id, form) }
+
+        context "when the form is valid" do
+          let(:params) do
+            {
+              name: "Gotham City",
+              host: "decide.gotham.gov",
+              secondary_hosts: "foo.gotham.gov\r\n\r\nbar.gotham.gov"
+            }
+          end
+
+          it "returns a valid response" do
+            expect { command.call }.to broadcast(:ok)
+          end
+
+          it "updates the organization" do
+            expect { command.call }.to change { Organization.count }.by(1)
+            organization = Organization.last
+
+            expect(organization.name).to eq("Gotham City")
+            expect(organization.host).to eq("decide.gotham.gov")
+            expect(organization.secondary_hosts).to match_array(["foo.gotham.gov", "bar.gotham.gov"])
+          end
+        end
+
+        context "when the form is invalid" do
+          let(:params) do
+            {
+              name: nil,
+              host: "foo.com"
+            }
+          end
+
+          it "returns an invalid response" do
+            expect { command.call }.to broadcast(:invalid)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -20,10 +20,13 @@ describe "Organizations", type: :feature do
       it "creates a new organization" do
         fill_in "Name", with: "Citizen Corp"
         fill_in "Host", with: "www.citizen.corp"
+        fill_in "Secondary hosts", with: "foo.citizen.corp\n\rbar.citizen.corp"
+        fill_in "Reference prefix", with: "CCORP"
         fill_in "Organization admin name", with: "City Mayor"
         fill_in "Organization admin email", with: "mayor@citizen.corp"
         check "organization_available_locales_en"
         choose "organization_default_locale_en"
+        check "Decidim::DummyAuthorizationHandler"
         click_button "Create organization & invite admin"
 
         expect(page).to have_css("div.flash.success")
@@ -53,6 +56,8 @@ describe "Organizations", type: :feature do
       it "edits the data" do
         fill_in "Name", with: "Citizens Rule!"
         fill_in "Host", with: "www.foo.org"
+        fill_in "Secondary hosts", with: "foobar.citizen.corp\n\rbar.citizen.corp"
+        check "Decidim::DummyAuthorizationHandler"
         click_button "Save"
 
         expect(page).to have_css("div.flash.success")

data/docs/analytics.md

@@ -0,0 +1,23 @@
+# Analytics
+
+Decidim, for a matter of privacy, doesn't come bundled (or associated with) any analytics service, leaving that part to the developer.
+
+Adding analytics is quite easy. We've set up a partial in place for that. Just create a view in your app under `app/views/layouts/decidim/_head_extra.html.erb` with your content.
+
+Here's an example for Piwik:
+
+```
+<script type="text/javascript">
+  var _paq = _paq || [];
+  // tracker methods like "setCustomDimension" should be called before "trackPageView"
+  _paq.push(['trackPageView']);
+  _paq.push(['enableLinkTracking']);
+  (function() {
+    var u="?????";
+    _paq.push(['setTrackerUrl', u+'piwik.php']);
+    _paq.push(['setSiteId', '?']);
+    var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
+    g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
+  })();
+</script>
+```

data/docs/how_to_create_a_plugin.md

@@ -87,6 +87,7 @@ s.add_development_dependency "decidim-dev", Decidim.version
 
 ```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"
@@ -149,6 +150,7 @@ require "jquery-rails"
 require "sass-rails"
 require "foundation-rails"
 require "foundation_rails_helper"
+require "autoprefixer-rails"
 
 module Decidim
   module <EngineName>
@@ -178,4 +180,4 @@ require "decidim/common_rake"
 ```ruby
 ENV["ENGINE_NAME"] = File.dirname(File.dirname(__FILE__)).split("/").last
 require "decidim/test/base_spec_helper"
-```
+```

data/lib/generators/decidim/app_generator.rb

@@ -50,6 +50,10 @@ module Decidim
         template "database.yml.erb", "config/database.yml", force: true
       end
 
+      def decidim_controller
+        template "decidim_controller.rb.erb", "app/controllers/decidim_controller.rb", force: true
+      end
+
       def docker
         template "Dockerfile.erb", "Dockerfile"
         template "docker-compose.yml.erb", "docker-compose.yml"

data/lib/generators/decidim/demo_generator.rb

@@ -7,7 +7,7 @@ require_relative "install_generator"
 
 module Decidim
   module Generators
-    # Modifies an existing decidim app so it can be used as a demo of Dcidim.
+    # Modifies an existing decidim app so it can be used as a demo of Decidim.
     class DemoGenerator < Rails::Generators::Base
       def source_paths
         [

data/lib/generators/decidim/install_generator.rb

@@ -31,7 +31,14 @@ module Decidim
       end
 
       def add_seeds
-        append_file "db/seeds.rb", "\n# You can remove the 'faker' gem if you don't want Decidim seeds.\nDecidim.seed!"
+        append_file("db/seeds.rb", <<-SEEDS_CONTENT)
+# You can remove the 'faker' gem if you don't want Decidim seeds.
+if ENV["HEROKU_APP_NAME"].present?
+  ENV["DECIDIM_HOST"] = ENV["HEROKU_APP_NAME"] + ".herokuapp.com"
+  ENV["SEED"] = "true"
+end
+Decidim.seed!
+        SEEDS_CONTENT
       end
 
       def copy_initializer

data/lib/generators/decidim/review_app_generator.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+require "rails/generators"
+require "rails/generators/rails/app/app_generator"
+require "decidim/core/version"
+require_relative "app_builder"
+require_relative "install_generator"
+
+module Decidim
+  module Generators
+    # Modifies an existing decidim app so it works as a Heroku review app.
+    class ReviewAppGenerator < Rails::Generators::Base
+      def source_paths
+        [
+          File.expand_path("../../../../decidim-dev/lib/decidim/dev", __FILE__)
+        ]
+      end
+
+      def modify_app_json_file
+        gsub_file("app.json", "\"env\": {", <<-APP_JSON_CONTENT)
+"scripts": {
+    "postdeploy":"rake db:schema:load db:migrate db:seed"
+  },
+  "env": {
+    "AWS_ACCESS_KEY_ID": {
+      "required": true
+    },
+    "AWS_SECRET_ACCESS_KEY": {
+      "required": true
+    },
+    "HERE_APP_ID": {
+      "required": false
+    },
+    "HERE_APP_CODE": {
+      "required": false
+    },
+    "HEROKU_APP_NAME": {
+      "required": true
+    },
+APP_JSON_CONTENT
+      end
+
+      def modify_initializer
+        gsub_file("config/initializers/decidim.rb", /^end/, <<-INITIALIZER_CONTENT)
+
+  if ENV["HEROKU_APP_NAME"].present?
+    config.base_uploads_path = ENV["HEROKU_APP_NAME"] + "/"
+  end
+end
+INITIALIZER_CONTENT
+      end
+    end
+  end
+end