spina 0.6.29 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1eb435c25584cb0604129c081ad90635b107807e
-  data.tar.gz: 0420712f69aafc5cc1280af2971c82376e91522e
+  metadata.gz: 18550031d6f530e50c842bd6d5b6f892040439d4
+  data.tar.gz: 4eb48f489fcbc4b805629953e09903107f12d459
 SHA512:
-  metadata.gz: c2a4546a4e1ac102109fb191aaea1e5f13ed7243a75729596583c56a9f815e65ce2add8a877e1ea614f2d0af8f816c384a3184017fee56a58e525f8e2f28eb45
-  data.tar.gz: 63c995ab4946074262c1b41eb88651b622c52c824f34fe3897d716f9cb4df7e74f9104c2d1a38487fce8438261479a301d140aea852bc1a9bb26b721faebf92a
+  metadata.gz: 488a30be0435ac0fb60a84a70669f725f892ea9c0d16d3fe04d185c70f414c79229e92a217d998a4f0c9aae43b259a04ca0b156027ac09d85b652b4ec541f0cc
+  data.tar.gz: 330492cb94e6fbe7cef0be0529bb42856e04afe4b55968560cec153eee3de99efa9a74ffecf7acc73110fff5743ae29a0fddc83e22e45389a8ce46fda0a45e80

data/README.md

