decidim 0.0.1.alpha5 → 0.0.1.alpha6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 16728bf79aa6c114df6b46890af4bafc3d28ff89
-  data.tar.gz: 5b9218c6d7c13bab0e2df151c18a6cc5bc656126
+  metadata.gz: f79e614829f7efc389b21794735ad290ecb5c2c3
+  data.tar.gz: c089dfa987459c548261d150db30cf1595af2383
 SHA512:
-  metadata.gz: b471cd3e5dfca0cedbb6405795e2131c4e5a8e87be791a7e198254b3c02d902954f8ca3a53ae7f4fe7481b747e36e4fbce489598245325ee58da1171a55f886f
-  data.tar.gz: 98911183731f92cf4b7c93ad8fd9dcda86fd786d45ed8f629e92a8220c2cf93ad1100ee80c14c29efa0ff733caeab1c66cc162d451604b032f74505dbec59d43
+  metadata.gz: 7444f2272a69d7a3e4c95bedfe1787306d4b92b578a4952ebca4d152252666322044d0c8178ff6cf12c5c40b8a3abb10ec0f03e2ad4c78132a8f544e7aa32cf7
+  data.tar.gz: f30d3430455919cf3c6e8da904e47679ac86c0b2b26036d09c996da2e29905d2c09d2b466baad3b98e7e7ab38344f97ae28a8db25c0a3492881262723d3dcaef

data/.codeclimate.yml

@@ -13,6 +13,8 @@ engines:
     exclude_fingerprints:
     - 645ddab80611224e15d61c8426285296
     - 82b4059b3b55d7b7f06d8aba6cb7b81a
+    - b0c92f6cd3876fc88891cbd4ff26faea
+    - 2804eaecd03c1e9786c9a6f7007dd61e
   eslint:
     enabled: true
   fixme:

data/Gemfile.lock

@@ -12,19 +12,20 @@ GIT
 PATH
   remote: .
   specs:
-    decidim (0.0.1.alpha5)
-      decidim-admin (= 0.0.1.alpha5)
-      decidim-core (= 0.0.1.alpha5)
-      decidim-system (= 0.0.1.alpha5)
+    decidim (0.0.1.alpha6)
+      decidim-admin (= 0.0.1.alpha6)
+      decidim-core (= 0.0.1.alpha6)
+      decidim-system (= 0.0.1.alpha6)
       rails (~> 5.0.0)
       rails-i18n (~> 5.0.0)
 
 PATH
   remote: decidim-admin
   specs:
-    decidim-admin (0.0.1.alpha5)
+    decidim-admin (0.0.1.alpha6)
       active_link_to (~> 1.0.0)
-      decidim-core (= 0.0.1.alpha5)
+      carrierwave (~> 1.0.0.beta)
+      decidim-core (= 0.0.1.alpha6)
       devise (~> 4.2)
       devise-i18n (~> 1.1.0)
       devise_invitable (~> 1.7.0)
@@ -41,7 +42,7 @@ PATH
 PATH
   remote: decidim-core
   specs:
-    decidim-core (0.0.1.alpha5)
+    decidim-core (0.0.1.alpha6)
       active_link_to (~> 1.0.0)
       devise (~> 4.2)
       devise-i18n (~> 1.1.0)
@@ -60,7 +61,7 @@ PATH
 PATH
   remote: decidim-dev
   specs:
-    decidim-dev (0.0.1.alpha5)
+    decidim-dev (0.0.1.alpha6)
       byebug
       capybara (~> 2.10.0)
       database_cleaner (~> 1.5.0)
@@ -74,9 +75,9 @@ PATH
 PATH
   remote: decidim-system
   specs:
-    decidim-system (0.0.1.alpha5)
+    decidim-system (0.0.1.alpha6)
       active_link_to (~> 1.0.0)
-      decidim-core (= 0.0.1.alpha5)
+      decidim-core (= 0.0.1.alpha6)
       devise (~> 4.2)
       devise-i18n (~> 1.1.0)
       devise_invitable (~> 1.7.0)
@@ -152,6 +153,10 @@ GEM
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
+    carrierwave (1.0.0.beta)
+      activemodel (>= 4.0.0)
+      activesupport (>= 4.0.0)
+      mime-types (>= 1.16)
     codecov (0.1.5)
       json
       simplecov

