decidim-participatory_processes 0.6.8 → 0.7.0

data/db/migrate/20170220110740_remove_steps_short_description.rb

@@ -19,7 +19,7 @@ class RemoveStepsShortDescription < ActiveRecord::Migration[5.0]
 
   def new_description_for(step)
     desc = {}
-    step.description.keys.each do |locale|
+    step.description.each_key do |locale|
       desc[locale] = step.short_description[locale] + step.description[locale]
     end
     desc

data/lib/decidim/participatory_processes/admin_engine.rb

@@ -15,7 +15,7 @@ module Decidim
 
       routes do
         resources :participatory_process_groups
-        resources :participatory_processes, except: :show do
+        resources :participatory_processes, param: :slug, except: :show do
           resource :publish, controller: "participatory_process_publications", only: [:create, :destroy]
           resources :copies, controller: "participatory_process_copies", only: [:new, :create]
 
@@ -33,7 +33,7 @@ module Decidim
           resources :attachments, controller: "participatory_process_attachments"
         end
 
-        scope "/participatory_processes/:participatory_process_id" do
+        scope "/participatory_processes/:participatory_process_slug" do
           resources :categories
 
           resources :features do
@@ -53,7 +53,7 @@ module Decidim
           end
         end
 
-        scope "/participatory_processes/:participatory_process_id/features/:feature_id/manage" do
+        scope "/participatory_processes/:participatory_process_slug/features/:feature_id/manage" do
           Decidim.feature_manifests.each do |manifest|
             next unless manifest.admin_engine
 
@@ -83,7 +83,7 @@ module Decidim
                     icon_name: "target",
                     position: 2,
                     active: :inclusive,
-                    if: can?(:manage, Decidim::ParticipatoryProcess)
+                    if: can?(:read, Decidim::ParticipatoryProcess)
 
           menu.item I18n.t("menu.participatory_process_groups", scope: "decidim.admin"),
                     decidim_admin_participatory_processes.participatory_process_groups_path,

data/lib/decidim/participatory_processes/engine.rb

@@ -12,13 +12,23 @@ module Decidim
       isolate_namespace Decidim::ParticipatoryProcesses
 
       routes do
+        get "processes/:process_id", to: redirect { |params, _request|
+          process = Decidim::ParticipatoryProcess.find(params[:process_id])
+          process ? "/processes/#{process.slug}" : "/404"
+        }, constraints: { process_id: /[0-9]+/ }
+
+        get "/processes/:process_id/f/:feature_id", to: redirect { |params, _request|
+          process = Decidim::ParticipatoryProcess.find(params[:process_id])
+          process ? "/processes/#{process.slug}/f/#{params[:feature_id]}" : "/404"
+        }, constraints: { process_id: /[0-9]+/ }
+
         resources :participatory_process_groups, only: :show, path: "processes_groups"
-        resources :participatory_processes, only: [:index, :show], path: "processes" do
+        resources :participatory_processes, only: [:index, :show], param: :slug, path: "processes" do
           resources :participatory_process_steps, only: [:index], path: "steps"
           resource :participatory_process_widget, only: :show, path: "embed"
         end
 
-        scope "/processes/:participatory_process_id/f/:feature_id" do
+        scope "/processes/:participatory_process_slug/f/:feature_id" do
           Decidim.feature_manifests.each do |manifest|
             next unless manifest.engine
 
@@ -47,6 +57,7 @@ module Decidim
           menu.item I18n.t("menu.processes", scope: "decidim"),
                     decidim_participatory_processes.participatory_processes_path,
                     position: 2,
+                    if: Decidim::ParticipatoryProcess.where(organization: current_organization).published.any?,
                     active: :inclusive
         end
       end

data/lib/decidim/participatory_processes/participatory_space.rb

@@ -11,7 +11,7 @@ Decidim.register_participatory_space(:participatory_processes) do |participatory
     seeds_root = File.join(__dir__, "..", "..", "..", "db", "seeds")
 
     process_groups = []
-    3.times do
+    2.times do
       process_groups << Decidim::ParticipatoryProcessGroup.create!(
         name: Decidim::Faker::Localized.sentence(3),
         description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
@@ -22,8 +22,8 @@ Decidim.register_participatory_space(:participatory_processes) do |participatory
       )
     end
 
