decidim-assemblies 0.8.3 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a5e19cd2b2c3452c6b347ceffb2f54efbfdd708
-  data.tar.gz: 1a21d4162dc350d2644de0b8e64dca47a53d0dee
+  metadata.gz: 36bdde02af4051c46ec0dfe0fa5f01a80bb4c4ee
+  data.tar.gz: a761f3f9f2ec9a17707a5987559ba09ed766e6ad
 SHA512:
-  metadata.gz: fff5da60a3aac6b67c0ec87a61b434445cc2f2ad8a90e82e3ce3f207a1717fb491f6d158aa355d4809e21653bc4be0f2bc375f0e359bab549a80588e95c15c1a
-  data.tar.gz: b5b1cddaa99cc66ed9b81e711fe4db33687d85dd5f1bfefe1e36112300c4604f79bbd929dcc0ecadf8a2281972df4e5043047e7eda07544940f6f5ffd99e7bf4
+  metadata.gz: 67d0794a61829846d36a3d8fc3c3c5ce11f4acbf8c57f59ea78e90e0263c257eef2bd8c1b75df0e548b20e5b26c7b96535af9f4b053037a0fb597fcdf3fd0d00
+  data.tar.gz: e2c685cf545dd8890512dc11b9c699f9c1e741957844729e00c67cd82f71199e1694c7e121543786b6ae5f642eccd79fc4f080c55b9c1adcce5c489d427cad43

data/app/controllers/decidim/assemblies/admin/assemblies_controller.rb

@@ -7,7 +7,6 @@ module Decidim
       #
       class AssembliesController < Decidim::Admin::ApplicationController
         helper_method :current_assembly
-
         layout "decidim/admin/assemblies"
 
         def index
@@ -84,12 +83,16 @@ module Decidim
           ).first
         end
 
+        def current_participatory_space
+          current_assembly
+        end
+
         def collection
           @collection ||= OrganizationAssemblies.new(current_user.organization).query
         end
 
         def ability_context
-          super.merge(current_assembly: current_assembly)
+          super.merge(current_participatory_space: current_assembly)
         end
 
         def assembly_params

data/app/controllers/decidim/assemblies/admin/concerns/assembly_admin.rb

@@ -13,12 +13,22 @@ module Decidim
           extend ActiveSupport::Concern
 
           included do
-            include NeedsAssembly
-
-            layout "decidim/admin/assembly"
+            include Decidim::Admin::ParticipatorySpaceAdminContext
+            participatory_space_admin_layout
 
+            helper_method :current_assembly
             alias_method :current_participatory_space, :current_assembly
           end
+
+          def current_assembly
+            @current_assembly ||= organization_assemblies.find_by!(
+              slug: params[:assembly_slug] || params[:slug]
+            )
+          end
+
+          def organization_assemblies
+            @organization_assemblies ||= OrganizationAssemblies.new(current_organization).query
+          end
         end
       end
     end

data/app/controllers/decidim/assemblies/assemblies_controller.rb

@@ -5,9 +5,8 @@ module Decidim
     # A controller that holds the logic to show Assemblies in a
     # public layout.
     class AssembliesController < Decidim::ApplicationController
-      layout "layouts/decidim/assembly", only: [:show]
-
-      before_action -> { extend NeedsAssembly }, only: [:show]
+      include ParticipatorySpaceContext
+      participatory_space_layout only: :show
 
       helper Decidim::AttachmentsHelper
       helper Decidim::IconHelper
@@ -22,12 +21,14 @@ module Decidim
         authorize! :read, Assembly
       end
 
-      def show
-        authorize! :read, current_assembly
-      end
+      def show; end
 
       private
 
+      def current_participatory_space
+        @current_participatory_space ||= OrganizationAssemblies.new(current_organization).query.find_by(slug: params[:slug])
+      end
+
       def published_assemblies
         @published_assemblies ||= OrganizationPublishedAssemblies.new(current_organization)
       end
@@ -43,7 +44,7 @@ module Decidim
       end
 
       def stats
-        @stats ||= AssemblyStatsPresenter.new(assembly: current_assembly)
+        @stats ||= AssemblyStatsPresenter.new(assembly: current_participatory_space)
       end
     end
   end

data/app/views/decidim/assemblies/assemblies/_statistics.html.erb

