decidim-debates 0.10.1 → 0.11.0.pre1

data/config/locales/pl.yml

@@ -12,6 +12,19 @@ pl:
         title: Tytuł
         user_group_id: Utwórz debatę jako
   decidim:
+    components:
+      debates:
+        actions:
+          create: Stwórz
+        name: Debaty
+        settings:
+          global:
+            announcement: Ogłoszenie
+            comments_enabled: Komentarze włączone
+          step:
+            announcement: Ogłoszenie
+            comments_blocked: Komentarze zablokowane
+            creation_enabled: Utworzenie debaty przez użytkowników
     debates:
       actions:
         confirm_destroy: Jesteś pewny?
@@ -109,16 +122,3 @@ pl:
           email_outro: Otrzymałeś to powiadomienie, ponieważ obserwujesz %{participatory_space_title}. Możesz przestać otrzymywać powiadomienia po poprzednim linku.
           email_subject: Debaty są teraz dostępne w %{participatory_space_title}
           notification_title: Możesz teraz uruchomić <a href="%{resource_path}">nowych debat</a> w <a href="%{participatory_space_url}">%{participatory_space_title}</a>
-    features:
-      debates:
-        actions:
-          create: Stwórz
-        name: Debaty
-        settings:
-          global:
-            announcement: Ogłoszenie
-            comments_enabled: Komentarze włączone
-          step:
-            announcement: Ogłoszenie
-            comments_blocked: Komentarze zablokowane
-            creation_enabled: Utworzenie debaty przez użytkowników

data/config/locales/pt-BR.yml

@@ -12,6 +12,19 @@ pt-BR:
         title: Título
         user_group_id: Criar debate como
   decidim:
+    components:
+      debates:
+        actions:
+          create: Crio
+        name: Debates
+        settings:
+          global:
+            announcement: Anúncio
+            comments_enabled: Comentários ativados
+          step:
+            announcement: Anúncio
+            comments_blocked: Comentários bloqueados
+            creation_enabled: Criação de debate por usuários habilitado
     debates:
       actions:
         confirm_destroy: Você tem certeza?
@@ -116,16 +129,3 @@ pt-BR:
           email_outro: Você recebeu esta notificação porque está seguindo %{participatory_space_title}. Você pode parar de receber notificações após o link anterior.
           email_subject: Debates agora disponíveis em %{participatory_space_title}
           notification_title: Agora você pode começar <a href="%{resource_path}">novos debates</a> em <a href="%{participatory_space_url}">%{participatory_space_title}</a>
-    features:
-      debates:
-        actions:
-          create: Crio
-        name: Debates
-        settings:
-          global:
-            announcement: Anúncio
-            comments_enabled: Comentários ativados
-          step:
-            announcement: Anúncio
-            comments_blocked: Comentários bloqueados
-            creation_enabled: Criação de debate por usuários habilitado

data/config/locales/pt.yml

@@ -12,6 +12,19 @@ pt:
         title: Título
         user_group_id: Criar debate como
   decidim:
+    components:
+      debates:
+        actions:
+          create: Crio
+        name: Debates
+        settings:
+          global:
+            announcement: Anúncio
+            comments_enabled: Comentários ativados
+          step:
+            announcement: Anúncio
+            comments_blocked: Comentários bloqueados
+            creation_enabled: Criação de debate por usuários habilitado
     debates:
       actions:
         confirm_destroy: Você tem certeza?
@@ -116,16 +129,3 @@ pt:
           email_outro: Você recebeu esta notificação porque está seguindo %{participatory_space_title}. Você pode parar de receber notificações após o link anterior.
           email_subject: Debates agora disponíveis em %{participatory_space_title}
           notification_title: Agora você pode começar <a href="%{resource_path}">novos debates</a> em <a href="%{participatory_space_url}">%{participatory_space_title}</a>
-    features:
-      debates:
-        actions:
-          create: Crio
-        name: Debates
-        settings:
-          global:
-            announcement: Anúncio
-            comments_enabled: Comentários ativados
-          step:
-            announcement: Anúncio
-            comments_blocked: Comentários bloqueados
-            creation_enabled: Criação de debate por usuários habilitado

data/config/locales/ru.yml

