decidim-proposals 0.12.2 → 0.13.0.pre1

data/lib/decidim/proposals/proposal_serializer.rb

@@ -28,7 +28,7 @@ module Decidim
           body: @proposal.body,
           votes: @proposal.proposal_votes_count,
           comments: @proposal.comments.count,
-          created_at: @proposal.created_at,
+          published_at: @proposal.published_at,
           url: url,
           component: { id: component.id },
           meeting_urls: meetings

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

@@ -137,18 +137,32 @@ FactoryBot.define do
   end
 
   factory :proposal, class: "Decidim::Proposals::Proposal" do
+    transient do
+      users nil
+      # user_groups correspondence to users is by sorting order
+      user_groups []
+    end
+
     title { Faker::Lorem.sentence }
     body { Faker::Lorem.sentences(3).join("\n") }
     component { create(:proposal_component) }
     published_at { Time.current }
     address { "#{Faker::Address.street_name}, #{Faker::Address.city}" }
 
-    author do
-      create(:user, organization: component.organization) if component
+    after(:build) do |proposal, evaluator|
+      if proposal.component
+        users = evaluator.users || [create(:user, organization: proposal.component.participatory_space.organization)]
+        users.each_with_index do |user, idx|
+          user_group = evaluator.user_groups[idx]
+          Decidim::Coauthorship.create(author: user, user_group: user_group, coauthorable: proposal)
+        end
+      end
     end
 
     trait :official do
-      author nil
+      after :build do |proposal|
+        proposal.coauthorships.clear
+      end
     end
 
     trait :evaluating do

data/lib/decidim/proposals/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-proposals
 version: !ruby/object:Gem::Version
-  version: 0.12.2
+  version: 0.13.0.pre1
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-11 00:00:00.000000000 Z
+date: 2018-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cells-erb
@@ -44,30 +44,30 @@ dependencies:
   name: decidim-comments
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: 0.13.a
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: 0.13.a
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: 0.13.a
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: 0.13.a
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
@@ -114,86 +114,86 @@ dependencies:
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: 0.13.a
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: 0.13.a
 - !ruby/object:Gem::Dependency
   name: decidim-assemblies
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: 0.13.a
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: 0.13.a
 - !ruby/object:Gem::Dependency
   name: decidim-budgets
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: 0.13.a
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: 0.13.a
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: 0.13.a
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: 0.13.a
 - !ruby/object:Gem::Dependency
   name: decidim-meetings
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: 0.13.a
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: 0.13.a
 - !ruby/object:Gem::Dependency
   name: decidim-participatory_processes
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: 0.13.a
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: 0.13.a
 description: A proposals component for decidim's participatory spaces.
 email:
 - josepjaume@gmail.com
@@ -215,6 +215,7 @@ 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/coauthorships_cell.rb
 - app/cells/decidim/proposals/endorsers_list/show.erb
 - app/cells/decidim/proposals/endorsers_list_cell.rb
 - app/cells/decidim/proposals/proposal_cell.rb
@@ -315,7 +316,6 @@ files:
 - app/views/decidim/proposals/proposals/_endorsement_button.html.erb
 - app/views/decidim/proposals/proposals/_endorsement_identities_cabin.html.erb
 - app/views/decidim/proposals/proposals/_endorsements_card_row.html.erb
-- 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/_linked_proposals.html.erb
@@ -379,6 +379,9 @@ files:
 - 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/20180529101323_add_counter_cache_coauthorships_to_proposals.rb
+- db/migrate/20180529110230_move_authorships_to_coauthorships.rb
+- db/migrate/20180529110830_remove_authorships_from_proposals.rb
 - lib/decidim/content_parsers/proposal_parser.rb
 - lib/decidim/content_renderers/proposal_renderer.rb
 - lib/decidim/proposals.rb
@@ -405,9 +408,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/views/decidim/proposals/proposals/_endorsements_count.html.erb

@@ -1,5 +0,0 @@
-<%= link_to "#list-of-endorsements", id: "proposal-#{proposal.id}-endorsements-count", class: "button small compact light button--sc button--shadow #{fully_endorsed ? 'success' : 'secondary'}" do %>
-  <%= icon "bullhorn", class: "icon--small", aria_label: "Endorsements", role: "img" %>
-      <%= proposal.proposal_endorsements_count %>
-</button>
-<% end %>