decidim 0.0.1.alpha4 → 0.0.1.alpha5

data/decidim-dev/Gemfile

@@ -1,17 +1,6 @@
-eval(File.read(File.dirname(__FILE__) + "/../common_gemfile.rb"))
+source 'https://rubygems.org'
 
-# Declare your gem's dependencies in decidim-system.gemspec.
-# Bundler will treat runtime dependencies like base dependencies, and
-# development dependencies will be added by default to the :development group.
+gem 'decidim', path: '..'
 gemspec
 
-# Declare any dependencies that are still in development here instead of in
-# your gemspec. These might include edge Rails or gems from your path or
-# Git. Remember to move these dependencies to your gemspec before releasing
-# your gem to rubygems.org.
-
-# To use a debugger
-# gem 'byebug', group: [:development, :test]
-
-gemspec path: "../decidim-core"
-gemspec path: ".."
+eval(File.read(File.join(File.dirname(__FILE__), "..", "Gemfile.common")))

data/decidim-dev/decidim-dev.gemspec

@@ -19,12 +19,11 @@ Gem::Specification.new do |s|
 
   s.add_dependency "factory_girl_rails"
   s.add_dependency "database_cleaner", "~> 1.5.0"
-  s.add_dependency "capybara", "~> 2.4"
+  s.add_dependency "capybara", "~> 2.10.0"
   s.add_dependency "rspec-rails", "~> 3.5"
   s.add_dependency "byebug"
   s.add_dependency "wisper-rspec"
-  s.add_dependency "pg"
-  s.add_dependency "listen"
+  s.add_dependency "listen", "~> 3.1.0"
   s.add_dependency "launchy"
   s.add_dependency "i18n-tasks", "~> 0.9.5"
 end

data/decidim-dev/lib/decidim/test/i18n_spec.rb

@@ -15,4 +15,20 @@ RSpec.describe "I18n" do
     expect(unused_keys).to be_empty,
                            "#{unused_keys.leaves.count} unused i18n keys, run `i18n-tasks unused` to show them"
   end
+
+  it "is normalized" do
+    previous_locale_hashes = locale_hashes
+    i18n.normalize_store!
+    new_locale_hashes = locale_hashes
+
+    expect(previous_locale_hashes).to eq(new_locale_hashes),
+                                      "Please normalize your locale files with `i18n-tasks normalize`"
+  end
+
+  def locale_hashes
+    Dir.glob("config/locales/**/*.yml").inject({}) do |results, file|
+      md5 = Digest::MD5.file(file).hexdigest
+      results.merge(file => md5)
+    end
+  end
 end

data/decidim-dev/lib/decidim/test/rspec_support/action_mailer.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+require "nokogiri"
 
 RSpec.configure do |config|
   config.before(:each) do
@@ -19,11 +20,11 @@ module MailerHelpers
   end
 
   def last_email_body
-    last_email.body.encoded
+    (last_email.body || last_email.html_part.body).encoded
   end
 
   def last_email_link
-    URI.extract(last_email_body.to_s, %w(http https)).last
+    Nokogiri::HTML(last_email_body).css("table.content a").last["href"]
   end
 end
 

data/decidim-dev/lib/decidim/test/rspec_support/warden.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 RSpec.configure do |config|
   config.include Warden::Test::Helpers, type: :feature
+  config.include Devise::Test::ControllerHelpers, type: :controller
 
   config.after :each, type: :feature do
     Warden.test_reset!

data/decidim-system/Gemfile

@@ -1,17 +1,6 @@
-eval(File.read(File.dirname(__FILE__) + "/../common_gemfile.rb"))
+source 'https://rubygems.org'
 
-# Declare your gem's dependencies in decidim-system.gemspec.
-# Bundler will treat runtime dependencies like base dependencies, and
-# development dependencies will be added by default to the :development group.
+gem 'decidim', path: '..'
 gemspec
 
-# Declare any dependencies that are still in development here instead of in
-# your gemspec. These might include edge Rails or gems from your path or
-# Git. Remember to move these dependencies to your gemspec before releasing
-# your gem to rubygems.org.
-
-# To use a debugger
-# gem 'byebug', group: [:development, :test]
-
-gemspec path: "../decidim-core"
-gemspec path: ".."
+eval(File.read(File.join(File.dirname(__FILE__), "..", "Gemfile.common")))

data/decidim-system/Rakefile

@@ -1,9 +1,4 @@
 # frozen_string_literal: true
-begin
-  require "bundler/setup"
-rescue LoadError
-  puts "You must `gem install bundler` and `bundle install` to run rake tasks"
-end
 
 require "decidim/common_rake"
 require "rdoc/task"

