RubyGems - decidim - Versions diffs - 0.0.2 → 0.0.3 - Mend

decidim 0.0.2 → 0.0.3

Potentially problematic release.

This version of decidim might be problematic. Click here for more details.

Files changed (439) hide show

data/decidim-admin/spec/shared/manage_process_categories_examples.rb CHANGED

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # frozen_string_literal: true
 RSpec.shared_examples "manage process categories examples" do
   before do
@@ -99,7 +100,7 @@ RSpec.shared_examples "manage process categories examples" do
         end
         within "#categories table" do
-          expect(page).to_not have_content(translated(category2.name))
+          expect(page).not_to have_content(translated(category2.name))
         end
       end
     end

data/decidim-admin/spec/shared/manage_process_steps_examples.rb CHANGED

@@ -121,7 +121,7 @@ RSpec.shared_examples "manage process steps examples" do
       end
       within "#steps table" do
-        expect(page).to_not have_content(translated(process_step2.title))
+        expect(page).not_to have_content(translated(process_step2.title))
       end
     end
   end

data/decidim-admin/spec/shared/manage_processes_examples.rb CHANGED

@@ -1,3 +1,4 @@
+# coding: utf-8
 # frozen_string_literal: true
 RSpec.shared_examples "manage processes examples" do
   context "previewing processes" do
@@ -9,7 +10,7 @@ RSpec.shared_examples "manage processes examples" do
           click_link "Preview"
         end
-        expect(current_path).to eq decidim.participatory_process_path(participatory_process)
+        expect(page).to have_css(".process-header")
         expect(page).to have_content(translated(participatory_process.title))
       end
     end
@@ -80,7 +81,7 @@ RSpec.shared_examples "manage processes examples" do
     end
     within "dl" do
-      expect(page).to_not have_css("img[src*='#{image2_filename}']")
+      expect(page).not_to have_css("img[src*='#{image2_filename}']")
       expect(page).to have_css("img[src*='#{image3_filename}']")
     end
   end
@@ -132,7 +133,7 @@ RSpec.shared_examples "manage processes examples" do
     it "doesn't let the admin manage processes form other organizations" do
       within "table" do
-        expect(page).to_not have_content(external_participatory_process.title)
+        expect(page).not_to have_content(external_participatory_process.title)
       end
     end
   end

data/decidim-admin/spec/views/decidim/static_pages/_form.html.erb_spec.rb CHANGED

@@ -13,7 +13,7 @@ module Decidim
       )
     end
     let(:ability) do
-      Decidim::Admin::Abilities::AdminUser.new(build(:user, :admin))
+      Decidim::Admin::Abilities::AdminUser.new(build(:user, :admin), {})
     end
     before do
@@ -24,7 +24,7 @@ module Decidim
     context "with a default static page" do
       let(:slug) { Decidim::StaticPage::DEFAULT_PAGES.sample }
-      it { is_expected.to_not include("slug") }
+      it { is_expected.not_to include("slug") }
     end
     context "with a normal static page" do

data/decidim-api/app/views/layouts/decidim/api/documentation.html.erb CHANGED

@@ -1,7 +1,7 @@
 <html>
   <head>
     <title><%= current_organization.name %> - API Documentation</title>
-    <%= javascript_include_tag 'decidim/api/docs', 'data-turbolinks-track': 'reload' %>
+    <%= javascript_include_tag 'decidim/api/docs' %>
   </head>
   <body>
     <%= yield %>

data/decidim-api/decidim-api.gemspec CHANGED

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.files = Dir["{app,config,db,lib,vendor}/**/*", "LICENSE.txt", "Rakefile", "README.md"]
   s.add_dependency "rails", *Decidim.rails_version
-  s.add_dependency "graphql", "~> 1.4.1"
+  s.add_dependency "graphql", "~> 1.4.2"
   s.add_dependency "graphiql-rails", "~> 1.4.1"
   s.add_dependency "rack-cors", "~> 0.4.0"
   s.add_dependency "sprockets-es6", "~> 0.9.2"

