decidim-budgets 0.10.1 → 0.11.0.pre1

data/config/locales/pt-BR.yml

@@ -42,6 +42,11 @@ pt-BR:
           update:
             invalid: Ocorreu um problema ao atualizar este projeto
             success: Projeto atualizado com sucesso
+      admin_log:
+        project:
+          create: "%{user_name} criou o projeto %{resource_name} no espaço %{space_name}"
+          delete: "%{user_name} excluiu o projeto %{resource_name} no espaço %{space_name}"
+          update: "%{user_name} atualizou o projeto %{resource_name} no espaço %{space_name}"
       models:
         project:
           fields:
@@ -100,7 +105,7 @@ pt-BR:
         show:
           budget: Despesas
           view_all_projects: Ver todos os projetos
-    features:
+    components:
       budgets:
         actions:
           vote: Voto
@@ -109,6 +114,7 @@ pt-BR:
           global:
             announcement: Anúncio
             comments_enabled: Comentários ativados
+            projects_per_page: Projetos por página
             total_budget: Orçamento total
             vote_threshold_percent: Porcentagem do limiar de voto
           step:

data/config/locales/pt.yml

@@ -42,6 +42,11 @@ pt:
           update:
             invalid: Ocorreu um problema ao atualizar este projeto
             success: Projeto atualizado com sucesso
+      admin_log:
+        project:
+          create: "%{user_name} criou o projeto %{resource_name} no espaço %{space_name}"
+          delete: "%{user_name} excluiu o projeto %{resource_name} no espaço %{space_name}"
+          update: "%{user_name} atualizou o projeto %{resource_name} no espaço %{space_name}"
       models:
         project:
           fields:
@@ -100,7 +105,7 @@ pt:
         show:
           budget: Despesas
           view_all_projects: Ver todos os projetos
-    features:
+    components:
       budgets:
         actions:
           vote: Voto
@@ -109,6 +114,7 @@ pt:
           global:
             announcement: Anúncio
             comments_enabled: Comentários ativados
+            projects_per_page: Projetos por página
             total_budget: Orçamento total
             vote_threshold_percent: Porcentagem do limiar de voto
           step:

data/config/locales/ru.yml

@@ -105,13 +105,6 @@ ru:
         show:
           budget: Бюджет
           view_all_projects: Просмотреть все проекты
-    features:
-      budgets:
-        actions:
-          vote: Голосовать
-        settings:
-          global:
-            total_budget: Общий бюджет
     orders:
       checkout:
         error: При обработке вашего голоса произошла ошибка

data/config/locales/sv.yml

@@ -42,6 +42,11 @@ sv:
           update:
             invalid: Det har varit ett problem att uppdatera projektet
             success: Projektet har blivit uppdaterat
+      admin_log:
+        project:
+          create: "%{user_name} skapade projektet %{resource_name} i %{space_name} -utrymmet"
+          delete: "%{user_name} raderade projektet %{resource_name} i %{space_name} -utrymmet"
+          update: "%{user_name} uppdaterade projektet %{resource_name} i %{space_name} -utrymmet"
       models:
         project:
           fields:
@@ -100,7 +105,7 @@ sv:
         show:
           budget: Budget
           view_all_projects: Visa alla projekt
-    features:
+    components:
       budgets:
         actions:
           vote: Rösta
@@ -109,6 +114,7 @@ sv:
           global:
             announcement: Meddelande
             comments_enabled: Kommentarer aktiverade
+            projects_per_page: Projekt per sida
             total_budget: Total budget
             vote_threshold_percent: Rösta tröskel procent
           step:

data/config/locales/uk.yml

@@ -106,13 +106,6 @@ uk:
         show:
           budget: Бюджет
           view_all_projects: Переглянути всi проекти
-    features:
-      budgets:
-        actions:
-          vote: Голосувати
-        settings:
-          global:
-            total_budget: Загальний бюджет
     orders:
       checkout:
         error: При обробці вашого голосу сталася помилка

data/db/migrate/20170215132708_add_reference_to_projects.rb

@@ -1,9 +1,13 @@
 # frozen_string_literal: true
 
 class AddReferenceToProjects < ActiveRecord::Migration[5.0]
+  class Project < ApplicationRecord
+    self.table_name = :decidim_budgets_projects
+  end
+
   def change
     add_column :decidim_budgets_projects, :reference, :string
-    Decidim::Budgets::Project.find_each(&:save)
+    Project.find_each(&:save)
     change_column_null :decidim_budgets_projects, :reference, false
   end
 end

