spina 2.1.1 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a28a0de26915bef00f7a6f1019dbfd0d6e927065daabef573f420892a9e22265
-  data.tar.gz: 99463e1a9c5525b73c1b348263d177223a8e0c96f1753316c4eb57958865ee9e
+  metadata.gz: 10ab1a1559660bdb66bf8122c5ef69a8a4811bd327c60d2622002804c6a8e945
+  data.tar.gz: 6568ddd0fba70f0d066a6434e6c1f707d038cdf74d9c7dcbd942f0bf59f125db
 SHA512:
-  metadata.gz: 163f8055f3efa7dee70d008bdecd7a94a41ba6ba17937d98cba10ae9ed10e34d2f1d586a14196531c66da2f07aa86ecb3154000cd12f6a883e13ee65ed480ee0
-  data.tar.gz: da9958a72dc526f1860d77a25820e8122f2a4e58ad6da22f2b6e3621f7b94163211d3eb39b4ac790e710a6ad29bf74afafed985101e53c89527b15a5a616106f
+  metadata.gz: 2a04b2b8a07cb6eb7e75f5130c25882e9848d41b9af5a8537db995ff09439b2f3103cd7e75d59896cc6acfc0b7a9e9637ac96ae016b80549d053200dabc12e6a
+  data.tar.gz: bc5a8bd8f902f22ff3d4e6ebc215b34a31675af249f9533b55f817d9972c4dd9436a5ca75aa2834c8cdea08140e1a8f8967af5e0563ecfc15205e6bb621489c7

data/app/controllers/concerns/spina/current_account.rb

@@ -0,0 +1,17 @@
+module Spina
+  module CurrentAccount
+    extend ActiveSupport::Concern
+    
+    included do
+      before_action :current_account
+      helper_method :current_account
+    end
+  
+    private
+    
+      def current_account
+        Spina::Current.account ||= ::Spina::Account.first
+      end
+        
+  end
+end

data/app/controllers/concerns/spina/current_theme.rb

@@ -0,0 +1,17 @@
+module Spina
+  module CurrentTheme
+    extend ActiveSupport::Concern
+    
+    included do
+      before_action :current_theme
+      helper_method :current_theme
+    end
+  
+    private
+    
+      def current_theme
+        Spina::Current.theme ||= ::Spina::Theme.find_by_name(current_account.theme)
+      end
+        
+  end
+end

data/app/controllers/spina/admin/admin_controller.rb

@@ -1,13 +1,14 @@
 module Spina
   module Admin
     class AdminController < ActionController::Base
-      include Spina::CurrentMethods
+      include Spina.config.authentication.constantize
+      include Spina::CurrentAccount, Spina::CurrentTheme
       
       helper Spina::Engine.helpers
       
       before_action :add_view_path
       before_action :set_admin_locale
-      before_action :authorize_spina_user
+      before_action :authenticate
       
       admin_section :content
       
@@ -25,14 +26,6 @@ module Spina
         def set_admin_locale
           I18n.locale = I18n.default_locale
         end
-  
-        def authorize_spina_user
-          redirect_to admin_login_path, flash: {information: I18n.t('spina.notifications.login')} unless current_spina_user
-        end
-  
-        def authorize_admin
-          render status: 401 unless current_spina_user.admin?
-        end
         
         def add_view_path
           prepend_view_path Spina::Engine.root.join('app/views/spina/admin')

data/app/controllers/spina/admin/pages_controller.rb

@@ -11,11 +11,11 @@ module Spina
         
         if params[:resource_id]
           @resource = Resource.find(params[:resource_id])
-          @page_templates = Current.theme.new_page_templates(recommended: @resource.view_template)
+          @page_templates = Spina::Current.theme.new_page_templates(recommended: @resource.view_template)
           @pages = @resource.pages.active.roots.includes(:translations)
         else
           @pages = Page.active.sorted.roots.main.includes(:translations)
-          @page_templates = Current.theme.new_page_templates
+          @page_templates = Spina::Current.theme.new_page_templates
         end
       end
 

