spina 1.1.1 → 2.0.0.alpha

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

@@ -0,0 +1,19 @@
+module Spina
+  module TranslatedContent
+    extend ActiveSupport::Concern
+
+    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_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
+  end
+end

data/app/models/spina/account.rb

@@ -1,25 +1,18 @@
 module Spina
   class Account < ApplicationRecord
+    include AttrJson::Record
+    include AttrJson::NestedAttributes
     include Partable
+    include TranslatedContent
 
     serialize :preferences
 
-    has_many :layout_parts, dependent: :destroy
-    accepts_nested_attributes_for :layout_parts, allow_destroy: true
-
-    alias_attribute :layout_part, :part
-    alias_attribute :parts, :layout_parts
-
     after_save :bootstrap_website
 
     def to_s
       name
     end
 
-    def content(layout_part)
-      layout_parts.find_by(name: layout_part).try(:content)
-    end
-
     def self.serialized_attr_accessor(*args)
       args.each do |method_name|
         define_method method_name do

data/app/models/spina/attachment.rb

@@ -2,10 +2,6 @@ module Spina
   class Attachment < ApplicationRecord
     has_one_attached :file
 
-    has_one :page_part, as: :page_partable
-    has_many :structure_parts, as: :structure_partable
-    has_and_belongs_to_many :attachment_collections, join_table: 'spina_attachment_collections_attachments'
-
     attr_accessor :_destroy
 
     scope :sorted, -> { order('file ASC') }

data/app/models/spina/current.rb

@@ -1,5 +1,6 @@
 module Spina
   class Current < ActiveSupport::CurrentAttributes
     attribute :page
+    attribute :account
   end
 end

data/app/models/spina/image.rb

@@ -4,11 +4,7 @@ module Spina
 
     has_one_attached :file
 
-    has_many :page_parts, as: :page_partable
-    has_many :structure_parts, as: :structure_partable
-
     scope :sorted, -> { order('created_at DESC') }
-    scope :sorted_by_image_collection, -> { order('position') }
 
     def name
       file.try(:filename).to_s

data/app/models/spina/page.rb

@@ -1,16 +1,14 @@
 module Spina
   class Page < ApplicationRecord
     extend Mobility
+    include AttrJson::Record
+    include AttrJson::NestedAttributes
     include Partable
+    include TranslatedContent
 
     # Stores the old path when generating a new materialized_path
     attr_accessor :old_path
 
-    # Page contains multiple parts called PageParts
-    has_many :page_parts, dependent: :destroy, inverse_of: :page
-    alias_attribute :parts, :page_parts
-    accepts_nested_attributes_for :page_parts, allow_destroy: true
-
     # Orphaned pages are adopted by parent pages if available, otherwise become root
     has_ancestry orphan_strategy: :adopt
 
@@ -28,10 +26,12 @@ module Spina
     scope :live, -> { active.where(draft: false) }
     scope :in_menu, -> { where(show_in_menu: true) }
 
+    # Copy resource from parent
+    before_save :set_resource_from_parent, if: -> { parent.present? }
+
     # Save children to update all materialized_paths
     after_save :save_children
     after_save :touch_navigations
-    after_save -> { page_parts.each(&:save) }
 
     # Create a 301 redirect if materialized_path changed
     after_save :rewrite_rule
@@ -41,7 +41,7 @@ module Spina
 
     translates :title, fallbacks: true
     translates :description, :materialized_path
-    translates :menu_title, :seo_title, default: -> { title }
+    translates :menu_title, :seo_title, :url_title, default: -> { title }
 
     def to_s
       name
@@ -51,8 +51,8 @@ module Spina
       id
     end
 
-    def url_title
-      title.try(:parameterize)
+    def slug
+      url_title&.parameterize
     end
 
     def custom_page?
@@ -91,12 +91,12 @@ module Spina
       theme.view_templates.find { |template| template[:name] == view_template_name }
     end
 
-    def view_template_page_parts(theme)
-      theme.page_parts.select { |page_part| page_part[:name].in? view_template_config(theme)[:page_parts] }
-    end
-
     private
 
