spina 0.8.3 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8050dae6944a2f6eab52fd1cacefc622d0cbd867
-  data.tar.gz: d192030943c6f20cee65e9a668034a9f75dc25a2
+  metadata.gz: 457fad6084480ec4091b8dba28d0f799dbd097dd
+  data.tar.gz: a3fb127947659c26b7583459ff2766891a51e6f5
 SHA512:
-  metadata.gz: 67d7777dd5978acc9f3d6cfb65273e16725a353e31e5f66c75abc5e3fc76e048e63a08cf8c3fcc50d77d0aa47870ba8dbb53c7eb79dfa837c5a0892366930992
-  data.tar.gz: b50e5baecdf2803b9c9524c1ea83865ce2119e034b085e67e010474797a6440de737961d196562da9ad15618c200ecd0cab72717de29b0270786acdce020baf0
+  metadata.gz: 4fc1056660d8c8cbd510508e426187be991ca7c0d50228eb1376ab17f1ed4a1320731f4c146554206ec9f3e11c2f9ae679e0d2695efdc50276e756bd5aca1345
+  data.tar.gz: 2559f8f9966ffde4febf060be5b2e455592f886bef922febc738a20abe59d70dd37992fa1c98fe6ae35dacad33907abf9b10b009990d83cfa827a3ee92bb40db

data/README.md

@@ -26,6 +26,19 @@ The installer will help you setup your first user.
 
 Then start `rails s` and access your admin panel at `/admin`.
 
