decidim-proposals 0.8.4 → 0.9.0

data/db/migrate/20170215132030_add_reference_to_proposals.rb

@@ -1,9 +1,13 @@
 # frozen_string_literal: true
 
 class AddReferenceToProposals < ActiveRecord::Migration[5.0]
+  class Proposal < ApplicationRecord
+    self.table_name = :decidim_proposals_proposals
+  end
+
   def change
     add_column :decidim_proposals_proposals, :reference, :string
-    Decidim::Proposals::Proposal.find_each(&:save)
+    Proposal.find_each(&:save)
     change_column_null :decidim_proposals_proposals, :reference, false
   end
 end

data/db/migrate/20180111110204_create_decidim_proposal_notes.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class CreateDecidimProposalNotes < ActiveRecord::Migration[5.1]
+  def change
+    create_table :decidim_proposals_proposal_notes do |t|
+      t.references :decidim_proposal, null: false, index: { name: "decidim_proposals_proposal_note_proposal" }
+      t.references :decidim_author, null: false, index: { name: "decidim_proposals_proposal_note_author" }
+      t.text :body, null: false
+
+      t.timestamps
+    end
+
+    add_column :decidim_proposals_proposals, :proposal_notes_count, :integer, null: false, default: 0
+  end
+end

data/db/migrate/20180115155220_add_index_created_at_proposal_notes.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddIndexCreatedAtProposalNotes < ActiveRecord::Migration[5.1]
+  def change
+    add_index :decidim_proposals_proposal_notes, :created_at
+  end
+end

data/lib/decidim/proposals/admin_engine.rb

@@ -11,6 +11,7 @@ module Decidim
       routes do
         resources :proposals, only: [:index, :new, :create] do
           resources :proposal_answers, only: [:edit, :update]
+          resources :proposal_notes, only: [:index, :create]
         end
 
         root to: "proposals#index"

data/lib/decidim/proposals/engine.rb

@@ -2,6 +2,7 @@
 
 require "kaminari"
 require "social-share-button"
+require "ransack"
 
 module Decidim
   module Proposals
@@ -13,6 +14,9 @@ module Decidim
 
       routes do
         resources :proposals, except: [:destroy] do
+          member do
+            put :withdraw
+          end
           resource :proposal_vote, only: [:create, :destroy]
           resource :proposal_widget, only: :show, path: "embed"
         end

data/lib/decidim/proposals/feature.rb

@@ -8,12 +8,10 @@ Decidim.register_feature(:proposals) do |feature|
   feature.icon = "decidim/proposals/icon.svg"
 
   feature.on(:before_destroy) do |instance|
-    if Decidim::Proposals::Proposal.where(feature: instance).any?
-      raise "Can't destroy this feature when there are proposals"
-    end
+    raise "Can't destroy this feature when there are proposals" if Decidim::Proposals::Proposal.where(feature: instance).any?
   end
 
-  feature.actions = %w(vote create)
+  feature.actions = %w(vote create withdraw)
 
   feature.settings(:global) do |settings|
     settings.attribute :vote_limit, type: :integer, default: 0
@@ -48,7 +46,11 @@ Decidim.register_feature(:proposals) do |feature|
     Decidim::Proposals::FilteredProposals.for(features, start_at, end_at).not_hidden.count
   end
 
-  feature.register_stat :votes_count, priority: Decidim::StatsRegistry::MEDIUM_PRIORITY do |features, start_at, end_at|
+  feature.register_stat :proposals_accepted, primary: true, priority: Decidim::StatsRegistry::HIGH_PRIORITY do |features, start_at, end_at|
+    Decidim::Proposals::FilteredProposals.for(features, start_at, end_at).accepted.count
+  end
+
+  feature.register_stat :votes_count, priority: Decidim::StatsRegistry::HIGH_PRIORITY do |features, start_at, end_at|
     proposals = Decidim::Proposals::FilteredProposals.for(features, start_at, end_at).not_hidden
     Decidim::Proposals::ProposalVote.where(proposal: proposals).count
   end
@@ -139,14 +141,27 @@ Decidim.register_feature(:proposals) do |feature|
           password: "password1234",
           password_confirmation: "password1234",
           name: name,
