spina 2.0.2 → 2.3.0

data/app/controllers/spina/api/api_controller.rb

@@ -0,0 +1,29 @@
+module Spina
+  module Api
+    class ApiController < ActionController::Base
+      include Spina::CurrentAccount, Spina::CurrentTheme
+      
+      protect_from_forgery unless: -> { request.format.json? }
+      
+      rescue_from ActiveRecord::RecordNotFound, with: :render_404
+      
+      TOKEN = Spina.config.api_key
+      
+      before_action :authenticate_api
+      
+      private
+      
+        def render_404
+          render json: {error: "Not Found"}, status: :not_found
+        end
+
+        def authenticate_api
+          head :not_found and return if TOKEN.blank?
+          authenticate_or_request_with_http_token do |token, options|
+            ActiveSupport::SecurityUtils.secure_compare(token, TOKEN)
+          end
+        end
+      
+    end
+  end
+end

data/app/controllers/spina/api/images_controller.rb

@@ -0,0 +1,12 @@
+module Spina
+  module Api
+    class ImagesController < ApiController
+      
+      def show
+        @image = Spina::Image.find(params[:id])
+        render json: Spina::Api::ImageSerializer.new(@image, {params: {view_context: view_context}}).serializable_hash.to_json
+      end
+      
+    end
+  end
+end

data/app/controllers/spina/api/navigations_controller.rb

@@ -0,0 +1,20 @@
+module Spina
+  module Api
+    class NavigationsController < ApiController
+      include Paginable
+      
+      def index
+        navigations = Navigation.order(:id)
+        paginated = pagination(navigations)
+        render json: Spina::Api::NavigationSerializer.new(paginated.first, paginated.last.merge(fields: {navigation: [:name, :label]})).serializable_hash.to_json
+      end
+      
+      def show
+        @navigation = Navigation.find(params[:id])
+        render json: Spina::Api::NavigationSerializer.new(@navigation).serializable_hash.to_json
+      end
+      
+    end
+  end
+end
+      

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

@@ -0,0 +1,26 @@
+module Spina
+  module Api
+    class PagesController < ApiController
+      include Paginable
+      
+      before_action :set_resource
+      
+      def index
+        pages = Page.live.includes(:translations).where(resource: @resource).order(:created_at)
+        render json: Spina::Api::PageSerializer.new(*pagination(pages)).serializable_hash.to_json
+      end
+      
+      def show
+        @page = Page.live.where(resource: @resource).find(params[:id])
+        render json: Spina::Api::PageSerializer.new(@page).serializable_hash.to_json
+      end
+      
+      private
+      
+        def set_resource
+          @resource = Spina::Resource.find(params[:resource_id]) if params[:resource_id].present?
+        end
+
+    end
+  end
+end

data/app/controllers/spina/api/resources_controller.rb

@@ -0,0 +1,19 @@
+module Spina
+  module Api
+    class ResourcesController < ApiController
+      include Paginable
+      
+      def index
+        resources = Resource.order(:id)
+        render json: Spina::Api::ResourceSerializer.new(*pagination(resources)).serializable_hash.to_json
+      end
+      
+      def show
+        @resource = Resource.find(params[:id])
+        render json: Spina::Api::ResourceSerializer.new(@resource).serializable_hash.to_json
+      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?, except: [:robots]
+  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/admin/icons_helper.rb

@@ -0,0 +1,26 @@
+require 'nokogiri'
+
+module Spina::Admin
+	module IconsHelper
+	
+		class FileNotFound < StandardError
+	  end
+		
+		def heroicon(name, style: :outline, **options)
+	    file = read_file(Spina::Engine.root.join("app/assets/icons/heroicons", style.to_s, "#{name}.svg"))
+	    
+	    doc = Nokogiri::XML(file)
+	    svg = doc.root
+	    svg[:class] = options[:class]
+	    ActiveSupport::SafeBuffer.new(svg.to_s)
+		end
+		
+		private
+		
+	    def read_file(path)
+	      File.exist?(path) || raise(FileNotFound, "File #{path} not found")
+	      File.read(path)
+	    end  
+
+	end
+end

data/app/helpers/spina/admin/images_helper.rb

