decidim-process_groups_content_block 0.16.0 → 0.16.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e0ab91977c71bc800e6ddc301d376f1f73a06c18
-  data.tar.gz: 1525ca13f49115e8cc0fb5ad58bc8b7f51cf782d
+SHA256:
+  metadata.gz: d7d1dc8bfb5244bfcb6d553c752f7e5c3af18b90b35a68af834f862e56aefddf
+  data.tar.gz: 9156032a3a4c28596ea5a0a9bd763d11e4c101ee58ecffe46257248ce7be49c4
 SHA512:
-  metadata.gz: 6a390ba7ffa628bf0988bff7a954e1d6155066655c6b2d13697765cf650c2a7d22bd4e361e5a835bb2d9be177150a0b7ac71aa976ee8818fb83756dbd60398c1
-  data.tar.gz: 40808a6753f72d869362812d1d29efdbd2fe1e069e753b230af99b4b7d5e2e0619194900e685cadc449ffb2c6a2012c0e72d54edab527a95a4894e9a8b67b6a2
+  metadata.gz: 1ebe1a7585e5038d27166c6a4225362086728fdbeb9caf2caabacee519c108415151568636b316699ae030a323ed598c80736f48a3e082d66fd3ec0893a3d018
+  data.tar.gz: d8c072c223ec648ac9b1b19353993a3eeeefe4b51af8e00b2b95fe58ed818c81e7933533261b8c9d1cbccee1efa44441fb1ffa6fcba72be873e7441c9cfa9773

data/README.md

@@ -1,5 +1,10 @@
 # Decidim::ProcessGroupsContentBlock
 
