spina 0.9.0 → 0.10.0

data/config/locales/pt-BR.yml

@@ -96,6 +96,10 @@ pt-BR:
       insert: 'Inserir documento'
       insert_multiple: 'Inserir documentos'
 
+    media_library:
+      photos: Imagens
+      attachments: Documentos
+
   activerecord:
     models:
       spina/page:

data/config/locales/ru.yml

@@ -96,20 +96,32 @@ ru:
       insert: 'Вставить документ'
       insert_multiple: 'Вставить документы'
 
+    media_library:
+      photos: Изображения
+      attachments: Документы
+
   activerecord:
     models:
       spina/page:
         one: Страница
-        other: Страницы
+        few: Страницы
+        many: Страниц
+        other: Страниц
       spina/user:
         one: Пользователь
-        other: Пользователи
+        few: Пользователея
+        many: Пользователей
+        other: Пользователей
       spina/photo:
         one: Изображение
-        other: Изображения
+        few: Изображения
+        many: Изображений
+        other: Изображений
       spina/attachment:
         one: Документ
-        other: Документы
+        few: Документа
+        many: Документов
+        other: Документов
 
     attributes:
       spina/account:

data/config/locales/tr.yml

@@ -96,6 +96,10 @@ tr:
       insert: 'Belge ekle'
       insert_multiple: 'Çoklu belge ekle'
 
+    media_library:
+      photos: Resimler
+      attachments: Belgeler
+
   activerecord:
     models:
       spina/page:

data/config/locales/zh-CN.yml

@@ -110,6 +110,10 @@ zh-CN:
       insert: '插入文档'
       insert_multiple: '插入多个文档'
 
+    media_library:
+      photos: 所有图片
+      attachments: 所有文档
+
   activerecord:
     models:
       spina/page:

data/config/routes.rb

@@ -20,7 +20,7 @@ Spina::Engine.routes.draw do
     get "logout" => "sessions#destroy"
 
     # Media library
-    get 'media_library' => 'photos#index', as: "media_library"
+    get 'media_library' => 'photos#media_library', as: "media_library"
 
     resources :pages do
       post :sort, on: :collection
@@ -62,7 +62,7 @@ Spina::Engine.routes.draw do
   resource :sitemap
 
   # Robots.txt
-  get '/robots', to: 'pages#robots', format: :txt
+  get '/robots', to: 'pages#robots', constraints: { format: 'txt' }
 
   # Frontend
   root to: "pages#homepage"
@@ -71,7 +71,7 @@ Spina::Engine.routes.draw do
   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/'))
+    !(Rails.env.development? && request.env['PATH_INFO'].starts_with?('/rails/') || request.env['PATH_INFO'].starts_with?('/attachments/'))
   }
 
 end

data/lib/generators/spina/install_generator.rb

@@ -1,6 +1,5 @@
 module Spina
   class InstallGenerator < Rails::Generators::Base
-
     source_root File.expand_path("../templates", __FILE__)
 
     def create_initializer_file
@@ -30,7 +29,8 @@ module Spina
 
     def create_account
       return if Account.exists? && !no?('An account already exists. Skip? [Yn]')
-      name = ask('What would you like to name your website?')
+      name = Account.first.try(:name) || 'MySite'
+      name = ask("What would you like to name your website? [#{name}]").presence || name
       account = Account.first_or_create.update_attribute(:name, name)
     end
 
@@ -47,18 +47,24 @@ module Spina
     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}"
+      if theme.in? ['default', 'demo']
+        template "config/initializers/themes/#{theme}.rb"
+        directory "app/assets/stylesheets/#{theme}"
+        directory "app/views/#{theme}"
+        directory "app/views/layouts/#{theme}"
+      end
+      Spina::THEMES.clear
+      Dir[Rails.root.join('config', 'initializers', 'themes', '*.rb')].each { |file| load file }
     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:')
-      password = ask('Create a temporary password:', echo: false)
+      email = 'admin@domain.com'
+      email = ask("Please enter an email address for your first user: [#{email}]").presence || email
+      password = 'password'
+      password = ask("Create a temporary password: [#{password}]").presence || password
+      @temporary_password = password
       User.create name: 'admin', email: email, password: password, admin: true
     end
 
@@ -69,7 +75,6 @@ module Spina
     def seed_demo_content
       theme_name = Account.first.theme
       if theme_name == 'demo' && !no?('Seed example content? [Yn]')
-
         current_theme = ::Spina::Theme.find_by_name(theme_name)
         if (page = Spina::Page.find_by(name: 'demo'))
           page.page_parts.clear
