decidim-pages 0.10.1 → 0.11.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3053879c9194bcd2637b7cc384eef645b15998c2611134c4e2de296aae1c8360
-  data.tar.gz: e83cc3b156716ceee1684fab1e69fcaab08ed565a996269ed26824de61726557
+  metadata.gz: 68b528a51e27c9477871e1672455bc17fd13858b780047e4b6f32e2f4249f5f6
+  data.tar.gz: c16bd8b714f0dc34531942f06ab3d09cf29d8f31156672802e7c3dfc780c6045
 SHA512:
-  metadata.gz: 4c950453adf8258fa2474c087829d173644b93e566fc70583264fa4d3b50e1cd16fd66c9339973877bd74a0e8267f4c24fd6e61f88b365625a225aa9c3423b02
-  data.tar.gz: 9917503466e922c9b2954a28d7e5aaf264f0b0a6246e79647a7e87dace02d3a9533c166d547675c5cb013bc4bf388c04e27519918a825609fba624a171c1474b
+  metadata.gz: d3f58344649804c0d1f99bd99a0354787065d97003205920f6032712fa76efd979d5d71e28f9f7ed0dd6e2843f2e60d850825dc6d36270a88c139a5685d2a816
+  data.tar.gz: fca5a38905d2ceea8917d38083520f8096be0ccf424624f08f068a2ede42c4de87f944dc0ca35d87b2d1b83b35b08c4d1ead7967d15389c406ad30e77898d525

data/README.md

@@ -4,7 +4,7 @@ The Pages module adds static page capabilities to any participatory process. It
 
 ## Usage
 
-Pages will be available as a Feature for a Participatory Process.
+Pages will be available as a Component for a Participatory Process.
 
 ## Installation
 

data/app/commands/decidim/pages/copy_page.rb

@@ -2,8 +2,8 @@
 
 module Decidim
   module Pages
-    # Command that gets called whenever a feature's page has to be duplicated.
-    # It's need a context with the old feature that
+    # Command that gets called whenever a component's page has to be duplicated.
+    # It's need a context with the old component that
     # is going to be duplicated on the new one
     class CopyPage < Rectify::Command
       def initialize(context)
@@ -12,9 +12,9 @@ module Decidim
 
       def call
         Decidim::Pages::Page.transaction do
-          pages = Decidim::Pages::Page.where(feature: @context[:old_feature])
+          pages = Decidim::Pages::Page.where(component: @context[:old_component])
           pages.each do |page|
-            Decidim::Pages::Page.create!(feature: @context[:new_feature], body: page.body)
+            Decidim::Pages::Page.create!(component: @context[:new_component], body: page.body)
           end
         end
         broadcast(:ok)

data/app/commands/decidim/pages/create_page.rb

@@ -2,15 +2,15 @@
 
 module Decidim
   module Pages
-    # Command that gets called whenever a feature's page has to be created. It
-    # usually happens as a callback when the feature itself is created.
+    # Command that gets called whenever a component's page has to be created. It
+    # usually happens as a callback when the component itself is created.
     class CreatePage < Rectify::Command
-      def initialize(feature)
-        @feature = feature
+      def initialize(component)
+        @component = component
       end
 
       def call
-        @page = Page.new(feature: @feature)
+        @page = Page.new(component: @component)
 
         @page.save ? broadcast(:ok) : broadcast(:invalid)
       end

data/app/commands/decidim/pages/destroy_page.rb

@@ -2,15 +2,15 @@
 
 module Decidim
   module Pages
-    # Command that gets called when the page of this feature needs to be
-    # destroyed. It usually happens as a callback when the feature is removed.
+    # Command that gets called when the page of this component needs to be
+    # destroyed. It usually happens as a callback when the component is removed.
     class DestroyPage < Rectify::Command
-      def initialize(feature)
-        @feature = feature
+      def initialize(component)
+        @component = component
       end
 
       def call
-        Page.where(feature: @feature).destroy_all
+        Page.where(component: @component).destroy_all
         broadcast(:ok)
       end
     end

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