+[![Build Status](https://travis-ci.com/mainio/decidim-module-process_groups_content_block.svg?branch=master)](https://travis-ci.com/mainio/decidim-module-process_groups_content_block)
+[![codecov](https://codecov.io/gh/mainio/decidim-module-process_groups_content_block/branch/master/graph/badge.svg)](https://codecov.io/gh/mainio/decidim-module-process_groups_content_block)
+
+The gem has been developed by [Mainio Tech](https://www.mainiotech.fi/).
+
 Adds a process groups content block to your Decidim instance to be used on the
 home page of the app.
 
@@ -8,7 +13,7 @@ home page of the app.
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'decidim-process_groups_content_block'
+gem "decidim-process_groups_content_block"
 ```
 
 And then execute:
@@ -28,6 +33,63 @@ $ bundle
 
 See [Decidim](https://github.com/decidim/decidim).
 
+### Developing
+
+To start contributing to this project, first:
+
+- Install the basic dependencies (such as Ruby and PostgreSQL)
+- Clone this repository
+
+Decidim's main repository also provides a Docker configuration file if you
+prefer to use Docker instead of installing the dependencies locally on your
+machine.
+
+You can create the development app by running the following commands after
+cloning this project:
+
+```bash
+$ bundle
+$ DATABASE_USERNAME=<username> DATABASE_PASSWORD=<password> bundle exec rake development_app
+```
+
+Note that the database user has to have rights to create and drop a database in
+order to create the dummy test app database.
+
+Then to test how the module works in Decidim, start the development server:
+
+```bash
+$ cd development_app
+$ DATABASE_USERNAME=<username> DATABASE_PASSWORD=<password> bundle exec rails s
+```
+
+In case you are using [rbenv](https://github.com/rbenv/rbenv) and have the
+[rbenv-vars](https://github.com/rbenv/rbenv-vars) plugin installed for it, you
+can add the environment variables to the root directory of the project in a file
+named `.rbenv-vars`. If these are defined for the environment, you can omit
+defining these in the commands shown above.
+
+#### Code Styling
+
+Please follow the code styling defined by the different linters that ensure we
+are all talking with the same language collaborating on the same project. This
+project is set to follow the same rules that Decidim itself follows.
+
+[Rubocop](https://rubocop.readthedocs.io/) linter is used for the Ruby language.
+
+You can run the code styling checks by running the following commands from the
+console:
+
+```
+$ bundle exec rubocop
+```
+
+To ease up following the style guide, you should install the plugin to your
+favorite editor, such as:
+
+- Atom - [linter-rubocop](https://atom.io/packages/linter-rubocop)
+- Sublime Text - [Sublime RuboCop](https://github.com/pderichs/sublime_rubocop)
+- Visual Studio Code - [Rubocop for Visual Studio Code](https://github.com/misogi/vscode-ruby-rubocop)
+
 ### Testing
 
 To run the tests run the following in the gem development path:
@@ -47,6 +109,18 @@ can add these environment variables to the root directory of the project in a
 file named `.rbenv-vars`. In this case, you can omit defining these in the
 commands shown above.
 
+### Test code coverage
+
+If you want to generate the code coverage report for the tests, you can use
+the `SIMPLECOV=1` environment variable in the rspec command as follows:
+
+```bash
+$ SIMPLECOV=1 bundle exec rspec
+```
+
+This will generate a folder named `coverage` in the project root which contains
+the code coverage report.
+
 ## License
 
 See [LICENSE-AGPLv3.txt](LICENSE-AGPLv3.txt).

data/app/cells/decidim/process_groups_content_block/content_blocks/highlighted_process_groups/show.erb

@@ -2,19 +2,49 @@
   <div class="row" id="highlighted-process-groups">
     <h3 class="section-heading"><%= t("active_processes", scope: i18n_scope) %></h3>
     <div class="row collapse">
-      <div class="row small-up-1 smallmedium-up-2 mediumlarge-up-3
-        large-up-4 card-grid">
+      <div class="row small-up-1 medium-up-2 large-up-3 card-grid">
         <% highlighted_groups.each do |group| %>
           <div class="column">
             <article class="card card--process card--stack card--mini">
-              <%= link_to decidim_participatory_processes.participatory_process_group_path(group), class: "card__link" do %>
-                <div class="card__image-top"
-                  style="background-image:url(<%= group.hero_image.url %>)"></div>
+              <% if group.hero_image.url.present? %>
+                <%= link_to decidim_participatory_processes.participatory_process_group_path(group), class: "card__link" do %>
+                  <%= image_tag group.hero_image.url, alt: title_for(group), class: "card__image" %>
+                <% end %>
               <% end %>
+
               <div class="card__content">
                 <%= link_to decidim_participatory_processes.participatory_process_group_path(group), class: "card__link" do %>
-                  <h4 class="card__title"><%= translated_attribute group.name %></h4>
+                  <h4 class="card__title"><%= title_for(group) %></h4>
                 <% end %>
+                <div class="card__text">
+                  <div class="card__text--paragraph">
+                    <%= description_for(group) %>
+                  </div>
+                </div>
+              </div>
+
+              <div class="card__icondata">
+                <ul class="card-data">
+                  <li class="card-data__item">
+                    <%= icon "process" %>
+                  </li>
+                  <li class="card-data__item">
+                    <div>
+                      <strong><%= t("layouts.decidim.participatory_process_groups.participatory_process_group.processes_count") %></strong>
+                      <%= group.participatory_processes.published.count.to_s %>
+                    </div>
+                  </li>
+                </ul>
+              </div>
+
+              <div class="card__footer">
+                <div class="card__support">
+                  <%= link_to(
+                    t("layouts.decidim.participatory_process_groups.participatory_process_group.browse"),
+                    decidim_participatory_processes.participatory_process_group_path(group),
+                    class: "card__button button hollow primary"
+                  ) %>
+                </div>
               </div>
             </article>
           </div>

data/app/cells/decidim/process_groups_content_block/content_blocks/highlighted_process_groups_cell.rb

@@ -4,26 +4,30 @@ module Decidim
   module ProcessGroupsContentBlock
     module ContentBlocks
       class HighlightedProcessGroupsCell < Decidim::ViewModel
-        include Decidim::SanitizeHelper
+        include Decidim::ApplicationHelper # html_truncate
+        include Decidim::LayoutHelper # If icons are needed in the (customized) view
+        include Decidim::SanitizeHelper # decidim_sanitize
 
         delegate :current_organization, to: :controller
         delegate :current_user, to: :controller
 
         def show
-          if highlighted_groups.any?
-            render
-          end
+          render if highlighted_groups.any?
         end
 
         def highlighted_groups
-          Decidim::ParticipatoryProcesses::OrganizationPrioritizedParticipatoryProcessGroups.new(
-            current_organization
-          ).query
-          .joins(:participatory_processes)
-          .where.not(decidim_participatory_processes: { published_at: nil })
-          .where('decidim_participatory_processes.end_date > ?', DateTime.now)
-          .group('decidim_participatory_process_groups.id')
-          .having('COUNT(decidim_participatory_processes.id) > 0')
+          Decidim::ParticipatoryProcesses::OrganizationPrioritizedParticipatoryProcessGroups
+            .new(current_organization)
+            .query
+            .joins(:participatory_processes)
+            .where.not(decidim_participatory_processes: { published_at: nil })
+            .where(
+              "decidim_participatory_processes.end_date IS NULL "\
+              "OR decidim_participatory_processes.end_date > ?",
+              Time.current
+            )
+            .group("decidim_participatory_process_groups.id")
+            .having("COUNT(decidim_participatory_processes.id) > 0")
         end
 
         def i18n_scope
@@ -33,6 +37,17 @@ module Decidim
         def decidim_participatory_processes
           Decidim::ParticipatoryProcesses::Engine.routes.url_helpers
         end
+
+        private
+
+        def title_for(group)
+          translated_attribute(group.name)
+        end
+
+        def description_for(group)
+          text = translated_attribute(group.description)
+          decidim_sanitize(html_truncate(text, length: 100))
+        end
       end
     end
   end

data/config/locales/en.yml

@@ -1,3 +1,4 @@
+---
 en:
   decidim:
     process_groups_content_block:
@@ -7,5 +8,5 @@ en:
       pages:
         home:
           highlighted_process_groups:
-            active_processes: 'Active processes'
-            see_all_processes: 'Show all processes'
+            active_processes: Active processes
+            see_all_processes: Show all processes

data/config/locales/fi.yml

@@ -1,3 +1,4 @@
+---
 fi:
   decidim:
     process_groups_content_block:
@@ -7,5 +8,5 @@ fi:
       pages:
         home:
           highlighted_process_groups:
-            active_processes: 'Aktiiviset prosessit'
-            see_all_processes: 'Näytä kaikki prosessit'
+            active_processes: Aktiiviset prosessit
+            see_all_processes: Näytä kaikki prosessit

data/lib/decidim/process_groups_content_block/engine.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Decidim
   module ProcessGroupsContentBlock
     class Engine < ::Rails::Engine
@@ -7,7 +9,7 @@ module Decidim
         Cell::ViewModel.view_paths << File.expand_path("#{Decidim::ProcessGroupsContentBlock::Engine.root}/app/cells")
       end
 
-      initializer 'decidim_process_groups_content_block.content_blocks' do |app|
+      initializer "decidim_process_groups_content_block.content_blocks" do
         Decidim.content_blocks.register(:homepage, :highlighted_process_groups) do |content_block|
           content_block.cell = "decidim/process_groups_content_block/content_blocks/highlighted_process_groups"
           content_block.public_name_key = "decidim.process_groups_content_block.content_blocks.highlighted_process_groups.name"

data/lib/decidim/process_groups_content_block/version.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 module Decidim
   module ProcessGroupsContentBlock
-    VERSION = "0.16.0"
+    VERSION = "0.16.1"
     DECIDIM_VERSION = "~> 0.16.0"
   end
 end

data/lib/decidim/process_groups_content_block.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative "process_groups_content_block/version"
 require_relative "process_groups_content_block/engine"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: decidim-process_groups_content_block
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.16.1
 platform: ruby
 authors:
 - Antti Hukkanen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-07 00:00:00.000000000 Z
+date: 2019-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -118,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Process groups content block for Decidim.