decidim-budgets 0.23.5 → 0.24.2

data/lib/decidim/budgets/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-budgets version.
   module Budgets
     def self.version
-      "0.23.5"
+      "0.24.2"
     end
   end
 end

data/lib/decidim/budgets/workflows/all.rb

@@ -11,7 +11,7 @@ module Decidim
         end
 
         # Users can vote in all budgets with this workflow.
-        def vote_allowed?(resource, _consider_progress = true)
+        def vote_allowed?(resource, _consider_progress: true)
           !voted?(resource)
         end
       end

data/lib/decidim/budgets/workflows/base.rb

@@ -40,7 +40,7 @@ module Decidim
         #                      Using `false` allow UI to offer users to discard votes in progress to start voting in another resource.
         #
         # Returns Boolean.
-        def vote_allowed?(_resource, _consider_progress = true)
+        def vote_allowed?(_resource, _consider_progress: true)
           raise StandardError, "Not implemented"
         end
 
@@ -64,14 +64,14 @@ module Decidim
         #
         # Returns Array.
         def voted
-          @voted ||= orders.values.map { |order_info| order_info[:order].budget if order_info[:status] == :voted } .compact
+          @voted ||= orders.values.map { |order_info| order_info[:order].budget if order_info[:status] == :voted }.compact
         end
 
         # Public: Return the list of budget resources where the user has orders in progress.
         #
         # Returns Array.
         def progress
-          @progress ||= orders.values.map { |order_info| order_info[:order].budget if order_info[:status] == :progress } .compact
+          @progress ||= orders.values.map { |order_info| order_info[:order].budget if order_info[:status] == :progress }.compact
         end
 
         # Public: Return the list of budget resources where the user could discard their order to vote in other components.

data/lib/decidim/budgets/workflows/one.rb

@@ -11,7 +11,7 @@ module Decidim
         end
 
         # Users can vote in any budget with this workflow, but only in one.
-        def vote_allowed?(resource, consider_progress = true)
+        def vote_allowed?(resource, consider_progress: true)
           return false if voted.any?
 
           if consider_progress

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-budgets
 version: !ruby/object:Gem::Version
-  version: 0.23.5
+  version: 0.24.2
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-08 00:00:00.000000000 Z
+date: 2021-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-comments
@@ -18,28 +18,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.5
+        version: 0.24.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.5
+        version: 0.24.2
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.5
+        version: 0.24.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.5
+        version: 0.24.2
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
@@ -80,42 +80,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.5
+        version: 0.24.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.5
+        version: 0.24.2
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.5
+        version: 0.24.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.5
+        version: 0.24.2
 - !ruby/object:Gem::Dependency
   name: decidim-proposals
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.5
+        version: 0.24.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.5
+        version: 0.24.2
 description: A budgets component for decidim's participatory spaces.
 email:
 - josepjaume@gmail.com
@@ -214,9 +214,6 @@ files:
 - app/queries/decidim/budgets/metrics/budget_participants_metric_measure.rb
 - app/serializers/decidim/budgets/data_portability_budgets_order_serializer.rb
 - app/services/decidim/budgets/project_search.rb
-- app/types/decidim/budgets/budget_type.rb
-- app/types/decidim/budgets/budgets_type.rb
-- app/types/decidim/budgets/project_type.rb
 - app/views/decidim/budgets/admin/budgets/_form.html.erb
 - app/views/decidim/budgets/admin/budgets/edit.html.erb
 - app/views/decidim/budgets/admin/budgets/index.html.erb
@@ -332,11 +329,17 @@ files:
 - db/migrate/20200728075039_add_selected_at_to_project.rb
 - db/migrate/20200804175222_votes_enabled_to_votes_choices.rb
 - db/migrate/20200827154129_add_commentable_counter_cache_to_projects.rb
+- db/migrate/20210310120613_add_followable_counter_cache_to_budgets.rb
+- lib/decidim/api/budget_type.rb
+- lib/decidim/api/budgets_type.rb
+- lib/decidim/api/project_type.rb
 - lib/decidim/budgets.rb
 - lib/decidim/budgets/admin.rb
 - lib/decidim/budgets/admin_engine.rb
+- lib/decidim/budgets/api.rb
 - lib/decidim/budgets/component.rb
 - lib/decidim/budgets/engine.rb
+- lib/decidim/budgets/project_serializer.rb
 - lib/decidim/budgets/seeds/Exampledocument.pdf
 - lib/decidim/budgets/seeds/city.jpeg
 - lib/decidim/budgets/test/factories.rb
@@ -357,14 +360,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key:
 specification_version: 4
 summary: Decidim budgets module

data/app/types/decidim/budgets/budget_type.rb

@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Budgets
-    BudgetType = GraphQL::ObjectType.define do
-      interfaces [
-        -> { Decidim::Core::ScopableInterface },
-        -> { Decidim::Core::TraceableInterface }
-      ]
-
-      name "Budget"
-      description "A budget"
-
-      field :id, !types.ID, "The internal ID of this budget"
-      field :title, !Decidim::Core::TranslatedFieldType, "The title for this budget"
-      field :description, !Decidim::Core::TranslatedFieldType, "The description for this budget"
-      field :total_budget, !types.Int, "The total budget"
-      field :createdAt, Decidim::Core::DateTimeType, "When this budget was created", property: :created_at
-      field :updatedAt, Decidim::Core::DateTimeType, "When this budget was updated", property: :updated_at
-
-      field :projects, !types[Decidim::Budgets::ProjectType], "The projects for this budget"
-    end
-  end
-end

data/app/types/decidim/budgets/budgets_type.rb

@@ -1,32 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Budgets
-    BudgetsType = GraphQL::ObjectType.define do
-      interfaces [-> { Decidim::Core::ComponentInterface }]
-
-      name "Budgets"
-      description "A budget component of a participatory space."
-
-      connection :budgets, BudgetType.connection_type do
-        resolve ->(component, _args, _ctx) {
-                  BudgetsTypeHelper.base_scope(component).includes(:component)
-                }
-      end
-
-      field(:budget, BudgetType) do
-        argument :id, !types.ID
-
-        resolve ->(component, args, _ctx) {
-          BudgetsTypeHelper.base_scope(component).find_by(id: args[:id])
-        }
-      end
-    end
-
-    module BudgetsTypeHelper
-      def self.base_scope(component)
-        Budget.where(component: component)
-      end
-    end
-  end
-end

data/app/types/decidim/budgets/project_type.rb

@@ -1,26 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Budgets
-    ProjectType = GraphQL::ObjectType.define do
-      interfaces [
-        -> { Decidim::Core::ScopableInterface },
-        -> { Decidim::Core::AttachableInterface },
-        -> { Decidim::Comments::CommentableInterface },
-        -> { Decidim::Core::CategorizableInterface }
-      ]
-
-      name "Project"
-      description "A project"
-
-      field :id, !types.ID, "The internal ID for this project"
-      field :title, Decidim::Core::TranslatedFieldType, "The title for this project"
-      field :description, Decidim::Core::TranslatedFieldType, "The description for this project"
-      field :budget_amount, types.Int, "The budget amount for this project"
-      field :selected, types.Boolean, "Whether this proposal is selected or not", property: :selected?
-      field :createdAt, Decidim::Core::DateTimeType, "When this project was created", property: :created_at
-      field :updatedAt, Decidim::Core::DateTimeType, "When this project was updated", property: :updated_at
-      field :reference, types.String, "The reference for this project"
-    end
-  end
-end