data/decidim-admin/app/assets/config/decidim_admin_manifest.js

@@ -1,2 +1,3 @@
-//= link_directory ../javascripts/decidim/admin.js
-//= link_directory ../stylesheets/decidim/admin.css
+//= link decidim/admin/application.js
+//= link decidim/admin/application.css
+//= link_directory ../images/decidim/admin/

data/decidim-admin/app/assets/stylesheets/decidim/admin/application.scss

@@ -0,0 +1,8 @@
+@import 'https://fonts.googleapis.com/css?family=Montserrat:400,700';
+
+@import "foundation_and_overrides";
+@import "layout";
+@import "login";
+@import "sidebar";
+@import "tables";
+@import "actions";

data/decidim-admin/app/commands/decidim/admin/create_participatory_process.rb

@@ -39,6 +39,8 @@ module Decidim
           hashtag: form.hashtag,
           description: form.description,
           short_description: form.short_description,
+          hero_image: form.hero_image,
+          banner_image: form.banner_image,
           organization: @organization
         )
       end

data/decidim-admin/app/commands/decidim/admin/update_participatory_process.rb

@@ -40,6 +40,8 @@ module Decidim
           subtitle: form.subtitle,
           slug: form.slug,
           hashtag: form.hashtag,
+          hero_image: form.hero_image,
+          banner_image: form.banner_image,
           description: form.description,
           short_description: form.short_description
         }

data/decidim-admin/app/controllers/decidim/admin/participatory_processes_controller.rb

@@ -63,9 +63,11 @@ module Decidim
       end
 
       def destroy
-        @participatory_process = collection.find(params[:id]).destroy!
+        @participatory_process = collection.find(params[:id])
         authorize @participatory_process
 
+        @participatory_process.destroy!
+
         flash[:notice] = I18n.t("participatory_processes.destroy.success", scope: "decidim.admin")
 
         redirect_to participatory_processes_path

data/decidim-admin/app/forms/decidim/admin/participatory_process_form.rb

@@ -16,6 +16,8 @@ module Decidim
 
       attribute :slug, String
       attribute :hashtag, String
+      attribute :hero_image
+      attribute :banner_image
 
       validates :slug, presence: true
       translatable_validates :title, :subtitle, :description, :short_description, presence: true

data/decidim-admin/app/helpers/decidim/admin/attributes_display_helper.rb

@@ -33,8 +33,7 @@ module Decidim
         attrs.map do |attr|
           if record.column_for_attribute(attr).type == :hstore
             I18n.available_locales.map do |locale|
-              content_tag(:dt, record.class.human_attribute_name(attr) + " (#{locale})") +
-                display_value(record, attr, locale)
+              display_label(record, attr, locale) + display_value(record, attr, locale)
             end.reduce(:+)
           else
             display_label(record, attr) + display_value(record, attr)
@@ -42,13 +41,14 @@ module Decidim
         end.reduce(:+)
       end
 
-      private
-
-      # Private: Holds the logic to render a label for a given attribute.
-      def display_label(record, attr)
-        content_tag(:dt, record.class.human_attribute_name(attr))
+      # Holds the logic to render a label for a given attribute.
+      def display_label(record, attr, locale = nil)
+        return content_tag(:dt, record.class.human_attribute_name(attr)) unless locale
+        content_tag(:dt, record.class.human_attribute_name(attr) + " (#{locale})")
       end
 
+      private
+
       # Private: Holds the logic to render the attribute value.
       def display_value(record, attr, locale = nil)
         return I18n.with_locale(locale) do

data/decidim-admin/app/views/decidim/admin/participatory_processes/_form.html.erb

@@ -21,3 +21,11 @@
 <div class="field">
   <%= form.translated :text_area, :description %>
 </div>
+
+<div class="field">
+  <%= form.file_field :hero_image %>
+</div>
+
+<div class="field">
+  <%= form.file_field :banner_image %>
+</div>

data/decidim-admin/app/views/decidim/admin/participatory_processes/show.html.erb

@@ -14,7 +14,12 @@
     :title,
     :subtitle,
     :hashtag,
+    :slug,
     :short_description,
     :description
     %>
+  <dt><%= display_label(@participatory_process, :hero_image) %></dt>
+  <dd><%= image_tag @participatory_process.hero_image.url.to_s %></dd>
+  <dt><%= display_label(@participatory_process, :banner_image) %></dt>
+  <dd><%= image_tag @participatory_process.banner_image.url.to_s %></dd>
 </dl>