+      def set_resource_from_parent
+        self.resource_id = parent.resource_id 
+      end
+
       def touch_navigations
         navigations.update_all(updated_at: Time.zone.now)
       end
@@ -106,19 +106,18 @@ module Spina
       end
 
       def localized_materialized_path
-        if I18n.locale == I18n.default_locale
+        if Mobility.locale == I18n.default_locale
           generate_materialized_path.prepend('/')
         else
-          generate_materialized_path.prepend("/#{I18n.locale}/").gsub(/\/\z/, "")
+          generate_materialized_path.prepend("/#{Mobility.locale}/").gsub(/\/\z/, "")
         end
       end
 
       def generate_materialized_path
-        if root?
-          name == 'homepage' ? '' : "#{url_title}"
-        else
-          ancestors.collect(&:url_title).append(url_title).join('/')
-        end
+        path_fragments = [resource&.slug]
+        path_fragments.append *ancestors.collect(&:slug)
+        path_fragments.append(slug) unless name == 'homepage'
+        path_fragments.compact.map(&:parameterize).join('/')
       end
 
   end

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

@@ -0,0 +1,17 @@
+module Spina
+  module Parts
+    class Attachment < Base
+      attr_json :attachment_id, :integer, default: nil
+      attr_json :signed_blob_id, :string, default: nil
+      attr_json :filename, :string, default: ""
+
+      def content
+        self
+      end
+
+      def present?
+        signed_blob_id.present?
+      end
+    end
+  end
+end

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

@@ -0,0 +1,12 @@
+module Spina
+  module Parts
+    class Base
+      include AttrJson::Model
+
+      attr_json_config(unknown_key: :strip)
+
+      attr_json :title, :string
+      attr_json :name, :string
+    end
+  end
+end

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

@@ -0,0 +1,30 @@
+module Spina
+  module Parts
+    class Image < Base
+      attr_json :image_id, :integer, default: nil
+      attr_json :signed_blob_id, :string, default: nil
+      attr_json :alt, :string, default: ""
+      attr_json :filename, :string, default: ""
+
+      def to_s
+        alt.presence || filename.presence || Spina::Image.model_name.human
+      end
+
+      def content
+        self
+      end
+
+      def svg?
+        filename =~ /\.svg\z/
+      end
+
+      def spina_image
+        Spina::Image.find_by(id: image_id)
+      end
+
+      def present?
+        signed_blob_id.present?
+      end
+    end
+  end
+end

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

@@ -0,0 +1,23 @@
+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
+
+      def to_s
+        Spina::Parts::ImageCollection.model_name.human
+      end
+
+      def content
+        (images || [])
+      end
+
+      def image_ids
+        content.map(&:image_id)
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,7 @@
+module Spina
+  module Parts
+    class Line < Base
+      attr_json :content, :string, default: ""
+    end
+  end
+end

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

@@ -0,0 +1,13 @@
+module Spina
+  module Parts
+    class Option < Base
+      attr_json :value, :string, default: ""
+
+      attr_accessor :options
+
+      def content
+        value
+      end
+    end
+  end
+end

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

@@ -0,0 +1,10 @@
+module Spina
+  module Parts
+    class Repeater < Base
+      include AttrJson::NestedAttributes
+
+      attr_json :content, RepeaterContent.to_type, array: true
+      attr_json_accepts_nested_attributes_for :content
+    end
+  end
+end

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

@@ -0,0 +1,15 @@
+module Spina
+  module Parts
+    class RepeaterContent < Base
+      include Partable
+      include AttrJson::NestedAttributes
+
+      attr_json :parts, AttrJson::Type::SpinaPartsModel.new, array: true
+      attr_json_accepts_nested_attributes_for :parts
+
+      def find_part(name)
+        (parts || []).find{|part| part.name.to_s == name.to_s}
+      end
+    end
+  end
+end

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

@@ -0,0 +1,7 @@
+module Spina
+  module Parts
+    class Text < Base
+      attr_json :content, :string, default: ""
+    end
+  end
+end

