decidim 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b4967577009dee595cd0f4e2b433af4dfc09ac61
-  data.tar.gz: 952054cd021780bbe7c36af4a6e9a082f7513414
+  metadata.gz: 46a9ccf5bb2360e2fec0849dcee0ba4c1b6ff33e
+  data.tar.gz: 10b930adcc15d110a86e959a813e0a85f078e23f
 SHA512:
-  metadata.gz: 20de3c5a3f538c661d40b14dc79efbba4ee8d3829b2f21c70c4a8078c5f881fc418b1c7d2fb772901976b2e4c577636435e7bdb7650b09fd3f30078fd82c15b3
-  data.tar.gz: 5f549fe406ca1b9ef7d7ddec5784af29edc25b9e2b89f9587b1552b8fe6370f25d87e5b769460a00dcd5886dfd2053667b98220d6794c41eee11ac4e9e2360d9
+  metadata.gz: 6e0676d63092ce94e3154f96114defbf474c15873007d4ecab4bf501adb1ee22ff1d3e14bb71662edad65b5de8fcc1767630c64be0e41e2a5d9eca99b1f976ec
+  data.tar.gz: 072ee4afc3fc22b7f73c2edf3cb292d4daf47ef201d82a4cfcbe990c9d0e35b72d2a0e056a042a76f7322e0e1dd7840381f05b3d7245ae1be0bee6b4eed0c2d9

data/.codeclimate.yml

@@ -29,6 +29,17 @@ engines:
     enabled: false
   fixme:
     enabled: true
+    exclude_paths:
+     - decidim-comments/app/assets/javascripts/decidim/comments/bundle.js.map
+  grep:
+    enabled: true
+    config:
+      patterns:
+        no-trailing-whitespace:
+          pattern: \s*$
+          annotation: "Don't leave trailing whitespace"
+          severity: minor
+          categories: Style
   rubocop:
     enabled: true
     channel: rubocop-0-48

data/CHANGELOG.md

@@ -1,7 +1,21 @@
 # Change Log
 
 ## [Unreleased](https://github.com/decidim/decidim/tree/HEAD)
