spina 0.8.3 → 0.9.0

data/config/locales/ru.yml

@@ -33,20 +33,6 @@ ru:
       documents: Документы
       photos: Изображения
 
-    inquiries:
-      title: Сообщения
-      all: Все сообщения
-      all_description: Все сообщения
-      delete_confirmation: "Вы уверены, что хотите удалить <strong>%{subject}</strong> сообщение?"
-      empty: У вас нет входящих сообщений
-      empty_inbox: У вас нет входящих сообщений
-      empty_spam: "У вас нет сообщений, помеченных как спам"
-      inbox: Входящие
-      inbox_description: Входящие сообщения
-      mark_as_read: Пометить как прочитанное
-      no_spam: Не спам
-      spam: Спам
-
     pages:
       new: Новая страница
       create_page: "Создать %{template}"
@@ -92,9 +78,6 @@ ru:
       account: Общее
       account_description: Персональные параметры
       account_save: Сохранить параметры
-      aviary: Вольер
-      aviary_description: Настройки вольера
-      aviary_save: Сохранить параметры
       style: Дизайн
       style_description: Выберите тему
       style_save: Сохранить параметры стиля
@@ -127,9 +110,6 @@ ru:
       spina/attachment:
         one: Документ
         other: Документы
-      spina/inquiry:
-        one: Сообщение
-        other: Сообщения
 
     attributes:
       spina/account:
@@ -157,12 +137,6 @@ ru:
         name: Название файла
         size: Размер
 
-      spina/inquiries:
-        email: Почта
-        name: от
-        message: Сообщение
-        phone: Телефон
-
       spina/page:
         title: Заголовок
         title_placeholder: Заголовок страницы

data/config/locales/tr.yml

@@ -33,20 +33,6 @@ tr:
       documents: Belgeler
       photos: Resimler
 
-    inquiries:
-      title: Mesajlar
-      all: Tüm mesajlar
-      all_description: Tüm mesajlarınız
-      delete_confirmation: "<strong>%{subject}</strong> başlıklı mesajı silmek istediğinizden emin misiniz?"
-      empty: Henüz hiç mesajınız bulunmuyor
-      empty_inbox: Gelen kutusu boş
-      empty_spam: Spam olarak işaretli mesaj bulunmuyor
-      inbox: Gelen kutusu
-      inbox_description: Yeni gelen mesajlarınız
-      mark_as_read: Okundu olarak işaretle
-      no_spam: Spam değil
-      spam: Spam
-
     pages:
       new: Yeni sayfa
       create_page: "Yeni %{template}"
@@ -92,9 +78,6 @@ tr:
       account: Genel
       account_description: Kişisel seçenekleriniz
       account_save: Seçenekleri kaydet
-      aviary: Aviary
-      aviary_description: Aviary seçenekleriniz
-      aviary_save: Seçenekleri kaydet
       style: Görünüm
       style_description: Size uyan bir tema seçin
       style_save: Görünümü kaydet
@@ -115,10 +98,10 @@ tr:
 
   activerecord:
     models:
-      spina/page: 
+      spina/page:
         one: Sayfa
         other: Sayfalar
-      spina/user: 
+      spina/user:
         one: Kullanıcı
         other: Kullanıcılar
       spina/photo:
@@ -127,9 +110,6 @@ tr:
       spina/attachment:
         one: Belge
         other: Belgeler
-      spina/inquiry:
-        one: Mesaj
-        other: Mesajlar
 
     attributes:
       spina/account:
@@ -157,12 +137,6 @@ tr:
         name: Dosya adı
         size: Boyut
 
-      spina/inquiries:
-        email: Eposta
-        name: Gönderen
-        message: Mesaj
-        phone: Telefon
-
       spina/page:
         title: Başlık
         title_placeholder: Sayfa başlığı

data/config/locales/zh-CN.yml

@@ -92,9 +92,6 @@ zh-CN:
       account: 通用
       account_description: 个人设置
       account_save: 保存设置
-      aviary: Aviary
-      aviary_description: 设置 aviary
-      aviary_save: 保存设置
       style: 样式
       style_description: 选择主题
       style_save: 保存样式

data/config/routes.rb

@@ -9,7 +9,6 @@ Spina::Engine.routes.draw do
         get :style
         get :analytics
         get :social
-        get :aviary
       end
     end
 
@@ -57,23 +56,8 @@ Spina::Engine.routes.draw do
         get :link
       end
     end
-
-    resources :inquiries, only: [:index, :show, :destroy] do
-      collection do
-        get :inbox
-        get :spam
-      end
-      member do
-        get :inbox_show
-        patch :mark_as_read
-        patch :unmark_spam
-      end
-    end
   end
 
-  # Inquiries
-  resources :inquiries
-
   # Sitemap
   resource :sitemap
 
@@ -83,11 +67,11 @@ Spina::Engine.routes.draw do
   # Frontend
   root to: "pages#homepage"
 