@@ -1,6 +1,6 @@
 <section class="extended" id="assembly-statistics" class="statistics">
   <div class="row column">
-    <h4 class="section-heading"><%= t("statistics.headline", scope: "decidim.assemblies", assembly: translated_attribute(current_assembly.title)) %></h3>
+    <h4 class="section-heading"><%= t("statistics.headline", scope: "decidim.assemblies", assembly: translated_attribute(current_participatory_space.title)) %></h3>
   </div>
   <div class="row">
     <div class="columns small-centered mediumlarge-12 large-12 process_stats">

data/app/views/decidim/assemblies/assemblies/show.html.erb

@@ -1,8 +1,8 @@
 <% add_decidim_meta_tags({
-  image_url: current_assembly.hero_image.url,
-  description: translated_attribute(current_assembly.short_description),
-  title: translated_attribute(current_assembly.title),
-  url: assembly_url(current_assembly),
+  image_url: current_participatory_space.hero_image.url,
+  description: translated_attribute(current_participatory_space.short_description),
+  title: translated_attribute(current_participatory_space.title),
+  url: assembly_url(current_participatory_space),
   twitter_handler: current_organization.twitter_handler
 }) %>
 
@@ -11,61 +11,61 @@
     <div class="columns medium-7 mediumlarge-8">
       <div class="section">
         <div class="lead">
-          <%= decidim_sanitize translated_attribute(current_assembly.short_description) %>
+          <%= decidim_sanitize translated_attribute(current_participatory_space.short_description) %>
         </div>
-        <%= decidim_sanitize translated_attribute(current_assembly.description) %>
+        <%= decidim_sanitize translated_attribute(current_participatory_space.description) %>
       </div>
-      <%= attachments_for current_assembly %>
+      <%= attachments_for current_participatory_space %>
     </div>
     <div class="section columns medium-5 mediumlarge-4 large-3">
       <div class="card extra definition-data">
-        <% if translated_attribute(current_assembly.meta_scope).present? %>
+        <% if translated_attribute(current_participatory_space.meta_scope).present? %>
           <div class="definition-data__item scope">
             <span class="definition-data__title"><%= t("assemblies.show.scope", scope: "decidim") %></span>
-              <%= translated_attribute(current_assembly.meta_scope) %>
+              <%= translated_attribute(current_participatory_space.meta_scope) %>
           </div>
         <% end %>
 
-        <% if translated_attribute(current_assembly.developer_group).present? %>
+        <% if translated_attribute(current_participatory_space.developer_group).present? %>
           <div class="definition-data__item developer-group">
             <span class="definition-data__title"><%= t("assemblies.show.developer_group", scope: "decidim") %></span>
-              <%= translated_attribute(current_assembly.developer_group) %>
+              <%= translated_attribute(current_participatory_space.developer_group) %>
           </div>
         <% end %>
 
-        <% if translated_attribute(current_assembly.local_area).present? %>
+        <% if translated_attribute(current_participatory_space.local_area).present? %>
           <div class="definition-data__item local_area">
             <span class="definition-data__title"><%= t("assemblies.show.local_area", scope: "decidim") %></span>
-              <%= translated_attribute(current_assembly.local_area) %>
+              <%= translated_attribute(current_participatory_space.local_area) %>
           </div>
         <% end %>
 
-         <% if translated_attribute(current_assembly.target).present? %>
+         <% if translated_attribute(current_participatory_space.target).present? %>
           <div class="definition-data__item target">
             <span class="definition-data__title"><%= t("assemblies.show.target", scope: "decidim") %></span>
-              <%= translated_attribute(current_assembly.target) %>
+              <%= translated_attribute(current_participatory_space.target) %>
           </div>
         <% end %>
 
-         <% if translated_attribute(current_assembly.participatory_scope).present? %>
+         <% if translated_attribute(current_participatory_space.participatory_scope).present? %>
           <div class="definition-data__item participatory_scope">
             <span class="definition-data__title"><%= t("assemblies.show.participatory_scope", scope: "decidim") %></span>
-              <%= translated_attribute(current_assembly.participatory_scope) %>
+              <%= translated_attribute(current_participatory_space.participatory_scope) %>
           </div>
         <% end %>
 
-        <% if translated_attribute(current_assembly.participatory_structure).present? %>
+        <% if translated_attribute(current_participatory_space.participatory_structure).present? %>
           <div class="definition-data__item participatory_structure">
             <span class="definition-data__title"><%= t("assemblies.show.participatory_structure", scope: "decidim") %></span>