data/app/controllers/spina/admin/password_resets_controller.rb

@@ -3,7 +3,7 @@ module Spina
     class PasswordResetsController < AdminController
       layout "spina/admin/sessions"
 
-      skip_before_action :authorize_spina_user
+      skip_before_action :authenticate
 
       def new
       end

data/app/controllers/spina/admin/sessions_controller.rb

@@ -1,7 +1,7 @@
 module Spina
   module Admin
     class SessionsController < AdminController
-      skip_before_action :authorize_spina_user
+      skip_before_action :authenticate
 
       def new
       end

data/app/controllers/spina/admin/users_controller.rb

@@ -1,6 +1,7 @@
 module Spina
   module Admin
     class UsersController < AdminController
+      before_action :authorize_authentication_module
       before_action :authorize_admin, except: [:index]
       before_action :set_user, only: [:edit, :update, :destroy]
       
@@ -47,7 +48,7 @@ module Spina
       end
 
       def destroy
-        if @user != current_spina_user   
+        if @user != current_spina_user
           @user.destroy 
           redirect_to spina.admin_users_url, flash: {success: t('spina.users.deleted')}
         end
@@ -66,6 +67,15 @@ module Spina
         def set_user
           @user = User.find(params[:id])
         end
+        
+        def authorize_authentication_module
+          render status: 401 unless Spina.config.authentication == "Spina::Authentication::Sessions"
+        end
+        
+        def authorize_admin
+          render status: 401 unless current_spina_user.admin?
+        end
+        
     end
   end
 end

data/app/controllers/spina/application_controller.rb

@@ -1,5 +1,6 @@
 class Spina::ApplicationController < Spina.frontend_parent_controller.constantize
-  include Spina::CurrentMethods
+  include Spina.config.authentication.constantize
+  include Spina::CurrentAccount, Spina::CurrentTheme
   
   helper Spina::Engine.helpers
   

data/app/controllers/spina/pages_controller.rb

@@ -1,18 +1,18 @@
 class Spina::PagesController < Spina::ApplicationController
   include Spina::Frontend
 
-  before_action :current_spina_user_can_view_page?
+  before_action :authorize_page
 
   helper_method :page
 
   def homepage
     render_with_template(page)
   end
-
+  
   private
-
-    def current_spina_user_can_view_page?
-      raise ActiveRecord::RecordNotFound unless current_spina_user.present? || page.live?
+  
+    def authorize_page
+      raise ActiveRecord::RecordNotFound unless page.live? || logged_in?
     end
 
 end

data/app/helpers/spina/attachments_helper.rb

@@ -2,7 +2,7 @@ module Spina
   module AttachmentsHelper
 
     def file_url(file)
-      main_app.rails_service_blob_path(file.signed_id, file.filename)
+      main_app.url_for(file)
     end
 
   end

data/app/models/spina/page.rb

@@ -53,7 +53,7 @@ module Spina
     end
 
     def slug
-      url_title&.parameterize
+      url_title.to_s.to_slug.normalize(transliterations: Spina.config.transliterations)
     end
     
     def homepage?

data/app/views/spina/admin/attachments/_attachment.html.erb

@@ -9,6 +9,11 @@
           <%= heroicon('pencil', style: :solid, class: 'w-4 h-4 mr-1 text-gray-600') %>
           <%=t 'spina.ui.rename' %>
         <% end %>
+        
+        <%= link_to file_url(attachment.file), class: "btn btn-default h-7 px-2 mr-2 text-xs" do %>
+          <%= heroicon('download', style: :solid, class: 'w-4 h-4 mr-1 text-gray-600') %>
+          <%=t 'spina.attachments.download' %>
+        <% end %>
       </div>
     </turbo-frame>
     

data/app/views/spina/admin/shared/_navigation.html.erb

@@ -40,7 +40,10 @@
         <% nav.links do %>
           <%= render Spina::MainNavigation::LinkComponent.new(t('spina.settings.general'), spina.edit_admin_account_path, active: controller_name == "accounts") %>
           <%= render Spina::MainNavigation::LinkComponent.new(t('spina.website.theme'), spina.edit_admin_theme_path, active: controller_name == "theme") %>
