spina 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 457fad6084480ec4091b8dba28d0f799dbd097dd
-  data.tar.gz: a3fb127947659c26b7583459ff2766891a51e6f5
+  metadata.gz: 45b73e285b4b35cf4782e720d0277ae1af6a0776
+  data.tar.gz: 65eb2d13073be2d35ff85c1e1644dce083cc8e31
 SHA512:
-  metadata.gz: 4fc1056660d8c8cbd510508e426187be991ca7c0d50228eb1376ab17f1ed4a1320731f4c146554206ec9f3e11c2f9ae679e0d2695efdc50276e756bd5aca1345
-  data.tar.gz: 2559f8f9966ffde4febf060be5b2e455592f886bef922febc738a20abe59d70dd37992fa1c98fe6ae35dacad33907abf9b10b009990d83cfa827a3ee92bb40db
+  metadata.gz: 6996c1d9b49a2e0f277bba4b00e954b6830236af42e0d58cb7605eb91d951a3df27dceb93081d730689dc820dc89121286b5aa9b0914b93f2ef0d4efb4a43eb9
+  data.tar.gz: 9ab874f94373d00377c03b4c65aca1a82c59644c2bfd911f8375384ee527fa7ecf7b80f41c56e992d22808f784441890440bcadd28b822d00405d88ec5d490c7

data/README.md

