spina 2.12.0 → 2.13.0

data/app/models/spina/attachment.rb

@@ -4,7 +4,7 @@ module Spina
 
     attr_accessor :_destroy
 
-    scope :sorted, -> { order('created_at DESC') }
+    scope :sorted, -> { order("created_at DESC") }
 
     def name
       file.filename.to_s
@@ -13,7 +13,7 @@ module Spina
     def content
       file if file.attached?
     end
-    
+
     def present?
       signed_blob_id.present?
     end
@@ -21,11 +21,10 @@ module Spina
     alias_method :old_update, :update
     def update(attributes)
       if attributes["_destroy"] == "1" && attributes["file"].blank?
-        self.page_part.destroy
+        page_part.destroy
       else
         old_update(attributes)
       end
     end
-
   end
 end

data/app/models/spina/current.rb

@@ -5,4 +5,4 @@ module Spina
     attribute :user
     attribute :theme
   end
-end
+end

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

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

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

@@ -1,13 +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
+end

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

@@ -1,39 +1,38 @@
-require 'net/http'
+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
+
+    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

@@ -1,39 +1,38 @@
-require 'net/http'
+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
+
+    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
+end

data/app/models/spina/image.rb

@@ -4,7 +4,7 @@ module Spina
 
     has_one_attached :file
 
-    scope :sorted, -> { order('created_at DESC') }
+    scope :sorted, -> { order("created_at DESC") }
 
     def name
       file.try(:filename).to_s
@@ -12,7 +12,7 @@ module Spina
 
     def variant(options)
       return "" unless file.attached?
-      return file if file.content_type.include?('svg')
+      return file if file.content_type.include?("svg")
       return file unless file.variable?
 
       file.variant(options)
@@ -22,10 +22,10 @@ module Spina
       self
     end
 
