spina 2.0.0.alpha → 2.0.0.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 840093f4a3186a7f872eb18f178f4b80619947ac14875213954e7eb956568176
-  data.tar.gz: 8013ac66f225fe12684596f71dbedef71fcb01cc88a404b7aa71ea6efb11afb7
+  metadata.gz: 8ffac212f63076f1f1f2618fd99a9aea48b98522a17744693effa84c3a0b728f
+  data.tar.gz: 4fc74453a0f0a9bee380e48f6b5fff9af7b5b3c9b1291baf857e3ff6d0d90980
 SHA512:
-  metadata.gz: 63bacad75a83b92a8e95609d1d79b9174cedf521a37d08321f245b9e450c4384a539e5c4c5f3017fb449ce186e5adf40f3bf7e84459bdb1dedd241389d6dc124
-  data.tar.gz: 4d354cf6a05ffb631e0da43bf0707b6aab00476c6ebc7255d775ea316ec5d9ead75fae8c4489e744266af42400c47d7b7afdf1a771a072b6e31bbfd9f8877b33
+  metadata.gz: 60571a66d7df102b996d258960bb820f5a29186cb42153a20970a98606af9515b12da196debc41d11ba352b1af7febb6b90a71b3e71d76aaeaa43c2ad6ddad30
+  data.tar.gz: 4b9724c07226f0ce27df11bfce67062da229a5ed4d1e6af6595345f78513fa84a1943afc86aaa6c5a091e012a93e218a6bce6f5240cb4259583daaa4432391ed

data/app/assets/icons/spina/preview/icons_spina-preview.html

@@ -288,8 +288,6 @@
 .icon-users-outline:before { content: "\f107"; }
     </style>
 
