spina 0.8.3 → 0.9.0

data/app/controllers/spina/sitemaps_controller.rb

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

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

@@ -6,7 +6,7 @@ module Spina
         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(association.to_s.singularize + "_fields", f: builder)
+          render("spina/admin/#{ partable_partial_namespace(new_object) }/fields", f: builder)
         end
         link_to '#', class: "#{add_fields_class(new_object)} button button-link", data: {id: id, fields: fields.gsub("\n", "")} do
           block.yield
@@ -22,11 +22,21 @@ module Spina
       end
 
       def build_structure_parts(name, item)
-        current_theme.config.structures[name].each do |part|
+        structure = current_theme.structures.find { |structure| structure[:name] == name }
+        structure[:structure_parts].each do |part|
           part = item.structure_parts.build(part)
           part.structure_partable = part.structure_partable_type.constantize.new
         end
       end
+
+      def partable_partial_namespace(partable)
+        partable_type_partial_namespace(partable.model_name.to_s)
+      end
+
+      def partable_type_partial_namespace(partable_type)
+        partable_type.tableize.sub(/\Aspina\//, '')
+      end
+
     end
   end
 end

data/app/helpers/spina/application_helper.rb

@@ -55,14 +55,5 @@ module Spina
       html.html_safe
     end
 
-    def captcha
-      NegativeCaptcha.new(
-        secret: Spina.config.NEGATIVE_CAPTCHA_SECRET,
-        spinner: request.remote_ip,
-        fields: [:email, :message, :name],
-        params: params
-      )
-    end
-
   end
 end

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

@@ -0,0 +1,31 @@
+require 'active_support/concern'
+
+module Spina
+  module Part
+    extend ActiveSupport::Concern
+
+    included do
+      attr_accessor :position
+
+      validates :name, :title, :partable_type, presence: true
+
+      scope :sorted, -> { order(:position) }
+    end
+
+    def to_s
+      name
+    end
+
+    def content
+      self.partable.try(:content) || self.partable
+    end
+
+    def partable_attributes=(attributes)
+      if self.partable.present?
+        self.partable.assign_attributes(attributes)
+      else
+        self.partable = self.partable_type.constantize.new(attributes)
+      end
+    end
+  end
+end

data/app/models/spina/ability.rb

@@ -10,7 +10,6 @@ module Spina
         can :manage, Photo
         can :manage, Attachment
         can :manage, Account
-        can :manage, Inquiry
 
         # Spina.config.plugins.each do |plugin|
         #   can :manage, "#{plugin.class_name}".constantize

data/app/models/spina/account.rb

@@ -37,13 +37,13 @@ module Spina
       end
     end
 
-    serialized_attr_accessor :google_analytics, :google_site_verification, :facebook, :twitter, :google_plus, :theme, :aviary_api_key, :aviary_language, :ngrok_address
+    serialized_attr_accessor :google_analytics, :google_site_verification, :facebook, :twitter, :google_plus, :theme
 
     private
 
     def bootstrap_website
-      theme = ::Spina.theme(self.theme)
-      bootstrap_pages(theme) if theme
+      theme_config = ::Spina::Theme.find_by_name(theme)
+      bootstrap_pages(theme_config) if theme_config
     end
 
     def bootstrap_pages(theme)
@@ -53,17 +53,17 @@ module Spina
     end
 
     def find_or_create_custom_pages(theme)
-      theme.config.custom_pages.each do |page|
+      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])
       end
     end
 
     def deactivate_unused_view_templates(theme)
-      Page.where(active: true).where.not(view_template: theme.config.view_templates.keys).update_all(active: false)
+      Page.where(active: true).where.not(view_template: theme.view_templates.map { |h| h[:name] }).update_all(active: false)
     end
 
     def activate_used_view_templates(theme)
-      Page.where(active: false).where(view_template: theme.config.view_templates.keys).update_all(active: true)
+      Page.where(active: false).where(view_template: theme.view_templates.map { |h| h[:name] }).update_all(active: true)
     end
 
   end

data/app/models/spina/attachment.rb

@@ -1,6 +1,6 @@
 module Spina
   class Attachment < ActiveRecord::Base
-    
+
     has_one :page_part, as: :page_partable
     has_and_belongs_to_many :attachment_collections, join_table: 'spina_attachment_collections_attachments'
 

data/app/models/spina/layout_part.rb

@@ -1,44 +1,21 @@
 module Spina
   class LayoutPart < ActiveRecord::Base
-    include ApplicationHelper
+    include Part
 
     belongs_to :account
     belongs_to :layout_partable, polymorphic: true
 
     accepts_nested_attributes_for :layout_partable, allow_destroy: true
-    attr_accessor :position
 
-    validates_presence_of :name, :layout_partable_type, :title
     validates_uniqueness_of :name, scope: :account_id
 
-    scope :sorted, -> { order(:position) }
-
     alias_attribute :partable, :layout_partable