data/decidim-system/app/assets/javascripts/decidim/system.js

@@ -11,11 +11,12 @@
 // about supported directives.
 //
 //= require jquery
-//= require jquery.turbolinks
 //= require jquery_ujs
 //= require foundation
+//= require turbolinks
 //= require_self
 
-$(function(){ $(document).foundation(); });
+$(document).on("turbolinks:load", function() {
+  $(document).foundation();
+});
 
-//= require turbolinks

data/decidim-system/app/commands/decidim/system/register_organization.rb

@@ -46,6 +46,7 @@ module Decidim
       def invite_admin(organization)
         Decidim::User.invite!(
           {
+            name: form.organization_admin_name,
             email: form.organization_admin_email,
             organization: organization,
             roles: ["admin"]

data/decidim-system/app/forms/decidim/system/register_organization_form.rb

@@ -11,8 +11,9 @@ module Decidim
       mimic :organization
 
       attribute :organization_admin_email, String
+      attribute :organization_admin_name, String
 
-      validates :organization_admin_email, presence: true
+      validates :organization_admin_email, :organization_admin_name, presence: true
 
       translatable_attribute :description, String
     end

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

@@ -15,6 +15,10 @@
     <%= f.translated :text_area, :description %>
   </div>
 
+  <div class="field">
+    <%= f.text_field :organization_admin_name %>
+  </div>
+
   <div class="field">
     <%= f.email_field :organization_admin_email %>
   </div>

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

@@ -0,0 +1,60 @@
+---
+ca:
+  decidim:
+    system:
+      actions:
+        confirm_destroy: Segur que ho vols eliminar?
+        destroy: Eliminar
+        edit: Editar
+        new: Nou %{name}
+        save: Desar
+        title: Accions
+      admins:
+        create:
+          error: S'ha produït un error en crear un nou administrador.
+          success: Administrador creat correctament
+        destroy:
+          success: Administrador eliminat correctament.
+        edit:
+          title: Edita administrador
+          update: Actualitzar administrador
+        index:
+          title: Administradors
+        new:
+          create: Crear administrador
+          title: Nou administrador
+        update:
+          error: S'ha produït un error en actualitzar aquest administrador..
+          success: Administrador actualitzat correctament
+      menu:
+        admins: Administradors
+        dashboard: Tauler de control
+        organizations: Organitzacions
+      models:
+        admin:
+          fields:
+            created_at: Data de creació
+            email: Correu electrònic
+          name: Administrador
+          validations:
+            email_uniqueness: Ja existeix un altre administrador amb aquest correu electrònic.
+        organization:
+          actions:
+            save_and_invite: Crear organització i convidar a administrador
+          fields:
+            created_at: Data de creació
+            name: Nom
+          name: Organització
+      organizations:
+        create:
+          error: S'ha produït un error en crear una nova organització.
+          success: Organització creada correctament.
+        index:
+          title: Organitzacions
+        new:
+          title: Nova organització
+        update:
+          error: S'ha produït un error en actualitzar aquesta organització.
+          success: Organització actualitzada correctament.
+      titles:
+        dashboard: Tauler de control

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

@@ -0,0 +1,60 @@
+---
+es:
+  decidim:
+    system:
+      actions:
+        confirm_destroy: "¿Seguro que lo quieres eliminar?"
+        destroy: Eliminar
+        edit: Editar
+        new: Nuevo %{name}
+        save: Guardar
+        title: Acciones
+      admins:
+        create:
+          error: Se ha producido un error al crear un nuevo administrador.
+          success: Administrador creado correctamente
+        destroy:
+          success: Administrador eliminado correctamente.
+        edit:
+          title: Editar administrador
+          update: Actualizar administrador
+        index:
+          title: Administradores
+        new:
+          create: Crear administrador
+          title: Nuevo administrador
+        update:
+          error: Se ha producido un error al actualizar este administrador ..
+          success: Administrador actualizado correctamente
+      menu:
+        admins: Administradores
+        dashboard: Panel de control
+        organizations: Organizaciones
+      models:
+        admin:
+          fields:
+            created_at: Fecha de creación
+            email: Correo electrónico
+          name: Administrador
+          validations:
+            email_uniqueness: Ya existe otro administrador con este correo electrónico.
+        organization:
+          actions:
+            save_and_invite: Crear organización e invitar a administrador
+          fields:
+            created_at: Fecha de creación
+            name: Nombre
+          name: Organización
+      organizations:
+        create:
+          error: Se ha producido un error al crear una nueva organización.
+          success: Organización creada correctamente.
+        index:
+          title: Organizaciones
+        new:
+          title: Nueva organización
+        update:
+          error: Se ha producido un error al actualizar esta organización.
+          success: Organización actualizada correctamente.
+      titles:
+        dashboard: Panel de control

data/decidim-system/decidim-system.gemspec

@@ -27,10 +27,9 @@ Gem::Specification.new do |s|
   s.add_dependency "sass-rails", "~> 5.0.0"
   s.add_dependency "jquery-rails", "~> 4.0"
   s.add_dependency "turbolinks", Decidim.rails_version
-  s.add_dependency "jquery-turbolinks", "~> 2.1.0"
   s.add_dependency "jbuilder", "~> 2.5"
   s.add_dependency "foundation_rails_helper", "~> 2.0.0"
   s.add_dependency "active_link_to", "~> 1.0.0"
 
-  s.add_development_dependency "decidim-dev"
+  s.add_development_dependency "decidim-dev", Decidim.version
 end

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

@@ -8,7 +8,6 @@ require "decidim/core"
 require "jquery-rails"
 require "sass-rails"
 require "turbolinks"
-require "jquery-turbolinks"
 require "foundation-rails"
 require "foundation_rails_helper"
 require "jbuilder"

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

@@ -17,6 +17,7 @@ module Decidim
               name: "Gotham City",
               host: "decide.gotham.gov",
               description_en: "Fictional city appearing in American comic books.",
+              organization_admin_name: "Fiorello Henry La Guardia",
               organization_admin_email: "f.laguardia@gotham.gov"
             }
           end

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

@@ -20,6 +20,7 @@ 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 "Organization admin name", with: "City Mayor"
         fill_in "Organization admin email", with: "mayor@citizen.corp"
         click_button "Create organization & invite admin"
 

data/decidim.gemspec

@@ -26,6 +26,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "decidim-system", Decidim.version
   spec.add_dependency "decidim-admin", Decidim.version
   spec.add_dependency "rails", Decidim.rails_version
+  spec.add_dependency "rails-i18n", Decidim.rails_version
 
   spec.add_development_dependency "bundler", "~> 1.12"
   spec.add_development_dependency "rake", "~> 11.0"

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

@@ -1,7 +1,6 @@
 source "https://rubygems.org"
 
 ruby '<%= RUBY_VERSION %>'
-
 <% if options[:path] %>
 gem "decidim", path: "<%= options[:path] %>"
 <% elsif options[:edge] %>
@@ -9,21 +8,11 @@ gem "decidim", github: 'codegram/decidim'
 <% else %>
 gem "decidim", "<%= Gem::Specification.find_by_name("decidim").version %>"
 <% end %>
-
-gem 'rails', '<%= config.fetch(:rails_version) %>'
 gem 'puma', '~> 3.0'
-gem 'sass-rails', '~> 5.0'
 gem 'uglifier', '>= 1.3.0'
 
-gem 'pg'
-
-gem 'jquery-rails'
-gem 'turbolinks', '~> 5'
-gem 'redis', '~> 3.0'
-
 gem 'foundation_rails_helper', github: 'sgruhier/foundation_rails_helper'
 
-
 group :development, :test do
   gem 'byebug', platform: :mri
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim
 version: !ruby/object:Gem::Version
-  version: 0.0.1.alpha4
+  version: 0.0.1.alpha5
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-07 00:00:00.000000000 Z
+date: 2016-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -18,42 +18,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.1.alpha4
+        version: 0.0.1.alpha5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.1.alpha4
+        version: 0.0.1.alpha5
 - !ruby/object:Gem::Dependency
   name: decidim-system
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.1.alpha4
+        version: 0.0.1.alpha5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.1.alpha4
+        version: 0.0.1.alpha5
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.1.alpha4
+        version: 0.0.1.alpha5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.1.alpha4
+        version: 0.0.1.alpha5
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -68,6 +68,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 5.0.0
+- !ruby/object:Gem::Dependency
+  name: rails-i18n
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -134,15 +148,14 @@ files:
 - CODE_OF_CONDUCT.md
 - Dockerfile
 - Gemfile
+- Gemfile.common
 - Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/decidim
 - codecov.yml
-- common_gemfile.rb
 - decidim-admin/Gemfile
-- decidim-admin/Gemfile.lock
 - decidim-admin/README.md
 - decidim-admin/Rakefile
 - decidim-admin/app/assets/config/decidim_admin_manifest.js
@@ -156,18 +169,31 @@ files:
 - decidim-admin/app/assets/stylesheets/decidim/admin/_settings.scss
 - decidim-admin/app/assets/stylesheets/decidim/admin/_sidebar.scss
 - decidim-admin/app/assets/stylesheets/decidim/admin/_tables.scss
+- decidim-admin/app/commands/decidim/admin/create_participatory_process.rb
+- decidim-admin/app/commands/decidim/admin/update_participatory_process.rb
 - decidim-admin/app/constraints/decidim/admin/organization_dashboard_constraint.rb
+- decidim-admin/app/controllers/concerns/decidim/needs_authorization.rb
 - decidim-admin/app/controllers/decidim/admin/application_controller.rb
 - decidim-admin/app/controllers/decidim/admin/dashboard_controller.rb
+- decidim-admin/app/controllers/decidim/admin/participatory_processes_controller.rb
+- decidim-admin/app/forms/decidim/admin/participatory_process_form.rb
 - decidim-admin/app/helpers/decidim/admin/application_helper.rb
+- decidim-admin/app/helpers/decidim/admin/attributes_display_helper.rb
 - decidim-admin/app/jobs/decidim/admin/application_job.rb
 - decidim-admin/app/mailers/decidim/admin/application_mailer.rb
 - decidim-admin/app/models/decidim/admin/application_record.rb
 - decidim-admin/app/policies/decidim/admin/application_policy.rb
+- decidim-admin/app/policies/decidim/admin/dashboard_policy.rb
 - decidim-admin/app/policies/decidim/admin/organization_policy.rb
+- decidim-admin/app/policies/decidim/admin/participatory_process_policy.rb
 - decidim-admin/app/views/decidim/admin/dashboard/show.html.erb
 - decidim-admin/app/views/decidim/admin/devise/mailers/password_change.html.erb
 - decidim-admin/app/views/decidim/admin/devise/mailers/reset_password_instructions.html.erb
+- decidim-admin/app/views/decidim/admin/participatory_processes/_form.html.erb
+- decidim-admin/app/views/decidim/admin/participatory_processes/edit.html.erb
+- decidim-admin/app/views/decidim/admin/participatory_processes/index.html.erb
+- decidim-admin/app/views/decidim/admin/participatory_processes/new.html.erb
+- decidim-admin/app/views/decidim/admin/participatory_processes/show.html.erb
 - decidim-admin/app/views/layouts/decidim/admin/_header.html.erb
 - decidim-admin/app/views/layouts/decidim/admin/_login_items.html.erb
 - decidim-admin/app/views/layouts/decidim/admin/_sidebar.html.erb
@@ -175,7 +201,9 @@ files:
 - decidim-admin/app/views/layouts/decidim/admin/login.html.erb
 - decidim-admin/bin/rails
 - decidim-admin/config/i18n-tasks.yml
+- decidim-admin/config/locales/ca.yml
 - decidim-admin/config/locales/en.yml
+- decidim-admin/config/locales/es.yml
 - decidim-admin/config/routes.rb
 - decidim-admin/decidim-admin.gemspec
 - decidim-admin/lib/decidim/admin.rb
@@ -184,10 +212,12 @@ files:
 - decidim-admin/spec/factories.rb
 - decidim-admin/spec/features/admin_access_control.rb
 - decidim-admin/spec/features/admin_invite_spec.rb
+- decidim-admin/spec/features/manage_participatory_processes_spec.rb
+- decidim-admin/spec/policies/dashboard_policy_spec.rb
 - decidim-admin/spec/policies/organization_policy_spec.rb
+- decidim-admin/spec/policies/participatory_process_policy_spec.rb
 - decidim-admin/spec/spec_helper.rb
 - decidim-dev/Gemfile
-- decidim-dev/Gemfile.lock
 - decidim-dev/README.md
 - decidim-dev/decidim-dev.gemspec
 - decidim-dev/lib/decidim/common_rake.rb
@@ -203,7 +233,6 @@ files:
 - decidim-dev/lib/decidim/test/rspec_support/wisper.rb
 - decidim-dev/lib/generators/decidim/dummy_generator.rb
 - decidim-system/Gemfile
-- decidim-system/Gemfile.lock
 - decidim-system/README.md
 - decidim-system/Rakefile
 - decidim-system/app/assets/config/decidim_system_manifest.js
@@ -258,7 +287,9 @@ files:
 - decidim-system/app/views/layouts/decidim/system/login.html.erb
 - decidim-system/bin/rails
 - decidim-system/config/i18n-tasks.yml
+- decidim-system/config/locales/ca.yml
 - decidim-system/config/locales/en.yml
+- decidim-system/config/locales/es.yml
 - decidim-system/config/routes.rb
 - decidim-system/db/migrate/20160919105637_devise_create_decidim_admins.rb
 - decidim-system/db/seeds.rb