decidim 0.0.5 → 0.0.6

data/decidim-meetings/spec/spec_helper.rb

@@ -1,7 +1,2 @@
 ENV["ENGINE_NAME"] = File.dirname(File.dirname(__FILE__)).split("/").last
 require "decidim/dev/test/base_spec_helper"
-
-require "webmock/rspec"
-WebMock.allow_net_connect!
-
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }

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

@@ -27,10 +27,7 @@ module Decidim
         private
 
         def update_page
-          @page.update_attributes!(
-            title: @form.title,
-            body: @form.body
-          )
+          @page.update_attributes!(body: @form.body)
         end
       end
     end

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

@@ -9,10 +9,7 @@ module Decidim
       end
 
       def call
-        @page = Page.new(
-          title: @feature.name,
-          feature: @feature
-        )
+        @page = Page.new(feature: @feature)
 
         @page.save ? broadcast(:ok) : broadcast(:invalid)
       end

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

@@ -6,10 +6,7 @@ module Decidim
       class PageForm < Decidim::Form
         include TranslatableAttributes
 
-        translatable_attribute :title, String
         translatable_attribute :body, String
-
-        validates :title, translatable_presence: true
       end
     end
   end

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

@@ -4,13 +4,16 @@ module Decidim
     # The data store for a Page in the Decidim::Pages component. It stores a
     # title, description and any other useful information to render a custom page.
     class Page < Pages::ApplicationRecord
+      include Decidim::Resourceable
+      include Decidim::HasFeature
       include Decidim::Comments::Commentable
 
-      belongs_to :feature, foreign_key: "decidim_feature_id", class_name: Decidim::Feature
-      has_one :organization, through: :feature
+      feature_manifest_name "pages"
 
-      validates :title, :feature, presence: true
-      validate :feature_manifest_matches
+      # Public: Pages doesn't have title so we assign the feature one to it.
+      def title
+        feature.name
+      end
 
       # Public: Overrides the `commentable?` Commentable concern method.
       def commentable?
@@ -19,7 +22,7 @@ module Decidim
 
       # Public: Overrides the `accepts_new_comments?` Commentable concern method.
       def accepts_new_comments?
-         commentable? && !feature.active_step_settings.comments_blocked
+        commentable? && !feature.active_step_settings.comments_blocked
       end
 
       # Public: Overrides the `comments_have_alignment?` Commentable concern method.
@@ -31,13 +34,6 @@ module Decidim
       def comments_have_votes?
         true
       end
-
-      private
-
-      def feature_manifest_matches
-        return unless feature
-        errors.add(:feature, :invalid) unless feature.manifest_name == "pages"
-      end
     end
   end
 end

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

@@ -1,4 +1,3 @@
 <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")  %>
 </div>

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

@@ -1,5 +1,4 @@
 <% add_decidim_meta_tags({
-  title: translated_attribute(@page.title),
   description: translated_attribute(@page.body),
 }) %>
 

data/decidim-pages/config/locales/ca.yml

@@ -13,7 +13,6 @@ ca:
         models:
           components:
             body: Cos
-            title: Títol
         pages:
           edit:
             save: Desa la pàgina

data/decidim-pages/config/locales/en.yml

@@ -14,7 +14,6 @@ en:
         models:
           components:
             body: Body
-            title: Title
         pages:
           edit:
             save: Save page

data/decidim-pages/config/locales/es.yml

@@ -13,7 +13,6 @@ es:
         models:
           components:
             body: Cuerpo
-            title: Título
         pages:
           edit:
             save: Guardar página

data/decidim-pages/config/locales/eu.yml

@@ -1,7 +1,20 @@
 eu:
   decidim:
+    features:
+      pages:
+        name: Orrialdea
+        settings:
+          global:
+            comments_enabled: Iruzkin gaituak
     pages:
       admin:
         models:
           components:
-            title: Izenburua
+            body: Testu-gorputza
+        pages:
+          edit:
+            save: Gorde orria
+            title: Editatu orria
+          update:
+            invalid: Erroreak gertatu dira orria gordetzean.
+            success: Orria zuzen gorde da.

data/decidim-pages/config/locales/fi.yml