-          <%= render Spina::MainNavigation::LinkComponent.new(t('spina.settings.users'), spina.admin_users_path, active: controller_name == "users") %>
+
+          <% if Spina.config.authentication == "Spina::Authentication::Sessions" %>
+            <%= render Spina::MainNavigation::LinkComponent.new(t('spina.settings.users'), spina.admin_users_path, active: controller_name == "users") %>
+          <% end %>
           
           <%= render Spina::Hooks::HookComponent.new(partial: "settings_secondary_navigation") %>
           
@@ -54,13 +57,15 @@
       <% end %>
     </ul>
 
-    <ul class="md:block">
-      <li>
-        <%= link_to spina.admin_logout_path, class: 'p-3 w-14 block flex justify-center opacity-50 hover:opacity-100 transition duration-200 ease', data: {turbo: false} do %>
-          <%= heroicon('logout', style: :solid, class: 'h-8 w-8 text-white') %>
-        <% end %>
-      </li>
-    </ul>
+    <% if defined?(logout_path) %>
+      <ul class="md:block">
+        <li>
+          <%= link_to logout_path, class: 'p-3 w-14 block flex justify-center opacity-50 hover:opacity-100 transition duration-200 ease', data: {turbo: false} do %>
+            <%= heroicon('logout', style: :solid, class: 'h-8 w-8 text-white') %>
+          <% end %>
+        </li>
+      </ul>
+    <% end %>
 
   </div>
 </nav>

data/config/locales/en.yml

@@ -106,6 +106,7 @@ en:
     attachments:
       choose_attachment: Choose attachment
       delete_confirmation_html: Are you sure? This attachment <span class='font-semibold'>might</span> be in use on a page.
+      download: Download
       insert: Insert document
       insert_multiple: Insert documents
       upload: Upload files

data/lib/generators/spina/templates/config/initializers/spina.rb

@@ -1,31 +1,47 @@
-Spina.configure do |config|
-  # Set locales
-  config.locales = [:en]
-  # Run `rake spina:update_translations` after you add any new locale.
-
-  # Important Note
-  # ==============
-
-  # You MUST restart your server before changes to this file
-  # will take effect.
+Spina.configure do |config|  
+  # Locales
+  # ===============
+  # All locales your content should be available in.
+  # config.locales = [I18n.default_locale]
 
+  # Backend path
+  # ===============
   # Specify a backend path. Defaults to /admin.
   # config.backend_path = 'admin'
   
+  # Frontend routes
+  # ===============
+  # Uncomment the config below to disable all frontend routes.
+  # You'll have to write your own.
+  # config.disable_frontend_routes = true
+  
+  # Embedded image size
+  # ===============
+  # Images that are inserted in rich text fields are resized automatically.
+  # You can define your desired dimensions here.
+  # config.embedded_image_size = [2000, 2000]
+  
+  # Parent controller
+  # ===============
   # The parent controller all frontend Spina controllers inherit from
   # Defaults to ApplicationController
   # config.frontend_parent_controller = "ApplicationController"
   
+  # Authentication
+  # ===============
+  # Specify the module that handles authentication
+  # You can swap this out for something like Devise, or you can use your own authentication.
+  # The default is Spina::Authentication::Sessions and includes basic user management
+  # config.authentication = "Spina::Authentication::Sessions"
+  
   # Background jobs
   # ===============
-  # 
   # By default, all background jobs are queued as :default
   # config.queues.page_updates = :default
 
   # Confetti
   # ===============
-  # 
-  # For people who don't appreciate confetti, you can disable that here 
+  # For people who don't appreciate confetti, you can disable that here.
   # config.party_pooper = true
 
   # Pages Options
@@ -33,4 +49,11 @@ Spina.configure do |config|
 
   # Note that you might need to remove cached asset after changing this value
   # config.max_page_depth = 5