@@ -0,0 +1,18 @@
+module Spina::Admin
+  module ImagesHelper
+  
+    def ratio_tailwind_class_for_image_part(image)
+      case image.options.try(:[], :ratio)
+      when "portrait"
+        "w-28"
+      when "landscape"
+        "w-48"
+      when "wide"
+        "w-80"
+      else
+        "w-36" # Square (default)
+      end
+    end
+  
+  end
+end

data/app/helpers/spina/admin/pages_helper.rb

@@ -1,57 +1,30 @@
-module Spina
-  module Admin
-    module PagesHelper
-
-      def link_to_add_repeater_fields(f)
-        repeater_content = Spina::Parts::RepeaterContent.new(name: f.object.name, title: f.object.title)
-        fields = f.fields_for(:content, [repeater_content], child_index: repeater_content.object_id) do |builder|
-          render("spina/admin/parts/repeaters/fields", f: builder)
-        end
-        link_to '#', class: "add_structure_item_fields button button-link", data: {id: repeater_content.object_id, fields: fields.gsub("\n", "")} do
-          icon('plus')
-        end
-      end
-
-      def data_attrs_for_image_collection(f)
-        image = Spina::Parts::Image.new
-        fields = f.fields_for(:images, [image], child_index: image.object_id) do |builder|
-          render("spina/admin/parts/image_collections/fields", f: builder)
-        end
-        {fields: fields.gsub("\n", ""), id: image.object_id}
+module Spina::Admin
+  module PagesHelper
+    
+    def asset_available?(path)
+      if Rails.configuration.assets.compile
+        Rails.application.precompiled_assets.include?(path)
+      else
+        Rails.application.assets_manifest.assets[path].present?
       end
+    end
 
-      def build_parts(partable, parts)
-        I18n.with_locale(@locale) do
-          parts.map do |part|
-            part_attributes = current_theme.parts.find{|p|p[:name].to_s == part.to_s}
-            partable.part(part_attributes)
-          end
+    def build_parts(partable, parts)
+      I18n.with_locale(@locale) do
+        parts.map do |part|
+          part_attributes = current_theme.parts.find{|p|p[:name].to_s == part.to_s}
+          partable.part(part_attributes)
         end
       end
+    end
 
