spina 2.5.0 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6eddb2bbef87fd0d66a6ca49f2234bf75a659a67ddf1ccbf95b5ccb0fc385332
-  data.tar.gz: 283ae2a27280cd16c66927ce8aa82210112372a8bc873d25519ee7cf3e3b8b1b
+  metadata.gz: f8e6360561b1bb460394fb3d5032f1927d97a50b8de91742da13cb17d1b8e4b0
+  data.tar.gz: d10a26f6215d2b2f4788cc5a97851d802f84b701376a5f7ab4a7dd37f0939453
 SHA512:
-  metadata.gz: 41ba06425dd468e816f32031eef4eaa6bafef3defb437274c980d96d9e9dcc130dcb975942dfc0171bcd0883b07efb3a4037610c9c843f9b7ad936c3afb88e57
-  data.tar.gz: b973bea94d9d22268c076b7023de7dc617876a0064ac6cb47c2513499b5e082c0556a7f991573088c3a228d53c4ee4453f0f1c44756dbe4580c0d48c3be37617
+  metadata.gz: 3adb1591ca4cef306680e456e00081042662d8d9b224c5a88aa0cc2845c0ace2d08db511474e7f1981581e967947143b225895d4360303ddbb8aafcd9f477eda
+  data.tar.gz: 863d27360647fd54c8ac5475da675cae966873e12c8d63264e3c370980333fbea0c92eea252499125bd685a4421c81f2698e94bb41f4962494080f5302842dfe

data/README.md

@@ -18,9 +18,9 @@ gem 'spina'
 
 Run the installer to start the setup process:
 
-    rails g spina:install
+    rails g spina:install [--silent] [--first-deploy]
 
-The installer will help you create your first user.
+The installer will help you create your first user interactively, unless you choose the optional `--silent` flag : in this case, defaults will apply.
 
 Then start `rails s` and access Spina at `/admin`.
 

data/app/controllers/concerns/spina/frontend.rb

@@ -53,7 +53,7 @@ module Spina
       end
 
       def spina_request_path
-        segments = ['/', params[:locale], params[:id]].compact
+        segments = [Spina.mounted_at, params[:locale], params[:id]].compact
         File.join(*segments)
       end
 

data/app/models/spina/page.rb

@@ -122,11 +122,12 @@ module Spina
       end
 
       def localized_materialized_path
-        if Mobility.locale == I18n.default_locale
-          generate_materialized_path.prepend('/')
+        segments = if Mobility.locale == I18n.default_locale
+          [Spina.mounted_at, generate_materialized_path]
         else
-          generate_materialized_path.prepend("/#{Mobility.locale}/").gsub(/\/\z/, "")
+          [Spina.mounted_at, Mobility.locale, generate_materialized_path]
         end
+        File.join(*segments.map(&:to_s).compact)
       end
 
       def generate_materialized_path

data/config/routes.rb

@@ -94,8 +94,9 @@ Spina::Engine.routes.draw do
     # 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/') || request.env['PATH_INFO'].starts_with?("/#{Spina.config.backend_path}") || request.env['PATH_INFO'].starts_with?('/attachments/'))) && request.path.exclude?("rails/active_storage")
+    get '/*id' => 'pages#show', as: "page", controller: 'pages', constraints: -> (request) {
+      request.path.exclude?(ActiveStorage.routes_prefix) &&
+      !(Rails.env.development? && request.path.starts_with?('/rails/'))
     }
   end
 

data/lib/generators/spina/embed_generator.rb

@@ -0,0 +1,18 @@
+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

data/lib/generators/spina/install_generator.rb

@@ -1,52 +1,61 @@
 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 Rails.env.production?
+      return if first_deploy?
       template 'config/initializers/spina.rb'
     end
 
     def create_mobility_initializer_file
-      return if Rails.env.production?
+      return if first_deploy?
       template 'config/initializers/mobility.rb'
     end
 
     def add_route
-      return if Rails.env.production?
+      return if first_deploy?
       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?
+      return if first_deploy?
       rake 'spina:install:migrations'
     end
 
     def run_migrations
+      return if first_deploy?
       rake 'db:migrate'
     end
 
     def create_account
       return if ::Spina::Account.exists? && !no?('An account already exists. Skip? [Yn]')
       name = ::Spina::Account.first.try(:name) || 'MySite'
-      name = ask("What would you like to name your website? [#{name}]").presence || name
-      account = ::Spina::Account.first_or_create.update_attribute(:name, name)
+      if talkative_install?
+        name = ask("What would you like to name your website? [#{name}]").presence || name
+      end
+      account = ::Spina::Account.first_or_create.update(name: name)
     end
 
     def set_theme
       account = ::Spina::Account.first
-      return if account.theme.present? && !no?("Theme '#{account.theme} is set. Skip? [Yn]")
+      return if account.theme.present? && !no?("Theme '#{account.theme}' is set. Skip? [Yn]")
 
-      theme = begin
-                theme = account.theme || themes.first
-                theme = ask("What theme do you want to use? (#{themes.join('/')}) [#{theme}]").presence || theme
-              end until theme.in? themes
+      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
+      end
 