@@ -2,7 +2,10 @@
 
 [Visit the website](http://www.spinacms.com)
 
-[![Code Climate](https://codeclimate.com/github/denkGroot/Spina/badges/gpa.svg)](https://codeclimate.com/github/denkGroot/Spina) [![Test Coverage](https://codeclimate.com/github/denkGroot/Spina/badges/coverage.svg)](https://codeclimate.com/github/denkGroot/Spina/coverage) [ ![Codeship Status for denkGroot/Spina](https://codeship.com/projects/e13debf0-e6af-0132-8abf-32d84f3372de/status?branch=master)](https://codeship.com/projects/82322)
+[![Codeship Status for denkGroot/Spina](https://img.shields.io/codeship/e13debf0-e6af-0132-8abf-32d84f3372de.svg)](https://codeship.com/projects/82322)
+[![Code Climate](https://codeclimate.com/github/denkGroot/Spina/badges/gpa.svg)](https://codeclimate.com/github/denkGroot/Spina)
+[![Test Coverage](https://codeclimate.com/github/denkGroot/Spina/badges/coverage.svg)](https://codeclimate.com/github/denkGroot/Spina/coverage)
+[![Slack](https://slack-spinacms.herokuapp.com/badge.svg)](https://slack-spinacms.herokuapp.com)
 
 # Getting Started
 

data/app/assets/javascripts/spina/admin/application.js

@@ -6,3 +6,4 @@
 //= require ./pages
 //= require ./account
 //= require ./confirm_delete
+//= require ./spina.trix

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

@@ -1,24 +1,25 @@
 $(document).ready ->
-  featherEditor = new Aviary.Feather
-    apiKey: $('body').attr('aviary_api_key'),
-    theme: 'dark',
-    language: $('body').attr('aviary_language'),
-    tools: 'crop,enhance,contrast,sharpness,text,whiten,effects,warmth,orientation,brightness,saturation,redeye,blemish',
-    onSave: (imageID, newURL) ->
-      img = $('#' + imageID)
-      img.attr('src', newURL)
-      $.post(img.attr('data-posturl'), { new_image: newURL })
-    ,
-    onError: (errorObj) ->
-      alert(errorObj.message)
+  if(typeof(Aviary) != "undefined")
+    featherEditor = new Aviary.Feather
+      apiKey: $('body').attr('aviary_api_key'),
+      theme: 'dark',
+      language: $('body').attr('aviary_language'),
+      tools: 'crop,enhance,contrast,sharpness,text,whiten,effects,warmth,orientation,brightness,saturation,redeye,blemish',
+      onSave: (imageID, newURL) ->
+        img = $('#' + imageID)
+        img.attr('src', newURL)
+        $.post(img.attr('data-posturl'), { new_image: newURL })
+      ,
+      onError: (errorObj) ->
+        alert(errorObj.message)
 
-  launchEditor = (id, src) ->
-    featherEditor.launch
-      image: id,
-      url: ($('body').attr('ngrok_address') + src)
-    return false
+    launchEditor = (id, src) ->
+      featherEditor.launch
+        image: id,
+        url: ($('body').attr('ngrok_address') + src)
+      return false
 
-  $(document).on 'click', '[data-aviary]', (e) ->
-    e.preventDefault()
-    image = $(this).parents('.item').find('img')
-    return launchEditor(image.attr('id'), image.attr('data-image'))
+    $(document).on 'click', '[data-aviary]', (e) ->
+      e.preventDefault()
+      image = $(this).parents('.item').find('img')
+      return launchEditor(image.attr('id'), image.attr('data-image'))

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

@@ -7,7 +7,7 @@ ready = ->
     position_array = []
     $(e.target).find('li.image').each (index) ->
       position_array.push $(this).data('photo-id')
-    $(e.target).parents('td').find('.photo-positions').val(position_array.join(","))
+    $(e.target).parents('.horizontal-form-content').find('.photo-positions').val(position_array.join(","))
 
   $('.structure-form-menu ul').sortable().bind 'sortupdate', (e) ->
     $(e.target).find('li').each (index) ->
@@ -22,9 +22,9 @@ $(document).on 'change', '.page-template select', ->
   show_page_parts(page_parts)
 
 show_page_parts = (page_parts) ->
-  $('tr.page-part').hide()
+  $('.horizontal-form-group.page-part').hide()
   for page_part in page_parts
-    $('tr.page-part[data-name=' + page_part + ']').show()
+    $('.horizontal-form-group.page-part[data-name=' + page_part + ']').show()
 
 # Dynamically add and remove fields in a nested form
 $(document).on 'click', 'form .add_fields', (event) ->
@@ -43,7 +43,7 @@ $(document).on 'click', 'form .add_structure', (event) ->
   $structureForm = $(this).parents('.structure-form')
 
   time = new Date().getTime()
-  regexp = new RegExp($(this).data('id'), 'g')
+  regexp = new RegExp("#{$(this).data('id')}|new_association", 'g')
   $fields = $($(this).data('fields').replace(regexp, time))
   $structureForm.find('.structure-form-content').append($fields)
 

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

@@ -0,0 +1,45 @@
+window.Spina = {}
+
+Trix.config.blockAttributes = $.extend Trix.config.blockAttributes, {
+  h1:
+    tagName: 'h1'
+    singleLine: true
+    leaf: true
+  h2:
+    tagName: 'h2'
+    singleLine: true
+    leaf: true
+  h3:
+    tagName: 'h3'
+    singleLine: true
+    leaf: true
+  h4:
+    tagName: 'h4'
+    singleLine: true
+    leaf: true
+  h5:
+    tagName: 'h5'
+    singleLine: true
+    leaf: true
+  h6:
+    tagName: 'h6'
+    singleLine: true
+    leaf: true
+}
+
+class Spina.TrixAttachment
+  @photoSelect: (e) ->
+    editor_id = $(this).closest('trix-toolbar').data('editor-id')
+    $.get("/admin/photos/wysihtml5_select/#{editor_id}")
+
+  @photoInsert: (e, url) ->
+    length = this.editor.getDocument().toString().length
+    this.editor.setSelectedRange(length - 1)
+    this.editor.insertHTML "<img src='#{ url }' />"
+
+document.addEventListener 'trix-file-accept', (e) ->
+  e.preventDefault()
+
+$(document).on 'click', '.js-trix-photo', Spina.TrixAttachment.photoSelect
+
+$(document).on 'photo-insert', 'trix-editor', Spina.TrixAttachment.photoInsert

data/app/assets/stylesheets/spina/{application.css.sass → application.sass}

@@ -1,6 +1,6 @@
-@import normalize
+@import normalize.css
 @import bourbon
 @import mixins
 @import spina/admin_editing
 
-// Customize below
+// Customize below

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

@@ -3,6 +3,7 @@ module Spina
     class PagesController < AdminController
 
       before_filter :set_breadcrumb
+      before_filter :set_tabs, only: [:new, :create, :edit, :update]
 
       authorize_resource class: Page
 
@@ -15,7 +16,7 @@ module Spina
       def new
         @page = Page.new
         if current_theme.new_page_templates.any? { |template| template[0] == params[:view_template] }
-          @page.view_template = params[:view_template] 
+          @page.view_template = params[:view_template]
         end
         add_breadcrumb I18n.t('spina.pages.new')
         @page_parts = current_theme.config.page_parts.map { |page_part| @page.page_part(page_part) }
@@ -24,6 +25,7 @@ module Spina
       def create
         @page = Page.new(page_params)
         add_breadcrumb I18n.t('spina.pages.new')
+        # @page.set_materialized_path
         if @page.save
           redirect_to spina.edit_admin_page_url(@page)
         else
@@ -55,14 +57,14 @@ module Spina
       end
 
       def sort
-        params[:list].each do |id|
-          if id[1][:children].present?
-            id[1][:children].each do |child|
-              child[1][:children].each { |child_child| update_page_position(child_child, child[1][:id]) } if child[1][:children].present?
-              update_page_position(child, id[1][:id])
+        params[:list].each_pair do |parent_pos, parent_node|
+          if parent_node[:children].present?
+            parent_node[:children].each_pair do |child_pos, child_node|
+              child_node[:children].each_pair { |grand_child_pos, grand_child| update_page_position(grand_child, grand_child_pos, child_node[:id]) } if child_node[:children].present?
+              update_page_position(child_node, child_pos, parent_node[:id])
             end
           end
-          update_page_position(id, nil)
+          update_page_position(parent_node, parent_pos, nil)
         end
         render nothing: true
       end
@@ -79,8 +81,12 @@ module Spina
         add_breadcrumb I18n.t('spina.website.pages'), spina.admin_pages_path
       end
 
-      def update_page_position(page, parent_id = nil)
-        Page.update(page[1][:id], position: page[0].to_i + 1, parent_id: parent_id )
+      def set_tabs
+        @tabs = %w{page_content page_seo advanced}
+      end
+
+      def update_page_position(page, position, parent_id = nil)
+        Page.update(page[:id], position: position.to_i + 1, parent_id: parent_id )
       end
 
       def page_params

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

@@ -2,7 +2,7 @@ module Spina
   module Admin
     class PhotosController < AdminController
       before_filter :set_breadcrumbs
-      
+
       authorize_resource class: Photo
 
       layout "spina/admin/media_library"
@@ -14,7 +14,13 @@ module Spina
       end
 
       def create
-        @photo = Photo.create(photo_params)
+        @photo = Photo.create!(photo_params)
+        respond_to do |format|
+          format.js
+          format.json do
+            render json: { file_url: @photo.file_url }
+          end
+        end
       end
 
       def destroy
@@ -71,7 +77,7 @@ module Spina
       def photo_params
         params.require(:photo).permit(:file)
       end
-      
+
     end
   end
 end

data/app/controllers/spina/application_controller.rb

@@ -11,7 +11,7 @@ module Spina
     end
 
     def current_theme
-      @current_theme = ::Spina.themes.first
+      @current_theme = ::Spina.themes.detect{|theme| theme.name == current_account.theme }
     end
     helper_method :current_theme
 

data/app/controllers/spina/pages_controller.rb

@@ -1,5 +1,6 @@
 module Spina
   class PagesController < ApplicationController
+    before_action :rewrite_page, only: [:show]
     before_action :current_user_can_view_page?, except: [:robots]
 
     def homepage
@@ -8,11 +9,7 @@ module Spina
 
     def show
       if should_skip_to_first_child?
-        if page.is_root?
-          redirect_to spina.subpage_path(page, first_live_child) and return
-        else
-          redirect_to spina.third_level_page_path(page.parent, page, first_live_child) and return
-        end
+        redirect_to first_live_child.try(:materialized_path) and return
       elsif page.link_url.present?
         redirect_to page.link_url and return
       end
@@ -22,8 +19,15 @@ module Spina
 
     private
 
+      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?
+        end
+      end
+
       def page
-        @page ||= (action_name == 'homepage') ? Page.find_by(name: 'homepage') : Page.find(params[:id])
+        @page ||= (action_name == 'homepage') ? Page.find_by(name: 'homepage') : Page.find_by(materialized_path: "/" + params[:id])
       end
       helper_method :page
 
@@ -40,7 +44,7 @@ module Spina
       end
 
       def render_with_template(page)
-        render layout: "#{current_theme.to_s.underscore}/application", template: "#{current_theme.to_s.underscore}/pages/#{page.view_template || 'show'}"
+        render layout: "#{current_theme.to_s.parameterize.underscore}/application", template: "#{current_theme.to_s.parameterize.underscore}/pages/#{page.view_template || 'show'}"
       end
 
   end

data/app/controllers/spina/sitemaps_controller.rb

@@ -1,7 +1,7 @@
 module Spina
   class SitemapsController < ApplicationController
     def show
-      @pages = Page.sorted
+      @pages = Page.live.sorted
     end
   end
-end
+end

data/app/models/spina/account.rb

@@ -1,24 +1,22 @@
 module Spina
   class Account < ActiveRecord::Base
     serialize :preferences
+    include Spina::Partable
 
     mount_uploader :logo, LogoUploader
 
     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 layout_part(layout_part)
-      layout_part = layout_parts.where(name: layout_part[:name]).first || layout_parts.build(layout_part)
-      layout_part.layout_partable = layout_part.layout_partable_type.constantize.new unless layout_part.layout_partable.present?
-      layout_part
-    end
-
     def content(layout_part)
       layout_part = layout_parts.where(name: layout_part).first
       layout_part.try(:content)

data/app/models/spina/layout_part.rb

@@ -13,6 +13,8 @@ module Spina
 
     scope :sorted, -> { order(:position) }
 
+    alias_attribute :partable, :layout_partable
+
     def to_s
       name
     end
@@ -34,5 +36,9 @@ module Spina
       end
     end
 
+    def partable_type
+      layout_partable_type
+    end
+
   end
 end

data/app/models/spina/page.rb

@@ -1,20 +1,22 @@
 module Spina
   class Page < ActiveRecord::Base
-    extend FriendlyId
-    
-    has_ancestry orphan_strategy: :adopt # i.e. added to the parent of deleted node
+    include Spina::Partable
+
+    attr_accessor :old_path
 
-    friendly_id :slug_candidates, use: [:slugged, :finders]
+    has_ancestry orphan_strategy: :adopt # i.e. added to the parent of deleted node
 
     has_many :page_parts, dependent: :destroy
 
     before_validation :ensure_title
-    before_save :set_materialized_path
-    before_save :ancestry_is_nil
+    before_validation :ancestry_is_nil
+    before_validation :set_materialized_path
     after_save :save_children
+    after_save :rewrite_rule
 
     accepts_nested_attributes_for :page_parts, allow_destroy: true
     validates_presence_of :title
+    validates :materialized_path, uniqueness: true
 
     scope :sorted, -> { order('position') }
     scope :custom_pages, -> { where(deletable: false) }
@@ -22,27 +24,19 @@ module Spina
     scope :in_menu, -> { where(show_in_menu: true) }
     scope :active, -> { where(active: true) }
 
-    def slug_candidates
-      [
-        :title, 
-        [:title, :id]
-      ]
-    end
-
-    def should_generate_new_friendly_id?
-      title_changed?
-    end
+    alias_attribute :page_part, :part
+    alias_attribute :parts, :page_parts
 
     def to_s
       name
     end
 
-    def custom_page?
-      !deletable
+    def url_title
+      title.try(:parameterize)
     end
 
-    def set_materialized_path
-      self.materialized_path = generate_materialized_path
+    def custom_page?
+      !deletable
     end
 
     def save_children
@@ -57,12 +51,6 @@ module Spina
       read_attribute(:seo_title).blank? ? title : read_attribute(:seo_title)
     end
 
-    def page_part(page_part)
-      page_part = page_parts.where(name: page_part[:name]).first || page_parts.build(page_part)
-      page_part.page_partable = page_part.page_partable_type.constantize.new unless page_part.page_partable.present?
-      page_part
-    end
-
     def has_content?(page_part)
       content(page_part).present?
     end
@@ -94,27 +82,36 @@ module Spina
       self.save
     end
 
+    def set_materialized_path
+      self.old_path = materialized_path
+      self.materialized_path = generate_materialized_path
+      self.materialized_path += "-#{self.class.where(materialized_path: materialized_path).count}" if self.class.where(materialized_path: materialized_path).where.not(id: id).count > 0
+      materialized_path
+    end
+
     private
 
+    def rewrite_rule
+      RewriteRule.create(old_path: old_path, new_path: materialized_path) if old_path != materialized_path
+    end
+
     def generate_materialized_path
       if self.name == 'homepage'
         "/"
       else
         case self.depth
         when 0
-          "/#{slug}"
+          "/#{url_title}"
         when 1
-          "/#{self.parent.slug}/#{slug}"
+          "/#{self.parent.url_title}/#{url_title}"
         when 2
-          "/#{self.parent.parent.try(:slug)}/#{self.parent.slug}/#{slug}"
+          "/#{self.parent.parent.url_title}/#{self.parent.url_title}/#{url_title}"
         end
       end
     end
 
     def ancestry_is_nil
-      if self.ancestry && self.ancestry.empty?
-        self.ancestry = nil
-      end
+      self.ancestry = self.ancestry.presence
     end
 
     def ensure_title