+
+  # Transliterations
+  # ===============
+  # Set provided transliterations for normalizing url slugs
+  # %i( bulgarian cyrillic danish german greek latin macedonian norwegian 
+  #     romanian russian serbian spanish swedish ukrainian vietnamese)
+  # config.transliterations = %i(latin)
 end

data/lib/spina.rb

@@ -7,6 +7,8 @@ require 'spina/theme'
 require 'spina/tailwind_purger'
 require 'spina/attr_json_spina_parts_model'
 require 'spina/attr_json_monkeypatch'
+require 'spina/authentication/sessions'
+require 'spina/authentication/basic'
 
 module Spina
   include ActiveSupport::Configurable
@@ -15,34 +17,42 @@ module Spina
   PLUGINS = []
   THEMES = []
 
-  config_accessor :backend_path, 
+  config_accessor :authentication,
+                  :backend_path, 
                   :frontend_parent_controller,
                   :disable_frontend_routes,
-                  :max_page_depth,
+                  :disable_decorator_load,
                   :locales, 
                   :embedded_image_size,
                   :party_pooper,
                   :tailwind_purge_content,
-                  :queues
+                  :queues,
+                  :transliterations
 
-  # Specify a backend path. Defaults to /admin.
+  # Defaults
+  self.authentication = "Spina::Authentication::Sessions"
   self.backend_path = 'admin'
-  
-  # The parent controller all frontend Spina controllers inherit from
-  # Default is ApplicationController
-  self.frontend_parent_controller = "ApplicationController"
-
   self.disable_frontend_routes = false
-
-  self.max_page_depth = 5
-
+  self.disable_decorator_load = false
+  self.embedded_image_size = [2000, 2000]
+  self.frontend_parent_controller = "ApplicationController"
   self.locales = [I18n.default_locale]
+  self.party_pooper = false
+  self.transliterations = %i(latin)
   
-  # Queues
+  # Queues for background jobs
+  # - config.queues.page_updates
   self.queues = ActiveSupport::InheritableOptions.new
   
-  # Don't like confetti?
-  self.party_pooper = false
+  # Tailwind purging
+  # Spina will by default purge all unused Tailwind classes by scanning
+  # the files listed below. You probably don't want to override this in 
+  # your main app. Spina Plugins can add files to this array.
+  self.tailwind_purge_content = Spina::Engine.root.glob("app/views/**/*.*") + 
+                                Spina::Engine.root.glob("app/components/**/*.*") + 
+                                Spina::Engine.root.glob("app/helpers/**/*.*") + 
+                                Spina::Engine.root.glob("app/assets/javascripts/**/*.js") +
+                                Spina::Engine.root.glob("app/**/tailwind/custom.css")
 
   # Images that are embedded in the Trix editor are resized to fit
   # You can optimize this for your website and go for a smaller (or larger) size
@@ -64,18 +74,4 @@ module Spina
       config_obj
     end
   end
-  
-  self.embedded_image_size = [2000, 2000]
-
-  
-  # Tailwind purging
-  # Spina will by default purge all unused Tailwind classes by scanning
-  # the files listed below. You probably don't want to override this in 
-  # your main app. Spina Plugins can add files to this array.
-  self.tailwind_purge_content = Spina::Engine.root.glob("app/views/**/*.*") + 
-                                Spina::Engine.root.glob("app/components/**/*.*") + 
-                                Spina::Engine.root.glob("app/helpers/**/*.*") + 
-                                Spina::Engine.root.glob("app/assets/javascripts/**/*.js") +
-                                Spina::Engine.root.glob("app/**/tailwind/custom.css")
-
 end

data/lib/spina/authentication/basic.rb

@@ -0,0 +1,24 @@
+module Spina
+  module Authentication
+    module Basic
+      extend ActiveSupport::Concern
+      
+      included do
+        helper_method :logged_in?
+      end
+      
+      def logged_in?
+        authenticate
+      end
+      
+      private
+      
+        def authenticate
+          authenticate_or_request_with_http_basic do |username, password|
+            username == Rails.application.credentials.dig(:spina, :username) && password == Rails.application.credentials.dig(:spina, :password)
+          end
+        end
+    
+    end
+  end
+end

