spina 2.3.5 → 2.6.1

data/app/helpers/spina/spina_helper.rb

@@ -1,10 +1,11 @@
 module Spina::SpinaHelper
 
-  def spina_importmap_tags(entry_point = "application")
+  def spina_importmap_tags(entry_point = "application", shim: true)
     safe_join [
       javascript_inline_importmap_tag(Spina.config.importmap.to_json(resolver: self)),
       javascript_importmap_module_preload_tags(Spina.config.importmap),
-      javascript_importmap_shim_tag,
+      (javascript_importmap_shim_nonce_configuration_tag if shim),
+      (javascript_importmap_shim_tag if shim),
       javascript_import_module_tag(entry_point)
     ], "\n"
   end

data/app/mailers/spina/application_mailer.rb

@@ -0,0 +1,7 @@
+module Spina
+  class ApplicationMailer < ActionMailer::Base
+    default Spina.config.mailer_defaults
+    
+    layout 'spina/mail'
+  end
+end

data/app/mailers/spina/user_mailer.rb

@@ -1,21 +1,13 @@
 module Spina
-  class UserMailer < ActionMailer::Base
-    layout 'spina/mail'
+  class UserMailer < ApplicationMailer
 
-    def forgot_password(user)
+    def forgot_password(user, user_agent_string = nil)
       @user = user
-
-      mail(
-        to: @user.email, 
-        from: current_account.email, 
-        subject: t('spina.forgot_password.mail_subject')
-      )
+      @browser = Browser.new(user_agent_string)
+      
+      mail to: @user.email, 
+           subject: t('spina.user_mailer.forgot_password.subject')
     end
 
-    private
-
-      def current_account
-        Spina::Account.first
-      end
   end
 end

data/app/models/spina/embeds/base.rb

@@ -0,0 +1,7 @@
+module Spina::Embeds
+  class Base    
+    include ActiveModel::Model
+    include Spina::Embeddable
+    include Spina::Embeds::TrixConversion
+  end
+end

data/app/models/spina/embeds/button.rb

@@ -0,0 +1,13 @@
+module Spina::Embeds
+  class Button < Base
+    attributes :url, :label
+    
+    heroicon "cursor-click"
+    
+    validates :url, :label, presence: true
+    
+    def to_trix_partial_path
+      "spina/embeds/buttons/trix_button"
+    end
+  end
+end

data/app/models/spina/embeds/vimeo.rb

@@ -0,0 +1,39 @@
+require 'net/http'
+
+module Spina::Embeds
+  class Vimeo < Base
+    attributes :url
+    
+    heroicon "video-camera"
+    
+    REGEX = /(https?:\/\/)?(www.)?(player.)?vimeo.com\/([a-z]*\/)*([0-9]{6,11})[?]?.*/
+    
+    validates :url, presence: true, format: {with: REGEX}
+    
+    def id
+      REGEX.match(url).try(:[], 5)
+    end
+    
+    # Get title from Vimeo API (remote call)
+    def remote_title
+      get_vimeo_json&.dig(0, "title")
+    end
+    
+    def to_trix_partial_path
+      "spina/embeds/vimeos/thumbnail"
+    end
+    
+    private
+    
+      def get_vimeo_json
+        uri = URI("https://vimeo.com/api/v2/video/#{id}.json")
+        response = Net::HTTP.get(uri)
+        begin
+          JSON.parse(response)
+        rescue
+          nil
+        end
+      end
+    
+  end
+end

data/app/models/spina/embeds/youtube.rb

@@ -0,0 +1,39 @@
+require 'net/http'
+
+module Spina::Embeds
+  class Youtube < Base
+    attributes :url
+    
+    heroicon "video-camera"
+    
+    REGEX = /(?:youtube(?:-nocookie)?\.com\/(?:[^\/\n\s]+\/\S+\/|(?:v|e(?:mbed)?)\/|\S*?[?&]v=)|youtu\.be\/)([a-zA-Z0-9_-]{11})/
+    
+    validates :url, presence: true, format: {with: REGEX}
+    
+    def id
+      REGEX.match(url).try(:[], 1)
+    end
+    
+    # Get title from Youtube API (remote call)
+    def remote_title
+      get_youtube_json&.dig("title")
+    end
+    
+    def to_trix_partial_path
+      "spina/embeds/youtubes/thumbnail"
+    end
+    
+    private
+  
+      def get_youtube_json
+        uri = URI("https://www.youtube.com/oembed?url=http://youtube.com/watch?v=#{id}&format=json")
+        response = Net::HTTP.get(uri)
+        begin
+          JSON.parse(response)
+        rescue
+          nil
+        end
+      end
+      
+  end
+end