+          nickname: Faker::Twitter.unique.screen_name,
           organization: feature.organization,
           tos_agreement: "1",
-          confirmed_at: Time.current
+          confirmed_at: Time.current,
+          personal_url: Faker::Internet.url,
+          about: Faker::Lorem.paragraph(2)
         )
 
         Decidim::Proposals::ProposalVote.create!(proposal: proposal, author: author) unless proposal.answered? && proposal.rejected?
       end
 
+      (n % 3).times do
+        author_admin = Decidim::User.where(organization: feature.organization, admin: true).all.sample
+
+        Decidim::Proposals::ProposalNote.create!(
+          proposal: proposal,
+          author: author_admin,
+          body: Faker::Lorem.paragraphs(2).join("\n")
+        )
+      end
+
       Decidim::Comments::Seed.comments_for(proposal)
     end
   end

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

@@ -120,6 +120,10 @@ FactoryBot.define do
       answered_at { Time.current }
     end
 
+    trait :withdrawn do
+      state "withdrawn"
+    end
+
     trait :with_answer do
       answer { Decidim::Faker::Localized.sentence }
       answered_at { Time.current }
@@ -130,4 +134,10 @@ FactoryBot.define do
     proposal { build(:proposal) }
     author { build(:user, organization: proposal.organization) }
   end
+
+  factory :proposal_note, class: "Decidim::Proposals::ProposalNote" do
+    body { Faker::Lorem.sentences(3).join("\n") }
+    proposal { build(:proposal) }
+    author { build(:user, organization: proposal.organization) }
+  end
 end

data/lib/decidim/proposals/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds decidim-proposals version.
   module Proposals
     def self.version
-      "0.8.4"
+      "0.9.0"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-proposals
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.9.0
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-16 00:00:00.000000000 Z
+date: 2018-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-comments
@@ -18,141 +18,155 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.4
+        version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.4
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.4
+        version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.4
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: ransack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: social-share-button
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.4
+        version: 0.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.4
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: decidim-assemblies
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.4
+        version: 0.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.4
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: decidim-budgets
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.4
+        version: 0.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.4
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.4
+        version: 0.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.4
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: decidim-meetings
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.4
+        version: 0.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.4
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: decidim-participatory_processes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.4
+        version: 0.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.4
-description: A proposals component for decidim's participatory processes.
+        version: 0.9.0
+description: A proposals component for decidim's participatory spaces.
 email:
 - josepjaume@gmail.com
 - mrc2407@gmail.com
@@ -172,21 +186,29 @@ files:
 - app/assets/stylesheets/decidim/proposals/social_share.css.scss
 - app/commands/decidim/proposals/admin/answer_proposal.rb
 - app/commands/decidim/proposals/admin/create_proposal.rb
+- app/commands/decidim/proposals/admin/create_proposal_note.rb
 - app/commands/decidim/proposals/create_proposal.rb
 - app/commands/decidim/proposals/create_proposal_export.rb
 - app/commands/decidim/proposals/unvote_proposal.rb
 - app/commands/decidim/proposals/update_proposal.rb
 - app/commands/decidim/proposals/vote_proposal.rb
+- app/commands/decidim/proposals/withdraw_proposal.rb
 - app/controllers/concerns/decidim/proposals/orderable.rb
 - app/controllers/decidim/proposals/admin/application_controller.rb
 - app/controllers/decidim/proposals/admin/proposal_answers_controller.rb
+- app/controllers/decidim/proposals/admin/proposal_notes_controller.rb
 - app/controllers/decidim/proposals/admin/proposals_controller.rb
 - app/controllers/decidim/proposals/application_controller.rb
 - app/controllers/decidim/proposals/proposal_votes_controller.rb
 - app/controllers/decidim/proposals/proposal_widgets_controller.rb
 - app/controllers/decidim/proposals/proposals_controller.rb
+- app/events/decidim/proposals/accepted_proposal_event.rb
+- app/events/decidim/proposals/create_proposal_event.rb
+- app/events/decidim/proposals/evaluating_proposal_event.rb
+- app/events/decidim/proposals/rejected_proposal_event.rb
 - app/forms/decidim/proposals/admin/proposal_answer_form.rb
 - app/forms/decidim/proposals/admin/proposal_form.rb