@@ -89,10 +94,25 @@ module Spina
       end
     end
 
+    def feedback
+      puts
+      puts '    Your Spina site has been succesfully installed! '
+      puts
+      puts '    Restart your server and visit http://localhost:3000 in your browser!'
+      puts "    The admin backend is located at http://localhost:3000/#{Spina.config.backend_path}."
+      puts
+      puts "    Site name      :  #{Account.first.name}"
+      puts "    Active theme   :  #{Account.first.theme}"
+      puts "    User email     :  #{User.first.email}"
+      puts "    User password  :  #{@temporary_password}"
+      puts
+    end
+
     private
 
       def themes
-        Rails.env.production? ? Spina::Theme.all.map(&:name) : ['default', 'demo']
+        themes = Spina::Theme.all.map(&:name)
+        themes | ['default', 'demo']
       end
 
   end

data/lib/generators/spina/templates/app/views/default/pages/homepage.html.haml

@@ -1,2 +1,2 @@
 %h1= @page.title
-= @page.content(:content).try(:html_safe)
+= @page.content(:text).try(:html_safe)

data/lib/generators/spina/templates/app/views/default/pages/show.html.haml

@@ -1,3 +1,3 @@
 %h1= @page.title
-= @page.content(:content).try(:html_safe)
+= @page.content(:text).try(:html_safe)
 

data/lib/generators/spina/templates/app/views/demo/pages/homepage.html.haml

@@ -1,2 +1,2 @@
 %h1= @page.title
-= @page.content(:content).try(:html_safe)
+= @page.content(:text).try(:html_safe)

data/lib/generators/spina/templates/app/views/demo/pages/show.html.haml

@@ -1,3 +1,3 @@
 %h1= @page.title
-= @page.content(:content).try(:html_safe)
+= @page.content(:text).try(:html_safe)
 

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

@@ -1,6 +1,7 @@
 Spina.configure do |config|
   # Set locales
   config.locales = [:en]
+  # Run `rake spina:update_translations` after you add any new locale.
 
   # Important Note
   # ==============

data/lib/spina.rb

@@ -1,6 +1,7 @@
 require 'spina/engine'
+require 'spina/plugin'
 require 'spina/railtie'
-require 'spina/template'
+require 'spina/theme'
 
 module Spina
 

data/lib/spina/version.rb

@@ -1,3 +1,3 @@
 module Spina
-  VERSION = "0.9.0"
+  VERSION = "0.10.0"
 end

data/lib/tasks/spina_tasks.rake

@@ -5,4 +5,12 @@ namespace :spina do
     Spina::Account.first.save
   end
 
-end
+  desc "Update translations after adding locales"
+  task update_translations: :environment do
+    Spina.locales.each do |locale|
+      I18n.locale = locale
+      Spina::Page.find_each(&:save!)
+    end
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spina
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Bram Jetten
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-18 00:00:00.000000000 Z
+date: 2016-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: bcrypt
   requirement: !ruby/object:Gem::Requirement
@@ -138,7 +138,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: cancan
+  name: cancancan
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -209,6 +209,20 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: turbolinks
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5'
+- !ruby/object:Gem::Dependency
+  name: kaminari
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -222,7 +236,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: kaminari
+  name: globalize
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -236,19 +250,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: globalize
+  name: activemodel-serializers-xml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rack-rewrite
   requirement: !ruby/object:Gem::Requirement
@@ -281,7 +295,7 @@ files:
 - app/assets/javascripts/spina/admin/pages.js.coffee.erb
 - app/assets/javascripts/spina/admin/spina.infinite_scroll.coffee
 - app/assets/javascripts/spina/admin/spina.scaffold.coffee
-- app/assets/javascripts/spina/admin/spina.trix.js.coffee
+- app/assets/javascripts/spina/admin/spina.trix.js.coffee.erb
 - app/assets/javascripts/spina/application.js
 - app/assets/stylesheets/spina/_mixins.scss
 - app/assets/stylesheets/spina/_normalize.scss
@@ -305,6 +319,7 @@ files:
 - app/models/concerns/spina/partable.rb
 - app/models/spina/ability.rb
 - app/models/spina/account.rb
+- app/models/spina/application_record.rb
 - app/models/spina/attachment.rb
 - app/models/spina/attachment_collection.rb
 - app/models/spina/color.rb
@@ -321,15 +336,14 @@ files:
 - app/models/spina/structure_part.rb
 - app/models/spina/text.rb
 - app/models/spina/user.rb
