spina 2.11.0 → 2.13.0

data/config/locales/de.yml

@@ -347,6 +347,7 @@ de:
     ui:
       cancel: Abbrechen
       delete: Löschen
+      delete_item: "%{item} löschen"
       load_more: Weitere laden
       move_to: Verschieben nach
       new_entry: Neuer Eintrag

data/config/locales/en.yml

@@ -131,6 +131,7 @@ en:
       insert: Insert document
       insert_multiple: Insert documents
       upload: Upload files
+      upload_one: Upload file
     cancel: Cancel
     choose_from_library: Choose from library
     close: Close
@@ -344,10 +345,12 @@ en:
     ui:
       cancel: Cancel
       delete: Delete
+      delete_item: "Delete %{item}"
       load_more: Load more
       move_to: Move to
       new_entry: New entry
       optional: Optional
+      or: or
       rename: Rename
       replace: Replace
       save_changes: Save changes

data/config/locales/nl.yml

@@ -108,7 +108,8 @@ nl:
       delete_confirmation_html: Weet je het zeker? Het kan zijn dat dit document in gebruik is op een pagina.
       insert: Document toevoegen
       insert_multiple: Documenten toevoegen
-      upload: 
+      upload: Upload documenten
+      upload_one: Upload document
     cancel: Annuleren
     choose_from_library: Kies uit bibliotheek
     close: Sluiten
@@ -315,10 +316,12 @@ nl:
     ui:
       cancel: Annuleer
       delete: Verwijder
+      delete_item: "Verwijder %{item}"
       load_more: Meer laden
       move_to: Verplaats naar
       new_entry: Nieuw item
       optional: Optioneel
+      or: of
       rename: Hernoemen
       replace: Vervangen
       save_changes: Wijzigingen opslaan

data/config/routes.rb

@@ -11,7 +11,6 @@ Rails.application.routes.draw do
 end
 
 Spina::Engine.routes.draw do
-  
   # API
   namespace :api, path: Spina.config.api_path do
     resources :pages, only: [:index, :show]
@@ -33,7 +32,7 @@ Spina::Engine.routes.draw do
     patch "/settings/:plugin", to: "settings#update", as: :settings
 
     resources :users
-    
+
     # Sessions
     resources :sessions
     get "login" => "sessions#new"
@@ -48,10 +47,11 @@ Spina::Engine.routes.draw do
         get :edit_template
         get :children
       end
-      
+
       resource :move, controller: "move_pages"
 
       post :sort, on: :collection
+      post :sort_one, on: :member
     end
     resources :page_translations, only: [:destroy]
     resources :parent_pages
@@ -59,18 +59,13 @@ Spina::Engine.routes.draw do
 
     resources :resources, only: [:show, :edit, :update]
 
-    resources :navigations do
+    resources :navigations, only: [:index, :edit, :update] do
       post :sort, on: :member
       resources :navigation_items
     end
 
     resources :attachments do
-      collection do
-        get 'select/:page_part_id' => 'attachments#select', as: :select
-        post 'insert/:page_part_id' => 'attachments#insert', as: :insert
-        get 'select_collection/:page_part_id' => 'attachments#select_collection', as: :select_collection
-        post 'insert_collection/:page_part_id' => 'attachments#insert_collection', as: :insert_collection
-      end
+      post :inline_upload, on: :collection
     end
     resources :rename_files
 
@@ -79,9 +74,9 @@ Spina::Engine.routes.draw do
     end
 
     resources :images
-    
+
     resource :media_picker, controller: "media_picker", only: [:show]
-    
+
     resources :embeds, only: [:new, :create]
   end
 
@@ -93,12 +88,11 @@ Spina::Engine.routes.draw do
     root to: "pages#homepage"
 
     # Pages