-
-    def to_s
-      name
-    end
+    alias_attribute :partable_type, :layout_partable_type
+    alias_method :layout_partable_attributes=, :partable_attributes=
 
     def position(theme)
-      layout_parts = theme.config.layout_template[:layout_parts]
+      layout_parts = theme.layout_template[:layout_parts]
       layout_parts.index { |layout_part| layout_part == self.name }.to_i
     end
-
-    def content
-      self.layout_partable.try(:content) || self.layout_partable
-    end
-
-    def layout_partable_attributes=(attributes)
-      if self.layout_partable.present?
-        self.layout_partable.update_attributes(attributes)
-      else
-        self.layout_partable = self.layout_partable_type.constantize.create(attributes)
-      end
-    end
-
-    def partable_type
-      layout_partable_type
-    end
-
   end
 end

data/app/models/spina/line.rb

@@ -1,5 +1,7 @@
 module Spina
   class Line < ActiveRecord::Base
+    translates :content
+
     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/page.rb

@@ -2,11 +2,13 @@ module Spina
   class Page < ActiveRecord::Base
     include Spina::Partable
 
+    translates :title, :menu_title, :seo_title, :description, :materialized_path
+
     attr_accessor :old_path
 
     has_ancestry orphan_strategy: :adopt # i.e. added to the parent of deleted node
 
-    has_many :page_parts, dependent: :destroy
+    has_many :page_parts, dependent: :destroy, inverse_of: :page
 
     before_validation :ensure_title
     before_validation :ancestry_is_nil
@@ -74,23 +76,40 @@ module Spina
 
     def set_materialized_path
       self.old_path = materialized_path
-      self.materialized_path = generate_materialized_path
+      self.materialized_path = localized_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
 
+    def cache_key
+      super + "_" + Globalize.locale.to_s
+    end
+
+    def view_template_config(theme)
+      view_template_name = view_template.presence || 'show'
+      theme.view_templates.find { |template| template[:name] == view_template_name }
+    end
+
     private
 
     def rewrite_rule
       RewriteRule.create(old_path: old_path, new_path: materialized_path) if old_path != materialized_path
     end
 
+    def localized_materialized_path
+      if I18n.locale == I18n.default_locale
+        generate_materialized_path.prepend('/')
+      else
+        generate_materialized_path.prepend("/#{I18n.locale}/")
+      end
+    end
+
     def generate_materialized_path
       if root?
-        name == 'homepage' ? '/' : "/#{url_title}"
+        name == 'homepage' ? '' : "#{url_title}"
       else
-        ancestors.collect(&:url_title).append(url_title).join('/').prepend('/')
-      end
+        ancestors.collect(&:url_title).append(url_title).join('/')
+      end      
     end
 
     def ancestry_is_nil

data/app/models/spina/page_part.rb

@@ -1,44 +1,20 @@
 module Spina
   class PagePart < ActiveRecord::Base
-    include ApplicationHelper
+    include Part
 
-    belongs_to :page
+    belongs_to :page, inverse_of: :page_parts
     belongs_to :page_partable, polymorphic: true
 
     accepts_nested_attributes_for :page_partable, allow_destroy: true
-    attr_accessor :position
 
-    validates_presence_of :name, :page_partable_type, :title
-    validates_uniqueness_of :name, scope: :page_id
-
-    scope :sorted, -> { order(:position) }
+    validates :name, uniqueness: {scope: :page_id}
 
     alias_attribute :partable, :page_partable
-
-    def to_s
-      name
-    end
+    alias_attribute :partable_type, :page_partable_type
+    alias_method :page_partable_attributes=, :partable_attributes=
 
     def position(theme)
-      page_parts = theme.config.view_templates[self.page.try(:view_template) || "show"][:page_parts]
-      page_parts.index { |page_part| page_part == self.name }.to_i
-    end
-
-    def content
-      self.page_partable.try(:content) || self.page_partable
+      page.view_template_config(theme)[:page_parts].index { |page_part| page_part == self.name }.to_i
     end
-
-    def page_partable_attributes=(attributes)
-      if self.page_partable.present?
-        self.page_partable.assign_attributes(attributes)
-      else
-        self.page_partable = self.page_partable_type.constantize.new(attributes)
-      end
-    end
-
-    def partable_type
-      page_partable_type
-    end
-
   end
 end

data/app/models/spina/structure_part.rb

@@ -1,29 +1,17 @@
 module Spina
   class StructurePart < ActiveRecord::Base
+    include Part
+
     belongs_to :structure_item
     belongs_to :structure_partable, polymorphic: true
 
     accepts_nested_attributes_for :structure_partable, allow_destroy: true
 