-  # get ':materialized_pathroot/:subpage/:id' => "pages#show", as: "third_level_page"
-  # get ':root/:id' => "pages#show", as: "subpage"
+  # Pages
+  get '/:locale/*id' => 'pages#show', constraints: {locale: /#{Spina.config.locales.join('|')}/ }
+  get '/:locale/' => 'pages#homepage', constraints: {locale: /#{Spina.config.locales.join('|')}/ }
   get '/*id' => 'pages#show', as: "page", controller: 'pages', constraints: lambda { |request|
     !(Rails.env.development? && request.env['PATH_INFO'].starts_with?('/rails/'))
   }
 
 end
-

data/db/migrate/{20150507135428_create_spina_tables.rb → 1_create_spina_tables.rb}

@@ -38,17 +38,6 @@ class CreateSpinaTables < ActiveRecord::Migration
       t.datetime "updated_at"
     end
 
-    create_table "spina_inquiries", force: :cascade do |t|
-      t.string   "name"
-      t.string   "email"
-      t.string   "phone"
-      t.text     "message"
-      t.boolean  "archived",   default: false
-      t.datetime "created_at",                 null: false
-      t.datetime "updated_at",                 null: false
-      t.boolean  "spam"
-    end
-
     create_table "spina_layout_parts", force: :cascade do |t|
       t.string   "title"
       t.string   "name"

data/db/migrate/2_create_spina_translation_tables.rb

@@ -0,0 +1,13 @@
+class CreateSpinaTranslationTables < ActiveRecord::Migration
+  def up
+    Spina::Page.create_translation_table! title: :string, menu_title: :string, description: :string, seo_title: :string, materialized_path: :string
+    Spina::Text.create_translation_table! content: :text
+    Spina::Line.create_translation_table! content: :string
+  end
+
+  def down
+    Spina::Page.drop_translation_table!
+    Spina::Text.drop_translation_table!
+    Spina::Line.drop_translation_table!
+  end
+end

data/lib/generators/spina/install_generator.rb

@@ -4,15 +4,23 @@ module Spina
     source_root File.expand_path("../templates", __FILE__)
 
     def create_initializer_file
+      return if Rails.env.production?
       template 'config/initializers/spina.rb'
     end
 
+    def create_carrierwave_initializer_file
+      return if Rails.env.production?
+      template 'config/initializers/carrierwave.rb'
+    end
+
     def add_route
+      return if Rails.env.production?
       return if Rails.application.routes.routes.detect { |route| route.app.app == Spina::Engine }
       route "mount Spina::Engine => '/'"
     end
 
     def copy_migrations
+      return if Rails.env.production?
       rake 'spina:install:migrations'
     end
 
@@ -31,19 +39,22 @@ module Spina
       return if account.theme.present? && !no?("Theme '#{account.theme} is set. Skip? [Yn]")
 
       theme = begin
-                theme = account.theme || 'default'
-                theme = ask("What theme do you want to use? (default/demo) [#{theme}]").presence || theme
-              end until theme.in? ['default', 'demo']
+                theme = account.theme || themes.first
+                theme = ask("What theme do you want to use? (#{themes.join('/')}) [#{theme}]").presence || theme
+              end until theme.in? themes
 
       account.update_attribute(:theme, theme)
+    end
 
+    def copy_template_files
+      return if Rails.env.production?
+      theme = Account.first.theme
       template "config/initializers/themes/#{theme}.rb"
       directory "app/assets/stylesheets/#{theme}"
       directory "app/views/#{theme}"
       directory "app/views/layouts/#{theme}"
     end
 
-
     def create_user
       return if User.exists? && !no?('A user already exists. Skip? [Yn]')
       email = ask('Please enter an email address for your first user:')
@@ -59,10 +70,10 @@ module Spina
       theme_name = Account.first.theme
       if theme_name == 'demo' && !no?('Seed example content? [Yn]')
 
-        current_theme = ::Spina.themes.find { |theme| theme.name == theme_name }
+        current_theme = ::Spina::Theme.find_by_name(theme_name)
         if (page = Spina::Page.find_by(name: 'demo'))
           page.page_parts.clear
-          parts = current_theme.config.page_parts.map { |page_part| page.page_part(page_part) }
+          parts = current_theme.page_parts.map { |page_part| page.page_part(page_part) }
           parts.each do |part|
             case part.partable_type
             when 'Spina::Line' then part.partable.content = 'This is a single line'
@@ -70,9 +81,6 @@ module Spina
             when 'Spina::Photo' then part.partable.remote_file_url = 'https://unsplash.it/300/200?random'
             when 'Spina::PhotoCollection'
               5.times { part.partable.photos.build(remote_file_url: 'https://unsplash.it/300/200?random') }
-            # when 'Spina::Structure'
-            #   part.partable.structure_items.build({ name: 'title', title: 'Title', structure_partable_type: 'Spina::Line' })
-            #   part.partable.structure_items.build({ name: 'description', title: 'Description', structure_partable_type:  'Spina::Text' })
             when 'Spina::Color' then part.partable.content = '#6865b4'
             end
           end
@@ -81,5 +89,11 @@ module Spina
       end
     end
 
+    private
+
+      def themes
+        Rails.env.production? ? Spina::Theme.all.map(&:name) : ['default', 'demo']
+      end
+
   end
 end

data/lib/generators/spina/templates/app/assets/stylesheets/demo/application.css.sass

@@ -64,3 +64,6 @@ a
 
 .nav-item.active > a
   text-decoration: underline
+
+#languages
+  float: right

data/lib/generators/spina/templates/app/views/demo/shared/_languages.html.haml

@@ -0,0 +1,2 @@
+- if Spina.config.locales.size > 1
+  #languages= Spina.config.locales.map{|l| link_to_unless(l == I18n.locale, l.upcase, root_url(params: {locale: l}))}.join(' / ').html_safe

data/lib/generators/spina/templates/app/views/layouts/demo/application.html.haml

@@ -7,5 +7,6 @@
     = csrf_meta_tags
   %body
     .container
+      = render 'demo/shared/languages'
       = render 'demo/shared/navigation'
       = yield

data/lib/generators/spina/templates/config/initializers/carrierwave.rb

@@ -0,0 +1,17 @@
+CarrierWave.configure do |config|
+  config.storage = :file
+
+  # Use S3 if you want
+  # config.storage = :fog
+  # config.fog_credentials = {
+  #   provider:               'AWS',
+  #   region:                 '',
+  #   aws_access_key_id:      '',
+  #   aws_secret_access_key:  ''
+  # }
+  # config.fog_directory  = ''
+  # config.fog_public     = true
+  # config.fog_attributes = { 'Cache-Control' => 'max-age=315576000' }
+
+  config.enable_processing = !Rails.env.test?
+end

data/lib/generators/spina/templates/config/initializers/spina.rb

@@ -1,5 +1,6 @@
 Spina.configure do |config|
-  config.NEGATIVE_CAPTCHA_SECRET = '<%= Spina.config.try(:NEGATIVE_CAPTCHA_SECRET) || SecureRandom.hex(64) %>'
+  # Set locales
+  config.locales = [:en]
 
   # Important Note
   # ==============
@@ -15,25 +16,4 @@ Spina.configure do |config|
 
   # Note that you might need to remove cached asset after changing this value
   # config.max_page_depth = 5
-
-  # Storage Options
-  # ===============
-
-  # Please specify how you want to store photos, your logo, and
-  # other files. We use CarrierWave for storage. See
-  # https://github.com/denkGroot/Spina/tree/master/app/uploaders/spina
-
-  # config.storage = :file
-
-  # If you want to use s3 to store uploads (recommended)
-
-  # config.storage = :s3
-  # config.aws_region = "eu-west-1"
-  # config.aws_access_key_id = "abc123"
-  # config.aws_secret_key = "abc123"
-  # config.s3_bucket = "mybucket"
-  # If you want to store your files localy (not recommended for
-  # production, in large part because it's more difficult to ensure
-  # that files are backed up in sync with your database):
-
 end

data/lib/generators/spina/templates/config/initializers/themes/default.rb

@@ -1,47 +1,31 @@
-module Spina
-  module DefaultTheme
-    include ::ActiveSupport::Configurable
+::Spina::Theme.register do |theme|
+
+  theme.name = 'default'
+  theme.title = 'Default Theme'
+
+  theme.page_parts = [{
+    name:           'text',
+    title:          'Text',
+    partable_type:  'Spina::Text'
+  }]
+
+  theme.view_templates = [{
+    name:       'homepage',
+    title:      'Homepage',
+    page_parts: ['text']
+  }, {
+    name: 'show',
+    title:        'Default',
+    description:  'A simple page',
+    usage:        'Use for your content',
+    page_parts:   ['text']
+  }]
+
+  theme.custom_pages = [{
+    name:           'homepage',
+    title:          'Homepage',
+    deletable:      false,
+    view_template:  'homepage'
+  }]
 
-    config_accessor :title, :page_parts, :view_templates, :layout_parts, :custom_pages, :plugins, :structures
-
-    self.title = 'Default theme'
-
-    self.page_parts = [{
-      name:               'text',
-      title:              'Text',
-      page_partable_type: 'Spina::Text'
-    }]
-
-    self.structures = {}
-
-    self.layout_parts = []
-
-    self.view_templates = {
-      'homepage' => {
-        title:      'Homepage',
-        page_parts: ['text']
-      },
-      'show' => {
-        title:        'Default',
-        description:  'A simple page',
-        usage:        'Use for your content',
-        page_parts:   ['text']
-      }
-    }
-
-    self.custom_pages = [{
-      name:           'homepage',
-      title:          'Homepage',
-      deletable:      false,
-      view_template:  'homepage'
-    }]
-
-    self.plugins = []
-
-  end
 end
-
-theme = Spina::Theme.new
-theme.name = 'default'
-theme.config = Spina::DefaultTheme.config
-Spina.register_theme(theme)