@@ -0,0 +1,22 @@
+fi:
+  decidim:
+    features:
+      pages:
+        name: Sivu
+        settings:
+          global:
+            comments_enabled: Kommentointi sallittu
+          step:
+            comments_blocked: Kommentointi estetty
+    pages:
+      admin:
+        models:
+          components:
+            body: Runko
+        pages:
+          edit:
+            save: Tallenna sivu
+            title: Muokkaa sivua
+          update:
+            invalid: Sivun tallennuksessa oli virheitä.
+            success: Sivu tallennettu onnistuneesti.

data/decidim-pages/db/migrate/20170220091402_remove_page_feature_titles.rb

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

data/decidim-pages/lib/decidim/pages/engine.rb

@@ -8,6 +8,7 @@ module Decidim
       isolate_namespace Decidim::Pages
 
       routes do
+        resources :pages, only: [:show], controller: :application
         root to: "application#show"
       end
     end

data/decidim-pages/lib/decidim/pages/feature.rb

@@ -27,6 +27,10 @@ Decidim.register_feature(:pages) do |feature|
     settings.attribute :comments_blocked, type: :boolean, default: false
   end
 
+  feature.register_resource do |resource|
+    resource.model_class_name = "Decidim::Pages::Page"
+  end
+
   feature.seeds do
     Decidim::ParticipatoryProcess.all.each do |process|
       next unless process.steps.any?
@@ -40,7 +44,6 @@ Decidim.register_feature(:pages) do |feature|
 
       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

data/decidim-pages/spec/commands/create_page_spec.rb

@@ -31,10 +31,9 @@ module Decidim
 
           it "creates a new page with the same name as the feature" do
             expect(Page).to receive(:new).with({
-              title: feature.name,
               feature: feature
             }).and_call_original
-            
+
             expect do
               command.call
             end.to change { Page.count }.by(1)

data/decidim-pages/spec/commands/update_page_spec.rb