@@ -6,7 +6,7 @@ module Decidim
       # Base controller for the administration of this module. It inherits from
       # Decidim's admin base controller in order to inherit the layout and other
       # convenience methods relevant to a this component.
-      class ApplicationController < Decidim::Admin::Features::BaseController
+      class ApplicationController < Decidim::Admin::Components::BaseController
       end
     end
   end

data/app/controllers/decidim/pages/admin/pages_controller.rb

@@ -28,7 +28,7 @@ module Decidim
         private
 
         def page
-          @page ||= Pages::Page.find_by(feature: current_feature)
+          @page ||= Pages::Page.find_by(component: current_component)
         end
       end
     end

data/app/controllers/decidim/pages/application_controller.rb

@@ -5,11 +5,11 @@ module Decidim
     # This controller is the abstract class from which all other controllers of
     # this engine inherit.
     #
-    # Note that it inherits from `Decidim::Features::Basecontroller`, which
+    # Note that it inherits from `Decidim::Components::Basecontroller`, which
     # override its layout and provide all kinds of useful methods.
-    class ApplicationController < Decidim::Features::BaseController
+    class ApplicationController < Decidim::Components::BaseController
       def show
-        @page = Page.find_by(feature: current_feature)
+        @page = Page.find_by(component: current_component)
       end
     end
   end

data/app/models/decidim/pages/page.rb

@@ -6,19 +6,19 @@ module Decidim
     # title, description and any other useful information to render a custom page.
     class Page < Pages::ApplicationRecord
       include Decidim::Resourceable
-      include Decidim::HasFeature
+      include Decidim::HasComponent
       include Decidim::Traceable
       include Decidim::Loggable
 
-      feature_manifest_name "pages"
+      component_manifest_name "pages"
 
       def self.log_presenter_class_for(_log)
         Decidim::Pages::AdminLog::PagePresenter
       end
 
-      # Public: Pages doesn't have title so we assign the feature one to it.
+      # Public: Pages doesn't have title so we assign the component one to it.
       def title
-        feature.name
+        component.name
       end
     end
   end

data/app/views/decidim/pages/admin/pages/_form.html.erb

@@ -4,7 +4,7 @@
   </div>
   <div class="card-section">
     <div class="row column">
-      <%= form.translated :editor, :body, toolbar: :full, lines: 30, label: t("models.components.body", scope: "decidim.pages.admin")  %>
+      <%= form.translated :editor, :body, toolbar: :full, lines: 30, label: t("models.components.body", scope: "decidim.pages.admin") %>
     </div>
   </div>
 </div>

data/app/views/decidim/pages/admin/pages/edit.html.erb

@@ -1,5 +1,5 @@
-<%=  decidim_form_for(@form, url: page_path, method: :post, html: { class: "form edit_page" }) do |form| %>
-  <%= render partial: 'form', object: form, locals: { title: t('.title') }  %>
+<%= decidim_form_for(@form, url: page_path, method: :post, html: { class: "form edit_page" }) do |form| %>
+  <%= render partial: "form", object: form, locals: { title: t(".title") } %>
 
   <div class="button--double form-general-submit">
     <%= form.submit t(".save") %>

data/app/views/decidim/pages/application/show.html.erb

@@ -2,7 +2,7 @@
   description: translated_attribute(@page.body),
 }) %>
 
-<%= render partial: "decidim/shared/feature_announcement" %>
+<%= render partial: "decidim/shared/component_announcement" %>
 
 <div class="row column">
   <div class="row">

data/config/locales/ca.yml

@@ -3,7 +3,7 @@ ca:
     admin_log:
       page:
         update: "%{user_name} ha actualitzat la pàgina %{resource_name} a l'espai %{space_name}"
-    features:
+    components:
       pages:
         name: Pàgina
         settings:

data/config/locales/en.yml

@@ -4,7 +4,7 @@ en:
     admin_log:
       page:
         update: "%{user_name} updated the %{resource_name} page in %{space_name}"