data/db/migrate/20180305133340_rename_features_to_components_at_budgets.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class RenameFeaturesToComponentsAtBudgets < ActiveRecord::Migration[5.1]
+  def change
+    rename_column :decidim_budgets_orders, :decidim_feature_id, :decidim_component_id
+    rename_column :decidim_budgets_projects, :decidim_feature_id, :decidim_component_id
+    rename_index :decidim_budgets_orders, "decidim_budgets_order_user_feature_unique", "decidim_budgets_order_user_component_unique"
+
+    if index_name_exists?(:decidim_budgets_orders, "index_decidim_budgets_orders_on_decidim_feature_id")
+      rename_index :decidim_budgets_orders, "index_decidim_budgets_orders_on_decidim_feature_id", "index_decidim_budgets_orders_on_decidim_component_id"
+    end
+
+    if index_name_exists?(:decidim_budgets_projects, "index_decidim_budgets_projects_on_decidim_feature_id")
+      rename_index :decidim_budgets_projects, "index_decidim_budgets_projects_on_decidim_feature_id", "index_decidim_budgets_projects_on_decidim_component_id"
+    end
+  end
+end

data/lib/decidim/budgets/{feature.rb → component.rb}

@@ -1,57 +1,58 @@
 # frozen_string_literal: true
 
-require "decidim/features/namer"
+require "decidim/components/namer"
 
-Decidim.register_feature(:budgets) do |feature|
-  feature.engine = Decidim::Budgets::Engine
-  feature.admin_engine = Decidim::Budgets::AdminEngine
-  feature.icon = "decidim/budgets/icon.svg"
-  feature.stylesheet = "decidim/budgets/budgets"
+Decidim.register_component(:budgets) do |component|
+  component.engine = Decidim::Budgets::Engine
+  component.admin_engine = Decidim::Budgets::AdminEngine
+  component.icon = "decidim/budgets/icon.svg"
+  component.stylesheet = "decidim/budgets/budgets"
 
-  feature.actions = %(vote)
+  component.actions = %(vote)
 
-  feature.on(:before_destroy) do |instance|
-    raise StandardError, "Can't remove this feature" if Decidim::Budgets::Project.where(feature: instance).any?
+  component.on(:before_destroy) do |instance|
+    raise StandardError, "Can't remove this component" if Decidim::Budgets::Project.where(component: instance).any?
   end
 
-  feature.register_resource do |resource|
+  component.register_resource do |resource|
     resource.model_class_name = "Decidim::Budgets::Project"
     resource.template = "decidim/budgets/projects/linked_projects"
   end
 
-  feature.register_stat :projects_count, primary: true, priority: Decidim::StatsRegistry::LOW_PRIORITY do |features, start_at, end_at|
-    Decidim::Budgets::FilteredProjects.for(features, start_at, end_at).count
+  component.register_stat :projects_count, primary: true, priority: Decidim::StatsRegistry::LOW_PRIORITY do |components, start_at, end_at|
+    Decidim::Budgets::FilteredProjects.for(components, start_at, end_at).count
   end
 
-  feature.register_stat :orders_count do |features, start_at, end_at|
-    orders = Decidim::Budgets::Order.where(feature: features)
+  component.register_stat :orders_count do |components, start_at, end_at|
+    orders = Decidim::Budgets::Order.where(component: components)
     orders = orders.where("created_at >= ?", start_at) if start_at.present?
     orders = orders.where("created_at <= ?", end_at) if end_at.present?
     orders.count
   end
 
-  feature.register_stat :comments_count, tag: :comments do |features, start_at, end_at|
-    projects = Decidim::Budgets::FilteredProjects.for(features, start_at, end_at)
+  component.register_stat :comments_count, tag: :comments do |components, start_at, end_at|
+    projects = Decidim::Budgets::FilteredProjects.for(components, start_at, end_at)
     Decidim::Comments::Comment.where(root_commentable: projects).count
   end
 
-  feature.settings(:global) do |settings|
+  component.settings(:global) do |settings|
+    settings.attribute :projects_per_page, type: :integer, default: 12
     settings.attribute :total_budget, type: :integer, default: 100_000_000
     settings.attribute :vote_threshold_percent, type: :integer, default: 70
     settings.attribute :comments_enabled, type: :boolean, default: true
     settings.attribute :announcement, type: :text, translated: true, editor: true
   end
 
-  feature.settings(:step) do |settings|
+  component.settings(:step) do |settings|
     settings.attribute :comments_blocked, type: :boolean, default: false
     settings.attribute :votes_enabled, type: :boolean, default: true
     settings.attribute :show_votes, type: :boolean, default: false
     settings.attribute :announcement, type: :text, translated: true, editor: true
   end
 