@@ -11,7 +11,6 @@ module Decidim
         let(:page) { create(:page, feature: feature) }
         let(:form_params) do
           {
-            "title" => page.title,
             "body" => page.body,
             "page" => {
               "commentable" => false

data/decidim-pages/spec/factories.rb

@@ -2,8 +2,13 @@ require "decidim/core/test/factories"
 require "decidim/comments/test/factories"
 
 FactoryGirl.define do
+  factory :page_feature, parent: :feature do
+    name { Decidim::Features::Namer.new(participatory_process.organization.available_locales, :pages).i18n_name }
+    manifest_name :pages
+    participatory_process { create(:participatory_process, :with_steps) }
+  end
+
   factory :page, class: Decidim::Pages::Page do
-    title { Decidim::Faker::Localized.sentence(3) }
     body { Decidim::Faker::Localized.wrapped("<p>", "</p>") { Decidim::Faker::Localized.sentence(4) } }
     feature { build(:feature, manifest_name: "pages") }
   end

data/decidim-pages/spec/features/admin_spec.rb

@@ -9,18 +9,10 @@ describe "Edit a page", type: :feature do
 
   describe "admin page" do
     before do
-      create(:page, feature: feature, title: title, body: body)
+      create(:page, feature: feature, body: body)
       visit_feature_admin
     end
 
-    let(:title) do
-      {
-        "en" => "Hello world",
-        "ca" => "Hola món",
-        "es" => "Hola mundo"
-      }
-    end
-
     let(:body) do
       {
         "en" => "<p>Content</p>",
@@ -30,12 +22,6 @@ describe "Edit a page", type: :feature do
     end
 
     it "updates the page" do
-      new_title = {
-        en: "New title",
-        ca: "Nou títol",
-        es: "Nuevo título"
-      }
-
       new_body = {
         en: "<p>New body</p>",
         ca: "<p>Nou cos</p>",
@@ -43,7 +29,6 @@ describe "Edit a page", type: :feature do
       }
 
       within "form.edit_page" do
-        fill_in_i18n(:page_title, "#title-tabs", new_title)
         fill_in_i18n_editor(:page_body, "#body-tabs", new_body)
         find("*[type=submit]").click
       end
@@ -54,7 +39,6 @@ describe "Edit a page", type: :feature do
 
       visit_feature
 
-      expect(page).to have_title("New title")
       expect(page).to have_content("New body")
     end
   end

data/decidim-pages/spec/features/comments_spec.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+require "spec_helper"
+
+describe "Comments", type: :feature, perform_enqueued: true do
+  let!(:feature) { create(:page_feature, organization: organization) }
+  let!(:commentable) { create(:page, feature: feature) }
+
+  let(:resource_path) { decidim_pages.page_path(commentable, feature_id: feature, participatory_process_id: feature.participatory_process) }
+  include_examples "comments"
+end

data/decidim-pages/spec/features/page_show_spec.rb

@@ -6,14 +6,6 @@ describe "Show a page", type: :feature do
   include_context "feature"
   let(:manifest_name) { "pages" }
 
-  let(:title) do
-    {
-      "en" => "Hello world",
-      "ca" => "Hola món",
-      "es" => "Hola mundo"
-    }
-  end
-
   let(:body) do
     {
       "en" => "<p>Content</p>",
@@ -22,7 +14,7 @@ describe "Show a page", type: :feature do
     }
   end
 
-  let!(:page_feature) { create(:page, feature: feature, title: title, body: body) }
+  let!(:page_feature) { create(:page, feature: feature, body: body) }
 
   describe "page show" do
     before do
@@ -30,7 +22,6 @@ describe "Show a page", type: :feature do
     end
 
     it "renders the content of the page" do
-      expect(page).to have_title("Hello world")
       expect(page).to have_content("Content")
     end
   end

data/decidim-pages/spec/forms/page_form_spec.rb

@@ -8,14 +8,6 @@ module Decidim
       describe PageForm do
         let(:current_organization) { create(:organization) }
 
-        let(:title) do
-          {
-            "en" => "Hello world",
-            "ca" => "Hola món",
-            "es" => "Hola mundo"
-          }
-        end
-
         let(:body) do
           {
             "en" => "<p>Content</p>",
@@ -29,7 +21,6 @@ module Decidim
         let(:attributes) do
           {
             "page" => {
-              "title" => title,
               "body" => body,
               "commentable" => commentable
             }
@@ -45,18 +36,6 @@ module Decidim
         context "when everything is OK" do
           it { is_expected.to be_valid }
         end
-
-        context "when any title translation is blank" do
-          let(:title) do
-            {
-              "en" => "Hello world",
-              "ca" => "Hola món",
-              "es" => ""
-            }
-          end
-
-          it { is_expected.not_to be_valid }
-        end
       end
     end
   end

data/decidim-pages/spec/models/page_spec.rb

@@ -7,6 +7,8 @@ module Decidim
       let(:page) { create(:page) }
       subject { page }
 
+      include_examples "has feature"
+
       it { is_expected.to be_valid }
 
       context "without a feature" do
@@ -24,10 +26,6 @@ module Decidim
       it "has an associated feature" do
         expect(page.feature).to be_a(Decidim::Feature)
       end
-
-      it "has an I18n title" do
-        expect(page.title).to be_a(Hash)
-      end
     end
   end
 end

data/decidim-proposals/app/commands/decidim/proposals/admin/create_proposal.rb

@@ -34,7 +34,10 @@ module Decidim
             body: form.body,
             category: form.category,
             scope: form.scope,
-            feature: form.feature
+            feature: form.feature,
+            address: form.address,
+            latitude: form.latitude,
+            longitude: form.longitude
           )
         end
       end

data/decidim-proposals/app/commands/decidim/proposals/create_proposal.rb

@@ -37,7 +37,10 @@ module Decidim
           scope: form.scope,
           author: @current_user,
           decidim_user_group_id: form.user_group_id,
-          feature: form.feature
+          feature: form.feature,
+          address: form.address,
+          latitude: form.latitude,
+          longitude: form.longitude
         )
       end
     end

data/decidim-proposals/app/controllers/decidim/proposals/admin/proposals_controller.rb

@@ -34,6 +34,10 @@ module Decidim
         def proposals
           @proposals ||= Proposal.where(feature: current_feature)
         end
+
+        def proposal
+          @proposal ||= Proposal.where(feature: current_feature).find(params[:id])
+        end
       end
     end
   end