@@ -1,4 +1,4 @@
-![Spina CMS](http://www.denkwebsite.nl/spinacms.png)
+![Spina CMS](http://www.spinacms.com/spinacms.png)
 
 [Visit the website](http://www.spinacms.com)
 
@@ -156,7 +156,7 @@ Finally, let's go to `views/default/pages/show.html.erb` and add the following:
 ```ruby
 <h1><%= @page.title %></h1>
 
-<%= @page.content(:content).try(:html_safe) %>
+<%= @page.content(:text).try(:html_safe) %>
 <%= @page.content(:portfolio).try(:html_safe) %> # added this line
 ```
 
@@ -179,6 +179,10 @@ The views for these templates are stored in `app/views/default/pages`.
 
 You can define custom pages for your theme that will be generated when bootstrapping your website. You can define whether or not they're deletable. By default Spina creates a custom page named Homepage which is not deletable.
 
+# Contributing
+
+Check our [Contributing Guide](CONTRIBUTING.md) for instructions on how to help the project.
+
 # License
 
 Spina is released under the [MIT license](LICENSE.md).

data/app/assets/javascripts/spina/admin/account.js.coffee

@@ -3,7 +3,7 @@ ready = ->
     layout_parts = $('.account-theme').data('layout-parts')
     show_layout_parts(layout_parts)
 
-$(document).on 'ready page:load', ready
+$(document).on 'turbolinks:load', ready
 
 $(document).on 'change', '.account-theme select', ->
   layout_parts = $(this).find('option:selected').data('layout-parts').split(" ")

data/app/assets/javascripts/spina/admin/pages.js.coffee.erb

@@ -18,7 +18,7 @@ ready = ->
       id = $(this).data('structure-item-id')
       $(".structure_form_pane_#{id}_position").val(index)
 
-$(document).on 'ready page:load', ready
+$(document).on 'turbolinks:load', ready
 
 # Change templates makes page parts appear and disappear
 $(document).on 'change', '.page-template select', ->

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

@@ -1,20 +1,24 @@
 class Spina.InfiniteScroll
   @init: (link) ->
     $(window).off('scroll.infiniteScroll')
+    $('#main, #overlay section').off('scroll.infiniteScroll')
 
     $link = $(link)
     if (url = $link.find('a').attr('href'))
       $(window).on 'scroll.infiniteScroll', => @loadNextPage($link)
-      $(window).scroll()
+      $('#main, #overlay section').on('scroll.infiniteScroll', -> $(window).trigger 'scroll.infiniteScroll')
+      $(window).trigger('scroll.infiniteScroll')
 
   @loadNextPage: ($link) ->
     if ($(window).scrollTop() > $link.offset().top - $(window).height() - 500)
       $(window).off('scroll.infiniteScroll')
+      $('#main, #overlay section').off('scroll.infiniteScroll')
       $.rails.disableElement($link.find('a'))
       $.getScript($link.find('a').attr('href'))
 
 $.fn.infiniteScroll = () ->
   Spina.InfiniteScroll.init(this)
 
-$(document).on 'page:change', ->
+$(document).on 'turbolinks:load', ->
   $(window).off('scroll.infiniteScroll')
+  $('#main, #overlay section').off('scroll.infiniteScroll')

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

@@ -11,5 +11,5 @@ class Spina.Scaffold
 $.fn.enhance = () ->
   Spina.Scaffold.enhance(this)
 
-$(document).on 'page:change', ->
-  Spina.Scaffold.init()
+$(document).on 'turbolinks:load', ->
+  Spina.Scaffold.init()

data/app/assets/javascripts/spina/admin/{spina.trix.js.coffee → spina.trix.js.coffee.erb}

@@ -30,7 +30,7 @@ Trix.config.blockAttributes = $.extend Trix.config.blockAttributes, {
 class Spina.TrixAttachment
   @photoSelect: (e) ->
     editor_id = $(this).closest('trix-toolbar').data('editor-id')
-    $.get("/admin/photos/wysihtml5_select/#{editor_id}")
+    $.get("<%= Spina::Engine.routes.url_helpers.wysihtml5_select_admin_photos_path('') %>/#{editor_id}")
 
   @photoInsert: (e, url) ->
     length = this.editor.getDocument().toString().length

data/app/assets/stylesheets/spina/admin/application.sass

@@ -1 +1,4 @@
 @import spina
+
+.infinite-scroll
+  @include clearfix

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

@@ -4,8 +4,6 @@ module Spina
 
       authorize_resource class: Account
 
-      layout "spina/admin/settings"
-
       def edit
         add_breadcrumb I18n.t('spina.preferences.account'), spina.edit_admin_account_path
       end

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

@@ -4,8 +4,6 @@ module Spina
       before_action :set_admin_locale
       before_action :authorize_user
 
-      layout 'spina/admin/application'
-
       def current_admin_path
         request.fullpath[%r{/#{ Spina.config.backend_path }(.*)}, 1]
       end

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

@@ -24,7 +24,8 @@ module Spina
       end
 
       def select
-        @attachments = Attachment.file_attached.sorted
+        @selected_attachment_id = Attachment.find_by(id: params[:selected_attachment_id]).try(:id)
+        @attachments = Attachment.order_by_ids(@selected_attachment_id).file_attached.sorted
         @attachment = Attachment.new
       end
 
@@ -33,12 +34,13 @@ module Spina
       end
 
       def select_collection
-        @attachments = Attachment.file_attached.sorted
+        @selected_attachment_ids = Attachment.where(id: params[:selected_attachment_ids]).ids
+        @attachments = Attachment.order_by_ids(@selected_attachment_ids).file_attached.sorted
         @attachment = Attachment.new
       end
 
       def insert_collection
-        @attachments = Attachment.find(params[:attachment_ids])
+        @attachments = Attachment.where(id: params[:attachment_ids])
       end
 
       private

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

@@ -8,9 +8,8 @@ module Spina
 
       authorize_resource class: Page
 
-      layout "spina/admin/website"
-
       def index
+        redirect_to admin_pages_path unless current_admin_path.starts_with?('/pages')
         @pages = Page.active.sorted.roots
       end
 

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

@@ -13,6 +13,10 @@ module Spina
         @photo = Photo.new
       end
 
+      def media_library
+        redirect_to spina.admin_photos_path
+      end
+
       def create
         @photo = Photo.create!(photo_params)
         respond_to do |format|
@@ -42,9 +46,9 @@ module Spina
       end
 
       def photo_select
-        selected = params[:selected_photo_id] || Array.new
-        @photos = Photo.order_by_ids(selected).sorted.page(params[:page])
-        @selected_photo = Photo.find(selected)
+        @selected_photo_id = Photo.find_by(id: params[:selected_photo_id]).try(:id)
+        @hidden_field_id = params[:hidden_field_id]
+        @photos = Photo.order_by_ids(@selected_photo_id).sorted.page(params[:page])
         @photo = Photo.new
 
         if params[:page].present?
@@ -55,9 +59,8 @@ module Spina
       end
 
       def photo_collection_select
-        selected = params[:selected_photo_ids] || Array.new
-        @photos = Photo.order_by_ids(selected).sorted.page(params[:page])
-        @selected_photos = Photo.where(id: selected)
+        @selected_photo_ids = Photo.where(id: params[:selected_photo_ids]).ids
+        @photos = Photo.order_by_ids(@selected_photo_ids).sorted.page(params[:page])
         @photo = Photo.new
 
         if params[:page].present?

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

@@ -5,8 +5,6 @@ module Spina
 
       authorize_resource class: User
 
-      layout "spina/admin/settings"
-
       def index
         @users = User.all
       end

data/app/controllers/spina/pages_controller.rb

@@ -27,19 +27,30 @@ module Spina
       end
 
       def rewrite_page
-        unless page.present?
-          @rule = RewriteRule.find_by(old_path: "/" + params[:id])
-          redirect_to @rule.new_path, status: :moved_permanently if @rule.present?
+        if page.nil? && rule = RewriteRule.find_by(old_path: "/" + params[:id])
+          redirect_to rule.new_path, status: :moved_permanently
         end
       end
 
+      def page_by_locale(locale)
+        Page.with_translations(locale).find_by(materialized_path: spina_request_path)
+      end
+
       def page
-        @page ||= (action_name == 'homepage') ? Page.find_by!(name: 'homepage') : Page.with_translations(I18n.locale).find_by!(materialized_path: request.path) || Page.with_translations(I18n.default_locale).find_by!(materialized_path: request.path)
+        current_page = page_by_locale(I18n.locale) || page_by_locale(I18n.default_locale)
+        @page ||= (action_name == 'homepage') ? Page.find_by!(name: 'homepage') : current_page
       end
       helper_method :page
 
+      def spina_request_path
+        segments = ['/', params[:locale], params[:id]].compact
+        File.join(*segments)
+      end
+
       def current_user_can_view_page?
-        raise ActiveRecord::RecordNotFound unless page.live? || current_user.present?
+        raise ActiveRecord::RecordNotFound if page.nil? || !page.live?
+
+        current_user.present?
       end
 
       def should_skip_to_first_child?
@@ -51,7 +62,7 @@ module Spina
       end
 
       def render_with_template(page)
-        render layout: "#{current_theme.name.parameterize.underscore}/application", template: "#{current_theme.name.parameterize.underscore}/pages/#{page.view_template || 'show'}"
+        render layout: "#{current_theme.name.parameterize.underscore}/#{page.layout_template || 'application'}", template: "#{current_theme.name.parameterize.underscore}/pages/#{page.view_template || 'show'}"
       end
 
       def render_404

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

@@ -37,6 +37,21 @@ module Spina
         partable_type.tableize.sub(/\Aspina\//, '')
       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
+        pages = pages.where.not(id: page.subtree.ids) unless page.new_record?
+
+        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.compact
+      end
+
     end
   end
 end

data/app/models/spina/account.rb

@@ -1,5 +1,5 @@
 module Spina
-  class Account < ActiveRecord::Base
+  class Account < ApplicationRecord
     serialize :preferences
     include Spina::Partable
 
@@ -18,15 +18,14 @@ module Spina
     end
 
     def content(layout_part)
-      layout_part = layout_parts.where(name: layout_part).first
-      layout_part.try(:content)
+      layout_parts.find_by(name: layout_part).try(:content)
     end
 
     def self.serialized_attr_accessor(*args)
       args.each do |method_name|
         eval "
           def #{method_name}
-            (self.preferences || {})[:#{method_name}]
+            self.preferences.try(:[], :#{method_name})
           end
 
           def #{method_name}=(value)
@@ -54,16 +53,18 @@ module Spina
 
     def find_or_create_custom_pages(theme)
       theme.custom_pages.each do |page|
-        Page.where(name: page[:name]).first_or_create(title: page[:title]).update_columns(view_template: page[:view_template], deletable: page[:deletable])
+        Page.by_name(page[:name])
+            .first_or_create(title: page[:title])
+            .update_columns(view_template: page[:view_template], deletable: page[:deletable])
       end
     end
 
     def deactivate_unused_view_templates(theme)
-      Page.where(active: true).where.not(view_template: theme.view_templates.map { |h| h[:name] }).update_all(active: false)
+      Page.active.not_by_config_theme(theme).update_all(active: false)
     end
 
     def activate_used_view_templates(theme)
-      Page.where(active: false).where(view_template: theme.view_templates.map { |h| h[:name] }).update_all(active: true)
+      Page.not_active.by_config_theme(theme).update_all(active: true)
     end
 
   end

data/app/models/spina/application_record.rb

@@ -0,0 +1,5 @@
+module Spina
+  class ApplicationRecord < ActiveRecord::Base
+    self.abstract_class = true
+  end
+end

data/app/models/spina/attachment.rb

@@ -1,5 +1,5 @@
 module Spina
-  class Attachment < ActiveRecord::Base
+  class Attachment < ApplicationRecord
 
     has_one :page_part, as: :page_partable
     has_and_belongs_to_many :attachment_collections, join_table: 'spina_attachment_collections_attachments'
@@ -24,5 +24,10 @@ module Spina
       end
     end
 
+    def self.order_by_ids(ids)
+      sql = sanitize_sql_for_assignment({id: ids})
+      order("CASE WHEN #{sql} THEN 0 ELSE 1 END")
+    end
+
   end
 end

data/app/models/spina/attachment_collection.rb

@@ -1,5 +1,5 @@
 module Spina
-  class AttachmentCollection < ActiveRecord::Base
+  class AttachmentCollection < ApplicationRecord
 
     has_one :page_part, as: :page_partable
     has_and_belongs_to_many :attachments, join_table: 'spina_attachment_collections_attachments'

data/app/models/spina/color.rb

@@ -1,5 +1,5 @@
 module Spina
-  class Color < ActiveRecord::Base
+  class Color < ApplicationRecord
     has_many :page_parts, as: :page_partable
     has_many :layout_parts, as: :layout_partable
     has_many :structure_parts, as: :structure_partable

data/app/models/spina/layout_part.rb

@@ -1,5 +1,5 @@
 module Spina
-  class LayoutPart < ActiveRecord::Base
+  class LayoutPart < ApplicationRecord
     include Part
 
     belongs_to :account

data/app/models/spina/line.rb

@@ -1,5 +1,5 @@
 module Spina
-  class Line < ActiveRecord::Base
+  class Line < ApplicationRecord
     translates :content
 
     has_many :page_parts, as: :page_partable

data/app/models/spina/page.rb

@@ -1,5 +1,5 @@
 module Spina
-  class Page < ActiveRecord::Base
+  class Page < ApplicationRecord
     include Spina::Partable
 
     translates :title, :menu_title, :seo_title, :description, :materialized_path
@@ -25,6 +25,10 @@ module Spina
     scope :live, -> { where(draft: false, active: true) }
     scope :in_menu, -> { where(show_in_menu: true) }
     scope :active, -> { where(active: true) }
+    scope :not_active, -> { where(active: false) }
+    scope :by_name, ->(name) { where(name: name) }
+    scope :not_by_config_theme, ->(theme) { where.not(view_template: theme.view_templates.map { |h| h[:name] }) }
+    scope :by_config_theme, ->(theme) { where(view_template: theme.view_templates.map { |h| h[:name] }) }
 
     alias_attribute :page_part, :part
     alias_attribute :parts, :page_parts
@@ -90,6 +94,10 @@ module Spina
       theme.view_templates.find { |template| template[:name] == view_template_name }
     end
 
+    def full_materialized_path
+      File.join(Spina::Engine.routes.url_helpers.root_path, materialized_path)
+    end
+
     private
 
     def rewrite_rule
@@ -109,7 +117,7 @@ module Spina
         name == 'homepage' ? '' : "#{url_title}"
       else
         ancestors.collect(&:url_title).append(url_title).join('/')
-      end      
+      end
     end
 
     def ancestry_is_nil

data/app/models/spina/page_part.rb

@@ -1,5 +1,5 @@
 module Spina
-  class PagePart < ActiveRecord::Base
+  class PagePart < ApplicationRecord
     include Part
 
     belongs_to :page, inverse_of: :page_parts

data/app/models/spina/photo.rb

@@ -1,5 +1,5 @@
 module Spina
-  class Photo < ActiveRecord::Base
+  class Photo < ApplicationRecord
     mount_uploader :file, PhotoUploader
 
     has_many :page_parts, as: :page_partable
@@ -21,7 +21,7 @@ module Spina
     end
 
     def self.order_by_ids(ids)
-      sql = sanitize_sql_for_conditions({id: ids})
+      sql = sanitize_sql_for_assignment({id: ids})
       order("CASE WHEN #{sql} THEN 0 ELSE 1 END")
     end