data/decidim-api/lib/decidim/api.rb CHANGED

@@ -7,6 +7,7 @@ module Decidim
   module Api
     autoload :MutationType, "decidim/api/types/mutation"
     autoload :QueryType, "decidim/api/types/query"
+    autoload :AuthorInterface, "decidim/api/types/author_interface"
     autoload :TranslatedFieldType, "decidim/api/types/translated_field"
     autoload :LocalizedStringType, "decidim/api/types/localized_string"

data/decidim-api/lib/decidim/api/schema.rb CHANGED

@@ -5,6 +5,11 @@ module Decidim
     Schema = GraphQL::Schema.define do
       query QueryType
       mutation MutationType
+      resolve_type lambda { |obj, _ctx|
+        return Decidim::UserType if obj.is_a? Decidim::User
+        return Decidim::UserGroupType if obj.is_a? Decidim::UserGroup
+      }
     end
   end
 end

data/decidim-api/lib/decidim/api/test/type_context.rb CHANGED

@@ -18,6 +18,7 @@ RSpec.shared_context "graphql type" do
     GraphQL::Schema.define do
       query query_type
+      resolve_type ->(obj, ctx) {}
     end
   end

data/decidim-api/lib/decidim/api/types/author_interface.rb ADDED

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+module Decidim
+  module Api
+    # This interface represents an author who owns a resource.
+    AuthorInterface = GraphQL::InterfaceType.define do
+      name "Author"
+      description "An author"
+      field :name, !types.String, "The author's name"
+      field :avatarUrl, !types.String, "The author's avatar url"
+    end
+  end
+end

data/decidim-api/spec/types/query_type_spec.rb CHANGED

@@ -17,7 +17,7 @@ module Decidim
         it "returns all the processes" do
           expect(response["processes"]).to     include("id" => process1.id.to_s)
           expect(response["processes"]).to     include("id" => process2.id.to_s)
-          expect(response["processes"]).to_not include("id" => process3.id.to_s)
+          expect(response["processes"]).not_to include("id" => process3.id.to_s)
         end
       end
     end

data/decidim-api/spec/types/translated_field_type_spec.rb CHANGED

@@ -40,7 +40,7 @@ module Decidim
           it "returns the translations on the provided locales" do
             translations = response["translations"]
             expect(translations).to include({ "locale" => "ca", "text" => "Hola"})
-            expect(translations).to_not include({ "locale" => "en", "text" => "Hello"})
+            expect(translations).not_to include({ "locale" => "en", "text" => "Hello"})
           end
         end
       end

data/decidim-budgets/.gitignore ADDED

