spina 1.0.3 → 1.1.0

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

@@ -13,7 +13,7 @@ module Spina
 
         if user.present?
           user.regenerate_password_reset_token
-          user.update_attributes!(password_reset_sent_at: Time.zone.now)
+          user.touch(:password_reset_sent_at)
           UserMailer.forgot_password(user).deliver_now
           redirect_to admin_login_path, flash: {success: t('spina.forgot_password.instructions_sent')}
         else
@@ -31,7 +31,7 @@ module Spina
 
         if @user.password_reset_sent_at < 2.hours.ago
           redirect_to new_admin_password_reset_path, flash: {alert: t('spina.forgot_password.expired')}
-        elsif @user.update_attributes(user_params)
+        elsif @user.update(user_params)
           redirect_to admin_login_path, flash: {success: t('spina.forgot_password.success')}
         else
           render :edit

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

@@ -2,20 +2,19 @@ module Spina
   module Admin
     class ResourcesController < AdminController
 
-      def show
-        @resource = Resource.find(params[:id])
+      before_action :set_resource, only: [:show, :edit, :update]
+
+      def show        
         add_breadcrumb @resource.label
       end
 
-      def edit
-        @resource = Resource.find(params[:id])
+      def edit        
         add_breadcrumb @resource.label, spina.admin_resource_path(@resource)
         add_breadcrumb t('spina.edit')
       end
 
-      def update
-        @resource = Resource.find(params[:id])
-        if @resource.update_attributes(resource_params)
+      def update        
+        if @resource.update(resource_params)
           redirect_to spina.admin_resource_path(@resource)
         else
           render :edit
@@ -28,6 +27,9 @@ module Spina
           params.require(:resource).permit(:label, :view_template, :order_by, :parent_page_id)
         end
 
+        def set_resource
+          @resource = Resource.find(params[:id])          
+        end
     end
   end
 end

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

@@ -10,7 +10,7 @@ module Spina
       end
 
       def update
-        if @setting.update_attributes(settings_params)
+        if @setting.update(settings_params)
           redirect_to spina.admin_edit_settings_path(plugin.namespace)
         else
           add_breadcrumb t("spina.#{plugin.namespace}.title")

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

@@ -3,6 +3,7 @@ module Spina
     class UsersController < AdminController
       before_action :set_breadcrumbs
       before_action :authorize_admin, except: [:index]
+      before_action :set_user, only: [:edit, :update, :destroy]
 
       def index
         @users = User.all
@@ -24,15 +25,13 @@ module Spina
         end
       end
 
-      def edit
-        @user = User.find(params[:id])
+      def edit        
         add_breadcrumb "#{@user}"
       end
 
-      def update
-        @user = User.find(params[:id])
+      def update        
         add_breadcrumb "#{@user}"
-        if @user.update_attributes(user_params)
+        if @user.update(user_params)
           redirect_to spina.admin_users_url
         else
           flash.now[:alert] = I18n.t('spina.users.cannot_be_created')
@@ -40,8 +39,7 @@ module Spina
         end
       end
 
-      def destroy
-        @user = User.find(params[:id])
+      def destroy        
         @user.destroy unless @user == current_spina_user
         redirect_to admin_users_url
       end
@@ -56,6 +54,9 @@ module Spina
           params.require(:user).permit(:admin, :email, :name, :password_digest, :password, :password_confirmation, :last_logged_in)
         end
 
+        def set_user
+          @user = User.find(params[:id])
+        end
     end
   end
 end

data/app/controllers/spina/pages_controller.rb

@@ -13,9 +13,7 @@ module Spina
     private
 
       def current_spina_user_can_view_page?
-        raise ActiveRecord::RecordNotFound if page.nil? || !page.live?
-
-        current_spina_user.present?
+        raise ActiveRecord::RecordNotFound unless current_spina_user.present? || page.live?
       end
 
   end

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

@@ -39,11 +39,11 @@ module Spina
         pages = Spina::Page.active.regular_pages
         pages = pages.where.not(id: page.subtree.ids) unless page.new_record? || !page.methods.include?(:subtree)
 
-        flatten_nested_hash(pages.arrange(order: :position)).map do |page|
+        (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 << [page.parent&.menu_title, page&.parent_id].compact).uniq.compact
       end
 
       def option_label(part, value)