data/lib/spina/authentication/sessions.rb

@@ -0,0 +1,32 @@
+module Spina
+  module Authentication
+    module Sessions
+      extend ActiveSupport::Concern
+      
+      included do
+        helper_method :current_spina_user
+        helper_method :logged_in?
+        helper_method :logout_path
+      end
+      
+      def current_spina_user
+        Spina::Current.user ||= User.find_by(id: session[:spina_user_id]) if session[:spina_user_id]
+      end
+      
+      def logged_in?
+        current_spina_user
+      end
+      
+      def logout_path
+        spina.admin_logout_path
+      end
+      
+      private
+      
+        def authenticate
+          redirect_to admin_login_path, flash: {information: I18n.t('spina.notifications.login')} unless logged_in?
+        end
+    
+    end
+  end
+end

data/lib/spina/engine.rb

@@ -6,6 +6,7 @@ require 'breadcrumbs_on_rails'
 require 'kaminari'
 require 'mobility'
 require 'rack-rewrite'
+require 'babosa'
 require 'attr_json'
 require 'view_component/engine'
 
@@ -15,10 +16,12 @@ module Spina
 
     config.autoload_paths += %W( #{config.root}/lib )
 
-    config.to_prepare do    
+    config.to_prepare do
       # Require decorators from main application
-      [Rails.root].flatten.map { |p| Dir[p.join('app', 'decorators', '**', '*_decorator.rb')]}.flatten.uniq.each do |decorator|
-        Rails.configuration.cache_classes ? require(decorator) : load(decorator)
+      unless Spina.config.disable_decorator_load
+        Dir.glob(Rails.root + "app/decorators/**/*_decorator.rb").each do |decorator|
+          require_dependency(decorator)
+        end
       end
 
       # Register JSON part types for editing content

data/lib/spina/version.rb

@@ -1,3 +1,3 @@
 module Spina
-  VERSION = "2.1.1"
+  VERSION = "2.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spina
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.2.0
 platform: ruby
 authors:
 - Bram Jetten
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-13 00:00:00.000000000 Z
+date: 2021-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -206,6 +206,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: babosa
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: CMS
 email:
 - bram@denkgroot.com
@@ -851,7 +865,8 @@ files:
 - app/components/spina/user_interface/modal_component.rb
 - app/components/spina/user_interface/tab_link_component.html.erb
 - app/components/spina/user_interface/tab_link_component.rb
-- app/controllers/concerns/spina/current_methods.rb
+- app/controllers/concerns/spina/current_account.rb
+- app/controllers/concerns/spina/current_theme.rb
 - app/controllers/concerns/spina/frontend.rb
 - app/controllers/spina/admin/accounts_controller.rb
 - app/controllers/spina/admin/admin_controller.rb
@@ -1035,6 +1050,8 @@ files:
 - lib/spina/admin_sectionable.rb
 - lib/spina/attr_json_monkeypatch.rb
 - lib/spina/attr_json_spina_parts_model.rb
+- lib/spina/authentication/basic.rb
+- lib/spina/authentication/sessions.rb
 - lib/spina/engine.rb
 - lib/spina/importmap_helper.rb
 - lib/spina/part.rb

data/app/controllers/concerns/spina/current_methods.rb

@@ -1,34 +0,0 @@
-module Spina
-  module CurrentMethods
-    extend ActiveSupport::Concern
-    
-    included do
-      before_action :set_current_attributes
-    
-      helper_method :current_theme
-      helper_method :current_spina_user
-      helper_method :current_account
-    end
-  
-    private
-    
-      def set_current_attributes
-        current_theme
-        current_spina_user
-        current_account
-      end
-    
-      def current_theme
-        Spina::Current.theme ||= ::Spina::Theme.find_by_name(current_account.theme)
-      end
-      
-      def current_spina_user
-        Spina::Current.user ||= ::Spina::User.find_by(id: session[:spina_user_id]) if session[:spina_user_id]
-      end
-    
-      def current_account
-        Spina::Current.account ||= ::Spina::Account.first
-      end
-        
-  end
-end