data/app/models/spina/page.rb

@@ -26,6 +26,8 @@ module Spina
     scope :sorted, -> { order(:position) }
     scope :live, -> { active.where(draft: false) }
     scope :in_menu, -> { where(show_in_menu: true) }
+    
+    before_create :set_default_position
 
     # Copy resource from parent
     before_save :set_resource_from_parent, if: -> { parent.present? }
@@ -102,6 +104,10 @@ module Spina
     end
 
     private
+    
+      def set_default_position
+        self.position ||= self.class.maximum(:position).to_i.next
+      end
 
       def set_resource_from_parent
         self.resource_id = parent.resource_id
@@ -116,11 +122,12 @@ module Spina
       end
 
       def localized_materialized_path
-        if Mobility.locale == I18n.default_locale
-          generate_materialized_path.prepend('/')
+        segments = if Mobility.locale == I18n.default_locale
+          [Spina.mounted_at, generate_materialized_path]
         else
-          generate_materialized_path.prepend("/#{Mobility.locale}/").gsub(/\/\z/, "")
+          [Spina.mounted_at, Mobility.locale, generate_materialized_path]
         end
+        File.join(*segments.map(&:to_s).compact)
       end
 
       def generate_materialized_path

data/app/models/spina/user.rb

@@ -15,6 +15,12 @@ module Spina
     def to_s
       name
     end
+    
+    def reset_passord!
+      regenerate_password_reset_token
+      self.password_reset_sent_at = Time.current
+      save!
+    end
 
   end
 end

data/app/presenters/spina/content_presenter.rb

@@ -14,7 +14,7 @@ module Spina
 
     def html(name)
       html = find_part(name)&.content
-      ActiveSupport::SafeBuffer.new(html.to_s)
+      RichTextPresenter.new(view_context, html)
     end
 
     def image_tag(image, variant_options = {}, options = {})

data/app/presenters/spina/rich_text_presenter.rb

@@ -0,0 +1,45 @@
+module Spina
+  class RichTextPresenter
+    attr_reader :html, :view_context
+    
+    EMBED_CONTENT_TYPE = "application/vnd+spina.embed+html"
+    
+    def initialize(view_context, html)
+      @view_context = view_context || Spina::Current.page&.view_context
+      @html = html
+    end
+    
+    def to_s
+      ActiveSupport::SafeBuffer.new(render_embeds(html))
+    end
+    
+    private
+    
+      def embed_selector
+        "figure[data-trix-content-type=\"#{EMBED_CONTENT_TYPE}\"]"
+      end
+    
+      def render_embeds(html)
+        doc = Nokogiri::HTML(html)
+        doc.css(embed_selector).each do |node|
+          node.replace render_embed(node.first_element_child)
+        end
+        doc.to_s
+      end
+      
+      def render_embed(element)
+        embeddable = element_to_embeddable(element)
+        view_context.render(embeddable)
+      end
+      
+      def element_to_embeddable(element)
+        embeddable = Spina::Embeds.constantize(element["data-embed-type"])
+        embeddable&.from_json(element["data-embed-attributes"]) || null_object
+      end
+      
+      def null_object
+        {inline: ""}
+      end
+
+  end
+end

data/app/views/layouts/spina/admin/application.html.erb

@@ -9,7 +9,7 @@
     <link rel="icon" href="<%= image_url('spina/favicon.png') %>" />
     
     <title>Spina CMS</title>
-    
+
     <!-- Tailwind -->
     <%= stylesheet_link_tag 'spina/application', data: {turbolinks_track: true} %>