data/app/helpers/spina/images_helper.rb

@@ -5,7 +5,7 @@ module Spina
     # 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?
+      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)
       else

data/app/models/spina/account.rb

@@ -33,15 +33,23 @@ module Spina
       end
     end
 
-    serialized_attr_accessor :google_analytics, :google_site_verification, :facebook, :twitter, :google_plus, :theme
+    serialized_attr_accessor :google_analytics, :google_site_verification, :facebook, :twitter, :instagram, :youtube, :linkedin, :google_plus, :theme
 
     private
 
     def bootstrap_website
       theme_config = ::Spina::Theme.find_by_name(theme)
       if theme_config
-        bootstrap_pages(theme_config)
+
         bootstrap_navigations(theme_config)
+        bootstrap_pages(theme_config)
+        bootstrap_resources(theme_config)
+      end
+    end
+
+    def bootstrap_navigations(theme)
+      theme.navigations.each_with_index do |navigation, index|
+        Navigation.where(name: navigation[:name]).first_or_create.update(navigation.merge(position: index))
       end
     end
 
@@ -51,9 +59,9 @@ module Spina
       activate_used_view_templates(theme)
     end
 
-    def bootstrap_navigations(theme)
-      theme.navigations.each_with_index do |navigation, index|
-        Navigation.where(name: navigation[:name]).first_or_create.update_attributes(navigation.merge(position: index))
+    def bootstrap_resources(theme)
+      theme.resources.each do |resource|
+        Resource.where(name: resource[:name]).first_or_create.update(resource)
       end
     end
 
@@ -61,7 +69,7 @@ module Spina
       theme.custom_pages.each do |page|
         Page.where(name: page[:name])
             .first_or_create(title: page[:title])
-            .update_attributes(view_template: page[:view_template], deletable: page[:deletable])
+            .update(view_template: page[:view_template], deletable: page[:deletable])
       end
     end
 

data/app/models/spina/attachment.rb

@@ -18,12 +18,12 @@ module Spina
       file if file.attached?
     end
 
-    alias_method :old_update_attributes, :update_attributes
-    def update_attributes(attributes)
+    alias_method :old_update, :update
+    def update(attributes)
       if attributes["_destroy"] == "1" && attributes["file"].blank?
         self.page_part.destroy
       else
-        old_update_attributes(attributes)
+        old_update(attributes)
       end
     end
 

data/app/models/spina/image.rb

@@ -21,6 +21,15 @@ module Spina
     def content
       self
     end
- 
+
+    def thumbnail(size = '100x100', modifier = '^')
+      variant(
+        combine_options: {
+          gravity: 'center',
+          thumbnail: "#{size}#{modifier}",
+          extent: size
+        }
+      )
+    end
   end
 end

data/app/models/spina/image_collection.rb

@@ -13,10 +13,10 @@ module Spina
       self
     end
 
-    alias_method :old_update_attributes, :update_attributes
-    def update_attributes(attributes)
+    alias_method :old_update, :update
+    def update(attributes)
       self.images.clear if attributes.reject{|key,value| key == "id" }.blank?
-      old_update_attributes(attributes)
+      old_update(attributes)
     end
 
   end

data/app/models/spina/line.rb

@@ -1,7 +1,7 @@
 module Spina
   class Line < ApplicationRecord
     extend Mobility
-    translates :content
+    translates :content, fallbacks: true
 
     has_many :page_parts, as: :page_partable
     has_many :layout_parts, as: :layout_partable

data/app/models/spina/navigation_item.rb

@@ -5,6 +5,7 @@ module Spina
 
     has_ancestry orphan_strategy: :adopt
 
+    scope :regular_pages, -> { joins(:page).where(spina_pages: {resource_id: nil}) }
     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}) }
@@ -12,6 +13,6 @@ module Spina
 
     validates :page, uniqueness: {scope: :navigation}
 
-    delegate :menu_title, :materialized_path, to: :page
+    delegate :menu_title, :materialized_path, :draft?, to: :page
   end
 end

data/app/models/spina/page.rb

@@ -39,13 +39,18 @@ module Spina
     before_validation :set_materialized_path
     validates :title, presence: true
 
-    translates :title, :description, :materialized_path
+    translates :title, fallbacks: true
+    translates :description, :materialized_path
     translates :menu_title, :seo_title, default: -> { title }
 
     def to_s
       name
     end
 