-    validates_presence_of :name, :structure_partable_type, :title
-    validates_uniqueness_of :name, scope: :structure_item_id
-
-    scope :sorted, -> { order(:position) }
-
-    def to_s
-      name
-    end
-
-    def content
-      structure_partable.try(:content) || structure_partable
-    end
+    validates :structure_partable_type, presence: true
+    validates :name, uniqueness: {scope: :structure_item_id}
 
-    def structure_partable_attributes=(attributes)
-      if self.structure_partable.present?
-        self.structure_partable.assign_attributes(attributes)
-      else
-        self.structure_partable = self.structure_partable_type.constantize.new(attributes)
-      end
-    end
+    alias_attribute :partable, :structure_partable
+    alias_attribute :partable_type, :structure_partable_type
+    alias_method :structure_partable_attributes=, :partable_attributes=
   end
 end

data/app/models/spina/text.rb

@@ -1,5 +1,7 @@
 module Spina
   class Text < ActiveRecord::Base
+    translates :content
+    
     has_many :page_parts, as: :page_partable
     has_many :layout_parts, as: :layout_partable
     has_many :structure_parts, as: :structure_partable

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

@@ -7,36 +7,34 @@
     %title Spina
 
     / Stylesheet
-    = stylesheet_link_tag "spina/admin/application"
+    = stylesheet_link_tag 'spina/admin/application'
 
     /[if lt IE 9]
-      = javascript_include_tag "//html5shiv.googlecode.com/svn/trunk/html5.js"
+      = javascript_include_tag '//html5shiv.googlecode.com/svn/trunk/html5.js'
 
     / JavaScript
-    = javascript_include_tag "http://feather.aviary.com/imaging/v2/editor.js"
-    = javascript_include_tag "spina/admin/application"
-    = yield(:plugin_stylesheets) if content_for?(:plugin_stylesheets)
-  %body{aviary_api_key: current_account.aviary_api_key, aviary_language: current_account.aviary_language, ngrok_address: (current_account.ngrok_address if Rails.env.development?) }
-    = render 'spina/admin/shared/navigation'
+    = javascript_include_tag 'spina/admin/application'
+    = yield(:plugin_stylesheets)
 
+  %body
+    = render 'spina/admin/shared/primary_navigation'
     = yield(:secondary_navigation)
 
     %section#main
       %header#main_content_header
-        = yield(:permanent_notice) if content_for?(:permanent_notice)
+        = yield(:permanent_notice)
         .pull-right
-          = link_to "/", class: 'button button-hollow button-round button-small preview-website', data: {:"no-turbolink" => true} do
+          = link_to '/', class: 'button button-hollow button-round button-small preview-website', data: {:"no-turbolink" => true} do
             = icon('eye')
             = t('spina.preview_website')
+
+        = yield(:header_actions) if content_for?(:header_actions)
         .breadcrumbs= render_breadcrumbs separator: '<div class="divider"></div>'
-        = yield(:tertiary_navigation) if content_for?(:tertiary_navigation)
+        = yield(:tertiary_navigation)
 
         = render 'spina/admin/shared/notifications'
 
-      = content_for?(:content) ? yield(:content) : yield
+      = content_for?(:application) ? yield(:application) : yield
 
       = link_to 'http://www.spinacms.com', class: 'spina-logo', target: :blank do
         = image_tag('spina/spina.png')
-
-    / Aviary editor
-    #injection_site

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

@@ -1,12 +1,12 @@
 - content_for(:tertiary_navigation) do
   %nav.tabs
     %ul
-      %li{class: ('active' if controller_name == "photos")}
+      %li{class: ('active' if controller_name == 'photos')}
         = link_to Spina::Photo.model_name.human(count: 2), spina.admin_photos_path
-      %li{class: ('active' if controller_name == "attachments")}
+      %li{class: ('active' if controller_name == 'attachments')}
         = link_to Spina::Attachment.model_name.human(count: 2), spina.admin_attachments_path
 
-- content_for :website_content do
+- content_for :website do
   = yield
 
-= render template: "layouts/spina/admin/website"
+= render template: 'layouts/spina/admin/website'

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

@@ -34,13 +34,12 @@
           = t('spina.preferences.analytics')
           %small= t('spina.preferences.analytics_description')
 
-      %li{class: ('active' if params[:action] == 'aviary')}
-        = link_to spina.aviary_admin_account_path do
-          = icon('image')
-          = t('spina.preferences.aviary')
-          %small= t('spina.preferences.aviary_description')
+      - Spina::Plugin.all.each do |plugin|
+        - if current_theme.plugins.include? plugin.name
+          - if lookup_context.exists? "spina/admin/hooks/#{ plugin.namespace }/_settings_secondary_navigation"
+            = render "spina/admin/hooks/#{ plugin.namespace }/settings_secondary_navigation", plugin: plugin
 
-- content_for :content do
-  = yield
+- content_for(:application) do
+  = content_for?(:settings) ? yield(:settings) : yield
 
-= render template: "layouts/spina/admin/application"
+= render template: 'layouts/spina/admin/application'