data/decidim-admin/app/views/layouts/decidim/admin/_header.html.erb

@@ -1,4 +1,4 @@
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <%= csrf_meta_tags %>
-<%= stylesheet_link_tag    'decidim/admin', media: 'all', 'data-turbolinks-track': 'reload' %>
-<%= javascript_include_tag 'decidim/admin', 'data-turbolinks-track': 'reload' %>
+<%= stylesheet_link_tag    'decidim/admin/application', media: 'all', 'data-turbolinks-track': 'reload' %>
+<%= javascript_include_tag 'decidim/admin/application', 'data-turbolinks-track': 'reload' %>

data/decidim-admin/decidim-admin.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.description = "Organization administration to manage a single organization."
   s.license     = "MIT"
 
-  s.files = Dir["{app,config,db,lib}/**/*", "MIT-LICENSE", "Rakefile", "README.md"]
+  s.files = Dir["{app,config,db,lib,vendor}/**/*", "MIT-LICENSE", "Rakefile", "README.md"]
 
   s.add_dependency "decidim-core", Decidim.version
   s.add_dependency "rails", Decidim.rails_version
@@ -31,6 +31,7 @@ Gem::Specification.new do |s|
   s.add_dependency "foundation_rails_helper", "~> 2.0.0"
   s.add_dependency "active_link_to", "~> 1.0.0"
   s.add_dependency "pundit", "~> 1.1.0"
+  s.add_dependency "carrierwave", "~> 1.0.0.beta"
 
   s.add_development_dependency "decidim-dev", Decidim.version
   s.add_development_dependency "pundit-matchers", "~> 1.1.0"

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

@@ -20,11 +20,8 @@ module Decidim
     class Engine < ::Rails::Engine
       isolate_namespace Decidim::Admin
 
-      config.to_prepare do
-        Rails.application.config.assets.precompile += %w(
-          decidim/admin.js
-          decidim/admin.css
-        )
+      initializer "decidim_admin.assets" do |app|
+        app.config.assets.precompile += %w(decidim_admin_manifest.js)
       end
     end
   end

data/decidim-admin/spec/features/manage_participatory_processes_spec.rb

@@ -3,6 +3,18 @@
 require "spec_helper"
 
 describe "Manage participatory processes", type: :feature do
+  let(:image1_filename) { "city.jpeg" }
+  let(:image1_path) do
+    File.join(File.dirname(__FILE__), "..", "..", "..", "decidim-dev", "spec", "support", image1_filename)
+  end
+  let(:image2_filename) { "city2.jpeg" }
+  let(:image2_path) do
+    File.join(File.dirname(__FILE__), "..", "..", "..", "decidim-dev", "spec", "support", image2_filename)
+  end
+  let(:image3_filename) { "city3.jpeg" }
+  let(:image3_path) do
+    File.join(File.dirname(__FILE__), "..", "..", "..", "decidim-dev", "spec", "support", image3_filename)
+  end
   let(:organization) { create(:organization) }
   let(:admin) { create(:user, :admin, :confirmed, organization: organization) }
   let!(:participatory_process) { create(:process, organization: organization) }
@@ -13,6 +25,31 @@ describe "Manage participatory processes", type: :feature do
     visit decidim_admin.participatory_processes_path
   end
 
+  it "displays all fields from a single participatory process" do
+    within "table" do
+      click_link participatory_process.title["en"]
+    end
+
+    within "dl" do
+      expect(page).to have_content(participatory_process.title["en"])
+      expect(page).to have_content(participatory_process.title["es"])
+      expect(page).to have_content(participatory_process.title["ca"])
+      expect(page).to have_content(participatory_process.subtitle["en"])
+      expect(page).to have_content(participatory_process.subtitle["es"])
+      expect(page).to have_content(participatory_process.subtitle["ca"])
+      expect(page).to have_content(participatory_process.short_description["en"])
+      expect(page).to have_content(participatory_process.short_description["es"])
+      expect(page).to have_content(participatory_process.short_description["ca"])
+      expect(page).to have_content(participatory_process.description["en"])
+      expect(page).to have_content(participatory_process.description["es"])
+      expect(page).to have_content(participatory_process.description["ca"])
+      expect(page).to have_content(participatory_process.hashtag)
+      expect(page).to have_content(participatory_process.slug)
+      expect(page).to have_xpath("//img[@src=\"#{participatory_process.hero_image.url}\"]")
+      expect(page).to have_xpath("//img[@src=\"#{participatory_process.banner_image.url}\"]")
+    end
+  end
+
   it "creates a new participatory_process" do
     find(".actions .new").click
 