-    3.times do
-      Decidim::ParticipatoryProcess.create!(
+    2.times do
+      process = Decidim::ParticipatoryProcess.create!(
         title: Decidim::Faker::Localized.sentence(5),
         slug: Faker::Internet.unique.slug(nil, "-"),
         subtitle: Decidim::Faker::Localized.sentence(2),
@@ -46,13 +46,11 @@ Decidim.register_participatory_space(:participatory_processes) do |participatory
         participatory_scope: Decidim::Faker::Localized.sentence(1),
         participatory_structure: Decidim::Faker::Localized.sentence(2),
         start_date: Time.current,
-        end_date: 2.month.from_now.at_midnight,
+        end_date: 2.months.from_now.at_midnight,
         participatory_process_group: process_groups.sample,
         scope: Faker::Boolean.boolean(0.5) ? nil : Decidim::Scope.reorder("RANDOM()").first
       )
-    end
 
-    Decidim::ParticipatoryProcess.find_each do |process|
       Decidim::ParticipatoryProcessStep.find_or_initialize_by(
         participatory_process: process,
         active: true

data/lib/decidim/participatory_processes/test/factories.rb

@@ -26,7 +26,7 @@ FactoryGirl.define do
     participatory_structure { Decidim::Faker::Localized.sentence(2) }
     show_statistics true
     start_date { Time.current }
-    end_date 2.month.from_now.at_midnight
+    end_date 2.months.from_now.at_midnight
 
     trait :promoted do
       promoted true
@@ -81,7 +81,7 @@ FactoryGirl.define do
     title { Decidim::Faker::Localized.sentence(3) }
     description { Decidim::Faker::Localized.wrapped("<p>", "</p>") { Decidim::Faker::Localized.sentence(4) } }
     start_date 1.month.ago.at_midnight
-    end_date 2.month.from_now.at_midnight
+    end_date 2.months.from_now.at_midnight
     position nil
     participatory_process
 

data/lib/decidim/participatory_processes/version.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module Decidim
+  # This holds the decidim-participatory_processes version.
+  module ParticipatoryProcesses
+    def self.version
+      "0.7.0"
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-participatory_processes
 version: !ruby/object:Gem::Version
-  version: 0.6.8
+  version: 0.7.0
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-17 00:00:00.000000000 Z
+date: 2017-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -18,56 +18,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.8
+        version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.8
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 5.1.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 5.1.3
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.8
+        version: 0.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.8
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.8
+        version: 0.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.8
+        version: 0.7.0
 description: Participatory Processes plugin for decidim
 email:
 - josepjaume@gmail.com
@@ -180,7 +166,6 @@ files:
 - app/views/decidim/participatory_processes/participatory_process_steps/_timeline.html.erb
 - app/views/decidim/participatory_processes/participatory_process_steps/index.html.erb
 - app/views/decidim/participatory_processes/participatory_process_widgets/show.html.erb
-- app/views/decidim/participatory_processes/participatory_processes/_no_processes_yet.html.erb
 - app/views/decidim/participatory_processes/participatory_processes/_promoted_process.html.erb
 - app/views/decidim/participatory_processes/participatory_processes/_statistics.html.erb
 - app/views/decidim/participatory_processes/participatory_processes/index.html.erb
@@ -201,6 +186,7 @@ files:
 - config/locales/it.yml
 - config/locales/nl.yml
 - config/locales/pl.yml
+- config/locales/ru.yml
 - config/locales/uk.yml
 - db/migrate/20161005130108_add_participatory_processes.rb
 - db/migrate/20161010102356_translate_processes.rb
@@ -239,9 +225,10 @@ files:
 - lib/decidim/participatory_processes/engine.rb
 - lib/decidim/participatory_processes/participatory_space.rb
 - lib/decidim/participatory_processes/test/factories.rb
+- lib/decidim/participatory_processes/version.rb
 homepage: https://github.com/decidim/decidim
 licenses:
-- AGPLv3
+- AGPL-3.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -259,7 +246,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Participatory Processes plugin for decidim

data/app/views/decidim/participatory_processes/participatory_processes/_no_processes_yet.html.erb

@@ -1,3 +0,0 @@
-<div class="column">
-  <p><%= t("participatory_processes.no_processes_yet.no_processes_yet", scope: "layouts.decidim") %></p>
-</div>