decidim-pages 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab78619392592e129e5832c0a779ef5283722b6a
-  data.tar.gz: 32f49164085f41b9f788ff173ddb1b1f1339726f
+  metadata.gz: 6d4f91509718700bba96bb88a5ea4699924256e9
+  data.tar.gz: f4852700fc682d785e646f0d70037700214bad83
 SHA512:
-  metadata.gz: cabddfa8a9fc6812b2bc7f41580bb2e01d5fc48307fb56f959295667bf4dd5cd04ac412606284151dc2db15c31a95088ea89e80719d42b1c6ff9a52fbc254778
-  data.tar.gz: 7553a56a6e9268c7f2bf87fd009b3a46b3edd99d905762deda8abb6443200ce4e978fa78fb0fc9777c43af179f92d59d17d40bb0489432c465c49b5d62026623
+  metadata.gz: 60ad78cc25ad9cb936d21c8ec41c60b61fed3ac39f190322e56ce144af173f3ee9d2e37f21def010d37bc4acac75408cc30c6c68c252795bcaae83a4eaa0fa1b
+  data.tar.gz: 51b6191f76068e592d06e4f3019433bd56a5456fc42fe242cde032a7b7295c35f38e11f38b89e72f7595c51d17fa395bd68ecc94d8d41b6db2cb0f18f8f1e929

data/Rakefile

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

data/app/assets/images/decidim/pages/icon.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="8" height="8" viewBox="0 0 8 8">
+  <path d="M0 0v8h7v-4h-4v-4h-3zm4 0v3h3l-3-3zm-3 2h1v1h-1v-1zm0 2h1v1h-1v-1zm0 2h4v1h-4v-1z" />
+</svg>

data/app/commands/decidim/pages/admin/update_page.rb

@@ -29,8 +29,7 @@ module Decidim
         def update_page
           @page.update_attributes!(
             title: @form.title,
-            body: @form.body,
-            commentable: @form.commentable
+            body: @form.body
           )
         end
       end

data/app/forms/decidim/pages/admin/page_form.rb

@@ -8,7 +8,6 @@ module Decidim
 
         translatable_attribute :title, String
         translatable_attribute :body, String
-        attribute :commentable, Boolean
 
         validates :title, translatable_presence: true
       end

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

@@ -1,5 +1,4 @@
 <div class="field">
   <%= form.translated :text_field, :title, autofocus: true, label: t("models.components.title", scope: "decidim.pages.admin") %>
   <%= form.translated :editor, :body, toolbar: :full, lines: 30, label: t("models.components.body", scope: "decidim.pages.admin")  %>
-  <%= form.check_box :commentable, label: t("models.components.commentable", scope: "decidim.pages.admin") %>
 </div>

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

@@ -9,8 +9,8 @@
   </div>
 </div>
 
-<%= content_for :expanded do %>
-  <% if @page.commentable? %>
-    <%= comments_for @page, arguable: true %>
+<% if feature_settings.comments_always_enabled || current_settings.comments_enabled %>
+  <%= content_for :expanded do %>
+    <%= comments_for @page, arguable: true, votable: true %>
   <% end %>
 <% end %>

data/config/i18n-tasks.yml

@@ -2,3 +2,4 @@ base_locale: en
 locales: [en]
 ignore_unused:
 - "decidim.features.pages.name"
+- "decidim.features.pages.settings.*"

data/config/locales/ca.yml

@@ -3,12 +3,16 @@ ca:
     features:
       pages:
         name: Pàgina
+        settings:
+          global:
+            comments_always_enabled: Comentaris sempre habilitats
+          step:
+            comments_enabled: Comentaris habilitats
     pages:
       admin:
         models:
           components:
             body: Cos
-            commentable: Habilitar comentaris per a aquesta pàgina
             title: Títol
         pages:
           edit:

data/config/locales/en.yml

@@ -4,12 +4,16 @@ en:
     features:
       pages:
         name: Page
+        settings:
+          global:
+            comments_always_enabled: Comments always enabled
+          step:
+            comments_enabled: Comments enabled
     pages:
       admin:
         models:
           components:
             body: Body
-            commentable: Enable comments for this page
             title: Title
         pages:
           edit:

data/config/locales/es.yml

@@ -3,12 +3,16 @@ es:
     features:
       pages:
         name: Página
+        settings:
+          global:
+            comments_always_enabled: Comentarios siempre habilitados
+          step:
+            comments_enabled: Comentarios habilitados
     pages:
       admin:
         models:
           components:
             body: Cuerpo
-            commentable: Habilitar comentarios para esta página
             title: Título
         pages:
           edit:

data/db/migrate/20170110145040_remove_commentable_flag_from_pages.rb

@@ -0,0 +1,5 @@
+class RemoveCommentableFlagFromPages < ActiveRecord::Migration[5.0]
+  def change
+    remove_column :decidim_pages_pages, :commentable
+  end
+end

data/lib/decidim/pages/feature.rb

@@ -5,6 +5,7 @@ require_dependency "decidim/features/namer"
 Decidim.register_feature(:pages) do |feature|
   feature.engine = Decidim::Pages::Engine
   feature.admin_engine = Decidim::Pages::AdminEngine
+  feature.icon = "decidim/pages/icon.svg"
 
   feature.on(:create) do |instance|
     Decidim::Pages::CreatePage.call(instance) do
@@ -18,6 +19,14 @@ Decidim.register_feature(:pages) do |feature|
     end
   end
 
+  feature.settings(:global) do |settings|
+    settings.attribute :comments_always_enabled, type: :boolean
+  end
+
+  feature.settings(:step) do |settings|
+    settings.attribute :comments_enabled, type: :boolean
+  end
+
   feature.seeds do
     Decidim::ParticipatoryProcess.all.each do |process|
       next unless process.steps.any?
@@ -28,14 +37,15 @@ Decidim.register_feature(:pages) do |feature|
         participatory_process: process
       )
 
-      Decidim::Pages::Page.create!(
+      page = Decidim::Pages::Page.create!(
         feature: feature,
         title: Decidim::Faker::Localized.sentence(2),
         body: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
           Decidim::Faker::Localized.paragraph(3)
-        end,
-        commentable: true
+        end
       )
+
+      Decidim::Comments::Seed.comments_for(page)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-pages
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-21 00:00:00.000000000 Z
+date: 2017-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -18,28 +18,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 0.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 0.0.2
 - !ruby/object:Gem::Dependency
   name: decidim-comments
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 0.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 0.0.2
 - !ruby/object:Gem::Dependency
   name: rectify
   requirement: !ruby/object:Gem::Requirement
@@ -60,14 +60,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 0.0.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 0.0.2
 description: A pages component for decidim's participatory processes.
 email:
 - josepjaume@gmail.com
@@ -79,6 +79,7 @@ extra_rdoc_files: []
 files:
 - README.md
 - Rakefile
+- app/assets/images/decidim/pages/icon.svg
 - app/commands/decidim/pages/admin/update_page.rb
 - app/commands/decidim/pages/create_page.rb
 - app/commands/decidim/pages/destroy_page.rb
@@ -98,6 +99,7 @@ files:
 - config/locales/es.yml
 - db/migrate/20161116121353_create_decidim_pages.rb
 - db/migrate/20161214150429_add_commentable_to_pages.rb
+- db/migrate/20170110145040_remove_commentable_flag_from_pages.rb
 - lib/decidim/pages.rb
 - lib/decidim/pages/admin.rb
 - lib/decidim/pages/admin_engine.rb
@@ -124,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: A pages component for decidim's participatory processes.