@@ -2,4 +2,6 @@ ru:
   activemodel:
     attributes:
       debate:
+        category_id: Категории
         decidim_category_id: Категория
+        title: Название

data/config/locales/sv.yml

@@ -12,6 +12,19 @@ sv:
         title: Titel
         user_group_id: Skapa debatt som
   decidim:
+    components:
+      debates:
+        actions:
+          create: Skapa
+        name: debatter
+        settings:
+          global:
+            announcement: Meddelande
+            comments_enabled: Kommentarer aktiverade
+          step:
+            announcement: Meddelande
+            comments_blocked: Kommentarer blockerade
+            creation_enabled: Debatt skapande av användare aktiverat
     debates:
       actions:
         confirm_destroy: Är du säker?
@@ -116,16 +129,3 @@ sv:
           email_outro: Du har fått den här meddelandet eftersom du följer %{participatory_space_title}. Du kan sluta ta emot meddelanden efter föregående länk.
           email_subject: Debatter finns nu i %{participatory_space_title}
           notification_title: Nu kan du starta <a href="%{resource_path}">nya debatter</a> i <a href="%{participatory_space_url}">%{participatory_space_title}</a>
-    features:
-      debates:
-        actions:
-          create: Skapa
-        name: Debatter
-        settings:
-          global:
-            announcement: Meddelande
-            comments_enabled: Kommentarer aktiverade
-          step:
-            announcement: Meddelande
-            comments_blocked: Kommentarer blockerade
-            creation_enabled: Debatt skapande av användare aktiverat

data/config/locales/uk.yml

@@ -11,6 +11,14 @@ uk:
         title: Заголовок
         user_group_id: Створити обговорення як
   decidim:
+    components:
+      debates:
+        settings:
+          global:
+            comments_enabled: Коментарі ввімкнено
+          step:
+            comments_blocked: Коментарі заблоковано
+            creation_enabled: Увімкнено створення обговорень учасниками
     debates:
       actions:
         confirm_destroy: Ви впевнені?
@@ -94,14 +102,3 @@ uk:
             email_subject: Нове обговорення у %{space_title}
           user_followers:
             email_subject: Нове обговорення, створене %{author_nickname}
-    features:
-      debates:
-        actions:
-          create: Створити
-        name: Обговорення
-        settings:
-          global:
-            comments_enabled: Коментарі ввімкнено
-          step:
-            comments_blocked: Коментарі заблоковано
-            creation_enabled: Увімкнено створення обговорень учасниками

data/db/migrate/20180305133556_rename_features_to_components_at_debates.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class RenameFeaturesToComponentsAtDebates < ActiveRecord::Migration[5.1]
+  def change
+    rename_column :decidim_debates_debates, :decidim_feature_id, :decidim_component_id
+
+    if index_name_exists?(:decidim_debates_debates, "index_decidim_debates_debates_on_decidim_feature_id")
+      rename_index :decidim_debates_debates, "index_decidim_debates_debates_on_decidim_feature_id", "index_decidim_debates_debates_on_decidim_component_id"
+    end
+  end
+end

data/lib/decidim/debates.rb

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

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

@@ -1,36 +1,40 @@
 # frozen_string_literal: true
 
-require_dependency "decidim/features/namer"
+require_dependency "decidim/components/namer"
 
-Decidim.register_feature(:debates) do |feature|
-  feature.engine = Decidim::Debates::Engine
-  feature.admin_engine = Decidim::Debates::AdminEngine
-  feature.icon = "decidim/debates/icon.svg"
+Decidim.register_component(:debates) do |component|
+  component.engine = Decidim::Debates::Engine
+  component.admin_engine = Decidim::Debates::AdminEngine
+  component.icon = "decidim/debates/icon.svg"
 
-  feature.on(:before_destroy) do |instance|
-    raise StandardError, "Can't remove this feature" if Decidim::Debates::Debate.where(feature: instance).any?
+  component.on(:before_destroy) do |instance|
+    raise StandardError, "Can't remove this component" if Decidim::Debates::Debate.where(component: instance).any?
   end
 
-  feature.settings(:global) do |settings|
+  component.settings(:global) do |settings|
     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 :creation_enabled, type: :boolean, default: false
     settings.attribute :comments_blocked, type: :boolean, default: false
     settings.attribute :announcement, type: :text, translated: true, editor: true
   end
 