@@ -0,0 +1,7 @@
+.bundle/
+log/*.log
+pkg/
+test/dummy/db/*.sqlite3
+test/dummy/db/*.sqlite3-journal
+test/dummy/log/*.log
+test/dummy/tmp/

data/decidim-budgets/README.md ADDED

@@ -0,0 +1,23 @@
+# Decidim::Budgets
+The Budgets module adds projects to any participatory process. It adds a CRUD engine to the admin and public views scoped inside the participatory process. Projects will link to related proposals and have a budget. The users should be able to distribute a budget between these projects.
+## Usage
+Budgets will be available as a Feature for a Participatory Process.
+## Installation
+Add this line to your application's Gemfile:
+```ruby
+gem 'decidim-budgets
+```
+And then execute:
+```bash
+$ bundle
+```
+## Contributing
+See [Decidim](https://github.com/AjuntamentdeBarcelona/decidim).
+## License
+See [Decidim](https://github.com/AjuntamentdeBarcelona/decidim).

data/decidim-budgets/Rakefile ADDED

	@@ -0,0 +1,2 @@
1	+ # frozen_string_literal: true
2	+ require "decidim/dev/common_rake"

data/decidim-budgets/app/assets/config/decidim_budgets_manifest.js ADDED

	@@ -0,0 +1 @@
1	+ //= link decidim/budgets/projects.js

data/decidim-budgets/app/assets/images/decidim/budgets/icon.svg ADDED

@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="8" height="8" viewBox="0 0 8 8">
+  <path d="M2 0v1h-.75c-.68 0-1.25.57-1.25 1.25v.5c0 .68.44 1.24 1.09 1.41l2.56.66c.14.04.34.29.34.44v.5c0 .14-.11.25-.25.25h-2.5c-.12 0-.21-.04-.25-.06v-.94h-1v1c0 .34.2.63.44.78.23.16.52.22.81.22h.75v1h1v-1h.75c.69 0 1.25-.56 1.25-1.25v-.5c0-.68-.44-1.24-1.09-1.41l-2.56-.66c-.14-.04-.34-.29-.34-.44v-.5c0-.14.11-.25.25-.25h2.5c.11 0 .21.04.25.06v.94h1v-1c0-.34-.2-.63-.44-.78-.23-.16-.52-.22-.81-.22h-.75v-1h-1z"
+  transform="translate(1)" />
+</svg>

data/decidim-budgets/app/assets/javascripts/decidim/budgets/projects.js.es6 ADDED

@@ -0,0 +1,28 @@
+// = require_self
+$(() => {
+  const $projects = $('#projects, #project');
+  const $budgetSummaryTotal = $('.budget-summary__total');
+  const $budgetExceedModal = $('#budget-excess');
+  const totalBudget = $budgetSummaryTotal.data('total-budget');
+  const cancelEvent = (event) => {
+    event.stopPropagation();
+    event.preventDefault();
+  };
+  $projects.on('click', '.budget--list__action', (event) => {
+    const currentBudget = $('.budget-summary__progressbox').data('current-budget');
+    const $currentTarget = $(event.currentTarget);
+    const projectBudget = $currentTarget.data('budget');
+    if ($currentTarget.attr('disabled')) {
+      cancelEvent(event);
+    } else if ($currentTarget.data('add') && ((currentBudget + projectBudget) > totalBudget)) {
+      $budgetExceedModal.foundation('toggle');
+      cancelEvent(event);
+    }
+  });
+});

data/decidim-budgets/app/assets/stylesheets/decidim/budgets/_budgets.scss ADDED

	@@ -0,0 +1 @@
1	+ @import "budget/*";

data/decidim-budgets/app/assets/stylesheets/decidim/budgets/budget/_budget-list.scss ADDED

@@ -0,0 +1,32 @@
+.budget-list__title{
+  @include breakpoint(smallmedium down){
+    font-size: $global-font-size;
+  }
+}
+.budget-list__data{
+  flex-basis: 9rem;
+  @include breakpoint(medium){
+    flex-direction: row;
+    flex-basis: 16rem;
+  }
+}
+.budget-list__data--added{
+  background-color: mix(white, $success, 80%);
+}
+.budget-list__number{
+  @include breakpoint(medium down){
+    font-size: 1rem;
+  }
+  @include breakpoint(medium){
+    flex-grow: 1;
+    font-size: 1.5rem;
+    margin-right: 1rem;
+    margin-bottom: 0;
+    text-align: right;
+  }
+}
+.budget--list__action{
+  margin-bottom: 0;
+}

data/decidim-budgets/app/assets/stylesheets/decidim/budgets/budget/_budget-meter.scss ADDED

@@ -0,0 +1,78 @@
+.budget-summary__total{
+  margin-bottom: .5rem;
+}
+.budget-summary__progressbox{
+  align-items: stretch;
+  margin-bottom: .5rem;
+  @include breakpoint(smallmedium down){
+    text-align: center;
+  }
+  @include breakpoint(medium){
+    display: flex;
+  }
+  .button{
+    margin-bottom: 0;
+  }
+}
+.progressbox-fixed-wrapper{
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  z-index: 2;
+  background: $white;
+  box-shadow: 0 2px 7px rgba(black,.1);
+  display: none;
+  &.is-progressbox-visible{
+    display: block;
+  }
+}
+.budget-summary__progressbox--fixed{
+  margin: auto;
+  max-width: $global-width;
+  padding: 1rem 2rem;
+  @include breakpoint(mediumlarge){
+    padding: 1rem 4rem;
+  }
+  display: flex;
+}
+.budget-progress{
+  flex-grow: 1;
+  margin-bottom: .5rem;
+  min-height: 1.5rem;
+  @include breakpoint(medium){
+    min-height: 2rem;
+    margin-bottom: 0;
+    margin-right: 1rem;
+  }
+}
+.budget-progress--fixed{
+  min-height: 2rem;
+  margin-bottom: 0;
+  margin-right: 1rem;
+}
+.budget-progress__meter{
+  min-width: 0.1%;
+}
+.budget-summary__selected{
+  border-top: $border;
+  padding-top: .5rem;
+  padding-bottom: .5rem;
+}
+.budget-summary__selected-list{
+  margin-top: 2rem;
+}
+.budget-summary__selected-number{
+  margin: 0 .5rem;
+}

data/decidim-budgets/app/assets/stylesheets/decidim/budgets/budget/_progress.scss ADDED

@@ -0,0 +1,17 @@
+//Foundation progress extension
+.progress{
+  position: relative;
+}
+.progress-meter--minimum{
+  background: repeating-linear-gradient(-55deg, rgba(white, 0.2), rgba(white, 0.2) 8px, rgba(black, 0.03) 8px, rgba(black, 0.03) 16px);
+  position: absolute;
+}
+.progress-meter-text--right{
+  left: auto;
+  min-width: 100%;
+  transform: translate(0, -50%);
+  text-align: right;
+  padding-left: 1rem;
+  padding-right: .5rem;
+}

data/decidim-budgets/app/commands/decidim/budgets/add_line_item.rb ADDED

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+module Decidim
+  module Budgets
+    # A command with all the business to add new line items to orders
+    class AddLineItem < Rectify::Command
+      # Public: Initializes the command.
+      #
+      # order - The current order for the user or nil if it is not created yet.
+      # project - The the project to include in the order
+      # current_user - The current user logged in
+      def initialize(current_order, project, current_user)
+        @order = current_order
+        @project = project
+        @current_user = current_user
+      end
+      # Executes the command. Broadcasts these events:
+      #
+      # - :ok when everything is valid.
+      # - :invalid if the there is an error.
+      #
+      # Returns nothing.
+      def call
+        transaction do
+          return broadcast(:invalid) if order.checked_out?
+          add_line_item
+          broadcast(:ok, order)
+        end
+      end
+      private
+      def order
+        @order ||= Order.create!(user: @current_user, feature: @project.feature)
+      end
+      def add_line_item
+        order.projects << @project
+        order.save!
+      end
+    end
+  end
+end

data/decidim-budgets/app/commands/decidim/budgets/admin/create_project.rb ADDED

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+module Decidim
+  module Budgets
+    module Admin
+      # This command is executed when the user creates a Project from the admin
+      # panel.
+      class CreateProject < Rectify::Command
+        def initialize(form)
+          @form = form
+        end
+        # Creates the project if valid.
+        #
+        # Broadcasts :ok if successful, :invalid otherwise.
+        def call
+          return broadcast(:invalid) if @form.invalid?
+          transaction do
+            create_project
+            link_proposals
+          end
+          broadcast(:ok)
+        end
+        private
+        attr_reader :project
+        def create_project
+          @project = Project.create!(
+            scope: @form.scope,
+            category: @form.category,
+            feature: @form.current_feature,
+            title: @form.title,
+            short_description: @form.short_description,
+            description: @form.description,
+            budget: @form.budget
+          )
+        end
+        def proposals
+          @proposals ||= project.sibling_scope(:proposals).where(id: @form.proposal_ids)
+        end
+        def link_proposals
+          project.link_resources(proposals, "included_proposals")
+        end
+      end
+    end
+  end
+end