-    <!--[if lte IE 8]><script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
-
     <script>
       function toggleCharacters() {
         var body = document.getElementsByTagName('body')[0];

data/app/assets/icons/spina/preview/ics_spina-preview.html

@@ -309,8 +309,6 @@
 .icon-users-outline:before { content: "\f137"; }
     </style>
 
-    <!--[if lte IE 8]><script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
-
     <script>
       function toggleCharacters() {
         var body = document.getElementsByTagName('body')[0];

data/app/assets/javascripts/spina/admin/controllers/media_picker_controller.js

@@ -76,7 +76,7 @@
 
     insert_trix(event) {
       let customEvent = new CustomEvent("image-insert", {bubbles: true, cancelable: true, detail: {
-        url: this.trixImage.dataset.fullImageUrl, 
+        url: this.trixImage.dataset.imageUrl, 
         alt: this.altTarget.value, 
         link_to_url: this.linkToUrlTarget.value
       }})

data/app/assets/javascripts/spina/admin/scaffold.coffee

@@ -65,6 +65,7 @@ ready = ->
   if header = document.getElementById('header')
     headerHeight = header.getBoundingClientRect().height
     $('section#main').css({paddingTop: headerHeight})
+    $('section#main trix-toolbar').css({top: headerHeight + 15})
 
   # Login wrapper
   $('#login_wrapper').css('margin-top', $(document).innerHeight() / 8)

data/app/assets/stylesheets/spina/_forms.sass

@@ -677,13 +677,14 @@ input.datepicker
     ul li a, ul li.sortable-placeholder
       color: #444
       cursor: pointer
-      display: block
+      display: flex
       font-weight: 600
       font-size: 13px
       height: 44px
       line-height: 44px
       outline: none
       padding-left: 20px
+      padding-right: 6px
 
       &:hover
         background: #f9f9f9
@@ -694,6 +695,11 @@ input.datepicker
         margin-right: 8px
         vertical-align: middle
 
+      span
+        white-space: nowrap
+        overflow: hidden
+        text-overflow: ellipsis
+
     ul li.sortable-placeholder
       background: #f9f9f9
 

data/app/assets/stylesheets/spina/_trix_custom.sass

@@ -1,6 +1,10 @@
 trix-toolbar
+  position: sticky
+  z-index: 2
+
   .trix-button-group
     border: 0
+    margin-bottom: 0
 
     &:not(:first-child)
       margin-left: 10px
@@ -91,10 +95,12 @@ trix-toolbar
 trix-editor
   line-height: 18px
   min-height: 100px
+  margin-top: 15px
 
   h1, h2, h3, h4, h5, h6
     padding-left: 24px
     position: relative
+    z-index: 1
 
     &:after
       color: #ccc
@@ -167,10 +173,14 @@ trix-editor
     font-size: 16px
 
   .trix-attachment-spina-image
+    background: #f5f5f5
+    border-radius: 6px
     cursor: default
     display: block
+    height: 150px
     margin-bottom: 40px
     position: relative
+    width: 200px
 
     &[data-label=""]
       margin-bottom: 0px
@@ -181,8 +191,8 @@ trix-editor
     img
       border-radius: 6px
       display: block
-      max-height: 150px
-      max-width: 200px
+      height: 150px
+      width: 200px
 
     &:before
       background: #eee
@@ -201,7 +211,7 @@ trix-editor
       white-space: nowrap
       width: auto
 
-  figure[data-trix-mutable] 
+  figure[data-trix-mutable]
     .trix-attachment-spina-image:before
       background: $primary-color
       color: white
@@ -211,4 +221,4 @@ trix-editor
 
   .trix-button--remove
     border: none
-    box-shadow: 0 0 5px rgba(0, 0, 0, .15) 
+    box-shadow: 0 0 5px rgba(0, 0, 0, .15)

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

@@ -0,0 +1,26 @@
+module Spina
+  module CurrentMethods
+    extend ActiveSupport::Concern
+    
+    included do
+      helper_method :current_theme
+      helper_method :current_spina_user
+      helper_method :current_account
+    end
+  
+    private
+    
+      def current_theme
+        @current_theme ||= Spina::Theme.find_by_name(current_account.theme)
+      end
+      
+      def current_spina_user
+        @current_spina_user ||= Spina::User.where(id: session[:user_id]).first if session[:user_id]
+      end
+    
+      def current_account
+        @current_account ||= Spina::Account.first
+      end
+        
+  end
+end

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

@@ -1,6 +1,10 @@
 module Spina
   module Admin
-    class AdminController < ::Spina::ApplicationController
+    class AdminController < ActionController::Base
+      include Spina::CurrentMethods
+      
+      helper Spina::Engine.helpers
+      
       before_action :set_admin_locale
       before_action :authorize_spina_user
 

data/app/controllers/spina/application_controller.rb

@@ -1,24 +1,7 @@
-module Spina
-  class ApplicationController < ActionController::Base
-
-    protect_from_forgery with: :exception
-
-    private
-
-    def current_theme
-      @current_theme ||= ::Spina::Theme.find_by_name(current_account.theme)
-    end
-    helper_method :current_theme
-
-    def current_spina_user
-      @current_spina_user ||= ::Spina::User.where(id: session[:user_id]).first if session[:user_id]
-    end
-    helper_method :current_spina_user
-
-    def current_account
-      @current_account ||= ::Spina::Account.first
-    end
-    helper_method :current_account
-
-  end
+class Spina::ApplicationController < Spina.frontend_parent_controller.constantize
+  include Spina::CurrentMethods
+  
+  helper Spina::Engine.helpers
+  
+  protect_from_forgery with: :exception
 end

data/app/controllers/spina/pages_controller.rb

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

data/app/controllers/spina/sitemaps_controller.rb

@@ -1,8 +1,8 @@
-module Spina
-  class SitemapsController < Spina::ApplicationController
-    def show
-      I18n.locale = I18n.default_locale
-      @pages = Page.live.sorted
-    end
+class Spina::SitemapsController < Spina::ApplicationController
+  
+  def show
+    I18n.locale = I18n.default_locale
+    @pages = Spina::Page.live.sorted
   end
+  
 end

data/app/helpers/spina/images_helper.rb

@@ -1,29 +1,14 @@
 module Spina
   module ImagesHelper
 
-    # We wrap some Rails logic inside our own helper method
-    # because the resolve directive in ActiveStorage's routes
-    # doesn't work outside the main app in 5.2.0.rc2
-    def variant(image, options)
-      if image.attached? && image.variable?
-        variant = image.variant(options)
-        main_app.rails_blob_representation_path(variant.blob.signed_id, variant.variation.key, variant.blob.filename)
-      elsif image.image?
-        # Allows SVGs to be displayed as they are not variable. Requires:
-        # - https://github.com/Dreamersoul/administrate-field-active_storage/issues/36#issuecomment-608446819 to be applied
-        #
-        # Additionally, https://github.com/hopsoft/active_storage_svg_sanitizer/
-        # should be added if users are able to upload their own SVG content due to:
-        # https://github.com/rails/rails/issues/34665#issuecomment-445888009
-        main_app.url_for(image)
-      else
-        "https://placehold.it/100x100.png"
-      end
+    def thumbnail_url(image)
+      return "" if image.nil?
+      main_app.url_for(image.variant(resize: "400x300^", crop: "400x300+0+0"))
     end
 
-    def thumbnail_url(image)
+    def embedded_image_url(image)
       return "" if image.nil?
-      variant(image.file, resize: "400x300^", crop: "400x300+0+0")
+      main_app.url_for(image.variant(resize: Spina.config.embedded_image_size))
     end
 
   end

data/app/models/spina/page.rb

@@ -74,12 +74,17 @@ module Spina
     def next_sibling
       siblings.where('position > ?', position).sorted.first
     end
-
+    
     def set_materialized_path
       self.old_path = materialized_path
       self.materialized_path = localized_materialized_path
-      self.materialized_path = localized_materialized_path + "-#{Page.i18n.where(materialized_path: materialized_path).count}" if Page.i18n.where(materialized_path: materialized_path).where.not(id: id).count > 0
-      materialized_path
+      
+      # Append counter to duplicate materialized_path
+      i = 0
+      while duplicate_materialized_path?
+        i += 1
+        self.materialized_path = localized_materialized_path.concat("-#{i}")
+      end
     end
 
     def cache_key
@@ -119,6 +124,10 @@ module Spina
         path_fragments.append(slug) unless name == '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,6 +12,11 @@ module Spina
       def present?
         signed_blob_id.present?
       end
+      
+      def signed_id
+        signed_blob_id
+      end
+      
     end
   end
 end

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

@@ -25,6 +25,15 @@ module Spina
       def present?
         signed_blob_id.present?
       end
+      
+      def signed_id
+        signed_blob_id
+      end
+      
+      def variant(options)
+        Spina::Parts::ImageVariant.new(self, options)
+      end
+      
     end
   end
 end

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

@@ -0,0 +1,19 @@
+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

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

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

data/app/presenters/spina/content_presenter.rb

@@ -30,7 +30,7 @@ module Spina
 
     def attachment_url(attachment)
       attachment = find_part(attachment) unless attachment.is_a? Spina::Parts::Attachment
-      rails_service_blob_url(attachment)
+      view_context.main_app.url_for(attachment) if attachment.present?
     end
 
     private
@@ -38,16 +38,9 @@ module Spina
       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")
+        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)

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

@@ -13,9 +13,6 @@
     / Stylesheet
     = stylesheet_link_tag 'spina/admin/application', data: {turbolinks_track: true}
 
-    /[if lt IE 9]
-      = javascript_include_tag '//html5shiv.googlecode.com/svn/trunk/html5.js', data: {turbolinks_track: true}
-
     / JavaScript
     = javascript_include_tag 'spina/admin/application', data: {turbolinks_track: true}
     = yield(:plugin_stylesheets)

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

@@ -10,9 +10,6 @@
     / Stylesheet
     = stylesheet_link_tag "spina/admin/application"
 
-    /[if lt IE 9]
-      = javascript_include_tag "//html5shiv.googlecode.com/svn/trunk/html5.js"
-
     / JavaScript
     = javascript_include_tag "spina/admin/application"
 

data/app/views/spina/admin/accounts/social.html.haml

@@ -7,40 +7,46 @@
         = icon('check')
         = t('spina.preferences.social_media_save')
 
-  .well
+  %div{style: "margin-top: 40px"}
     .horizontal-form
       .horizontal-form-group
         .horizontal-form-label
           = Spina::Account.human_attribute_name(:facebook)
         .horizontal-form-content
-          = f.text_field :facebook, placeholder: Spina::Account.human_attribute_name(:facebook)
+          .page-form-control
+            = f.text_field :facebook, placeholder: Spina::Account.human_attribute_name(:facebook)
 
       .horizontal-form-group
         .horizontal-form-label
           = Spina::Account.human_attribute_name(:twitter)
         .horizontal-form-content
-          = f.text_field :twitter, placeholder: Spina::Account.human_attribute_name(:twitter)
+          .page-form-control
+            = f.text_field :twitter, placeholder: Spina::Account.human_attribute_name(:twitter)
 
       .horizontal-form-group
         .horizontal-form-label
           = Spina::Account.human_attribute_name(:instagram)
         .horizontal-form-content
-          = f.text_field :instagram, placeholder: Spina::Account.human_attribute_name(:instagram)
+          .page-form-control
+            = f.text_field :instagram, placeholder: Spina::Account.human_attribute_name(:instagram)
 
       .horizontal-form-group
         .horizontal-form-label
           = Spina::Account.human_attribute_name(:youtube)
         .horizontal-form-content
-          = f.text_field :youtube, placeholder: Spina::Account.human_attribute_name(:youtube)
+          .page-form-control
+            = f.text_field :youtube, placeholder: Spina::Account.human_attribute_name(:youtube)
 
       .horizontal-form-group
         .horizontal-form-label
           = Spina::Account.human_attribute_name(:linkedin)
         .horizontal-form-content
-          = f.text_field :linkedin, placeholder: Spina::Account.human_attribute_name(:linkedin)
+          .page-form-control
+            = f.text_field :linkedin, placeholder: Spina::Account.human_attribute_name(:linkedin)
 
       .horizontal-form-group
         .horizontal-form-label
           = Spina::Account.human_attribute_name(:google_plus)
         .horizontal-form-content
-          = f.text_field :google_plus, placeholder: Spina::Account.human_attribute_name(:google_plus)
+          .page-form-control
+            = f.text_field :google_plus, placeholder: Spina::Account.human_attribute_name(:google_plus)

data/app/views/spina/admin/attachments/index.html.haml

@@ -8,7 +8,7 @@
         %th
       %tr
         %td{colspan: 4}
-          = form_with model: [:admin, Spina::Attachment.new], class: 'new_document', style: 'margin-bottom: 0' do |f|
+          = form_with model: [:admin, Spina::Attachment.new], local: false, class: 'new_document', style: 'margin-bottom: 0' do |f|
             = f.submit style: 'display: none'
             = f.file_field :files, multiple: true, data: {direct_upload_url: main_app.rails_direct_uploads_url, customfileinput: true}
 

data/app/views/spina/admin/images/_image.html.haml

@@ -5,4 +5,4 @@
         = t('spina.images.delete')
       %span.photo-name= truncate(image.name, length: 125)
 
-  = image_tag variant(image.file, resize: '300x300^', crop: "300x300+0+0")
+  = image_tag main_app.url_for(image.file.variant(resize: '300x300^', crop: "300x300+0+0"))

data/app/views/spina/admin/media_folders/_media_folder.html.haml

@@ -1,7 +1,7 @@
 = link_to [:admin, media_folder], class: 'item media-folder', data: {add_to_media_folder_url: add_to_media_folder_admin_images_url(media_folder)} do
   .media-folder-thumbnail{data: {badge: media_folder.images.count}}
     - if media_folder.images.any?
-      = image_tag variant(media_folder.images.last.file, resize: '144x144^', crop: "144x144+0+0")
+      = image_tag main_app.url_for(media_folder.images.last.variant(resize: '144x144^', crop: "144x144+0+0"))
     - else
       = image_tag 'spina/media_folder_placeholder.svg'
     .media-folder-shadow

data/app/views/spina/admin/media_picker/_image.html.haml

@@ -1,3 +1,3 @@
 %label.media-picker-image{data: {target: "media-picker.image"}}
-  = check_box_tag :image_id, image.id, image.id.in?(selected_ids), data: {action: "media-picker#choose", image_id: image.id, signed_blob_id: image.file.blob.signed_id, thumbnail_url: thumbnail_url(image), full_image_url: main_app.url_for(image.file), filename: image.file.filename}
+  = check_box_tag :image_id, image.id, image.id.in?(selected_ids), data: {action: "media-picker#choose", image_id: image.id, signed_blob_id: image.file.blob.signed_id, thumbnail_url: thumbnail_url(image), image_url: embedded_image_url(image), filename: image.file.filename}
   %span= image_tag thumbnail_url(image)

data/app/views/spina/admin/media_picker/_media_picker_grid.html.haml

@@ -7,7 +7,7 @@
         .media-folder-shadow
       .media-folder-name=t "spina.images.all_images"
   - else
-    = form_with model: Spina::Image.new, url: admin_images_path, data: {action: "ajax:success->media-picker#refresh ajax:before->media-picker#startUpload", media_picker_url: spina.admin_media_picker_path} do |f|
+    = form_with model: Spina::Image.new, url: admin_images_path, local: false, data: {action: "ajax:success->media-picker#refresh ajax:before->media-picker#startUpload", media_picker_url: spina.admin_media_picker_path} do |f|
       .media-picker-uploader
         = f.file_field :files, multiple: true, accept: "image/*", data: {direct_upload_url: main_app.rails_direct_uploads_url}
         = f.submit
@@ -15,7 +15,7 @@
     - @media_folders.each do |media_folder|
       = link_to spina.admin_media_picker_path(media_folder_id: media_folder.id), class: 'media-folder', data: {action: "media-picker#openFolder"} do
         .media-folder-thumbnail{data: {badge: media_folder.images.size}}
-          = image_tag variant(media_folder.images.last.file, resize: '144x144^', crop: "144x144+0+0")
+          = image_tag main_app.url_for(media_folder.images.last.variant(resize: '144x144^', crop: "144x144+0+0"))
           .media-folder-shadow
         .media-folder-name= media_folder.name
 

data/app/views/spina/admin/media_picker/_modal.html.haml

@@ -16,7 +16,7 @@
             = link_to spina.admin_media_picker_path({media_folder_id: media_folder.id}.merge(request.query_parameters)), class: 'item media-folder', data: {remote: true} do
               .media-folder-thumbnail{data: {badge: media_folder.images.count}}
                 - if media_folder.images.any?
-                  = image_tag variant(media_folder.images.last.file, resize: '144x144^', crop: "144x144+0+0")
+                  = image_tag main_app.url_for(media_folder.images.last.variant(resize: '144x144^', crop: "144x144+0+0"))
                 - else
                   = image_tag 'spina/media_folder_placeholder.svg'
                 .media-folder-shadow

data/app/views/spina/admin/media_picker/select.js.erb

@@ -5,7 +5,7 @@ hidden_input.val("");
 <% if @image.present? %>
   hidden_input.parents('.media_picker').append("<%=j render partial: 'spina/admin/images/image', object: @image, locals: {simple: true} %>");
   hidden_input.parents('[data-controller="image-form"]').find(".image img").remove();
-  hidden_input.parents('[data-controller="image-form"]').find(".image")[0].insertAdjacentHTML("beforeend", `<%=j image_tag variant(@image.file, resize: "400x300^", crop: "400x300+0+0"), width: 200, height: 150 %>`)
+  hidden_input.parents('[data-controller="image-form"]').find(".image")[0].insertAdjacentHTML("beforeend", `<%=j image_tag main_app.url_for(@image.variant(resize: "400x300^", crop: "400x300+0+0")), width: 200, height: 150 %>`)
   hidden_input.val("<%= @image.id %>");
 
   // Trix editor

data/app/views/spina/admin/parts/multi_lines/_form.html.haml

@@ -0,0 +1,2 @@
+.page-form-label= f.object.title
+.page-form-control= f.text_area :content, placeholder: f.object.title

data/app/views/spina/admin/parts/repeaters/_form.html.haml

@@ -7,12 +7,11 @@
           %li{class: ('active' if index.zero?), data: {part_id: repeater_content.object_id, target: "repeater-form.listItem"}}
             = link_to "#structure_form_pane_#{repeater_content.object_id}" do
               %i.icon.icon-bars.sortable-handle
-              = repeater_content.parts&.first&.content
+              %span= strip_tags(repeater_content.parts&.first&.content.to_s)
 
       %div{style: "margin-top: 6px; margin-left: 6px"}
         = link_to_add_repeater_fields f do
           = icon('plus')
-
     .structure-form-content{data: {target: "repeater-form.content"}}
       = f.fields_for :content do |ff|
-        = render 'spina/admin/parts/repeaters/fields', f: ff
+        = render 'spina/admin/parts/repeaters/fields', f: ff

data/config/routes.rb

@@ -1,4 +1,17 @@
+Rails.application.routes.draw do
+  if ActiveStorage.respond_to?(:resolve_model_to_route)
+    resolve("Spina::Parts::Image") { |image, options| route_for(ActiveStorage.resolve_model_to_route, image, options) }
+    resolve("Spina::Parts::ImageVariant") { |image, options| route_for(ActiveStorage.resolve_model_to_route, image, options) }
+    resolve("Spina::Parts::Attachment") { |attachment, options| route_for(ActiveStorage.resolve_model_to_route, attachment, options) }
+  else
+    resolve("Spina::Parts::Image") { |image, options| route_for(:rails_blob, image, options) }
+    resolve("Spina::Parts::ImageVariant") { |image, options| route_for(:rails_representation, image, options) }
+    resolve("Spina::Parts::Attachment") { |attachment, options| route_for(:rails_blob, attachment, options) }
+  end
+end
+
 Spina::Engine.routes.draw do
+
   # Backend
   namespace :admin, path: Spina.config.backend_path do
     root to: "pages#index"

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

@@ -1,5 +1,14 @@
-Mobility.configure do |config|
-  config.default_backend = :table
-  config.accessor_method = :translates
-  config.query_method    = :i18n
+Mobility.configure do
+  plugins do
+    backend :table
+    active_record
+    reader
+    writer
+    backend_reader
+    query
+    cache
+    presence
+    fallbacks false # default to false, enable if passed fallbacks: true
+    default
+  end
 end

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

@@ -11,6 +11,10 @@ Spina.configure do |config|
 
   # Specify a backend path. Defaults to /admin.
   # config.backend_path = 'admin'
+  
+  # The parent controller all frontend Spina controllers inherit from
+  # Defaults to ApplicationController
+  # config.frontend_parent_controller = "ApplicationController"
 
   # Pages Options
   # ===============

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

@@ -12,13 +12,13 @@
   theme.view_templates = [{
     name:       'homepage',
     title:      'Homepage',
-    page_parts: ['text']
+    parts: ['text']
   }, {
     name: 'show',
     title:        'Default',
     description:  'A simple page',
     usage:        'Use for your content',
-    page_parts:   ['text']
+    parts:   ['text']
   }]
 
   theme.custom_pages = [{
@@ -30,7 +30,7 @@
 
   theme.navigations = [{
     name: 'mobile',
-    label: 'Mobile'  
+    label: 'Mobile'
   }, {
     name: 'main',
     label: 'Main navigation',

data/lib/spina.rb

@@ -12,16 +12,29 @@ module Spina
   PLUGINS = []
   THEMES = []
 
-  config_accessor :backend_path, :disable_frontend_routes, :storage, :max_page_depth, :locales
-
+  config_accessor :backend_path, 
+                  :frontend_parent_controller,
+                  :disable_frontend_routes,
+                  :max_page_depth, 
+                  :locales, 
+                  :embedded_image_size
+
+  # Specify a backend path. Defaults to /admin.
   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.storage = :file
-
   self.max_page_depth = 5
 
   self.locales = [I18n.default_locale]
 
+  # 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
+  # Default: 2000x2000px
+  self.embedded_image_size = "2000x2000>"
+
 end

data/lib/spina/engine.rb

@@ -3,7 +3,6 @@ require 'sass-rails'
 require 'coffee-rails'
 require 'jquery-rails'
 require 'turbolinks'
-require 'mini_magick'
 require 'ancestry'
 require 'breadcrumbs_on_rails'
 require 'kaminari'
@@ -19,10 +18,7 @@ module Spina
 
     config.autoload_paths += %W( #{config.root}/lib )
 
-    config.to_prepare do
-      # Load helpers from main application
-      Spina::ApplicationController.helper Rails.application.helpers
- 
+    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)
@@ -30,12 +26,13 @@ module Spina
 
       # Register JSON part types for editing content
       Spina::Part.register(
-        Spina::Parts::Line, 
-        Spina::Parts::Text, 
-        Spina::Parts::Image, 
-        Spina::Parts::ImageCollection, 
-        Spina::Parts::Repeater, 
-        Spina::Parts::Option, 
+        Spina::Parts::Line,
+        Spina::Parts::MultiLine,
+        Spina::Parts::Text,
+        Spina::Parts::Image,
+        Spina::Parts::ImageCollection,
+        Spina::Parts::Repeater,
+        Spina::Parts::Option,
         Spina::Parts::Attachment
       )
     end

data/lib/spina/version.rb

@@ -1,3 +1,3 @@
 module Spina
-  VERSION = "2.0.0.alpha"
+  VERSION = "2.0.0.beta"
 end

data/lib/tasks/spina_tasks.rake

@@ -11,7 +11,7 @@ namespace :spina do
       Mobility.with_locale(locale) do
 
         Spina::Page.all.order(:id).each do |page|
-          page.title = page.title(fallback: Mobility.new_fallbacks[locale])
+          page.title = page.title(fallback: I18n.fallbacks[locale])
           page.save
         end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spina
 version: !ruby/object:Gem::Version
-  version: 2.0.0.alpha
+  version: 2.0.0.beta
 platform: ruby
 authors:
 - Bram Jetten
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-29 00:00:00.000000000 Z
+date: 2021-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mini_magick
+  name: image_processing
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -182,16 +182,16 @@ dependencies:
   name: mobility
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.9
+        version: 1.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.9
+        version: 1.1.1
 - !ruby/object:Gem::Dependency
   name: rack-rewrite
   requirement: !ruby/object:Gem::Requirement
@@ -390,6 +390,7 @@ files:
 - app/assets/stylesheets/spina/admin/application.css.sass
 - app/assets/stylesheets/spina/application.sass
 - app/assets/stylesheets/spina_front_end.sass
+- app/controllers/concerns/spina/current_methods.rb
 - app/controllers/concerns/spina/frontend.rb
 - app/controllers/spina/admin/accounts_controller.rb
 - app/controllers/spina/admin/admin_controller.rb
@@ -429,7 +430,9 @@ files:
 - app/models/spina/parts/base.rb
 - app/models/spina/parts/image.rb
 - app/models/spina/parts/image_collection.rb
+- app/models/spina/parts/image_variant.rb
 - app/models/spina/parts/line.rb
+- app/models/spina/parts/multi_line.rb
 - app/models/spina/parts/option.rb
 - app/models/spina/parts/repeater.rb
 - app/models/spina/parts/repeater_content.rb
@@ -493,6 +496,7 @@ files:
 - app/views/spina/admin/parts/image_collections/_form.html.haml
 - app/views/spina/admin/parts/images/_form.html.haml
 - app/views/spina/admin/parts/lines/_form.html.haml
+- app/views/spina/admin/parts/multi_lines/_form.html.haml
 - app/views/spina/admin/parts/options/_form.html.haml
 - app/views/spina/admin/parts/repeaters/_fields.html.haml
 - app/views/spina/admin/parts/repeaters/_form.html.haml
@@ -593,10 +597,15 @@ files:
 - vendor/assets/stylesheets/spina/_animate.scss
 - vendor/assets/stylesheets/spina/_normalize.scss
 - vendor/assets/stylesheets/spina/_trix.css
-homepage: http://www.denkgroot.com
+homepage: https://www.spinacms.com
 licenses:
 - MIT
-metadata: {}
+metadata:
+  homepage_uri: https://www.spinacms.com
+  bug_tracker_uri: https://github.com/SpinaCMS/Spina/issues
+  documentation_uri: https://www.spinacms.com/guide
+  changelog_uri: https://github.com/SpinaCMS/Spina/blob/master/CHANGELOG.md
+  source_code_uri: https://github.com/SpinaCMS/Spina
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -612,7 +621,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Spina