spina 0.11.1 → 0.12.0

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

@@ -1,12 +1,12 @@
 .wizard-steps
+  display: flex
   margin: 30px 0 54px 0
-  @include display(flex)
 
   .wizard-step
-    @include display(flex)
+    display: flex
 
     &:not(:last-child)
-      @include flex(1)
+      flex: 1
 
   .wizard-step-circle
     background: #e7e7ee
@@ -36,7 +36,7 @@
       left: 0
       position: absolute
       top: 56px
-      @include transform(translateX(-50%))
+      transform: translateX(-50%)
 
     i.icon
       color: #dddde5
@@ -52,12 +52,12 @@
     background: #e7e7ee
     border-bottom: 1px solid #d6d6db
     border-top: 1px solid #d6d6db
+    flex: 1
     height: 12px
     margin: 0 -1px
     margin-top: 18px
     position: relative
     z-index: 3
-    @include flex(1)
 
   .wizard-step.done
     .wizard-step-circle:before

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

@@ -1,4 +1,7 @@
 @import spina
 
 .infinite-scroll
-  @include clearfix
+  &:after
+    clear: both
+    content: " "
+    display: block

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

@@ -1,5 +1,4 @@
 @import normalize.css
-@import bourbon
 @import spina/admin_editing
 
 // Customize below

data/app/assets/stylesheets/spina.sass

@@ -1,10 +1,9 @@
-// Frameworks
-@import bourbon
-@import neat
-
 // Configuration
 @import spina/configuration
 
+// Mixins
+@import spina/mixins
+
 // Normalizing
 @import spina/normalize
 
@@ -25,15 +24,10 @@
 @import spina/sortable_lists
 @import spina/gallery
 @import spina/login
-@import spina/cards
 @import spina/trix
 @import spina/wizard
 @import spina/notifications
 
-// Plugins
-@import spina/morris
-@import spina/wysihtml5
-@import spina/farbtastic
 
 html
   box-sizing: border-box
@@ -53,12 +47,12 @@ body
 
 // Primary navigation
 nav#primary