data/app/models/spina/resource.rb

@@ -1,10 +1,10 @@
 module Spina
   class Resource < ApplicationRecord
-    has_many :pages, dependent: :restrict_with_exception
+    extend Mobility
 
-    belongs_to :parent_page, class_name: "Spina::Page", optional: true
+    has_many :pages, dependent: :restrict_with_exception
 
-    after_save :scope_pages_to_parent_page
+    translates :slug, backend: :jsonb
 
     def pages
       case order_by
@@ -14,14 +14,6 @@ module Spina
         super.order(created_at: :desc)
       end
     end
-
-    private
-
-      def scope_pages_to_parent_page
-        pages.roots.each do |root_page|
-          root_page.update(parent: parent_page)
-        end
-      end
-
+    
   end
 end

data/app/presenters/spina/content_presenter.rb

@@ -0,0 +1,58 @@
+module Spina
+  class ContentPresenter
+    attr_reader :view_context, :container
+
+    def initialize(view_context, container)
+      @view_context = view_context || Spina::Current.page&.view_context
+      @container = container
+    end
+
+    def text(name)
+      part = find_part(name)
+      part&.content.to_s
+    end
+
+    def html(name)
+      html = find_part(name)&.content
+      ActiveSupport::SafeBuffer.new(html.to_s)
+    end
+
+    def image_tag(image, variant_options = {}, options = {})
+      image = find_part(image) unless image.is_a? Spina::Parts::Image
+      image_tag_options = {alt: image&.alt}
+      view_context.image_tag main_app_image_url(image, variant_options), options.merge(image_tag_options) if image.present?
+    end
+
+    def image_url(image, variant_options = {})
+      image = find_part(image) unless image.is_a? Spina::Parts::Image
+      main_app_image_url(image, variant_options) if image.present?
+    end
+
+    def attachment_url(attachment)
+      attachment = find_part(attachment) unless attachment.is_a? Spina::Parts::Attachment
+      rails_service_blob_url(attachment)
+    end
+
+    private
+
+      def main_app_image_url(image, variant_options = {})
+        # SVG's can't have variants, 
+        # Render rails_service_blob_url directly instead
+        return rails_service_blob_url(image) if image.svg?
+          
+        # Other images (like PNG & JPG) can have variants
+        variant_key = ActiveStorage::Variation.encode(variant_options)
+        view_context.main_app.rails_blob_representation_url(image.signed_blob_id, variant_key, image.filename.presence || "image")
+      end
+
+      def rails_service_blob_url(file)
+        return if file.blank?
+        view_context.main_app.rails_service_blob_url(file.signed_blob_id, filename: file.filename.presence || "file")
+      end
+
+      def find_part(name)
+        container.find_part(name)
+      end
+
+  end
+end

data/app/presenters/spina/menu_presenter.rb

@@ -50,6 +50,7 @@ module Spina
       end
 
       def render_item(item)
+        return nil unless item.materialized_path
         children = scoped_collection(item.children)
 
         content_tag(list_item_tag, class: list_item_css, data: {page_id: item.page_id, draft: (true if item.draft?) }) do
@@ -71,4 +72,4 @@ module Spina
       end
 
   end
-end
+end

data/app/views/layouts/spina/admin/admin.html.haml

@@ -6,7 +6,9 @@
     = csrf_meta_tags
     %meta{name: 'turbolinks-cache-control', content: 'no-preview'}
 
-    %title Spina
+    %link{rel: 'icon', href: image_url("spina/favicon.png")}
+
+    %title Spina CMS
 
     / Stylesheet
     = stylesheet_link_tag 'spina/admin/application', data: {turbolinks_track: true}
@@ -33,6 +35,3 @@
       = render 'spina/admin/shared/notifications'
 
       = content_for?(:application) ? yield(:application) : yield
-
-      = link_to 'http://www.spinacms.com', class: 'spina-logo', target: :blank do
-        = image_tag('spina/spina.svg', width: 32, height: 24)