@@ -31,6 +68,8 @@ describe "Manage participatory processes", type: :feature do
       fill_in :participatory_process_description_en, with: "A longer description"
       fill_in :participatory_process_description_es, with: "Descripción más larga"
       fill_in :participatory_process_description_ca, with: "Descripció més llarga"
+      attach_file :participatory_process_hero_image, image1_path
+      attach_file :participatory_process_banner_image, image2_path
 
       find("*[type=submit]").click
     end
@@ -41,6 +80,12 @@ describe "Manage participatory processes", type: :feature do
 
     within "table" do
       expect(page).to have_content("My participatory process")
+      click_link("My participatory process")
+    end
+
+    within "dl" do
+      expect(page).to have_css("img[src*='#{image1_filename}']")
+      expect(page).to have_css("img[src*='#{image2_filename}']")
     end
   end
 
@@ -53,6 +98,7 @@ describe "Manage participatory processes", type: :feature do
       fill_in :participatory_process_title_en, with: "My new title"
       fill_in :participatory_process_title_es, with: "Mi nuevo título"
       fill_in :participatory_process_title_ca, with: "El meu nou títol"
+      attach_file :participatory_process_banner_image, image3_path
 
       find("*[type=submit]").click
     end
@@ -63,6 +109,12 @@ describe "Manage participatory processes", type: :feature do
 
     within "table" do
       expect(page).to have_content("My new title")
+      click_link("My new title")
+    end
+
+    within "dl" do
+      expect(page).to_not have_css("img[src*='#{image2_filename}']")
+      expect(page).to have_css("img[src*='#{image3_filename}']")
     end
   end
 

data/decidim-dev/decidim-dev.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.description = "Utilities and tools we need to develop Decidim"
   s.license     = "MIT"
 
-  s.files = Dir["{app,config,db,lib}/**/*", "MIT-LICENSE", "Rakefile", "README.md"]
+  s.files = Dir["{app,config,db,lib,vendor}/**/*", "MIT-LICENSE", "Rakefile", "README.md"]
 
   s.add_dependency "factory_girl_rails"
   s.add_dependency "database_cleaner", "~> 1.5.0"

data/decidim-system/app/assets/config/decidim_system_manifest.js

@@ -1,2 +1,3 @@
-//= link_directory ../javascripts/decidim/system .js
-//= link_directory ../stylesheets/decidim/system .css
+//= link decidim/system/application.js
+//= link decidim/system/application.css
+//= link_directory ../images/decidim/system/

data/decidim-system/app/assets/stylesheets/decidim/system/application.scss

@@ -0,0 +1,8 @@
+@import 'https://fonts.googleapis.com/css?family=Montserrat:400,700';
+
+@import "foundation_and_overrides";
+@import "layout";
+@import "login";
+@import "sidebar";
+@import "tables";
+@import "actions";

data/decidim-system/app/views/layouts/decidim/system/_header.html.erb

@@ -1,4 +1,4 @@
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <%= csrf_meta_tags %>
-<%= stylesheet_link_tag    'decidim/system', media: 'all', 'data-turbolinks-track': 'reload' %>
-<%= javascript_include_tag 'decidim/system', 'data-turbolinks-track': 'reload' %>
+<%= stylesheet_link_tag    'decidim/system/application', media: 'all', 'data-turbolinks-track': 'reload' %>
+<%= javascript_include_tag 'decidim/system/application', 'data-turbolinks-track': 'reload' %>

data/decidim-system/decidim-system.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.description = "System administration to create new organization in an installation."
   s.license     = "MIT"
 
-  s.files = Dir["{app,config,db,lib}/**/*", "MIT-LICENSE", "Rakefile", "README.md"]
+  s.files = Dir["{app,config,db,lib,vendor}/**/*", "MIT-LICENSE", "Rakefile", "README.md"]
 
   s.add_dependency "decidim-core", Decidim.version
   s.add_dependency "rails", Decidim.rails_version

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

