decidim-proposals 0.11.2 → 0.12.0.pre

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-proposals
 version: !ruby/object:Gem::Version
-  version: 0.11.2
+  version: 0.12.0.pre
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,36 +10,64 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-13 00:00:00.000000000 Z
+date: 2018-06-06 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: cells-erb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+- !ruby/object:Gem::Dependency
+  name: cells-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.9
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.9
 - !ruby/object:Gem::Dependency
   name: decidim-comments
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0.pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0.pre
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0.pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0.pre
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
@@ -88,84 +116,84 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0.pre
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0.pre
 - !ruby/object:Gem::Dependency
   name: decidim-assemblies
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0.pre
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0.pre
 - !ruby/object:Gem::Dependency
   name: decidim-budgets
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0.pre
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0.pre
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0.pre
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0.pre
 - !ruby/object:Gem::Dependency
   name: decidim-meetings
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0.pre
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0.pre
 - !ruby/object:Gem::Dependency
   name: decidim-participatory_processes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0.pre
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0.pre
 description: A proposals component for decidim's participatory spaces.
 email:
 - josepjaume@gmail.com
@@ -187,6 +215,14 @@ files:
 - app/assets/javascripts/decidim/proposals/social_share.js
 - app/assets/javascripts/decidim/proposals/utils.js.es6
 - app/assets/stylesheets/decidim/proposals/social_share.css.scss
+- app/cells/decidim/proposals/endorsers_list/show.erb
+- app/cells/decidim/proposals/endorsers_list_cell.rb
+- app/cells/decidim/proposals/proposal_cell.rb
+- app/cells/decidim/proposals/proposal_m/footer.erb
+- app/cells/decidim/proposals/proposal_m/tags.erb
+- app/cells/decidim/proposals/proposal_m_cell.rb
+- app/cells/decidim/proposals/proposal_tags/show.erb
+- app/cells/decidim/proposals/proposal_tags_cell.rb
 - 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
@@ -230,20 +266,19 @@ files:
 - app/forms/decidim/proposals/proposal_form.rb
 - app/helpers/decidim/proposals/application_helper.rb
 - app/helpers/decidim/proposals/map_helper.rb
+- app/helpers/decidim/proposals/proposal_cells_helper.rb
 - app/helpers/decidim/proposals/proposal_endorsements_helper.rb
 - app/helpers/decidim/proposals/proposal_votes_helper.rb
 - app/helpers/decidim/proposals/proposal_wizard_helper.rb
 - app/jobs/decidim/proposals/notify_proposals_mentioned_job.rb
 - app/jobs/decidim/proposals/settings_change_job.rb
-- app/models/decidim/proposals/abilities/admin_ability.rb
-- app/models/decidim/proposals/abilities/current_user_ability.rb
-- app/models/decidim/proposals/abilities/participatory_process_admin_ability.rb
-- 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_endorsement.rb
 - app/models/decidim/proposals/proposal_note.rb
 - app/models/decidim/proposals/proposal_vote.rb
+- app/permissions/decidim/proposals/admin/permissions.rb
+- app/permissions/decidim/proposals/permissions.rb
 - app/presenters/decidim/proposals/admin_log/proposal_note_presenter.rb
 - app/presenters/decidim/proposals/admin_log/proposal_presenter.rb
 - app/presenters/decidim/proposals/admin_log/value_types/proposal_state_presenter.rb
@@ -283,8 +318,6 @@ files:
 - app/views/decidim/proposals/proposals/_endorsements_count.html.erb
 - app/views/decidim/proposals/proposals/_filters.html.erb
 - app/views/decidim/proposals/proposals/_filters_small_view.html.erb
-- app/views/decidim/proposals/proposals/_identities_listing.html.erb
-- app/views/decidim/proposals/proposals/_identity_xxs.html.erb
 - app/views/decidim/proposals/proposals/_linked_proposals.html.erb
 - app/views/decidim/proposals/proposals/_proposal.html.erb
 - app/views/decidim/proposals/proposals/_proposal_badge.html.erb
@@ -292,7 +325,6 @@ files:
 - app/views/decidim/proposals/proposals/_proposal_similar.html.erb
 - app/views/decidim/proposals/proposals/_proposals.html.erb
 - app/views/decidim/proposals/proposals/_remaining_votes_count.html.erb
-- app/views/decidim/proposals/proposals/_tags.html.erb
 - app/views/decidim/proposals/proposals/_vote_button.html.erb
 - app/views/decidim/proposals/proposals/_votes_count.html.erb
 - app/views/decidim/proposals/proposals/_voting_rules.html.erb
@@ -340,12 +372,13 @@ files:
 - db/migrate/20170612101809_migrate_proposals_category.rb
 - db/migrate/20171201115434_create_proposal_endorsements.rb
 - db/migrate/20171201122623_add_counter_cache_endorsements_to_proposals.rb