-[Full Changelog](https://github.com/decidim/decidim/compare/v0.4.3...HEAD)
+[Full Changelog](https://github.com/decidim/decidim/compare/v0.4.4...HEAD)
+
+## [v0.4.4](https://github.com/decidim/decidim/tree/v0.4.4) (2017-08-02)
+[Full Changelog](https://github.com/decidim/decidim/compare/v0.4.3...v0.4.4)
+
+**Fixed**
+
+- **decidim-budgets**: Fixed bug where current projects's category wouldn't appear in form. [\#1667](https://github.com/decidim/decidim/pull/1667).
+- **decidim-core**: Fixed crash when running migrations & seeding DB in the same ruby process. [\#1649](https://github.com/decidim/decidim/pull/1649).
+- **decidim-core**: Fixed bug when blank values were used in a `datetime` field. [\#1661](https://github.com/decidim/decidim/pull/1661)
+- **decidim-core**: Fixed preview permissions for unpublished features. [\#1670](https://github.com/decidim/decidim/pull/1670).
+- **decidim-meetings**: Fixed bug where current meeting's category wouldn't appear in form. [\#1667](https://github.com/decidim/decidim/pull/1667).
+- **decidim-proposals**: Fixed bug where current proposal's category wouldn't appear in form. [\#1667](https://github.com/decidim/decidim/pull/1667).
+- **decidim-proposals**: Fixed error when official proposals where commented and could not be notified. [\#1663](https://github.com/decidim/decidim/pull/1663).
+- **decidim-results**: Fixed bug where current result's category wouldn't appear in form. [\#1667](https://github.com/decidim/decidim/pull/1667).
 
 ## [v0.4.3](https://github.com/decidim/decidim/tree/v0.4.3) (2017-07-25)
 [Full Changelog](https://github.com/decidim/decidim/compare/v0.4.2...v0.4.3)
@@ -61,7 +75,7 @@
 
 - Sharing Link Option [\#1589](https://github.com/decidim/decidim/issues/1589)
 - Frontend url from backend [\#1587](https://github.com/decidim/decidim/issues/1587)
-- Impossible to used rake db:seed [\#1586](https://github.com/decidim/decidim/issues/1586)
+- Impossible to use rake db:seed [\#1586](https://github.com/decidim/decidim/issues/1586)
 - Limit max characters allowed in meeting cards view [\#1578](https://github.com/decidim/decidim/issues/1578)
 - Proposals Answers not working  [\#1576](https://github.com/decidim/decidim/issues/1576)
 - Invitation link isn't being regenerated while re-inviting admins [\#1573](https://github.com/decidim/decidim/issues/1573)

data/Gemfile.lock

@@ -1,21 +1,21 @@
 PATH
   remote: .
   specs:
-    decidim (0.4.3)
-      decidim-admin (= 0.4.3)
-      decidim-api (= 0.4.3)
-      decidim-budgets (= 0.4.3)
-      decidim-comments (= 0.4.3)
-      decidim-core (= 0.4.3)
-      decidim-meetings (= 0.4.3)
-      decidim-pages (= 0.4.3)
-      decidim-proposals (= 0.4.3)
-      decidim-results (= 0.4.3)
-      decidim-surveys (= 0.4.3)
-      decidim-system (= 0.4.3)
-    decidim-admin (0.4.3)
+    decidim (0.4.4)
+      decidim-admin (= 0.4.4)
+      decidim-api (= 0.4.4)
+      decidim-budgets (= 0.4.4)
+      decidim-comments (= 0.4.4)
+      decidim-core (= 0.4.4)
+      decidim-meetings (= 0.4.4)
+      decidim-pages (= 0.4.4)
+      decidim-proposals (= 0.4.4)
+      decidim-results (= 0.4.4)
+      decidim-surveys (= 0.4.4)
+      decidim-system (= 0.4.4)
+    decidim-admin (0.4.4)
       active_link_to (~> 1.0.0)
-      decidim-core (= 0.4.3)
+      decidim-core (= 0.4.4)
       devise (~> 4.2)
       devise-i18n (~> 1.1.0)
       devise_invitable (~> 1.7.0)
@@ -24,29 +24,29 @@ PATH
       rails (~> 5.1.1)
       rectify (~> 0.9.1)
       sassc-rails (~> 1.3.0)
-    decidim-api (0.4.3)
+    decidim-api (0.4.4)
       graphiql-rails (~> 1.4.2)
       graphql (~> 1.6.0)
       rack-cors (~> 0.4.0)
       rails (~> 5.1.1)
       sprockets-es6 (~> 0.9.2)
-    decidim-budgets (0.4.3)
-      decidim-comments (= 0.4.3)
-      decidim-core (= 0.4.3)
+    decidim-budgets (0.4.4)
+      decidim-comments (= 0.4.4)
+      decidim-core (= 0.4.4)
       kaminari (~> 1.0.1)
       rectify (~> 0.9.1)
       searchlight (~> 4.1.0)
-    decidim-comments (0.4.3)
-      decidim-core (= 0.4.3)
+    decidim-comments (0.4.4)
+      decidim-core (= 0.4.4)
       jquery-rails (~> 4.0)
       rails (~> 5.1.1)
-    decidim-core (0.4.3)
+    decidim-core (0.4.4)
       active_link_to (~> 1.0.4)
       autoprefixer-rails (~> 7.1.1)
       cancancan (~> 2.0.0)
       carrierwave (~> 1.1.0)
       date_validator (~> 0.9.0)
-      decidim-api (= 0.4.3)
+      decidim-api (= 0.4.4)
       devise (~> 4.3)
       devise-i18n (~> 1.1.0)
       file_validators (~> 2.1.0)
@@ -69,41 +69,40 @@ PATH
       rectify (~> 0.9.1)
       redis (~> 3.3.3)
       rubyzip (= 1.2.1)
-      sass (= 3.4.24)
       sassc-rails (~> 1.3.0)
       sprockets-es6 (~> 0.9.2)
       truncato (~> 0.7.9)
       wisper (~> 2.0.0)
-    decidim-meetings (0.4.3)
+    decidim-meetings (0.4.4)
       date_validator (~> 0.9)
-      decidim-core (= 0.4.3)
+      decidim-core (= 0.4.4)
       httparty (~> 0.15.0)
       jquery-tmpl-rails (~> 1.1.0)
       kaminari (~> 1.0.1)
       rectify (~> 0.8)
       searchlight (~> 4.1.0)
-    decidim-pages (0.4.3)
-      decidim-comments (= 0.4.3)
-      decidim-core (= 0.4.3)
+    decidim-pages (0.4.4)
+      decidim-comments (= 0.4.4)
+      decidim-core (= 0.4.4)
       rectify (~> 0.9.1)
-    decidim-proposals (0.4.3)
-      decidim-comments (= 0.4.3)
-      decidim-core (= 0.4.3)
+    decidim-proposals (0.4.4)
+      decidim-comments (= 0.4.4)
+      decidim-core (= 0.4.4)
       kaminari (~> 1.0.1)
       rectify (~> 0.9.1)
       social-share-button (~> 0.10.0)
-    decidim-results (0.4.3)
-      decidim-comments (= 0.4.3)
-      decidim-core (= 0.4.3)
+    decidim-results (0.4.4)
+      decidim-comments (= 0.4.4)
+      decidim-core (= 0.4.4)
       kaminari (~> 1.0.1)
       rectify (~> 0.9.1)
       searchlight (~> 4.1.0)
-    decidim-surveys (0.4.3)
-      decidim-core (= 0.4.3)
+    decidim-surveys (0.4.4)
+      decidim-core (= 0.4.4)
       jquery-tmpl-rails (~> 1.1.0)
-    decidim-system (0.4.3)
+    decidim-system (0.4.4)
       active_link_to (~> 1.0.0)
-      decidim-core (= 0.4.3)
+      decidim-core (= 0.4.4)
       devise (~> 4.2)
       devise-i18n (~> 1.1.0)
       devise_invitable (~> 1.7.1)
@@ -116,14 +115,14 @@ PATH
 PATH
   remote: decidim-dev
   specs:
-    decidim-dev (0.4.3)
+    decidim-dev (0.4.4)
       byebug
       capybara (~> 2.14.0)
       capybara-screenshot (~> 1.0.14)
       codecov (~> 0.1.9)
       database_cleaner (~> 1.6.0)
       db-query-matchers (~> 0.9.0)
-      decidim (= 0.4.3)
+      decidim (= 0.4.4)
       factory_girl_rails
       faker (~> 1.7.3)
       i18n-tasks (= 0.9.15)
@@ -368,7 +367,7 @@ GEM
       rack (>= 1.6.2, < 3)
     omniauth-facebook (4.0.0)
       omniauth-oauth2 (~> 1.2)
-    omniauth-google-oauth2 (0.5.1)
+    omniauth-google-oauth2 (0.5.2)
       jwt (~> 1.5)
       multi_json (~> 1.3)
       omniauth (>= 1.1.1)
@@ -486,7 +485,7 @@ GEM
     ruby_dep (1.5.0)
     rubyzip (1.2.1)
     safe_yaml (1.0.4)
-    sass (3.4.24)
+    sass (3.4.25)
     sassc (1.11.4)
       bundler
       ffi (~> 1.9.6)

data/README.md

@@ -140,7 +140,7 @@ If you plan to release your application you'll need to publish it using the same
 
 ## Example applications
 
-Since Decidim is a ruby gem, you can check out the [dependent repositories](https://github.com/decidim/decidim/network/dependents?type=application) to see how many applications are on the wild or tests that other developers have made. Here's a partial list with some of the projects that have used Decidim: 
+Since Decidim is a ruby gem, you can check out the [dependent repositories](https://github.com/decidim/decidim/network/dependents?type=application) to see how many applications are on the wild or tests that other developers have made. Here's a partial list with some of the projects that have used Decidim:
 
 * [Demo](http://staging.decidim.codegram.com)
 * [Decidim Barcelona](https://decidim.barcelona) - [View code](https://github.com/AjuntamentdeBarcelona/decidim-barcelona)

data/Rakefile

@@ -59,7 +59,7 @@ task :development_app do
   Dir.chdir("#{__dir__}/development_app") do
     Bundler.with_clean_env do
       sh "bundle exec spring stop"
-      sh "bundle exec rake db:seed"
+      sh "bundle exec rails db:seed"
       sh "bundle exec rails generate decidim:demo"
     end
   end

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

@@ -20,17 +20,13 @@ module Decidim
       def call
         return broadcast(:invalid) if process.nil? || process.published?
 
-        publish_process
+        process.publish!
         broadcast(:ok)
       end
 
       private
 
       attr_reader :process
-
-      def publish_process
-        process.update_attribute(:published_at, Time.current)
-      end
     end
   end
 end

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

@@ -20,17 +20,13 @@ module Decidim
       def call
         return broadcast(:invalid) if process.nil? || !process.published?
 
-        unpublish_process
+        process.unpublish!
         broadcast(:ok)
       end
 
       private
 
       attr_reader :process
-
-      def unpublish_process
-        process.update_attribute(:published_at, nil)
-      end
     end
   end
 end

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

@@ -12,7 +12,7 @@ module Decidim
 
       helper Decidim::Admin::ApplicationHelper
       helper Decidim::Admin::AttributesDisplayHelper
-      helper Decidim::Admin::FeatureSettingsHelper
+      helper Decidim::Admin::SettingsHelper
       helper Decidim::Admin::ProcessGroupsForSelectHelper
       helper Decidim::Admin::ProcessesForSelectHelper
       helper Decidim::Admin::IconLinkHelper

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

@@ -5,6 +5,7 @@ module Decidim
     # This controller allows admins to manage proposals in a participatory process.
     class ExportsController < ApplicationController
       include Concerns::ParticipatoryProcessAdmin
+      include Decidim::FeaturePathHelper
 
       def create
         authorize! :manage, feature
@@ -14,19 +15,11 @@ module Decidim
 
         flash[:notice] = t("decidim.admin.exports.notice")
 
-        redirect_back(fallback_location: fallback_location)
+        redirect_back(fallback_location: manage_feature_path(feature))
       end
 
       private
 
-      def fallback_location
-        send(
-          "decidim_admin_#{feature.manifest.name}_path",
-          feature_id: feature.id,
-          participatory_process_id: current_participatory_process.id
-        )
-      end
-
       def default_format
         "json"
       end

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

@@ -22,7 +22,7 @@ module Decidim
         UpdateFeaturePermissions.call(@permissions_form, feature) do
           on(:ok) do
             flash[:notice] = t("feature_permissions.update.success", scope: "decidim.admin")
-            redirect_to participatory_process_features_path(current_participatory_process)
+            redirect_to features_path(current_participatory_process)
           end
 
           on(:invalid) do

data/decidim-admin/app/controllers/decidim/admin/features/base_controller.rb

@@ -8,8 +8,9 @@ module Decidim
       class BaseController < Admin::ApplicationController
         skip_authorize_resource
         include Concerns::ParticipatoryProcessAdmin
-        include FeatureSettings
+        include Settings
 
+        helper Decidim::ResourceHelper
         helper Decidim::Admin::ExportsHelper
 
         helper_method :current_feature,
@@ -30,7 +31,7 @@ module Decidim
         end
 
         def parent_path
-          decidim_admin.participatory_process_features_path(current_participatory_process)
+          decidim_admin.features_path(current_participatory_process)
         end
       end
     end

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

@@ -91,7 +91,7 @@ module Decidim
         @feature = query_scope.find(params[:id])
         authorize! :update, @feature
 
-        @feature.update_attribute(:published_at, Time.current)
+        @feature.publish!
 
         flash[:notice] = I18n.t("features.publish.success", scope: "decidim.admin")
         redirect_to action: :index
@@ -101,7 +101,7 @@ module Decidim
         @feature = query_scope.find(params[:id])
         authorize! :update, @feature
 
-        @feature.update_attribute(:published_at, nil)
+        @feature.unpublish!
 
         flash[:notice] = I18n.t("features.unpublish.success", scope: "decidim.admin")
         redirect_to action: :index

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

@@ -78,7 +78,8 @@ module Decidim
       end
 
       def collection
-        @collection ||= current_user.organization.participatory_process_groups
+        @collection ||=
+          Decidim::OrganizationParticipatoryProcessGroups.new(current_user.organization).query
       end
     end
   end

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

@@ -75,16 +75,20 @@ module Decidim
         authorize! :create, Decidim::ParticipatoryProcess
       end
 
+      private
+
       def current_participatory_process
         @current_participatory_process ||= collection.find(params[:id]) if params[:id]
       end
 
-      private
-
       def collection
         @collection ||= Decidim::ParticipatoryProcessesWithUserRole.for(current_user)
       end
 
+      def ability_context
+        super.merge(current_participatory_process: current_participatory_process)
+      end
+
       def participatory_process_params
         {
           id: params[:id],

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

@@ -24,7 +24,7 @@ module Decidim
       private
 
       def slug_uniqueness
-        return unless current_organization.participatory_processes.where(slug: slug).where.not(id: id).any?
+        return unless OrganizationParticipatoryProcesses.new(current_organization).query.where(slug: slug).where.not(id: id).any?
 
         errors.add(:slug, :taken)
       end

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

@@ -58,7 +58,7 @@ module Decidim
       private
 
       def slug_uniqueness
-        return unless current_organization.participatory_processes.where(slug: slug).where.not(id: id).any?
+        return unless OrganizationParticipatoryProcesses.new(current_organization).query.where(slug: slug).where.not(id: id).any?
 
         errors.add(:slug, :taken)
       end

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

@@ -12,7 +12,7 @@ module Decidim
       # Returns an Array.
       def process_groups_for_select
         @process_groups_for_select ||=
-          current_organization.participatory_process_groups.map do |group|
+          OrganizationParticipatoryProcessGroups.new(current_organization).map do |group|
             [translated_attribute(group.name), group.id]
           end
       end

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

@@ -11,7 +11,7 @@ module Decidim
       #
       # Returns an Array.
       def processes_for_select
-        @processes_for_select ||= current_organization.participatory_processes.map do |process|
+        @processes_for_select ||= OrganizationParticipatoryProcesses.new(current_organization).map do |process|
           [
             translated_attribute(process.title),
             process.id