-              <%= translated_attribute(current_assembly.participatory_structure) %>
+              <%= translated_attribute(current_participatory_space.participatory_structure) %>
           </div>
         <% end %>
       </div>
       <%= render partial: "decidim/shared/share_modal" %>
-      <%= embed_modal_for assembly_assembly_widget_url(current_assembly, format: :js) %>
+      <%= embed_modal_for assembly_assembly_widget_url(current_participatory_space, format: :js) %>
     </div>
   </div>
-  <% if current_assembly.show_statistics? %>
+  <% if current_participatory_space.show_statistics? %>
     <%= render partial: 'statistics' %>
   <% end %>
 </div>

data/app/views/layouts/decidim/_assembly_header.html.erb

@@ -1,27 +1,27 @@
 <div class="process-header row column">
   <div class="row column process-header__main"
-       style="background-image:url(<%= current_assembly.banner_image.url %>);">
+       style="background-image:url(<%= current_participatory_space.banner_image.url %>);">
     <div class="process-header__container row">
       <div class="columns mediumlarge-9 process-header__info">
         <div>
           <h1 class="text-highlight heading2">
-            <%= translated_attribute(current_assembly.title) %>
+            <%= translated_attribute(current_participatory_space.title) %>
           </h1>
         </div>
         <div>
           <h2 class="text-highlight heading-small">
-            <% if current_assembly.hashtag.present? %>
+            <% if current_participatory_space.hashtag.present? %>
               <span class="process-header__hashtag">
-                <%= link_to "##{current_assembly.hashtag}", "https://twitter.com/hashtag/#{current_assembly.hashtag}" %>
+                <%= link_to "##{current_participatory_space.hashtag}", "https://twitter.com/hashtag/#{current_participatory_space.hashtag}" %>
               </span>
             <% end %>
-            <%= translated_attribute(current_assembly.subtitle) %>
+            <%= translated_attribute(current_participatory_space.subtitle) %>
           </h2>
         </div>
       </div>
     </div>
   </div>
-  <% if current_assembly.features.any? %>
+  <% if current_participatory_space.features.any? %>
     <div class="row column">
       <div class="process-nav">
         <button class="process-nav__trigger hide-for-medium"  data-toggle="process-nav-content">
@@ -38,14 +38,14 @@
         </button>
         <div class="row column process-nav__content is-active" id="process-nav-content" data-toggler=".is-active">
           <ul>
-            <li class="<%= "is-active" if is_active_link?(decidim_assemblies.assembly_path(current_assembly), :exclusive) %>">
-              <%= active_link_to decidim_assemblies.assembly_path(current_assembly), active: :exclusive, class: "process-nav__link", class_active: "is-active" do %>
+            <li class="<%= "is-active" if is_active_link?(decidim_assemblies.assembly_path(current_participatory_space), :exclusive) %>">
+              <%= active_link_to decidim_assemblies.assembly_path(current_participatory_space), active: :exclusive, class: "process-nav__link", class_active: "is-active" do %>
                 <%= external_icon "decidim/assemblies/assembly.svg" %>
                 <%= t ".assembly_menu_item" %>
               <% end %>
             </li>
 
-            <% current_assembly.features.each do |feature| %>
+            <% current_participatory_space.features.each do |feature| %>
               <% if feature.published? || feature == self.try(:current_feature) %>
                 <li class="<%= "is-active" if is_active_link?(main_feature_path(feature), :inclusive) %>">
                   <%= active_link_to main_feature_path(feature), class: "process-nav__link", active: :inclusive, class_active: "is-active" do %>

data/app/views/layouts/decidim/assembly.html.erb

@@ -1,8 +1,8 @@
 <% add_decidim_page_title(translated_attribute(current_feature.name)) if try(:current_feature) %>
-<% add_decidim_page_title(translated_attribute(current_assembly.title)) %>
+<% add_decidim_page_title(translated_attribute(current_participatory_space.title)) %>
 <% add_decidim_meta_tags(
-  image_url: current_assembly.banner_image.url,
-  description: translated_attribute(current_assembly.short_description),
+  image_url: current_participatory_space.banner_image.url,
+  description: translated_attribute(current_participatory_space.short_description),
 ) %>
 
 <%= render "layouts/decidim/application" do %>