+  background: linear-gradient(#3b3f74, #7a76ad)
   height: 100%
   overflow: hidden
   position: fixed
   width: 300px
   z-index: 5
-  @include linear-gradient(#3b3f74, #7a76ad)
 
   & > ul
     height: 100%
@@ -106,15 +100,15 @@ nav#primary
     opacity: 1
 
   ul li ul
+    background: linear-gradient(#3b3f74, #7a76ad)
     bottom: 0
     left: 80px
     padding-top: 20px
     position: absolute
     top: 0
+    transform: translateX(100%)
     width: calc(100% - 80px)
     z-index: 1
-    @include linear-gradient(#3b3f74, #7a76ad)
-    @include transform(translateX(100%))
 
     li a
       line-height: 40px
@@ -151,9 +145,9 @@ nav#primary
     right: 20px
     text-align: center
     top: 50%
+    transform: translateY(-50%)
     vertical-align: middle
     z-index: 1
-    @include transform(translateY(-50%))
 
   ul li ul li[data-badge] a
     z-index: 2
@@ -163,30 +157,30 @@ nav#primary
       background: rgba(255, 255, 255, .9)
 
   &.animated > ul
-    @include transition(background .3s ease)
+    transition: background .3s ease
 
     & > li > a
-      @include transition(all .3s ease)
+      transition: all .3s ease
 
       .icon
-        @include transition(all .3s ease)
+        transition: all .3s ease
 
     li.active ul
-      @include transition(all .3s ease)
+      transition: all .3s ease
 
   &.transformed > ul
     background: rgba(0, 0, 0, .4)
 
     & > li > a
       color: transparent
-      @include transform(translateX(-10px))
+      transform: translateX(-10px)
 
       .icon
         color: #f5f5fa
-        @include transform(translateX(10px))
+        transform: translateX(10px)
 
     li.active ul
-      @include transform(translateX(0%))
+      transform: translateX(0%)
 
 // Secondary navigation
 nav#secondary
@@ -216,8 +210,8 @@ nav#secondary
       left: 0px
       opacity: 0
       position: absolute
+      transform: scale(0)
       width: 100%
-      @include transform(scale(0))
 
   ul li a:hover
     opacity: 1
@@ -230,9 +224,9 @@ nav#secondary
 
     &:after
       opacity: 1
-      @include transform(scale(1))
-      @include transition(all .2s ease)
-      @include transition-delay(.05s)
+      transform: scale(1)
+      transition: all .2s ease
+      transition-delay: .05s
 
   ul li:first-child a
     margin-left: 0
@@ -527,8 +521,10 @@ hr.divider
 .pull-right
   float: right
 
-.clearfix
-  @include clearfix()
+.clearfix:after
+  clear: both
+  content: " "
+  display: block
 
 .spina-logo
   bottom: 0px
@@ -536,7 +532,7 @@ hr.divider
   padding: 20px
   position: fixed
   right: 0px
-  @include transition(opacity .2s ease)
+  transition: opacity .2s ease
 
   &:hover
     opacity: 1

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

@@ -2,18 +2,13 @@ module Spina
   module Admin
     class AccountsController < AdminController
 
-      authorize_resource class: Account
-
       def edit
         add_breadcrumb I18n.t('spina.preferences.account'), spina.edit_admin_account_path
       end
 
       def update
-        if current_account.update_attributes(account_params)
-          redirect_to :back
-        else
-          redirect_to :back
-        end
+        current_account.update_attributes(account_params)
+        redirect_back fallback_location: spina.edit_admin_account_path
       end
 
       def analytics

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

@@ -2,7 +2,7 @@ module Spina
   module Admin
     class AdminController < ::Spina::ApplicationController
       before_action :set_admin_locale
-      before_action :authorize_user
+      before_action :authorize_spina_user
 
       def current_admin_path
         request.fullpath[%r{/#{ Spina.config.backend_path }(.*)}, 1]
@@ -15,9 +15,14 @@ module Spina
         I18n.locale = I18n.default_locale
       end
 
-      def authorize_user
-        redirect_to spina.admin_login_url, flash: {information: I18n.t('spina.notifications.login')} unless current_user
+      def authorize_spina_user
+        redirect_to spina.admin_login_url, flash: {information: I18n.t('spina.notifications.login')} unless current_spina_user
       end
+
+      def authorize_admin
+        render status: 401 unless current_spina_user.admin?
+      end
+
     end
   end
 end

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

@@ -3,8 +3,6 @@ module Spina
     class AttachmentsController < AdminController
       before_action :set_breadcrumbs
 
-      authorize_resource class: Attachment
-
       layout "spina/admin/media_library"
 
       def index

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

@@ -5,19 +5,20 @@ module Spina
 
       before_action :set_breadcrumb, except: [:show]
 
-      load_and_authorize_resource class: Navigation
-
       def show
+        @navigation = Navigation.find(params[:id])
         add_breadcrumb t('spina.website.pages')
       end
 
       def edit
+        @navigation = Navigation.find(params[:id])
         add_breadcrumb @navigation.label, spina.admin_navigation_path(@navigation)
         add_breadcrumb t('spina.edit')
         render layout: 'spina/admin/admin'
       end
 
       def update
+        @navigation = Navigation.find(params[:id])
         if @navigation.update_attributes(navigation_params)
           redirect_to spina.admin_navigation_path(@navigation)
         else

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

@@ -5,8 +5,6 @@ module Spina
       before_action :set_tabs, only: [:new, :create, :edit, :update]
       before_action :set_locale
 
-      authorize_resource class: Page
-
       def index
         redirect_to admin_pages_path unless current_admin_path.starts_with?('/pages')
         @pages = Page.active.sorted.roots
@@ -18,7 +16,7 @@ module Spina
           @page.view_template = params[:view_template]
         end
         add_breadcrumb I18n.t('spina.pages.new')
-        @page_parts = @page.view_template_page_parts(current_theme).map { |part| @page.page_part(part) }
+        @page_parts = @page.view_template_page_parts(current_theme).map { |part| @page.part(part) }
         render layout: 'spina/admin/admin'
       end
 
@@ -26,9 +24,10 @@ module Spina
         @page = Page.new(page_params)
         add_breadcrumb I18n.t('spina.pages.new')
         if @page.save
-          redirect_to spina.edit_admin_page_url(@page)
+          @page.navigations << Spina::Navigation.where(auto_add_pages: true)
+          redirect_to spina.edit_admin_page_url(@page), flash: {success: t('spina.pages.saved')}
         else
-          @page_parts = @page.page_parts
+          @page_parts = @page.view_template_page_parts(current_theme).map { |part| @page.part(part) }
           render :new, layout: 'spina/admin/admin'
         end
       end
@@ -36,7 +35,7 @@ module Spina
       def edit
         @page = Page.find(params[:id])
         add_breadcrumb @page.title
-        @page_parts = @page.view_template_page_parts(current_theme).map { |part| @page.page_part(part) }
+        @page_parts = @page.view_template_page_parts(current_theme).map { |part| @page.part(part) }
         render layout: 'spina/admin/admin'
       end
 
@@ -48,11 +47,11 @@ module Spina
             add_breadcrumb @page.title
             @page.touch
             I18n.locale = I18n.default_locale
-            format.html { redirect_to spina.edit_admin_page_url(@page, params: {locale: @locale}) }
+            format.html { redirect_to spina.edit_admin_page_url(@page, params: {locale: @locale}), flash: {success: t('spina.pages.saved')} }
             format.js
           else
             format.html do
-              @page_parts = @page.page_parts
+              @page_parts = @page.view_template_page_parts(current_theme).map { |part| @page.part(part) }
               render :edit, layout: 'spina/admin/admin'
             end
           end

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

@@ -0,0 +1,49 @@
+module Spina
+  module Admin
+    class PasswordResetsController < AdminController
+      layout "spina/login"
+
+      skip_before_action :authorize_spina_user
+
+      def new
+      end
+
+      def create
+        user = User.find_by(email: params[:email])
+
+        if user.present?
+          user.regenerate_password_reset_token
+          user.update_attributes!(password_reset_sent_at: Time.zone.now)
+          UserMailer.forgot_password(user).deliver_now
+          redirect_to admin_login_path, flash: {success: t('spina.forgot_password.instructions_sent')}
+        else
+          flash.now[:alert] = t('spina.forgot_password.unknown_user')
+          render :new
+        end
+      end
+
+      def edit
+        @user = User.find_by!(password_reset_token: params[:id])
+      end
+
+      def update
+        @user = User.find_by(password_reset_token: params[:id])
+
+        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)
+          redirect_to admin_login_path, flash: {success: t('spina.forgot_password.success')}
+        else
+          render :edit
+        end
+      end
+
+      private
+
+        def user_params
+          params.require(:user).permit(:password, :password_confirmation)
+        end
+
+    end
+  end
+end

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

@@ -3,8 +3,6 @@ module Spina
     class PhotosController < AdminController
       before_action :set_breadcrumbs
 
-      authorize_resource class: Photo
-
       layout "spina/admin/media_library"
 
       def index
@@ -18,25 +16,8 @@ module Spina
       end
 
       def create
-        if photo_params[:files].present?
-          @photos = photo_params[:files].map do |file|
-            Photo.create!(file: file)
-          end
-          respond_to do |format|
-            format.js do
-              render :create_multiple
-            end
-          end
-        else
-          @photo = Photo.create!(photo_params)
-          respond_to do |format|
-            format.js do
-              render params[:media_library] ? :create : :create_and_select
-            end
-            format.json do
-              render json: { file_url: @photo.file_url }
-            end
-          end
+        @photos = photo_params[:files].map do |file|
+          Photo.create!(file: file)
         end
       end
 
@@ -89,19 +70,19 @@ module Spina
         @photos = Photo.find(params[:photo_ids]) if params[:photo_ids].present?
       end
 
-      def wysihtml5_insert
-        @photo = Photo.find(params[:photo_id])
+      def trix_insert    
+        @photo = Photo.find(params[:photo_id])    
       end
-
-      def wysihtml5_select
-        @photos = Photo.sorted.page(params[:page])
-        @photo = Photo.new
-
-        if params[:page].present?
-          render :wysihtml5_infinite_scroll
-        else
-          render :wysihtml5_select
-        end
+ 
+      def trix_select
+        @photos = Photo.sorted.page(params[:page])    
+        @photo = Photo.new    
+    
+        if params[:page].present?   
+          render :trix_infinite_scroll   
+        else    
+          render :trix_select    
+        end   
       end
 
       private
@@ -111,7 +92,7 @@ module Spina
       end
 
       def photo_params
-        params.require(:photo).permit(:file, files: [])
+        params.require(:photo).permit(files: [])
       end
 
     end

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

@@ -4,7 +4,7 @@ module Spina
 
       layout "spina/login"
 
-      skip_before_action :authorize_user
+      skip_before_action :authorize_spina_user
 
       def new
       end

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

@@ -2,8 +2,7 @@ module Spina
   module Admin
     class UsersController < AdminController
       before_action :set_breadcrumbs
-
-      authorize_resource class: User
+      before_action :authorize_admin, except: [:index]
 
       def index
         @users = User.all
@@ -43,19 +42,19 @@ module Spina
 
       def destroy
         @user = User.find(params[:id])
-        @user.destroy unless @user == current_user
+        @user.destroy unless @user == current_spina_user
         redirect_to admin_users_url
       end
 
       private
 
-      def set_breadcrumbs
-        add_breadcrumb I18n.t('spina.preferences.users'), spina.admin_users_path
-      end
+        def set_breadcrumbs
+          add_breadcrumb I18n.t('spina.preferences.users'), spina.admin_users_path
+        end
 
-      def user_params
-        params.require(:user).permit(:admin, :email, :name, :password_digest, :password, :password_confirmation, :last_logged_in)
-      end
+        def user_params
+          params.require(:user).permit(:admin, :email, :name, :password_digest, :password, :password_confirmation, :last_logged_in)
+        end
 
     end
   end

data/app/controllers/spina/application_controller.rb

@@ -3,23 +3,17 @@ module Spina
 
     protect_from_forgery with: :exception
 
-    include ApplicationHelper
-
     private
 
-    def current_ability
-      @current_ability ||= Ability.new(current_user)
-    end
-
     def current_theme
       @current_theme = ::Spina::Theme.find_by_name(current_account.theme)
     end
     helper_method :current_theme
 
-    def current_user
-      @current_user ||= ::Spina::User.where(id: session[:user_id]).first if session[:user_id]
+    def current_spina_user
+      @current_spina_user ||= ::Spina::User.where(id: session[:user_id]).first if session[:user_id]
     end
-    helper_method :current_user
+    helper_method :current_spina_user
 
     def current_account
       @current_account ||= ::Spina::Account.first

data/app/controllers/spina/pages_controller.rb

@@ -4,7 +4,7 @@ module Spina
 
     rescue_from ActiveRecord::RecordNotFound, with: :render_404
 
-    before_action :current_user_can_view_page?, except: [:robots]
+    before_action :current_spina_user_can_view_page?, except: [:robots]
 
     helper_method :page
 
@@ -14,10 +14,10 @@ module Spina
 
     private
 
-      def current_user_can_view_page?
+      def current_spina_user_can_view_page?
         raise ActiveRecord::RecordNotFound if page.nil? || !page.live?
 
-        current_user.present?
+        current_spina_user.present?
       end
 
       def render_404

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

@@ -1,35 +1,24 @@
 module Spina
   module Admin
     module PagesHelper
-      def link_to_add_structure_item_fields(f, association, &block)
-        new_object = f.object.send(association).klass.new
-        id = new_object.object_id
-        fields = f.fields_for(association, new_object, child_index: id) do |builder|
-          build_structure_parts(f.object.page_part.name, new_object) if structure_item?(new_object)
-          render("spina/admin/#{ partable_partial_namespace(new_object) }/fields", f: builder)
+      def link_to_add_structure_item_fields(f, &block)
+        item = StructureItem.new
+        fields = f.fields_for(:structure_items, item, child_index: item.object_id) do |builder|
+          build_structure_parts(f.object.page_part.name, item)
+          render("spina/admin/structure_items/fields", f: builder)
         end
-        link_to '#', class: "#{add_structure_item_fields_class(new_object)} button button-link", data: {id: id, fields: fields.gsub("\n", "")} do
-          block.yield
+        link_to '#', class: "add_structure_item_fields button button-link", data: {id: item.object_id, fields: fields.gsub("\n", "")} do
+          icon('plus')
         end
       end
 
-      def add_structure_item_fields_class(object)
-        structure_item?(object) ? 'add_structure' : 'add_structure_item_fields'
-      end
-
-      def structure_item?(object)
-        object.class.name.demodulize == "StructureItem"
-      end
-
       def build_structure_parts(name, item)
         structure = current_theme.structures.find { |structure| structure[:name] == name }
-        return item.structure_parts unless structure.present?
-        structure[:structure_parts].map do |structure_part|
-          part = item.structure_parts.where(name: structure_part[:name]).first
-          if part.nil?
-            part = item.structure_parts.build(structure_part)
-            part.structure_partable = structure_part[:partable_type].constantize.new
-          end
+        return item.parts unless structure.present?
+        structure[:structure_parts].map do |attributes|
+          part = item.parts.where(name: attributes[:name]).first_or_initialize(attributes)
+          part.partable = part.partable_type.constantize.new if part.partable.blank?
+          part.options = attributes[:options]
           part
         end
       end
@@ -57,6 +46,10 @@ module Spina
         end.compact
       end
 
+      def option_label(part, value)
+        t(['options',part.name,value].compact.join('.'))
+      end
+
     end
   end
 end

data/app/mailers/spina/user_mailer.rb

@@ -0,0 +1,21 @@
+module Spina
+  class UserMailer < ActionMailer::Base
+    layout 'spina/mail'
+
+    def forgot_password(user)
+      @user = user
+
+      mail(
+        to: @user.email, 
+        from: current_account.email, 
+        subject: t('spina.forgot_password.mail_subject')
+      )
+    end
+
+    private
+
+      def current_account
+        Spina::Account.first
+      end
+  end
+end

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

@@ -0,0 +1,12 @@
+require 'active_support/concern'
+
+module Spina
+  module Optionable
+    extend ActiveSupport::Concern
+
+    included do
+      attr_accessor :options
+    end
+
+  end
+end

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

@@ -20,6 +20,10 @@ module Spina
       self.partable.try(:content)
     end
 
+    def value
+      self.partable.try(:value)
+    end
+
     def partable_attributes=(attributes)
       if self.partable.present?
         self.partable.assign_attributes(attributes)
@@ -28,4 +32,4 @@ module Spina
       end
     end
   end
-end
+end