-      def parts_partial_namespace(part_type)
-        part_type.tableize.sub(/\Aspina\/parts\//, '')
-      end
-
-      def flatten_nested_hash(hash)
-        hash.flat_map{|k, v| [k, *flatten_nested_hash(v)]}
-      end
-
-      def page_ancestry_options(page)
-        pages = Spina::Page.active.regular_pages.includes(:translations)
-        pages = pages.where.not(id: page.subtree.ids) unless page.new_record? || !page.methods.include?(:subtree)
-
-        (flatten_nested_hash(pages.arrange(order: :position)).map do |page|
-          next if page.depth >= Spina.config.max_page_depth - 1
-          page_menu_title = page.depth.zero? ? page.menu_title : " #{page.menu_title}".indent(page.depth, '-')
-          [page_menu_title, page.id]
-        end << [page.parent&.menu_title, page&.parent_id].compact).map(&:presence).uniq.compact
-      end
-
-      def option_label(part, value)
-        t(['options',part.name,value].compact.join('.'))
-      end
+    def parts_partial_namespace(part_type)
+      part_type.tableize.sub(/\Aspina\/parts\//, '')
+    end
 
+    def option_label(part, value)
+      t(['options',part.name,value].compact.join('.'))
     end
+
   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/helpers/spina/images_helper.rb

@@ -3,12 +3,36 @@ module Spina
 
     def thumbnail_url(image)
       return "" if image.nil?
-      main_app.url_for(image.variant(resize: "400x300^", crop: "400x300+0+0"))
+      main_app.url_for(image.variant(resize_to_fill: [400, 300]))
     end
 
     def embedded_image_url(image)
       return "" if image.nil?
-      main_app.url_for(image.variant(resize: Spina.config.embedded_image_size))
+
+      # support both ImageProcessing gem macro :resize_to_limit and ImageMagick-specific :resize
+      resize_key = Spina.config.embedded_image_size.is_a?(Array) ? :resize_to_limit : :resize
+      main_app.url_for(image.variant(Hash[resize_key, Spina.config.embedded_image_size]))
+    end
+    
+    def content_type_color(image)
+      case content_type(image)
+      when "png"
+        "bg-green-300"
+      when "heic"
+        "bg-blue-200"
+      when "jpg", "jpeg"
+        "bg-blue-400"
+      when "gif"
+        "bg-indigo-300"
+      when "svg"
+        "bg-yellow-400"
+      else
+        "bg-gray-400"
+      end
+    end
+    
+    def content_type(image)
+      image.file.content_type.split("/").last
     end
 
   end

data/app/helpers/spina/spina_helper.rb

@@ -0,0 +1,13 @@
+module Spina::SpinaHelper
+
+  def spina_importmap_tags
+    safe_join [
+      javascript_inline_importmap_tag(Spina.config.importmap.paths),
+      javascript_importmap_shim_tag,
+      javascript_include_tag("spina/libraries/trix"),
+      javascript_import_module_tag("application")
+    ], "\n"
+  end
+  
+
+end

data/app/jobs/spina/application_job.rb

@@ -0,0 +1,4 @@
+module Spina
+  class ApplicationJob < ActiveJob::Base
+  end
+end

data/app/jobs/spina/resource_pages_update_job.rb

@@ -0,0 +1,11 @@
+module Spina
+  class ResourcePagesUpdateJob < ApplicationJob
+    queue_as { Spina.config.queues[:page_updates] }
+  
+    def perform(resource_id)
+      Page.where(resource_id: resource_id).roots.find_each(batch_size: 100) do |page|
+        page.save
+      end
+    end
+  end
+end

data/app/models/concerns/spina/gravatar.rb

@@ -0,0 +1,20 @@
+module Spina
+  module Gravatar
+    extend ActiveSupport::Concern
+    
+    def gravatar_url
+      "https://www.gravatar.com/avatar/#{gravatar_hash}?d=#{fallback_url}"
+    end
+    
+    private
+    
+      def fallback_url
+        "https://eu.ui-avatars.com/api/#{CGI.escape(name)}/128"
+      end
+    
+      def gravatar_hash
+        Digest::MD5.hexdigest(email.to_s.strip.downcase)
+      end
+    
+  end
+end

data/app/models/concerns/spina/translated_content.rb

@@ -1,19 +1,20 @@
 module Spina
   module TranslatedContent
     extend ActiveSupport::Concern
+    
+    include Spina::AttrJsonMonkeypatch
 
-    included do
-      
+    included do  
       # Store each locale's content in [locale]_content as an array of parts
       Spina.config.locales.each do |locale|
         attr_json "#{locale}_content".to_sym, AttrJson::Type::SpinaPartsModel.new, array: true, default: -> { [] }
+        attr_json_setter_monkeypatch "#{locale}_content".to_sym
         attr_json_accepts_nested_attributes_for "#{locale}_content".to_sym
       end
-
-      def find_part(name)
-        send("#{I18n.locale}_content").find{|part| part.name.to_s == name.to_s}
-      end
-
+    end
+    
+    def find_part(name)
+      send("#{I18n.locale}_content").find{|part| part.name.to_s == name.to_s}
     end
   end
 end

data/app/models/spina/account.rb

@@ -8,6 +8,8 @@ module Spina
     serialize :preferences
 
     after_save :bootstrap_website
+    
+    validates :name, presence: true
 
     def to_s
       name

data/app/models/spina/application_record.rb

@@ -1,5 +1,11 @@
 module Spina
   class ApplicationRecord < ActiveRecord::Base
     self.abstract_class = true
+    
+    # Remove Spina namespace from partial paths
+    def to_partial_path
+      super.gsub(/\Aspina\//, "")
+    end
+    
   end
 end

data/app/models/spina/attachment.rb

@@ -4,7 +4,7 @@ module Spina
 
     attr_accessor :_destroy
 
-    scope :sorted, -> { order('file ASC') }
+    scope :sorted, -> { order('created_at DESC') }
 
     def name
       file.filename.to_s
@@ -13,6 +13,10 @@ module Spina
     def content
       file if file.attached?
     end
+    
+    def present?
+      signed_blob_id.present?
+    end
 
     alias_method :old_update, :update
     def update(attributes)