-    features:
+    components:
       pages:
         name: Page
         settings:

data/config/locales/es.yml

@@ -3,7 +3,7 @@ es:
     admin_log:
       page:
         update: "%{user_name} actualizó la página %{resource_name} en %{space_name}"
-    features:
+    components:
       pages:
         name: Página
         settings:

data/config/locales/eu.yml

@@ -3,7 +3,7 @@ eu:
     admin_log:
       page:
         update: "%{user_name} %{resource_name} orrialdea %{space_name} eguneratu du"
-    features:
+    components:
       pages:
         name: Orria
         settings:

data/config/locales/fi.yml

@@ -3,7 +3,7 @@ fi:
     admin_log:
       page:
         update: "%{user_name} päivitti %{resource_name} -sivun %{space_name}"
-    features:
+    components:
       pages:
         name: Sivu
         settings:

data/config/locales/fr.yml

@@ -3,7 +3,7 @@ fr:
     admin_log:
       page:
         update: "%{user_name} a mis à jour la page %{resource_name} dans %{space_name}"
-    features:
+    components:
       pages:
         name: Page
         settings:

data/config/locales/gl.yml

@@ -3,7 +3,7 @@ gl:
     admin_log:
       page:
         update: "%{user_name} actualizou a páxina %{resource_name} en %{space_name}"
-    features:
+    components:
       pages:
         name: Páxina
         settings:

data/config/locales/it.yml

@@ -3,7 +3,7 @@ it:
     admin_log:
       page:
         update: "%{user_name} ha aggiornato la pagina %{resource_name} in %{space_name}"
-    features:
+    components:
       pages:
         name: Pagina
         settings:

data/config/locales/nl.yml

@@ -3,7 +3,7 @@ nl:
     admin_log:
       page:
         update: "%{user_name} heeft de %{resource_name} pagina in %{space_name} bijgewerkt"
-    features:
+    components:
       pages:
         name: Pagina
         settings:

data/config/locales/pl.yml

@@ -3,7 +3,7 @@ pl:
     admin_log:
       page:
         update: "%{user_name} zaktualizował stronę %{resource_name} w %{space_name}"
-    features:
+    components:
       pages:
         name: Strona
         settings:

data/config/locales/pt-BR.yml

@@ -3,7 +3,7 @@ pt-BR:
     admin_log:
       page:
         update: "%{user_name} atualizou a página %{resource_name} em %{space_name}"
-    features:
+    components:
       pages:
         name: Página
         settings:

data/config/locales/pt.yml

@@ -3,7 +3,7 @@ pt:
     admin_log:
       page:
         update: "%{user_name} atualizou a página %{resource_name} em %{space_name}"
-    features:
+    components:
       pages:
         name: Página
         settings:

data/config/locales/ru.yml

@@ -1,6 +1,6 @@
 ru:
   decidim:
-    features:
+    components:
       pages:
         name: Страница
         settings:

data/config/locales/sv.yml

@@ -3,7 +3,7 @@ sv:
     admin_log:
       page:
         update: "%{user_name} uppdaterade %{resource_name} sidan i %{space_name}"
-    features:
+    components:
       pages:
         name: Sida
         settings:

data/config/locales/uk.yml

@@ -1,6 +1,6 @@
 uk:
   decidim:
-    features:
+    components:
       pages:
         name: Сторінка
         settings:

data/db/migrate/20180305133658_rename_features_to_components_at_pages.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class RenameFeaturesToComponentsAtPages < ActiveRecord::Migration[5.1]
+  def change
+    rename_column :decidim_pages_pages, :decidim_feature_id, :decidim_component_id
+
+    if index_name_exists?(:decidim_pages_pages, "index_decidim_pages_pages_on_decidim_feature_id")
+      rename_index :decidim_pages_pages, "index_decidim_pages_pages_on_decidim_feature_id", "index_decidim_pages_pages_on_decidim_component_id"
+    end
+  end
+end

data/lib/decidim/pages.rb