+- app/presenters/spina/pages/breadcrumb.rb
 - app/presenters/spina/pages/menu_presenter.rb
 - app/uploaders/spina/default_store_uploader.rb
 - app/uploaders/spina/file_uploader.rb
 - app/uploaders/spina/logo_uploader.rb
 - app/uploaders/spina/photo_uploader.rb
-- app/views/layouts/spina/admin/application.html.haml
+- app/views/layouts/spina/admin/admin.html.haml
 - app/views/layouts/spina/admin/media_library.html.haml
-- app/views/layouts/spina/admin/settings.html.haml
-- app/views/layouts/spina/admin/website.html.haml
 - app/views/layouts/spina/email.html.erb
 - app/views/layouts/spina/login.html.haml
 - app/views/spina/admin/accounts/_form.html.haml
@@ -344,8 +358,8 @@ files:
 - app/views/spina/admin/attachments/_select_collection.html.haml
 - app/views/spina/admin/attachments/create.js.erb
 - app/views/spina/admin/attachments/index.html.haml
-- app/views/spina/admin/attachments/insert.js.erb
-- app/views/spina/admin/attachments/insert_collection.js.erb
+- app/views/spina/admin/attachments/insert.js.coffee
+- app/views/spina/admin/attachments/insert_collection.js.coffee
 - app/views/spina/admin/attachments/select.js.erb
 - app/views/spina/admin/attachments/select_collection.js.erb
 - app/views/spina/admin/layout_partables/colors/_form.html.haml
@@ -394,6 +408,7 @@ files:
 - app/views/spina/admin/photos/wysihtml5_insert.js.coffee
 - app/views/spina/admin/photos/wysihtml5_select.js.erb
 - app/views/spina/admin/sessions/new.html.haml
+- app/views/spina/admin/shared/_breadcrumbs.html.haml
 - app/views/spina/admin/shared/_notifications.html.haml
 - app/views/spina/admin/shared/_primary_navigation.html.haml
 - app/views/spina/admin/shared/_rich_text_field.html.haml
@@ -472,7 +487,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Spina

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

@@ -1,40 +0,0 @@
-%html{lang: I18n.locale}
-  %head
-    %meta{charset: 'utf-8'}
-    %meta{name: 'viewport', content: 'initial-scale=1.0, user-scalable=no'}
-    = csrf_meta_tags
-
-    %title Spina
-
-    / Stylesheet
-    = stylesheet_link_tag 'spina/admin/application'
-
-    /[if lt IE 9]
-      = javascript_include_tag '//html5shiv.googlecode.com/svn/trunk/html5.js'
-
-    / JavaScript
-    = 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)
-        .pull-right
-          = 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)
-
-        = render 'spina/admin/shared/notifications'
-
-      = content_for?(:application) ? yield(:application) : yield
-
-      = link_to 'http://www.spinacms.com', class: 'spina-logo', target: :blank do
-        = image_tag('spina/spina.png')

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

@@ -1,45 +0,0 @@
-- content_for :secondary_navigation do
-  %nav#secondary
-    %h1= t('spina.preferences.title')
-
-    %ul
-      %li{class: ('active' if params[:action] == 'edit' && params[:controller] == 'spina/admin/accounts')}
-        = link_to spina.edit_admin_account_path do
-          = icon('cog-outline')
-          = t('spina.preferences.account')
-          %small= t('spina.preferences.account_description')
-
-      %li{class: ('active' if params[:action] == 'style')}
-        = link_to spina.style_admin_account_path do
-          = icon('brush')
-          = t('spina.preferences.style')
-          %small= t('spina.preferences.style_description')
-
-      - if can? :manage, Spina::User
-        %li{class: ('active' if %w[users].include? controller_name)}
-          = link_to spina.admin_users_path do
-            = icon('users-outline')
-            = t('spina.preferences.users')
-            %small= t('spina.preferences.users_description')
-
-      %li{class: ('active' if params[:action] == 'social')}
-        = link_to spina.social_admin_account_path do
-          = icon('social-outline')
-          = t('spina.preferences.social_media')
-          %small= t('spina.preferences.social_media_description')
-
-      %li{class: ('active' if params[:action] == 'analytics')}
-        = link_to spina.analytics_admin_account_path do
-          = icon('chart-outline')
-          = t('spina.preferences.analytics')
-          %small= t('spina.preferences.analytics_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(:application) do
-  = content_for?(:settings) ? yield(:settings) : yield
-
-= render template: 'layouts/spina/admin/application'