-  feature.register_resource do |resource|
+  component.register_stat :debates_count, primary: true, priority: Decidim::StatsRegistry::HIGH_PRIORITY do |components, _start_at, _end_at|
+    Decidim::Debates::Debate.where(component: components).count
+  end
+
+  component.register_resource do |resource|
     resource.model_class_name = "Decidim::Debates::Debate"
   end
 
-  feature.actions = %w(create)
+  component.actions = %w(create)
 
-  feature.seeds do |participatory_space|
-    feature = Decidim::Feature.create!(
-      name: Decidim::Features::Namer.new(participatory_space.organization.available_locales, :debates).i18n_name,
+  component.seeds do |participatory_space|
+    component = Decidim::Component.create!(
+      name: Decidim::Components::Namer.new(participatory_space.organization.available_locales, :debates).i18n_name,
       manifest_name: :debates,
       published_at: Time.current,
       participatory_space: participatory_space
@@ -38,7 +42,7 @@ Decidim.register_feature(:debates) do |feature|
 
     3.times do
       debate = Decidim::Debates::Debate.create!(
-        feature: feature,
+        component: component,
         category: participatory_space.categories.sample,
         title: Decidim::Faker::Localized.sentence(2),
         description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do

data/lib/decidim/debates/engine.rb

@@ -25,7 +25,7 @@ module Decidim
       initializer "decidim_changes" do
         Decidim::SettingsChange.subscribe "debates" do |changes|
           Decidim::Debates::SettingsChangeJob.perform_later(
-            changes[:feature_id],
+            changes[:component_id],
             changes[:previous_settings],
             changes[:current_settings]
           )

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

@@ -8,7 +8,7 @@ FactoryBot.define do
     instructions { Decidim::Faker::Localized.wrapped("<p>", "</p>") { Decidim::Faker::Localized.sentence(4) } }
     start_time { 1.day.from_now }
     end_time { start_time.advance(hours: 2) }
-    feature { build(:feature, manifest_name: "debates") }
+    component { build(:component, manifest_name: "debates") }
 
     trait :open_ama do
       start_time { 1.day.ago }
@@ -17,22 +17,22 @@ FactoryBot.define do
 
     trait :with_author do
       author do
-        build(:user, organization: feature.organization) if feature
+        build(:user, organization: component.organization) if component
       end
     end
 
     trait :with_user_group_author do
       author do
-        build(:user, organization: feature.organization) if feature
+        build(:user, organization: component.organization) if component
       end
       user_group do
-        build(:user_group, :verified, organization: feature.organization, users: [author]) if feature
+        build(:user_group, :verified, organization: component.organization, users: [author]) if component
       end
     end
   end
 
-  factory :debates_feature, parent: :feature do
-    name { Decidim::Features::Namer.new(participatory_space.organization.available_locales, :debates).i18n_name }
+  factory :debates_component, parent: :component do
+    name { Decidim::Components::Namer.new(participatory_space.organization.available_locales, :debates).i18n_name }
     manifest_name :debates
     participatory_space { create(:participatory_process, :with_steps, organization: organization) }
     settings do

data/lib/decidim/debates/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-debates
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.11.0.pre1
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -11,7 +11,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
@@ -19,28 +19,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
@@ -75,28 +75,28 @@ 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
 description: A debates component for decidim's participatory spaces.
 email:
 - josepjaume@gmail.com
@@ -169,11 +169,12 @@ files:
 - db/migrate/20180119150434_add_reference_to_debates.rb
 - db/migrate/20180122090505_add_user_group_author_to_debates.rb
 - db/migrate/20180305092347_drop_category_id_column.rb
+- db/migrate/20180305133556_rename_features_to_components_at_debates.rb
 - lib/decidim/debates.rb
 - lib/decidim/debates/admin.rb
 - lib/decidim/debates/admin_engine.rb
+- lib/decidim/debates/component.rb
 - lib/decidim/debates/engine.rb
-- lib/decidim/debates/feature.rb
 - lib/decidim/debates/test/factories.rb
 - lib/decidim/debates/version.rb
 homepage: https://github.com/decidim/decidim
@@ -191,9 +192,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