-    get '/:locale/*id' => 'pages#show', constraints: {locale: /#{Spina.locales.join('|')}/ }
-    get '/:locale/' => 'pages#homepage', constraints: {locale: /#{Spina.locales.join('|')}/ }
-    get '/*id' => 'pages#show', as: "page", controller: 'pages', constraints: -> (request) {
+    get "/:locale/*id" => "pages#show", :constraints => {locale: /#{Spina.locales.join('|')}/}
+    get "/:locale/" => "pages#homepage", :constraints => {locale: /#{Spina.locales.join('|')}/}
+    get "/*id" => "pages#show", :as => "page", :controller => "pages", :constraints => ->(request) {
       request.path.exclude?(ActiveStorage.routes_prefix) &&
-      !(Rails.env.development? && request.path.starts_with?('/rails/'))
+        !(Rails.env.development? && request.path.starts_with?("/rails/"))
     }
   end
-
 end

data/db/migrate/1_create_spina_tables.rb

@@ -1,16 +1,16 @@
 class CreateSpinaTables < ActiveRecord::Migration[4.2]
   def change
     create_table "spina_accounts", force: :cascade do |t|
-      t.string   "name"
-      t.string   "address"
-      t.string   "postal_code"
-      t.string   "city"
-      t.string   "phone"
-      t.string   "email"
-      t.text     "preferences"
-      t.datetime "created_at",                     null: false
-      t.datetime "updated_at",                     null: false
-      t.boolean  "robots_allowed", default: false
+      t.string "name"
+      t.string "address"
+      t.string "postal_code"
+      t.string "city"
+      t.string "phone"
+      t.string "email"
+      t.text "preferences"
+      t.datetime "created_at", null: false
+      t.datetime "updated_at", null: false
+      t.boolean "robots_allowed", default: false
     end
 
     create_table "spina_attachment_collections", force: :cascade do |t|
@@ -24,62 +24,62 @@ class CreateSpinaTables < ActiveRecord::Migration[4.2]
     end
 
     create_table "spina_attachments", force: :cascade do |t|
-      t.string   "file"
+      t.string "file"
       t.datetime "created_at", null: false
       t.datetime "updated_at", null: false
     end
 
     create_table "spina_layout_parts", force: :cascade do |t|
-      t.string   "title"
-      t.string   "name"
-      t.integer  "layout_partable_id"
-      t.string   "layout_partable_type"
+      t.string "title"
+      t.string "name"
+      t.integer "layout_partable_id"
+      t.string "layout_partable_type"
       t.datetime "created_at"
       t.datetime "updated_at"
-      t.integer  "account_id"
+      t.integer "account_id"
     end
 
     create_table "spina_lines", force: :cascade do |t|
-      t.string   "content"
+      t.string "content"
       t.datetime "created_at"
       t.datetime "updated_at"
     end
 
     create_table "spina_page_parts", force: :cascade do |t|
-      t.string   "title"
-      t.string   "name"
-      t.datetime "created_at",         null: false
-      t.datetime "updated_at",         null: false
-      t.integer  "page_id"
-      t.integer  "page_partable_id"
-      t.string   "page_partable_type"
+      t.string "title"
+      t.string "name"
+      t.datetime "created_at", null: false
+      t.datetime "updated_at", null: false
+      t.integer "page_id"
+      t.integer "page_partable_id"
+      t.string "page_partable_type"
     end
 
     create_table "spina_pages", force: :cascade do |t|
-      t.string   "title"
-      t.string   "menu_title"
-      t.string   "description"
-      t.boolean  "show_in_menu",        default: true
-      t.string   "slug"
-      t.boolean  "deletable",           default: true
-      t.datetime "created_at",                          null: false
-      t.datetime "updated_at",                          null: false
-      t.string   "name"
-      t.string   "seo_title"
-      t.boolean  "skip_to_first_child", default: false
-      t.string   "view_template"
-      t.string   "layout_template"
-      t.boolean  "draft",               default: false
-      t.string   "link_url"
-      t.string   "ancestry"
-      t.integer  "position"
-      t.string   "materialized_path"
-      t.boolean  "active",              default: true
+      t.string "title"
+      t.string "menu_title"
+      t.string "description"
+      t.boolean "show_in_menu", default: true
+      t.string "slug"
+      t.boolean "deletable", default: true
+      t.datetime "created_at", null: false
+      t.datetime "updated_at", null: false
+      t.string "name"
+      t.string "seo_title"
+      t.boolean "skip_to_first_child", default: false
+      t.string "view_template"
+      t.string "layout_template"
+      t.boolean "draft", default: false
+      t.string "link_url"
+      t.string "ancestry"
+      t.integer "position"
+      t.string "materialized_path"
+      t.boolean "active", default: true
     end
 
     create_table "spina_structure_items", force: :cascade do |t|
-      t.integer  "structure_id"
-      t.integer  "position"
+      t.integer "structure_id"
+      t.integer "position"
       t.datetime "created_at"
       t.datetime "updated_at"
     end
@@ -87,11 +87,11 @@ class CreateSpinaTables < ActiveRecord::Migration[4.2]
     add_index "spina_structure_items", ["structure_id"], name: "index_spina_structure_items_on_structure_id", using: :btree
 
     create_table "spina_structure_parts", force: :cascade do |t|
-      t.integer  "structure_item_id"
-      t.integer  "structure_partable_id"
-      t.string   "structure_partable_type"
-      t.string   "name"
-      t.string   "title"
+      t.integer "structure_item_id"
+      t.integer "structure_partable_id"
+      t.string "structure_partable_type"
+      t.string "name"
+      t.string "title"
       t.datetime "created_at"
       t.datetime "updated_at"
     end
@@ -105,18 +105,18 @@ class CreateSpinaTables < ActiveRecord::Migration[4.2]
     end
 
     create_table "spina_texts", force: :cascade do |t|
-      t.text     "content"
+      t.text "content"
       t.datetime "created_at"
       t.datetime "updated_at"
     end
 
     create_table "spina_users", force: :cascade do |t|
-      t.string   "name"
-      t.string   "email"
-      t.string   "password_digest"
-      t.boolean  "admin",           default: false
-      t.datetime "created_at",                      null: false
-      t.datetime "updated_at",                      null: false
+      t.string "name"
+      t.string "email"
+      t.string "password_digest"
+      t.boolean "admin", default: false
+      t.datetime "created_at", null: false
+      t.datetime "updated_at", null: false
       t.datetime "last_logged_in"
     end
 

data/db/migrate/3_create_spina_navigations.rb

@@ -18,4 +18,4 @@ class CreateSpinaNavigations < ActiveRecord::Migration[4.2]
       t.index ["page_id", "navigation_id"], name: "index_spina_navigation_items_on_page_id_and_navigation_id", unique: true, using: :btree
     end
   end
-end
+end

data/db/seeds.rb

@@ -1,2 +1 @@
 puts "Seeding #{__FILE__} from Spina::Engine"
-

data/lib/generators/spina/embed_generator.rb

@@ -1,18 +1,17 @@
 module Spina
   class EmbedGenerator < Rails::Generators::NamedBase
     source_root File.expand_path("../templates", __FILE__)
-    
+
     argument :attributes, type: :array, default: [], banner: "field field"
-    
+
     def create_embed_object
       template "app/models/spina/embeds/embed.rb.tt", "app/models/spina/embeds/#{file_name}.rb"
     end
-    
+
     def create_views
       template "app/views/spina/embeds/_fields.html.erb", "app/views/spina/embeds/#{plural_file_name}/_#{file_name}_fields.html.erb"
-      
+
       template "app/views/spina/embeds/_partial.html.erb", "app/views/spina/embeds/#{plural_file_name}/_#{file_name}.html.erb"
     end
-    
   end
-end
+end

data/lib/generators/spina/install_generator.rb

@@ -1,18 +1,18 @@
 module Spina
   class InstallGenerator < Rails::Generators::Base
     source_root File.expand_path("../templates", __FILE__)
-    
+
     class_option :first_deploy, type: :boolean, default: false
     class_option :silent, type: :boolean, default: false
 
     def create_initializer_file
       return if first_deploy?
-      template 'config/initializers/spina.rb'
+      template "config/initializers/spina.rb"
     end
 
     def create_mobility_initializer_file
       return if first_deploy?
-      template 'config/initializers/mobility.rb'
+      template "config/initializers/mobility.rb"
     end
 
     def add_route
@@ -23,78 +23,82 @@ module Spina
 
     def copy_migrations
       return if first_deploy?
-      rake 'spina:install:migrations'
+      rake "spina:install:migrations"
     end
 
     def run_migrations
       return if first_deploy?
-      rake 'db:migrate'
+      rake "db:migrate"
     end
 
     def create_account
-      return if ::Spina::Account.exists? && ( !talkative_install? || !no?('An account already exists. Skip? [Yn]') )
-      name = ::Spina::Account.first.try(:name) || 'MySite'
+      return if ::Spina::Account.exists? && (silent_install? || !no?("An account already exists. Skip? [Yn]"))
+
+      name = ::Spina::Account.first&.name || "MySite"
       if talkative_install?
-        name = ask("What would you like to name your website? [#{name}]").presence || name
+        name = ask("What would you like to name your website?", default: name)
       end
-      account = ::Spina::Account.first_or_create.update(name: name)
+
+      ::Spina::Account.first_or_create.update(name: name)
     end
 
     def set_theme
       account = ::Spina::Account.first
-      return if account.theme.present? && ( !talkative_install? || !no?("Theme '#{account.theme}' is set. Skip? [Yn]") )
+      return if account.theme.present? && (silent_install? || !no?("Theme '#{account.theme}' is set. Skip? [Yn]"))
 
-      theme = account.theme || themes.first
-      if talkative_install?
-        theme = begin
-                  theme = ask("What theme do you want to use? (#{themes.join('/')}) [#{theme}]").presence || theme
-                end until theme.in? themes
+      theme = if talkative_install?
+        ask("What theme do you want to use?", limited_to: themes)
+      else
+        account.theme || themes.first
       end
 
       account.update(theme: theme)
     end
 
     def copy_template_files
-      return if options['first_deploy']
+      return if options["first_deploy"]
+
       theme = ::Spina::Account.first.theme
-      if theme.in? ['default', 'demo']
+      if theme.in?(["default", "demo"])
         template "config/initializers/themes/#{theme}.rb"
         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 }
+      Dir[Rails.root.join("config", "initializers", "themes", "*.rb")].each { |file| load file }
     end
 
     def create_user
-      return if ::Spina::User.exists? && ( !talkative_install? || !no?('A user already exists. Skip? [Yn]') )
+      return if ::Spina::User.exists? && (silent_install? || !no?("A user already exists. Skip? [Yn]"))
 
-      email = 'admin@domain.com'
+      email = "admin@domain.com"
       if talkative_install?
-        email = ask("Please enter an email address for your first user: [#{email}]").presence || email
+        email = ask("Please enter an email address for your first user:", default: email)
       end
-      password = 'password'
+
+      password = "password"
       if talkative_install?
-        password = ask("Create a temporary password: [#{password}]").presence || password
+        password = ask("Create a temporary password:", default: password)
       end
+
       @temporary_password = password
-      ::Spina::User.create name: 'admin', email: email, password: password, admin: true
+      ::Spina::User.create name: "admin", email: email, password: password, admin: true
     end
 
     def bootstrap_spina
-      rake 'spina:bootstrap'
+      rake "spina:bootstrap"
     end
-    
+
     def build_tailwind
-      rake 'spina:tailwind:build'
+      rake "spina:tailwind:build"
     end
 
     def feedback
-      return if !talkative_install?
+      return if silent_install?
       puts
-      puts '    Your Spina site has been succesfully installed! '
+      puts "    Your Spina site has been succesfully installed! "
       puts
-      puts '    Restart your server and visit http://localhost:3000 in your browser!'
+      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      :  #{::Spina::Account.first.name}"
@@ -106,18 +110,21 @@ module Spina
 
     private
 
-      def themes
-        themes = Spina::Theme.all.map(&:name)
-        themes | ['default', 'demo']
-      end
-      
-      def first_deploy?
-        options['first_deploy']
-      end
+    def themes
+      themes = Spina::Theme.all.map(&:name)
+      themes | ["default", "demo"]
+    end
 
-      def talkative_install?
-        !options['silent']
-      end
+    def first_deploy?
+      options["first_deploy"]
+    end
+
+    def talkative_install?
+      !silent_install?
+    end
 
+    def silent_install?
+      options["silent"]
+    end
   end
 end

data/lib/generators/spina/tailwind_config_generator.rb

@@ -1,10 +1,9 @@
 module Spina
   class TailwindConfigGenerator < Rails::Generators::Base
     source_root File.expand_path("../templates", __FILE__)
-    
+
     def create_tailwind_config_file
-      template 'app/assets/config/spina/tailwind.config.js'
+      template "app/assets/config/spina/tailwind.config.js"
     end
-    
   end
-end
+end

data/lib/generators/spina/templates/app/models/spina/embeds/embed.rb.tt

@@ -1,18 +1,20 @@
-class <%= class_name %> < Spina::Embeds::Base
-  attributes <%= attributes.map{|attr| ":#{attr.name}"}.join(", ") %>
-  
-  # You can use Rails validations on your attributes
-  validates <%= attributes.map{|attr| ":#{attr.name}"}.join(", ") %>, presence: true
-  
-  # Pick an icon at https://heroicons.com
-  # and it'll show up in the list of embeddable components
-  heroicon "chip"
-  
-  # If you want to render your embeddable component differently in Trix,
-  # you can choose to render a different partial
-  # Default: _<%= file_name %>.html.erb
-  # 
-  # def to_trix_partial_path
-  #  "spina/embeds/<%= plural_file_name %>/trix_<%= file_name %>"
-  # end
-end
+module Spina::Embeds
+  class <%= class_name %> < Spina::Embeds::Base
+    attributes <%= attributes.map{|attr| ":#{attr.name}"}.join(", ") %>
+
+    # You can use Rails validations on your attributes
+    validates <%= attributes.map{|attr| ":#{attr.name}"}.join(", ") %>, presence: true
+
+    # Pick an icon at https://heroicons.com
+    # and it'll show up in the list of embeddable components
+    heroicon "chip"
+
+    # If you want to render your embeddable component differently in Trix,
+    # you can choose to render a different partial
+    # Default: _<%= file_name %>.html.erb
+    #
+    # def to_trix_partial_path
+    #  "spina/embeds/<%= plural_file_name %>/trix_<%= file_name %>"
+    # end
+  end
+end

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

@@ -9,9 +9,9 @@
   <%= content.image_tag :image, resize_to_fill: [100, 100] %>
 <% end %>
 
-<%= current_account.content :line %>
+<%= current_spina_account.content :line %>
 
-<% repeater current_account.content(:repeater) do |repeater_content| %>
+<% repeater current_spina_account.content(:repeater) do |repeater_content| %>
   <%= repeater_content.content :line %>
 <% end %>
 

data/lib/generators/spina/templates/app/views/layouts/default/application.html.erb

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <title><%= current_account.name %></title>
+    <title><%= current_spina_account.name %></title>
     <%= csrf_meta_tags %>
   </head>
   <body>

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

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <title><%= current_account.name %></title>
+    <title><%= current_spina_account.name %></title>
     <%= csrf_meta_tags %>
   </head>
   <body>