+## Upgrading from 0.8 to 0.9
+
+Theme configuration changed to:
+
+```ruby
+# config/initializers/themes/default.rb
+Spina::Theme.register do |theme|
+# Theme config
+end
+```
+
+Check out [config/initializers/themes/default.rb](https://github.com/denkGroot/Spina/blob/master/lib/generators/spina/templates/config/initializers/themes/default.rb) for an example.
+
 ## Upgrading from 0.7 to 0.8
 
 Spina-specific configuration moved from `Spina::Engine.config` to just `Spina.config`.
@@ -67,42 +80,36 @@ Spina uses an initializer to create the basic building blocks of your page. Ther
 When you install Spina, you will see the following in `config/initializers/themes/default.rb`
 
 ```ruby
-module Spina
-  module DefaultTheme
-    include ::ActiveSupport::Configurable
-
-    config_accessor :title, :page_parts, :view_templates, :layout_parts, :custom_pages, :plugins, :structures
-
-    self.title = "Default theme"
-
-    self.page_parts = [{
-      name: 'content',
-      title: 'Content',
-      page_partable_type: "Spina::Text"
-    }]
-
-    self.structures = []
-    self.layout_parts = []
-    self.custom_pages = []
-    self.plugins = []
-
-    self.view_templates = {
-      'homepage' => {
-        title: 'Homepage',
-        page_parts: ['content']
-      },
-      'show' => {
-        title: 'Default',
-        description: 'A simple page',
-        usage: 'Use for your content',
-        page_parts: ['content']
-      }
-    }
-
-    self.custom_pages = [
-      { name: 'homepage', title: 'Homepage', deletable: false, view_template: 'homepage' }
-    ]
-  end
+::Spina::Theme.register do |theme|
+
+  theme.name = 'default'
+  theme.title = 'Default Theme'
+
+  theme.page_parts = [{
+    name:             'content',
+    title:            'Content',
+    partable_type:    'Spina::Text'
+  }]
+
+  theme.view_templates = [{
+    name:       'homepage',
+    title:      'Homepage',
+    page_parts: ['content']
+  }, {
+    name: 'show',
+    title:        'Default',
+    description:  'A simple page',
+    usage:        'Use for your content',
+    page_parts:   ['content']
+  }]
+
+  theme.custom_pages = [{
+    name:           'homepage',
+    title:          'Homepage',
+    deletable:      false,
+    view_template:  'homepage'
+  }]
+
 end
 ```
 
@@ -113,10 +120,15 @@ Spina represents each building block of your page, called a 'page part,' as a ha
 Let's say I wanted to add another text box below this called `portfolio`. First I would add another hash to the `self.page_parts` array like so:
 
 ```ruby
-self.page_parts = [
-  { name: 'content', title: 'Content', page_partable_type: "Spina::Text" },
-  { name: 'portfolio', title: 'Portfolio', page_partable_type: "Spina::Text" } # added this second hash
-]
+theme.page_parts = [{
+  name:             'content',
+  title:            'Content',
+  partable_type:    'Spina::Text'
+}, {
+  name:             'portfolio', # added this hash
+  title:            'Portfolio',
+  partable_type:    'Spina::Text'
+}]
 ```
 
 #### Add it to the view template
@@ -124,18 +136,17 @@ self.page_parts = [
 Now, we need to update the `self.view_templates` hash next. These view templates provide customization for the different views you might want. For example, you may have a 'blog' view or an 'about' view which add different page parts. For this example we will add the portfolio part into the 'Default' view template.
 
 ```ruby
-self.view_templates = {
-  'homepage' => {
-    title: 'Homepage',
-    page_parts: ['content']
-  },
-  'show' => {
-    title: 'Default',
-    description: 'A simple page',
-    usage: 'Use for your content',
-    page_parts: ['content', 'portfolio'] # added 'portfolio' here.
-  }
-}
+theme.view_templates = [{
+  name:       'homepage',
+  title:      'Homepage',
+  page_parts: ['content']
+}, {
+  name:         'show',
+  title:        'Default',
+  description:  'A simple page',
+  usage:        'Use for your content',
+  page_parts:   ['content', 'portfolio'] # added 'portfolio'
+}]
 ```
 
 #### Add it to the view

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

@@ -2,7 +2,6 @@
 //= require jquery_ujs
 //= require turbolinks
 //= require spina
-//= require ./aviary
 //= require ./account
 //= require ./confirm_delete
 //= require ./pages

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

@@ -26,30 +26,25 @@ module Spina
         add_breadcrumb I18n.t('spina.preferences.social_media'), spina.social_admin_account_path
       end
 
-      def aviary
-        add_breadcrumb I18n.t('spina.preferences.aviary'), spina.aviary_admin_account_path
-      end
-
       def style
         add_breadcrumb I18n.t('spina.preferences.style'), spina.style_admin_account_path
-        @themes = ::Spina.themes
-        @layout_parts = current_theme.config.layout_parts.map { |layout_part| current_account.layout_part(layout_part) }
+        @themes = ::Spina::Theme.all
+        @layout_parts = current_theme.layout_parts.map { |layout_part| current_account.layout_part(layout_part) }
       end
 
       private
 
       def account_params
-        params.require(:account).permit(:address, :city, :email, :logo, :name, :phone, 
-                                        :postal_code, :preferences, :google_analytics, 
-                                        :google_site_verification, :facebook, :twitter, :google_plus, 
-                                        :aviary_api_key, :aviary_language, :ngrok_address, 
-                                        :kvk_identifier, :theme, :vat_identifier, :robots_allowed, 
-                                        layout_parts_attributes: 
-                                          [:id, :layout_partable_type, :layout_partable_id, 
-                                            :name, :title, :position, :content, :page_id, 
-                                            layout_partable_attributes: 
+        params.require(:account).permit(:address, :city, :email, :logo, :name, :phone,
+                                        :postal_code, :preferences, :google_analytics,
+                                        :google_site_verification, :facebook, :twitter, :google_plus,
+                                        :kvk_identifier, :theme, :vat_identifier, :robots_allowed,
+                                        layout_parts_attributes:
+                                          [:id, :layout_partable_type, :layout_partable_id,
+                                            :name, :title, :position, :content, :page_id,
+                                            layout_partable_attributes:
                                               [:content, :photo_tokens, :attachment_tokens, :id]])
       end
     end
-  end    
+  end
 end

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

@@ -1,36 +1,25 @@
 module Spina
   module Admin
-    class AdminController < ApplicationController
-      
-      before_filter :authorize_user
-      before_filter :new_messages
+    class AdminController < ::Spina::ApplicationController
+      before_action :set_admin_locale
+      before_action :authorize_user
 
       layout 'spina/admin/application'
 
-      private
-
-      def authorize_user
-        redirect_to spina.admin_login_url, flash: {information: I18n.t('spina.notifications.login')} unless current_user
+      def current_admin_path
+        request.fullpath[%r{/#{ Spina.config.backend_path }(.*)}, 1]
       end
+      helper_method :current_admin_path
 
-      def new_messages
-        @new_messages = Inquiry.new_messages.sorted
-      end
+      private
 
-      def current_account
-        @current_account ||= Account.first
-      end
-      helper_method :current_account
-      
-      def current_user
-        @current_user ||= User.where(id: session[:user_id]).first if session[:user_id]
+      def set_admin_locale
+        I18n.locale = I18n.default_locale
       end
-      helper_method :current_user
 
-      def current_ability
-        @current_ability ||= Ability.new(current_user)
+      def authorize_user
+        redirect_to spina.admin_login_url, flash: {information: I18n.t('spina.notifications.login')} unless current_user
       end
-
     end
   end
-end
+end

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

@@ -1,7 +1,7 @@
 module Spina
   module Admin
     class AttachmentsController < AdminController
-      before_filter :set_breadcrumbs
+      before_action :set_breadcrumbs
 
       authorize_resource class: Attachment
 

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

@@ -2,8 +2,9 @@ module Spina
   module Admin
     class PagesController < AdminController
 
-      before_filter :set_breadcrumb
-      before_filter :set_tabs, only: [:new, :create, :edit, :update]
+      before_action :set_breadcrumb
+      before_action :set_tabs, only: [:new, :create, :edit, :update]
+      before_action :set_locale
 
       authorize_resource class: Page
 
@@ -19,13 +20,12 @@ module Spina
           @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) }
+        @page_parts = current_theme.page_parts.map { |page_part| @page.page_part(page_part) }
       end
 
       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
@@ -37,15 +37,18 @@ module Spina
       def edit
         @page = Page.find(params[:id])
         add_breadcrumb @page.title
-        @page_parts = current_theme.config.page_parts.map { |page_part| @page.page_part(page_part) }
+        @page_parts = current_theme.page_parts.map { |page_part| @page.page_part(page_part) }
       end
 
       def update
+        I18n.locale = params[:locale] || I18n.default_locale
         @page = Page.find(params[:id])
         add_breadcrumb @page.title
         respond_to do |format|
           if @page.update_attributes(page_params)
-            format.html { redirect_to spina.edit_admin_page_url(@page) }
+            @page.touch
+            I18n.locale = I18n.default_locale
+            format.html { redirect_to spina.edit_admin_page_url(@page, params: {locale: @locale}) }
             format.js
           else
             format.html do
@@ -72,6 +75,10 @@ module Spina
 
       private
 
+      def set_locale
+        @locale = params[:locale] || I18n.default_locale
+      end
+
       def set_breadcrumb
         add_breadcrumb I18n.t('spina.website.pages'), spina.admin_pages_path
       end
@@ -94,7 +101,7 @@ module Spina
       end
 
       def page_params
-        params.require(:page).permit!
+        params.require(:page).permit!.merge(locale: params[:locale] || I18n.default_locale)
       end
 
     end

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

@@ -1,7 +1,7 @@
 module Spina
   module Admin
     class PhotosController < AdminController
-      before_filter :set_breadcrumbs
+      before_action :set_breadcrumbs
 
       authorize_resource class: Photo
 
@@ -16,7 +16,9 @@ module Spina
       def create
         @photo = Photo.create!(photo_params)
         respond_to do |format|
-          format.js
+          format.js do
+            render params[:media_library] ? :create : :create_and_select
+          end
           format.json do
             render json: { file_url: @photo.file_url }
           end

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

@@ -1,10 +1,10 @@
 module Spina
   module Admin
     class SessionsController < AdminController
-      
+
       layout "spina/login"
 
-      skip_before_filter :authorize_user
+      skip_before_action :authorize_user
 
       def new
       end
@@ -25,6 +25,6 @@ module Spina
         session[:user_id] = nil
         redirect_to "/"
       end
-    end  
+    end
   end
 end

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

@@ -1,8 +1,8 @@
 module Spina
   module Admin
     class UsersController < AdminController
-      before_filter :set_breadcrumbs
-      
+      before_action :set_breadcrumbs
+
       authorize_resource class: User
 
       layout "spina/admin/settings"
@@ -58,7 +58,7 @@ module Spina
       def user_params
         params.require(:user).permit(:admin, :email, :name, :password_digest, :password, :password_confirmation, :last_logged_in)
       end
-      
+
     end
   end
 end

data/app/controllers/spina/application_controller.rb

@@ -1,7 +1,7 @@
 module Spina
   class ApplicationController < ActionController::Base
+
     protect_from_forgery with: :exception
-    helper_method :current_theme, :current_user, :current_account
 
     include ApplicationHelper
 
@@ -12,15 +12,19 @@ module Spina
     end
 
     def current_theme
-      @current_theme = ::Spina.themes.detect{|theme| theme.name == current_account.theme }
+      @current_theme = ::Spina::Theme.find_by_name(current_account.theme)
     end
+    helper_method :current_theme
 
     def current_user
-      @current_user ||= User.where(id: session[:user_id]).first if session[:user_id]
+      @current_user ||= Spina::User.where(id: session[:user_id]).first if session[:user_id]
     end
+    helper_method :current_user
 
     def current_account
       @current_account ||= Account.first
     end
+    helper_method :current_account
+
   end
 end

data/app/controllers/spina/pages_controller.rb

@@ -1,5 +1,8 @@
 module Spina
   class PagesController < Spina::ApplicationController
+    rescue_from ActiveRecord::RecordNotFound, with: :render_404
+
+    before_action :set_locale
     before_action :rewrite_page, only: [:show]
     before_action :current_user_can_view_page?, except: [:robots]
 
@@ -19,6 +22,10 @@ module Spina
 
     private
 
+      def set_locale
+        I18n.locale = params[:locale] || I18n.default_locale
+      end
+
       def rewrite_page
         unless page.present?
           @rule = RewriteRule.find_by(old_path: "/" + params[:id])
@@ -27,7 +34,7 @@ module Spina
       end
 
       def page
-        @page ||= (action_name == 'homepage') ? Page.find_by!(name: 'homepage') : Page.find_by!(materialized_path: "/" + params[:id])
+        @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)
       end
       helper_method :page
 
@@ -44,7 +51,11 @@ module Spina
       end
 
       def render_with_template(page)
-        render layout: "#{current_theme.to_s.parameterize.underscore}/application", template: "#{current_theme.to_s.parameterize.underscore}/pages/#{page.view_template || 'show'}"
+        render layout: "#{current_theme.name.parameterize.underscore}/application", template: "#{current_theme.name.parameterize.underscore}/pages/#{page.view_template || 'show'}"
+      end
+
+      def render_404
+        render file: "#{Rails.root}/public/404.html", status: 404
       end
 
   end