-      account.update_attribute(:theme, theme)
+      account.update(theme: theme)
     end
 
     def copy_template_files
+      return if options['first_deploy']
       theme = ::Spina::Account.first.theme
       if theme.in? ['default', 'demo']
         template "config/initializers/themes/#{theme}.rb"
@@ -59,10 +68,15 @@ module Spina
 
     def create_user
       return if ::Spina::User.exists? && !no?('A user already exists. Skip? [Yn]')
+
       email = 'admin@domain.com'
-      email = ask("Please enter an email address for your first user: [#{email}]").presence || email
+      if talkative_install?
+        email = ask("Please enter an email address for your first user: [#{email}]").presence || email
+      end
       password = 'password'
-      password = ask("Create a temporary password: [#{password}]").presence || password
+      if talkative_install?
+        password = ask("Create a temporary password: [#{password}]").presence || password
+      end
       @temporary_password = password
       ::Spina::User.create name: 'admin', email: email, password: password, admin: true
     end
@@ -91,6 +105,14 @@ module Spina
         themes = Spina::Theme.all.map(&:name)
         themes | ['default', 'demo']
       end
+      
+      def first_deploy?
+        options['first_deploy']
+      end
+
+      def talkative_install?
+        !options['silent']
+      end
 
   end
 end

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

@@ -0,0 +1,18 @@
+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

data/lib/generators/spina/templates/app/views/spina/embeds/_fields.html.erb

@@ -0,0 +1,13 @@
+<div class="text-xl font-bold mb-3 text-gray-800">
+  Your embed
+  <div class="text-sm text-gray-500 font-normal">
+    Descriptive text
+  </div>
+</div>
+
+<!-- 
+  Put your fields here using Spina's built-in ViewComponents:
+  
+  render Spina::Forms::LabelComponent.new(f, :url)
+  render Spina::Forms::TextFieldComponent.new(f, :url, autofocus: true)
+-->

data/lib/generators/spina/templates/app/views/spina/embeds/_partial.html.erb

@@ -0,0 +1,2 @@
+<!-- This is what visitors will see -->
+Your embed

data/lib/spina/engine.rb

@@ -9,7 +9,7 @@ require 'mobility'
 require 'rack-rewrite'
 require 'babosa'
 require 'attr_json'
-require 'view_component/engine'
+require 'view_component'
 require 'jsonapi/serializer'
 require 'browser'
 

data/lib/spina/version.rb

@@ -1,3 +1,3 @@
 module Spina
-  VERSION = "2.5.0"
+  VERSION = "2.6.0"
 end

data/lib/spina.rb

@@ -88,5 +88,10 @@ module Spina
       
       config_obj
     end
+    
+    def mounted_at
+      Spina::Engine.routes.find_script_name({})
+    end
+    
   end
 end

data/lib/tasks/spina_tasks.rake

@@ -1,5 +1,22 @@
 namespace :spina do
-
+  
+  desc "Install Spina"
+  task install: :environment do
+    begin
+      ActiveRecord::Base.connection
+    rescue ActiveRecord::NoDatabaseError
+      puts "ERROR: database does not exist, run \"rails db:create\" first"
+    else
+      Rails::Command.invoke :generate, ["spina:install"]
+    end
+  end
+  
+  desc "First deploy"
+  task first_deploy: :environment do
+    # First deploy will run the same steps as the install generator, but skips copying files
+    Rails::Command.invoke :generate, ["spina:install", "--first-deploy"]
+  end
+  
   desc "Generate all pages based on the theme config"
   task bootstrap: :environment do
     Spina::Account.first.save

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spina
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.6.0
 platform: ruby
 authors:
 - Bram Jetten
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-17 00:00:00.000000000 Z
+date: 2021-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -196,16 +196,16 @@ dependencies:
   name: turbo-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: stimulus-rails
   requirement: !ruby/object:Gem::Requirement
@@ -1108,7 +1108,9 @@ files:
 - db/migrate/8_create_spina_media_folders.rb
 - db/migrate/9_create_spina_images.rb
 - db/seeds.rb
+- lib/generators/spina/embed_generator.rb
 - lib/generators/spina/install_generator.rb
+- lib/generators/spina/templates/app/models/spina/embeds/embed.rb.tt
 - lib/generators/spina/templates/app/views/default/pages/homepage.html.erb
 - lib/generators/spina/templates/app/views/default/pages/show.html.erb
 - lib/generators/spina/templates/app/views/default/shared/_navigation.html.erb
@@ -1119,6 +1121,8 @@ files:
 - lib/generators/spina/templates/app/views/demo/shared/_navigation.html.erb
 - lib/generators/spina/templates/app/views/layouts/default/application.html.erb
 - lib/generators/spina/templates/app/views/layouts/demo/application.html.erb
+- lib/generators/spina/templates/app/views/spina/embeds/_fields.html.erb
+- lib/generators/spina/templates/app/views/spina/embeds/_partial.html.erb
 - lib/generators/spina/templates/config/initializers/mobility.rb
 - lib/generators/spina/templates/config/initializers/spina.rb
 - lib/generators/spina/templates/config/initializers/themes/default.rb
@@ -1158,7 +1162,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="