-  feature.seeds do |participatory_space|
-    feature = Decidim::Feature.create!(
-      name: Decidim::Features::Namer.new(participatory_space.organization.available_locales, :budgets).i18n_name,
+  component.seeds do |participatory_space|
+    component = Decidim::Component.create!(
+      name: Decidim::Components::Namer.new(participatory_space.organization.available_locales, :budgets).i18n_name,
       manifest_name: :budgets,
       published_at: Time.current,
       participatory_space: participatory_space
@@ -59,7 +60,7 @@ Decidim.register_feature(:budgets) do |feature|
 
     2.times do
       project = Decidim::Budgets::Project.create!(
-        feature: feature,
+        component: component,
         scope: participatory_space.organization.scopes.sample,
         category: participatory_space.categories.sample,
         title: Decidim::Faker::Localized.sentence(2),

data/lib/decidim/budgets/test/factories.rb

@@ -7,8 +7,8 @@ require "decidim/core/test/factories"
 require "decidim/participatory_processes/test/factories"
 
 FactoryBot.define do
-  factory :budget_feature, parent: :feature do
-    name { Decidim::Features::Namer.new(participatory_space.organization.available_locales, :budgets).i18n_name }
+  factory :budget_component, parent: :component do
+    name { Decidim::Components::Namer.new(participatory_space.organization.available_locales, :budgets).i18n_name }
     manifest_name :budgets
     participatory_space { create(:participatory_process, :with_steps, organization: organization) }
 
@@ -51,16 +51,16 @@ FactoryBot.define do
     title { Decidim::Faker::Localized.sentence(3) }
     description { Decidim::Faker::Localized.wrapped("<p>", "</p>") { Decidim::Faker::Localized.sentence(4) } }
     budget { Faker::Number.number(8) }
-    feature { create(:budget_feature) }
+    component { create(:budget_component) }
   end
 
   factory :order, class: "Decidim::Budgets::Order" do
-    feature { create(:budget_feature) }
-    user { create(:user, organization: feature.organization) }
+    component { create(:budget_component) }
+    user { create(:user, organization: component.organization) }
   end
 
   factory :line_item, class: "Decidim::Budgets::LineItem" do
     order
-    project { create(:project, feature: order.feature) }
+    project { create(:project, component: order.component) }
   end
 end

data/lib/decidim/budgets/version.rb

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

data/lib/decidim/budgets.rb

@@ -3,7 +3,7 @@
 require "decidim/budgets/admin"
 require "decidim/budgets/engine"
 require "decidim/budgets/admin_engine"
-require "decidim/budgets/feature"
+require "decidim/budgets/component"
 
 module Decidim
   # Base module for this engine.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-budgets
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.11.0.pre1
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-17 00:00:00.000000000 Z
+date: 2018-04-26 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.10.1
+        version: 0.11.0.pre1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: 0.11.0.pre1
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: 0.11.0.pre1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: 0.11.0.pre1
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
@@ -74,42 +74,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: 0.11.0.pre1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: 0.11.0.pre1
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: 0.11.0.pre1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: 0.11.0.pre1
 - !ruby/object:Gem::Dependency
   name: decidim-proposals
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: 0.11.0.pre1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: 0.11.0.pre1
 description: A budgets component for decidim's participatory spaces.
 email:
 - josepjaume@gmail.com
@@ -131,6 +131,7 @@ files:
 - app/assets/stylesheets/decidim/budgets/budget/_progress.scss
 - app/commands/decidim/budgets/add_line_item.rb
 - app/commands/decidim/budgets/admin/create_project.rb
+- app/commands/decidim/budgets/admin/destroy_project.rb
 - app/commands/decidim/budgets/admin/update_project.rb
 - app/commands/decidim/budgets/cancel_order.rb
 - app/commands/decidim/budgets/checkout.rb
@@ -151,6 +152,7 @@ files:
 - app/models/decidim/budgets/line_item.rb
 - app/models/decidim/budgets/order.rb
 - app/models/decidim/budgets/project.rb
+- app/presenters/decidim/budgets/admin_log/project_presenter.rb
 - app/queries/decidim/budgets/filtered_projects.rb
 - app/services/decidim/budgets/project_search.rb
 - app/views/decidim/budgets/admin/projects/_form.html.erb
@@ -196,11 +198,12 @@ files:
 - db/migrate/20170215132708_add_reference_to_projects.rb
 - db/migrate/20170410074214_remove_not_null_reference_budgets.rb
 - db/migrate/20170612101846_migrate_projects_category.rb
+- db/migrate/20180305133340_rename_features_to_components_at_budgets.rb
 - lib/decidim/budgets.rb
 - lib/decidim/budgets/admin.rb
 - lib/decidim/budgets/admin_engine.rb
+- lib/decidim/budgets/component.rb
 - lib/decidim/budgets/engine.rb
-- lib/decidim/budgets/feature.rb
 - lib/decidim/budgets/seeds/Exampledocument.pdf
 - lib/decidim/budgets/seeds/city.jpeg
 - lib/decidim/budgets/test/factories.rb
@@ -220,9 +223,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.3