-    def thumbnail(size = '100x100', modifier = '^')
+    def thumbnail(size = "100x100", modifier = "^")
       variant(
         combine_options: {
-          gravity: 'center',
+          gravity: "center",
           thumbnail: "#{size}#{modifier}",
           extent: size
         }

data/app/models/spina/media_folder.rb

@@ -4,4 +4,4 @@ module Spina
 
     validates :name, presence: true, uniqueness: true
   end
-end
+end

data/app/models/spina/navigation.rb

@@ -11,6 +11,5 @@ module Spina
     def cache_key
       super + "_" + Mobility.locale.to_s
     end
-    
   end
-end
+end

data/app/models/spina/navigation_item.rb

@@ -6,7 +6,7 @@ module Spina
     has_ancestry
 
     scope :regular_pages, -> { joins(:page).where(spina_pages: {resource_id: nil}) }
-    scope :sorted, -> { order('spina_navigation_items.position') }
+    scope :sorted, -> { order("spina_navigation_items.position") }
     scope :live, -> { joins(:page).where(spina_pages: {draft: false, active: true}) }
     scope :in_menu, -> { joins(:page).where(spina_pages: {show_in_menu: true}) }
     scope :active, -> { joins(:page).where(spina_pages: {active: true}) }
@@ -15,4 +15,4 @@ module Spina
 
     delegate :menu_title, :materialized_path, :draft?, to: :page
   end
-end
+end

data/app/models/spina/page.rb

@@ -20,7 +20,7 @@ module Spina
     belongs_to :resource, optional: true, touch: true
 
     scope :main, -> { where(resource_id: nil) }
-    scope :regular_pages, ->  { main }
+    scope :regular_pages, -> { main }
     scope :resource_pages, -> { where.not(resource: nil) }
     scope :active, -> { where(active: true) }
     scope :sorted, -> { order(:position) }
@@ -59,7 +59,7 @@ module Spina
     end
 
     def homepage?
-      name == 'homepage'
+      name == "homepage"
     end
 
     def custom_page?
@@ -75,11 +75,11 @@ module Spina
     end
 
     def previous_sibling
-      siblings.where('position < ?', position).sorted.last
+      siblings.where("position < ?", position).sorted.last
     end
 
     def next_sibling
-      siblings.where('position > ?', position).sorted.first
+      siblings.where("position > ?", position).sorted.first
     end
 
     def set_materialized_path
@@ -98,48 +98,42 @@ module Spina
       super + "_" + Mobility.locale.to_s
     end
 
-    def view_template_config(theme)
-      view_template_name = view_template.presence || 'show'
-      theme.view_templates.find { |template| template[:name] == view_template_name }
-    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
-      end
+    def set_default_position
+      self.position ||= self.class.maximum(:position).to_i.next
+    end
 
-      def touch_navigations
-        navigations.update_all(updated_at: Time.zone.now)
-      end
+    def set_resource_from_parent
+      self.resource_id = parent.resource_id
+    end
 
-      def rewrite_rule
-        RewriteRule.where(old_path: old_path).first_or_create.update(new_path: materialized_path) if old_path != materialized_path
-      end
+    def touch_navigations
+      navigations.update_all(updated_at: Time.zone.now)
+    end
 
-      def localized_materialized_path
-        segments = if Mobility.locale == I18n.default_locale
-          [Spina.mounted_at, generate_materialized_path]
-        else
-          [Spina.mounted_at, Mobility.locale, generate_materialized_path]
-        end
-        File.join(*segments.map(&:to_s).compact)
-      end
+    def rewrite_rule
+      RewriteRule.where(old_path: old_path).first_or_create.update(new_path: materialized_path) if old_path != materialized_path
+    end
 
-      def generate_materialized_path
-        path_fragments = [resource&.slug]
-        path_fragments.append *ancestors.collect(&:slug)
-        path_fragments.append(slug) unless homepage?
-        path_fragments.compact.map(&:parameterize).join('/')
+    def localized_materialized_path
+      segments = if Mobility.locale == I18n.default_locale
+        [Spina.mounted_at, generate_materialized_path]
+      else
+        [Spina.mounted_at, Mobility.locale, generate_materialized_path]
       end
+      File.join(*segments.map(&:to_s).compact)
+    end
 
-      def duplicate_materialized_path?
-        self.class.where.not(id: id).i18n.where(materialized_path: materialized_path).exists?
-      end
+    def generate_materialized_path
+      path_fragments = [resource&.slug]
+      path_fragments.append(*ancestors.collect(&:slug))
+      path_fragments.append(slug) unless homepage?
+      path_fragments.compact.map(&:parameterize).join("/")
+    end
 
+    def duplicate_materialized_path?
+      self.class.where.not(id: id).i18n.where(materialized_path: materialized_path).exists?
+    end
   end
 end

data/app/models/spina/parts/attachment.rb

@@ -12,11 +12,10 @@ module Spina
       def present?
         signed_blob_id.present?
       end
-      
+
       def signed_id(expires_in: nil)
         signed_blob_id
       end
-      
     end
   end
 end

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

@@ -6,14 +6,15 @@ module Spina
       attr_json_config(unknown_key: :strip)
 
       attr_json :name, :string
-      
-      attr_accessor :title, :hint
+
+      attr_accessor :title, :hint, :item_name
 
       def label
         content&.to_s
       end
 
-      def content; end
+      def content
+      end
     end
   end
-end
+end

data/app/models/spina/parts/image.rb

@@ -17,7 +17,7 @@ module Spina
       end
 
       def svg?
-        filename =~ /\.svg\z/
+        filename.end_with?(".svg")
       end
 
       def spina_image
@@ -27,15 +27,14 @@ module Spina
       def present?
         signed_blob_id.present?
       end
-      
+
       def signed_id(expires_in: nil)
         signed_blob_id
       end
-      
+
       def variant(options)
         Spina::Parts::ImageVariant.new(self, options)
       end
-      
     end
   end
 end

data/app/models/spina/parts/image_collection.rb

@@ -2,7 +2,7 @@ module Spina
   module Parts
     class ImageCollection < Base
       include AttrJson::NestedAttributes
-      
+
       attr_json :images, Image.to_type, array: true
       attr_json_accepts_nested_attributes_for :images
 
@@ -17,7 +17,6 @@ module Spina
       def image_ids
         content.map(&:image_id)
       end
-
     end
   end
-end
+end

data/app/models/spina/parts/image_variant.rb

@@ -2,18 +2,17 @@ module Spina
   module Parts
     class ImageVariant
       attr_reader :blob
-      
+
       def initialize(image, options)
         @blob = image
         @options = options
       end
-      
+
       def variation
         OpenStruct.new({
           key: ActiveStorage::Variation.encode(@options)
         })
-      end 
-
+      end
     end
   end
 end

data/app/models/spina/parts/repeater_content.rb

@@ -8,8 +8,8 @@ module Spina
       attr_json_accepts_nested_attributes_for :parts
 
       def find_part(name)
-        (parts || []).find{|part| part.name.to_s == name.to_s}
+        (parts || []).find { |part| part.name.to_s == name.to_s }
       end
     end
   end
-end
+end

data/app/models/spina/resource.rb

@@ -24,13 +24,12 @@ module Spina
         ResourcePagesUpdateJob.perform_later(id)
       end
     end
-    
+
     def order_by_options
       [
-        [Spina::Page.human_attribute_name(:title), "title"], 
+        [Spina::Page.human_attribute_name(:title), "title"],
         [Spina::Page.human_attribute_name(:created_at), "created_at"]
       ]
     end
-
   end
-end
+end

data/app/models/spina/rewrite_rule.rb

@@ -2,4 +2,4 @@ module Spina
   class RewriteRule < ApplicationRecord
     validates :old_path, uniqueness: true
   end
-end
+end

data/app/models/spina/setting.rb

@@ -1,7 +1,5 @@
 module Spina
   class Setting < ApplicationRecord
-
     validates :plugin, presence: true
-
   end
 end

data/app/models/spina/user.rb

@@ -1,12 +1,12 @@
 module Spina
   class User < ApplicationRecord
     include Gravatar
-    
+
     has_secure_password
     has_secure_token :password_reset_token
 
     validates :name, presence: true
-    validates :email, uniqueness: true, presence: true, format: { with:/\A[^@]+@[^@]+\z/ }
+    validates :email, uniqueness: true, presence: true, format: {with: /\A[^@]+@[^@]+\z/}
 
     def admin?
       admin
@@ -15,12 +15,11 @@ 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

@@ -35,17 +35,16 @@ module Spina
 
     private
 
-      def main_app_image_url(image, variant_options = {})
-        # SVG's can't have variants, 
-        # Render rails_service_blob_url directly instead
-        return view_context.main_app.url_for(image) if image.svg?
-        
-        view_context.main_app.url_for(image.variant(variant_options))
-      end
-
-      def find_part(name)
-        container.find_part(name)
-      end
+    def main_app_image_url(image, variant_options = {})
+      # SVG's can't have variants,
+      # Render rails_service_blob_url directly instead
+      return view_context.main_app.url_for(image) if image.svg?
 
+      view_context.main_app.url_for(image.variant(variant_options))
+    end
+
+    def find_part(name)
+      container.find_part(name)
+    end
   end
-end
+end