-- db/migrate/20171212102250_enable_pg_extensions.rb
+- db/migrate/20171212102250_enable_pg_trgm_extension_for_proposals.rb
 - db/migrate/20171220084719_add_published_at_to_proposals.rb
 - db/migrate/20180111110204_create_decidim_proposal_notes.rb
 - db/migrate/20180115155220_add_index_created_at_proposal_notes.rb
 - db/migrate/20180305133811_rename_features_to_components_at_proposals.rb
 - db/migrate/20180413135249_fix_nil_threshold_per_proposal.rb
+- db/migrate/20180516131201_index_proposals_as_searchable_resources.rb
 - lib/decidim/content_parsers/proposal_parser.rb
 - lib/decidim/content_renderers/proposal_renderer.rb
 - lib/decidim/proposals.rb
@@ -372,9 +405,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.6

data/app/models/decidim/proposals/abilities/admin_ability.rb

@@ -1,42 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Proposals
-    module Abilities
-      # Defines the abilities related to proposals for a logged in admin user.
-      # Intended to be used with `cancancan`.
-      class AdminAbility < Decidim::Abilities::AdminAbility
-        def define_abilities
-          super
-
-          can :manage, Proposal
-          can :unreport, Proposal
-          can :hide, Proposal
-          cannot :create, Proposal unless can_create_proposal?
-          cannot :update, Proposal unless can_update_proposal?
-          can :create, ProposalNote
-        end
-
-        private
-
-        def current_settings
-          @context.fetch(:current_settings, nil)
-        end
-
-        def component_settings
-          @context.fetch(:component_settings, nil)
-        end
-
-        def can_create_proposal?
-          current_settings.try(:creation_enabled?) &&
-            component_settings.try(:official_proposals_enabled)
-        end
-
-        def can_update_proposal?
-          current_settings.try(:proposal_answering_enabled) &&
-            component_settings.try(:proposal_answering_enabled)
-        end
-      end
-    end
-  end
-end

data/app/models/decidim/proposals/abilities/current_user_ability.rb

@@ -1,113 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Proposals
-    module Abilities
-      # Defines the abilities related to proposals for a logged in user.
-      # Intended to be used with `cancancan`.
-      class CurrentUserAbility
-        include CanCan::Ability
-
-        attr_reader :user, :context
-
-        def initialize(user, context)
-          return unless user
-
-          @user = user
-          @context = context
-
-          setup_endorsement_related_abilities
-          setup_voting_related_abilities
-          can :create, Proposal if authorized?(:create) && creation_enabled?
-          can :edit, Proposal do |proposal|
-            proposal.editable_by?(user)
-          end
-
-          can :withdraw, Proposal do |proposal|
-            can_withdraw?(proposal)
-          end
-
-          can :report, Proposal
-        end
-
-        private
-
-        def setup_endorsement_related_abilities
-          can :endorse, Proposal do |_proposal|
-            authorized?(:endorse) && endorsements_enabled? && !endorsements_blocked?
-          end
-          can :unendorse, Proposal do |_proposal|
-            authorized?(:unendorse) && endorsements_enabled?
-          end
-        end
-
-        def setup_voting_related_abilities
-          can :vote, Proposal do |_proposal|
-            authorized?(:vote) && voting_enabled? && remaining_votes.positive?
-          end
-          can :unvote, Proposal do |_proposal|
-            authorized?(:vote) && voting_enabled?
-          end
-        end
-
-        def authorized?(action)
-          return unless component
-
-          ActionAuthorizer.new(user, component, action).authorize.ok?
-        end
-
-        def vote_limit_enabled?
-          return unless component_settings
-          component_settings.vote_limit.present? && component_settings.vote_limit.positive?
-        end
-
-        def creation_enabled?
-          return unless current_settings
-          current_settings.creation_enabled?
-        end
-
-        def remaining_votes
-          return 1 unless vote_limit_enabled?
-
-          proposals = Proposal.where(component: component)
-          votes_count = ProposalVote.where(author: user, proposal: proposals).size
-          component_settings.vote_limit - votes_count
-        end
-
-        def endorsements_enabled?
-          return unless current_settings
-          current_settings.endorsements_enabled?
-        end
-
-        def endorsements_blocked?
-          return unless current_settings
-          current_settings.endorsements_blocked?
-        end
-
-        def voting_enabled?
-          return unless current_settings
-          current_settings.votes_enabled? && !current_settings.votes_blocked?
-        end
-
-        def current_settings
-          context.fetch(:current_settings, nil)
-        end
-
-        def component_settings
-          context.fetch(:component_settings, nil)
-        end
-
-        def component
-          component = context.fetch(:current_component, nil)
-          return nil unless component && component.manifest.name == :proposals
-
-          component
-        end
-
-        def can_withdraw?(proposal)
-          proposal.decidim_author_id == @user.id
-        end
-      end
-    end
-  end
-end