+    def page_id
+      id
+    end
+
     def url_title
       title.try(:parameterize)
     end
@@ -55,7 +60,7 @@ module Spina
     end
 
     def save_children
-      self.children.each(&:save)
+      children.each(&:save)
     end
 
     def live?
@@ -63,17 +68,17 @@ module Spina
     end
 
     def previous_sibling
-      self.siblings.where('position < ?', self.position).sorted.last
+      siblings.where('position < ?', position).sorted.last
     end
 
     def next_sibling
-      self.siblings.where('position > ?', self.position).sorted.first
+      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 += "-#{self.class.i18n.where(materialized_path: materialized_path).count}" if self.class.i18n.where(materialized_path: materialized_path).where.not(id: id).count > 0
+      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
     end
 
@@ -97,7 +102,7 @@ module Spina
       end
 
       def rewrite_rule
-        RewriteRule.where(old_path: old_path).first_or_create.update_attributes(new_path: materialized_path) if old_path != materialized_path
+        RewriteRule.where(old_path: old_path).first_or_create.update(new_path: materialized_path) if old_path != materialized_path
       end
 
       def localized_materialized_path

data/app/models/spina/resource.rb

@@ -4,6 +4,8 @@ module Spina
 
     belongs_to :parent_page, class_name: "Spina::Page", optional: true
 
+    after_save :scope_pages_to_parent_page
+
     def pages
       case order_by
       when "title"
@@ -12,5 +14,14 @@ 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/models/spina/text.rb

@@ -1,7 +1,7 @@
 module Spina
   class Text < ApplicationRecord
     extend Mobility
-    translates :content
+    translates :content, fallbacks: true
     
     has_many :page_parts, as: :page_partable
     has_many :layout_parts, as: :layout_partable

data/app/presenters/spina/menu_presenter.rb

@@ -0,0 +1,74 @@
+module Spina
+  class MenuPresenter
+    include ActionView::Helpers::TagHelper
+    include ActionView::Helpers::UrlHelper
+    include ActiveSupport::Configurable
+
+    attr_accessor :collection, :output_buffer
+
+    # Configuration
+    config_accessor :menu_tag, :menu_css,
+                    :list_tag, :list_css, 
+                    :list_item_tag, :list_item_css, 
+                    :link_tag_css,
+                    :include_drafts,
+                    :depth # root nodes are at depth 0
+
+    # Default configuration
+    self.menu_tag = :nav
+    self.list_tag = :ul
+    self.list_item_tag = :li
+    self.include_drafts = false
+
+    def initialize(collection)
+      @collection = collection
+    end
+
+    def to_html
+      render_menu(roots)
+    end
+
+    private
+
+      def roots
+        return collection.navigation_items.roots if collection.is_a?(Navigation)
+        collection.roots
+      end
+
+      def render_menu(collection)
+        content_tag(menu_tag, class: menu_css) do
+          render_items(scoped_collection(collection))
+        end
+      end
+
+      def render_items(collection)
+        content_tag(list_tag, class: list_css) do
+          collection.inject(ActiveSupport::SafeBuffer.new) do |buffer, item|
+            buffer << render_item(item)
+          end
+        end
+      end
+
+      def render_item(item)
+        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
+          buffer = ActiveSupport::SafeBuffer.new
+          buffer << link_to(item.menu_title, item.materialized_path, class: link_tag_css)
+          buffer << render_items(children) if render_children?(item) && children.any?
+          buffer
+        end
+      end
+
+      def scoped_collection(collection)
+        scoped = collection.regular_pages.active.in_menu.sorted
+        include_drafts ? scoped : scoped.live
+      end
+
+      def render_children?(item)
+        return true unless depth
+        item.depth < depth
+      end
+
+  end
+end

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

@@ -35,4 +35,4 @@
       = content_for?(:application) ? yield(:application) : yield
 
       = link_to 'http://www.spinacms.com', class: 'spina-logo', target: :blank do
-        = image_tag('spina/spina.png')
+        = image_tag('spina/spina.svg', width: 32, height: 24)

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

@@ -21,6 +21,24 @@
         .horizontal-form-content
           = 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)
+
+      .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)
+
+      .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)
+
       .horizontal-form-group
         .horizontal-form-label
           = Spina::Account.human_attribute_name(:google_plus)