@@ -23,4 +23,4 @@
   <%= render "layouts/decidim/feature_authorization_modals" %>
 <% end %>
 
-<% provide :meta_image_url, current_assembly.banner_image.url %>
+<% provide :meta_image_url, current_participatory_space.banner_image.url %>

data/lib/decidim/assemblies/participatory_space.rb

@@ -1,11 +1,18 @@
 # frozen_string_literal: true
 
 Decidim.register_participatory_space(:assemblies) do |participatory_space|
-  participatory_space.engine = Decidim::Assemblies::Engine
-  participatory_space.admin_engine = Decidim::Assemblies::AdminEngine
   participatory_space.icon = "decidim/assemblies/icon.svg"
   participatory_space.model_class_name = "Decidim::Assembly"
 
+  participatory_space.context(:public) do |context|
+    context.engine = Decidim::Assemblies::Engine
+    context.layout = "layouts/decidim/assembly"
+  end
+
+  participatory_space.context(:admin) do |context|
+    context.engine = Decidim::Assemblies::AdminEngine
+  end
+
   participatory_space.seeds do
     organization = Decidim::Organization.first
     seeds_root = File.join(__dir__, "..", "..", "..", "db", "seeds")

data/lib/decidim/assemblies/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-assemblies version.
   module Assemblies
     def self.version
-      "0.8.3"
+      "0.8.4"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-assemblies
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.4
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-15 00:00:00.000000000 Z
+date: 2018-01-16 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.8.3
+        version: 0.8.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: 0.8.4
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: 0.8.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: 0.8.4
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: 0.8.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: 0.8.4
 description: Assemblies plugin for decidim
 email:
 - josepjaume@gmail.com
@@ -77,8 +77,6 @@ files:
 - app/constraints/decidim/assemblies/current_assembly.rb
 - app/constraints/decidim/assemblies/current_feature.rb
 - app/controllers/concerns/decidim/assemblies/admin/assembly_context.rb
-- app/controllers/concerns/decidim/assemblies/assembly_context.rb
-- app/controllers/concerns/decidim/assemblies/needs_assembly.rb
 - app/controllers/decidim/assemblies/admin/application_controller.rb
 - app/controllers/decidim/assemblies/admin/assemblies_controller.rb
 - app/controllers/decidim/assemblies/admin/assembly_attachments_controller.rb

data/app/controllers/concerns/decidim/assemblies/assembly_context.rb

@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Assemblies
-    # This module, when injected into a controller, ensures there's a
-    # Assembly available and deducts it from the context.
-    module AssemblyContext
-      def self.extended(base)
-        base.class_eval do
-          include NeedsAssembly
-
-          layout "layouts/decidim/assembly"
-
-          before_action do
-            authorize! :read, current_assembly
-          end
-        end
-      end
-
-      def ability_context
-        super.merge(current_assembly: current_assembly)
-      end
-    end
-  end
-end

data/app/controllers/concerns/decidim/assemblies/needs_assembly.rb

@@ -1,54 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Assemblies
-    # This module, when injected into a controller, ensures there's a
-    # Assembly available and deducts it from the context.
-    module NeedsAssembly
-      def self.enhance_controller(instance_or_module)
-        instance_or_module.class_eval do
-          helper_method :current_assembly
-        end
-      end
-
-      def self.extended(base)
-        base.extend Decidim::NeedsOrganization, InstanceMethods
-
-        enhance_controller(base)
-      end
-
-      def self.included(base)
-        base.include Decidim::NeedsOrganization, InstanceMethods
-
-        enhance_controller(base)
-      end
-
-      module InstanceMethods
-        # Public: Finds the current Assembly given this controller's
-        # context.
-        #
-        # Returns the current Assembly.
-        def current_assembly
-          @current_assembly ||= detect_assembly
-        end
-
-        alias current_participatory_space current_assembly
-
-        private
-
-        def ability_context
-          super.merge(current_assembly: current_assembly)
-        end
-
-        def detect_assembly
-          request.env["current_assembly"] ||
-            organization_assemblies.find_by!(slug: params[:assembly_slug] || params[:slug])
-        end
-
-        def organization_assemblies
-          @organization_assemblies ||= OrganizationAssemblies.new(current_organization).query
-        end
-      end
-    end
-  end
-end