@@ -3,7 +3,7 @@
 require "decidim/pages/admin"
 require "decidim/pages/engine"
 require "decidim/pages/admin_engine"
-require "decidim/pages/feature"
+require "decidim/pages/component"
 
 module Decidim
   # This namespace holds the logic of the `Pages` component. This component

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

@@ -1,59 +1,59 @@
 # frozen_string_literal: true
 
-require "decidim/features/namer"
+require "decidim/components/namer"
 
-Decidim.register_feature(:pages) do |feature|
-  feature.engine = Decidim::Pages::Engine
-  feature.admin_engine = Decidim::Pages::AdminEngine
-  feature.icon = "decidim/pages/icon.svg"
+Decidim.register_component(:pages) do |component|
+  component.engine = Decidim::Pages::Engine
+  component.admin_engine = Decidim::Pages::AdminEngine
+  component.icon = "decidim/pages/icon.svg"
 
-  feature.on(:create) do |instance|
+  component.on(:create) do |instance|
     Decidim::Pages::CreatePage.call(instance) do
       on(:invalid) { raise "Can't create page" }
     end
   end
 
-  feature.on(:destroy) do |instance|
+  component.on(:destroy) do |instance|
     Decidim::Pages::DestroyPage.call(instance) do
       on(:error) { raise "Can't destroy page" }
     end
   end
 
-  feature.on(:copy) do |context|
+  component.on(:copy) do |context|
     Decidim::Pages::CopyPage.call(context) do
       on(:invalid) { raise "Can't duplicate page" }
     end
   end
 
-  feature.register_stat :pages_count do |features, start_at, end_at|
-    pages = Decidim::Pages::Page.where(feature: features)
+  component.register_stat :pages_count do |components, start_at, end_at|
+    pages = Decidim::Pages::Page.where(component: components)
     pages = pages.where("created_at >= ?", start_at) if start_at.present?
     pages = pages.where("created_at <= ?", end_at) if end_at.present?
     pages.count
   end
 
-  feature.settings(:global) do |settings|
+  component.settings(:global) do |settings|
     settings.attribute :announcement, type: :text, translated: true, editor: true
   end
 
-  feature.settings(:step) do |settings|
+  component.settings(:step) do |settings|
     settings.attribute :announcement, type: :text, translated: true, editor: true
   end
 
-  feature.register_resource do |resource|
+  component.register_resource do |resource|
     resource.model_class_name = "Decidim::Pages::Page"
   end
 
-  feature.seeds do |participatory_space|
-    feature = Decidim::Feature.create!(
-      name: Decidim::Features::Namer.new(participatory_space.organization.available_locales, :pages).i18n_name,
+  component.seeds do |participatory_space|
+    component = Decidim::Component.create!(
+      name: Decidim::Components::Namer.new(participatory_space.organization.available_locales, :pages).i18n_name,
       manifest_name: :pages,
       published_at: Time.current,
       participatory_space: participatory_space
     )
 
     Decidim::Pages::Page.create!(
-      feature: feature,
+      component: component,
       body: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
         Decidim::Faker::Localized.paragraph(3)
       end

data/lib/decidim/pages/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-pages
 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-core
@@ -18,42 +18,42 @@ 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-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-participatory_processes
   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 pages component for decidim's participatory processes.
 email:
 - josepjaume@gmail.com
@@ -100,11 +100,12 @@ files:
 - db/migrate/20161214150429_add_commentable_to_pages.rb
 - db/migrate/20170110145040_remove_commentable_flag_from_pages.rb
 - db/migrate/20170220091402_remove_page_feature_titles.rb
+- db/migrate/20180305133658_rename_features_to_components_at_pages.rb
 - lib/decidim/pages.rb
 - lib/decidim/pages/admin.rb
 - lib/decidim/pages/admin_engine.rb
+- lib/decidim/pages/component.rb
 - lib/decidim/pages/engine.rb
-- lib/decidim/pages/feature.rb
 - lib/decidim/pages/version.rb
 homepage: https://github.com/decidim/decidim
 licenses:
@@ -121,9 +122,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