data/app/models/decidim/proposals/abilities/participatory_process_admin_ability.rb

@@ -1,48 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Proposals
-    module Abilities
-      # Defines the abilities related to proposals for a logged in process admin user.
-      # Intended to be used with `cancancan`.
-      class ParticipatoryProcessAdminAbility < Decidim::Abilities::ParticipatoryProcessAdminAbility
-        def define_participatory_process_abilities
-          super
-
-          can [:manage, :unreport, :hide], Proposal do |proposal|
-            can_manage_process?(proposal.component.participatory_space)
-          end
-
-          cannot :create, Proposal unless can_create_proposal?
-          cannot :update, Proposal unless can_update_proposal?
-          can :create, ProposalNote
-        end
-
-        private
-
-        def current_settings
-          @context.fetch(:current_settings, nil)
-        end
-
-        def component_settings
-          @context.fetch(:component_settings, nil)
-        end
-
-        def current_component
-          @context.fetch(:current_component, nil)
-        end
-
-        def can_create_proposal?
-          current_settings.try(:creation_enabled?) &&
-            component_settings.try(:official_proposals_enabled) &&
-            can_manage_process?(current_component.try(:participatory_space))
-        end
-
-        def can_update_proposal?
-          current_settings.try(:proposal_answering_enabled) &&
-            component_settings.try(:proposal_answering_enabled)
-        end
-      end
-    end
-  end
-end

data/app/models/decidim/proposals/abilities/participatory_process_moderator_ability.rb

@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Proposals
-    module Abilities
-      # Defines the abilities related to proposals for a logged in process admin user.
-      # Intended to be used with `cancancan`.
-      class ParticipatoryProcessModeratorAbility < Decidim::Abilities::ParticipatoryProcessModeratorAbility
-        def define_participatory_process_abilities
-          super
-
-          can [:unreport, :hide], Proposal do |proposal|
-            can_manage_process?(proposal.component.participatory_space)
-          end
-        end
-      end
-    end
-  end
-end

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

@@ -1,30 +0,0 @@
-<%
-count = identities.count
-if count > 0
-%>
-  <div class="row">
-    <div class="columns large-12">
-      <h4 class="section-heading"><%= t(".title") %></h4>
-    </div>
-
-    <div class="columns large-12">
-      <%= identities_xxs(identities.limit(5)) %>
-      <% if count > 5 %><span id="<%= widget_ids[:ellipsis] %>" data-toggler=".hide">+<%= count - 5 %></span><% end -%>
-    </div>
-  </div>
-  <% if count > 5 %>
-    <div class="row">
-      <div id="<%= widget_ids[:see_all_identities] %>" class="columns large-12" data-toggler=".hide">
-        <a data-toggle="<%= widget_ids.values_at(:remaining_identities, :see_all_identities, :ellipsis).join(" ") %>"><%= t(".see_all") %></a>
-      </div>
-      <div id="<%= widget_ids[:remaining_identities] %>" class="hide" data-toggler=".hide">
-        <div class="columns large-12">
-          <%= identities_xxs(identities.offset(5)) %>
-        </div>
-        <div class="columns large-12">
-          <a data-toggle="<%= widget_ids.values_at(:remaining_identities, :see_all_identities, :ellipsis).join(" ") %>"><%= t(".see_less") %></a>
-        </div>
-      </div>
-    </div>
-  <% end -%>
-<% end %>

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

@@ -1,8 +0,0 @@
-<div class="author author--inline">
-  <span class="author__avatar author__avatar--small">
-    <%= image_tag identity.avatar_url %>
-  </span>
-  <span class="author__name">
-    <%= identity.name %>
-  </span>
-</div>

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

@@ -1,25 +0,0 @@
-<figure>
-  <figcaption class="text-uppercase">
-    <strong>
-      <%= t("filed_as", scope: "decidim.proposals.proposals.tags") %>
-    </strong>
-  </figcaption>
-
-  <ul>
-    <% if resource.category.present? %>
-      <li>
-        <%= link_to translated_attribute(resource.category.name), resource_locator(resource).index(filter: { category_id: resource.category.id }) %>
-        <% if resource.previous_category.present? && action_name == "show" %>
-          &nbsp;
-          <small class="text-small">
-            <%= t("changed_from", scope: "decidim.proposals.proposals.tags", previous_category: "#{resource.previous_category.translated_name}").html_safe %>
-          </small>
-        <% end %>
-      </li>
-    <% end %>
-
-    <% if has_visible_scopes?(resource) %>
-      <li><%= link_to translated_attribute(resource.scope.name), resource_locator(resource).index(filter: { scope_id: [resource.scope.id] }) %></li>
-    <% end %>
-  </ul>
-</figure>