@@ -19,11 +19,8 @@ module Decidim
     class Engine < ::Rails::Engine
       isolate_namespace Decidim::System
 
-      config.to_prepare do
-        Rails.application.config.assets.precompile += %w(
-          decidim/system.js
-          decidim/system.css
-        )
+      initializer "decidim_system.assets" do |app|
+        app.config.assets.precompile += %w(decidim_system_manifest.js)
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim
 version: !ruby/object:Gem::Version
-  version: 0.0.1.alpha5
+  version: 0.0.1.alpha6
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -18,42 +18,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.1.alpha5
+        version: 0.0.1.alpha6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.1.alpha5
+        version: 0.0.1.alpha6
 - !ruby/object:Gem::Dependency
   name: decidim-system
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.1.alpha5
+        version: 0.0.1.alpha6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.1.alpha5
+        version: 0.0.1.alpha6
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.1.alpha5
+        version: 0.0.1.alpha6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.1.alpha5
+        version: 0.0.1.alpha6
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -160,8 +160,7 @@ files:
 - decidim-admin/Rakefile
 - decidim-admin/app/assets/config/decidim_admin_manifest.js
 - decidim-admin/app/assets/images/decidim/admin/.keep
-- decidim-admin/app/assets/javascripts/decidim/admin.js
-- decidim-admin/app/assets/stylesheets/decidim/admin.scss
+- decidim-admin/app/assets/javascripts/decidim/admin/application.js
 - decidim-admin/app/assets/stylesheets/decidim/admin/_actions.scss
 - decidim-admin/app/assets/stylesheets/decidim/admin/_foundation_and_overrides.scss
 - decidim-admin/app/assets/stylesheets/decidim/admin/_layout.scss
@@ -169,6 +168,7 @@ 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/assets/stylesheets/decidim/admin/application.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
@@ -232,13 +232,15 @@ files:
 - decidim-dev/lib/decidim/test/rspec_support/warden.rb
 - decidim-dev/lib/decidim/test/rspec_support/wisper.rb
 - decidim-dev/lib/generators/decidim/dummy_generator.rb
+- decidim-dev/spec/support/city.jpeg
+- decidim-dev/spec/support/city2.jpeg
+- decidim-dev/spec/support/city3.jpeg
 - decidim-system/Gemfile
 - decidim-system/README.md
 - decidim-system/Rakefile
 - decidim-system/app/assets/config/decidim_system_manifest.js
 - decidim-system/app/assets/images/decidim/system/.keep
-- decidim-system/app/assets/javascripts/decidim/system.js
-- decidim-system/app/assets/stylesheets/decidim/system.scss
+- decidim-system/app/assets/javascripts/decidim/system/application.js
 - decidim-system/app/assets/stylesheets/decidim/system/_actions.scss
 - decidim-system/app/assets/stylesheets/decidim/system/_foundation_and_overrides.scss
 - decidim-system/app/assets/stylesheets/decidim/system/_layout.scss
@@ -246,6 +248,7 @@ files:
 - decidim-system/app/assets/stylesheets/decidim/system/_settings.scss
 - decidim-system/app/assets/stylesheets/decidim/system/_sidebar.scss
 - decidim-system/app/assets/stylesheets/decidim/system/_tables.scss
+- decidim-system/app/assets/stylesheets/decidim/system/application.scss
 - decidim-system/app/commands/decidim/system/create_admin.rb
 - decidim-system/app/commands/decidim/system/register_organization.rb
 - decidim-system/app/commands/decidim/system/update_admin.rb

data/decidim-admin/app/assets/stylesheets/decidim/admin.scss

@@ -1,8 +0,0 @@
-@import 'https://fonts.googleapis.com/css?family=Montserrat:400,700';
-
-@import "admin/foundation_and_overrides";
-@import "admin/layout";
-@import "admin/login";
-@import "admin/sidebar";
-@import "admin/tables";
-@import "admin/actions";

data/decidim-system/app/assets/stylesheets/decidim/system.scss

@@ -1,8 +0,0 @@
-@import 'https://fonts.googleapis.com/css?family=Montserrat:400,700';
-
-@import "system/foundation_and_overrides";
-@import "system/layout";
-@import "system/login";
-@import "system/sidebar";
-@import "system/tables";
-@import "system/actions";