+- app/forms/decidim/proposals/admin/proposal_note_form.rb
 - app/forms/decidim/proposals/proposal_form.rb
 - app/helpers/decidim/proposals/application_helper.rb
 - app/helpers/decidim/proposals/map_helper.rb
@@ -197,16 +219,22 @@ files:
 - app/models/decidim/proposals/abilities/participatory_process_moderator_ability.rb
 - app/models/decidim/proposals/application_record.rb
 - app/models/decidim/proposals/proposal.rb
+- app/models/decidim/proposals/proposal_note.rb
 - app/models/decidim/proposals/proposal_vote.rb
+- app/presenters/decidim/proposals/official_author_presenter.rb
+- app/presenters/decidim/proposals/proposal_presenter.rb
 - app/queries/decidim/proposals/filtered_proposals.rb
 - app/services/decidim/proposals/proposal_search.rb
 - app/views/decidim/proposals/admin/proposal_answers/edit.html.erb
+- app/views/decidim/proposals/admin/proposal_notes/_form.html.erb
+- app/views/decidim/proposals/admin/proposal_notes/_proposal_notes.html.erb
+- app/views/decidim/proposals/admin/proposal_notes/index.html.erb
 - app/views/decidim/proposals/admin/proposals/_form.html.erb
 - app/views/decidim/proposals/admin/proposals/index.html.erb
 - app/views/decidim/proposals/admin/proposals/new.html.erb
+- app/views/decidim/proposals/admin/shared/_info_proposal.html.erb
 - app/views/decidim/proposals/proposal_votes/update_buttons_and_counters.js.erb
 - app/views/decidim/proposals/proposal_widgets/show.html.erb
-- app/views/decidim/proposals/proposals/_author.html.erb
 - app/views/decidim/proposals/proposals/_count.html.erb
 - app/views/decidim/proposals/proposals/_filters.html.erb
 - app/views/decidim/proposals/proposals/_filters_small_view.html.erb
@@ -230,11 +258,14 @@ files:
 - config/locales/eu.yml
 - config/locales/fi.yml
 - config/locales/fr.yml
+- config/locales/gl.yml
 - config/locales/it.yml
 - config/locales/nl.yml
 - config/locales/pl.yml
+- config/locales/pt-BR.yml
 - config/locales/pt.yml
 - config/locales/ru.yml
+- config/locales/sv.yml
 - config/locales/uk.yml
 - db/migrate/20161212110850_create_decidim_proposals.rb
 - db/migrate/20170112115253_create_proposal_votes.rb
@@ -251,6 +282,8 @@ files:
 - db/migrate/20170307085300_migrate_proposal_reports_data_to_reports.rb
 - db/migrate/20170410073742_remove_not_null_reference_proposals.rb
 - db/migrate/20170612101809_migrate_proposals_category.rb
+- db/migrate/20180111110204_create_decidim_proposal_notes.rb
+- db/migrate/20180115155220_add_index_created_at_proposal_notes.rb
 - lib/decidim/proposals.rb
 - lib/decidim/proposals/admin.rb
 - lib/decidim/proposals/admin_engine.rb
@@ -271,7 +304,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.1
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -279,8 +312,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
-summary: A proposals component for decidim's participatory processes.
+summary: Decidim proposals module
 test_files: []

data/app/views/decidim/proposals/proposals/_author.html.erb

@@ -1,23 +0,0 @@
-<div class="author-data__main">
-  <div class="author author--inline">
-    <span class="author__avatar author__avatar--small">
-      <%= image_tag proposal.author_avatar_url %>
-    </span>
-    <span class="author__name">
-      <% if proposal.author&.deleted? %>
-        <span class="label label--small label--basic">
-          <%= t('.deleted') %>
-        </span>
-      <% else %>
-        <%= proposal.author_name %>
-      <% end %>
-    </span>
-    <% if proposal.user_group && proposal.user_group.verified? %>
-      &nbsp;
-      <span class="label label--highlight label--small">
-        <%= t ".verified_user_group" %>
-      </span>
-    <% end %>
-    <%= l proposal.created_at, format: :decidim_short %>
-  </div>
-</div>