spina 2.3.5 → 2.6.1

data/lib/spina/theme_reloader.rb

@@ -0,0 +1,20 @@
+class Spina::ThemeReloader
+  delegate :execute_if_updated, :execute, :updated?, to: :updater
+  
+  def reload!
+    theme_paths.each { |path| load path }
+  end
+  
+  private
+  
+    def updater
+      @updater ||= Rails.application.config.file_watcher.new(theme_paths) do 
+        reload!
+      end
+    end
+  
+    def theme_paths
+      Rails.root.glob("config/initializers/themes/*.rb") 
+    end
+  
+end

data/lib/spina/version.rb

@@ -1,3 +1,3 @@
 module Spina
-  VERSION = "2.3.5"
+  VERSION = "2.6.1"
 end

data/lib/spina.rb

@@ -1,6 +1,7 @@
 require 'spina/engine'
 require 'spina/admin_sectionable'
 require 'spina/railtie'
+require 'spina/theme_reloader'
 require 'spina/plugin'
 require 'spina/theme'
 require 'spina/tailwind_purger'
@@ -8,6 +9,9 @@ require 'spina/attr_json_spina_parts_model'
 require 'spina/attr_json_monkeypatch'
 require 'spina/authentication/sessions'
 require 'spina/authentication/basic'
+require 'spina/embeddable'
+require 'spina/embeds'
+require 'spina/embeds/trix_conversion'
 
 module Spina
   include ActiveSupport::Configurable
@@ -26,6 +30,7 @@ module Spina
                   :disable_decorator_load,
                   :locales, 
                   :embedded_image_size,
+                  :mailer_defaults,
                   :thumbnail_image_size,
                   :party_pooper,
                   :tailwind_purge_content,
@@ -40,6 +45,7 @@ module Spina
   self.disable_frontend_routes = false
   self.disable_decorator_load = false
   self.embedded_image_size = [2000, 2000]
+  self.mailer_defaults = ActiveSupport::OrderedOptions.new
   self.thumbnail_image_size = [400, 400]
   self.frontend_parent_controller = "ApplicationController"
   self.locales = [I18n.default_locale]
@@ -82,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
@@ -25,7 +42,7 @@ namespace :spina do
     desc "Compile Tailwind.css for Spina"
     task :compile do
       Dir.chdir(File.join(__dir__, "../..")) do
-        system "npx tailwindcss-cli@latest build -i ./app/assets/stylesheets/spina/tailwind/custom.css -o ./app/assets/stylesheets/spina/_tailwind.css -c ./app/assets/config/spina/tailwind.config.js"
+        system "npx tailwindcss@latest build -i ./app/assets/stylesheets/spina/tailwind/custom.css -o ./app/assets/stylesheets/spina/_tailwind.css -c ./app/assets/config/spina/tailwind.config.js"
       end
     end
     

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spina
 version: !ruby/object:Gem::Version
-  version: 2.3.5
+  version: 2.6.1
 platform: ruby
 authors:
 - Bram Jetten
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-22 00:00:00.000000000 Z
+date: 2021-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -52,20 +52,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: sass-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: image_processing
   requirement: !ruby/object:Gem::Requirement
@@ -182,44 +168,44 @@ dependencies:
   name: importmap-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.7.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.7.6
 - !ruby/object:Gem::Dependency
   name: turbo-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.4
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.4
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: stimulus-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.8
+        version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.8
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: babosa
   requirement: !ruby/object:Gem::Requirement
@@ -248,6 +234,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: browser
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: CMS
 email:
 - bram@denkgroot.com
@@ -801,17 +801,21 @@ files:
 - app/assets/images/spina/spina.png
 - app/assets/images/spina/spina.svg
 - app/assets/javascripts/spina/application.js
+- app/assets/javascripts/spina/controllers/application.js
 - app/assets/javascripts/spina/controllers/attachment_picker_controller.js
 - app/assets/javascripts/spina/controllers/autofocus_controller.js
 - app/assets/javascripts/spina/controllers/button_controller.js
 - app/assets/javascripts/spina/controllers/confetti_controller.js
 - app/assets/javascripts/spina/controllers/confirm_controller.js
 - app/assets/javascripts/spina/controllers/delegate_click_controller.js
+- app/assets/javascripts/spina/controllers/embed_controller.js
+- app/assets/javascripts/spina/controllers/embed_tag_controller.js
 - app/assets/javascripts/spina/controllers/exists_controller.js
 - app/assets/javascripts/spina/controllers/form_controller.js
 - app/assets/javascripts/spina/controllers/hotkeys_controller.js
 - app/assets/javascripts/spina/controllers/image_collection_controller.js
 - app/assets/javascripts/spina/controllers/image_fade_in_controller.js
+- app/assets/javascripts/spina/controllers/index.js
 - app/assets/javascripts/spina/controllers/infinite_scroll_controller.js
 - app/assets/javascripts/spina/controllers/loading_button_controller.js
 - app/assets/javascripts/spina/controllers/media_picker_controller.js
@@ -842,9 +846,9 @@ files:
 - app/assets/javascripts/spina/libraries/trix.js
 - app/assets/javascripts/spina/libraries/trix@1.3.1.esm.js
 - app/assets/stylesheets/spina/_animate.css
-- app/assets/stylesheets/spina/_fonts.scss
+- app/assets/stylesheets/spina/_fonts.css.erb
 - app/assets/stylesheets/spina/_tailwind.css
-- app/assets/stylesheets/spina/application.sass
+- app/assets/stylesheets/spina/application.css
 - app/assets/stylesheets/spina/tailwind/custom.css
 - app/components/spina/application_component.rb
 - app/components/spina/forms/group_component.html.erb
@@ -874,6 +878,8 @@ files:
 - app/components/spina/pages/list_component.rb
 - app/components/spina/pages/location_component.html.erb
 - app/components/spina/pages/location_component.rb
+- app/components/spina/pages/new_page_button_component.html.erb
+- app/components/spina/pages/new_page_button_component.rb
 - app/components/spina/pages/page_component.html.erb
 - app/components/spina/pages/page_component.rb
 - app/components/spina/pages/page_select_component.html.erb
@@ -900,6 +906,7 @@ files:
 - app/controllers/spina/admin/accounts_controller.rb
 - app/controllers/spina/admin/admin_controller.rb
 - app/controllers/spina/admin/attachments_controller.rb
+- app/controllers/spina/admin/embeds_controller.rb
 - app/controllers/spina/admin/images_controller.rb
 - app/controllers/spina/admin/layout_controller.rb
 - app/controllers/spina/admin/media_folders_controller.rb
@@ -932,6 +939,7 @@ files:
 - app/helpers/spina/spina_helper.rb
 - app/jobs/spina/application_job.rb
 - app/jobs/spina/resource_pages_update_job.rb
+- app/mailers/spina/application_mailer.rb
 - app/mailers/spina/user_mailer.rb
 - app/models/concerns/spina/gravatar.rb
 - app/models/concerns/spina/partable.rb
@@ -940,6 +948,10 @@ files:
 - app/models/spina/application_record.rb
 - app/models/spina/attachment.rb
 - app/models/spina/current.rb
+- app/models/spina/embeds/base.rb
+- app/models/spina/embeds/button.rb
+- app/models/spina/embeds/vimeo.rb
+- app/models/spina/embeds/youtube.rb
 - app/models/spina/image.rb
 - app/models/spina/media_folder.rb
 - app/models/spina/navigation.rb
@@ -962,6 +974,7 @@ files:
 - app/models/spina/user.rb
 - app/presenters/spina/content_presenter.rb
 - app/presenters/spina/menu_presenter.rb
+- app/presenters/spina/rich_text_presenter.rb
 - app/serializers/spina/api/base_serializer.rb
 - app/serializers/spina/api/image_serializer.rb
 - app/serializers/spina/api/navigation_serializer.rb
@@ -976,6 +989,7 @@ files:
 - app/views/spina/admin/attachments/edit.html.erb
 - app/views/spina/admin/attachments/index.html.erb
 - app/views/spina/admin/attachments/show.html.erb
+- app/views/spina/admin/embeds/new.html.erb
 - app/views/spina/admin/images/_image.html.erb
 - app/views/spina/admin/images/edit.html.erb
 - app/views/spina/admin/images/index.html.erb
@@ -1034,9 +1048,19 @@ files:
 - app/views/spina/admin/users/edit.html.erb
 - app/views/spina/admin/users/index.html.erb
 - app/views/spina/admin/users/new.html.erb
+- app/views/spina/embeds/buttons/_button.html.erb
+- app/views/spina/embeds/buttons/_button_fields.html.erb
+- app/views/spina/embeds/buttons/_trix_button.html.erb
+- app/views/spina/embeds/vimeos/_thumbnail.html.erb
+- app/views/spina/embeds/vimeos/_vimeo.html.erb
+- app/views/spina/embeds/vimeos/_vimeo_fields.html.erb
+- app/views/spina/embeds/youtubes/_thumbnail.html.erb
+- app/views/spina/embeds/youtubes/_youtube.html.erb
+- app/views/spina/embeds/youtubes/_youtube_fields.html.erb
 - app/views/spina/sitemaps/show.xml.builder
 - app/views/spina/user_mailer/forgot_password.html.erb
-- app/views/spina/user_mailer/forgot_password.txt.erb
+- app/views/spina/user_mailer/forgot_password.text.erb
+- config/initializers/importmap.rb
 - config/locales/TH.yml
 - config/locales/bg.yml
 - config/locales/de.yml
@@ -1070,7 +1094,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
@@ -1081,6 +1107,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
@@ -1091,12 +1119,16 @@ files:
 - lib/spina/attr_json_spina_parts_model.rb
 - lib/spina/authentication/basic.rb
 - lib/spina/authentication/sessions.rb
+- lib/spina/embeddable.rb
+- lib/spina/embeds.rb
+- lib/spina/embeds/trix_conversion.rb
 - lib/spina/engine.rb
 - lib/spina/part.rb
 - lib/spina/plugin.rb
 - lib/spina/railtie.rb
 - lib/spina/tailwind_purger.rb
 - lib/spina/theme.rb
+- lib/spina/theme_reloader.rb
 - lib/spina/version.rb
 - lib/tasks/spina_tasks.rake
 homepage: https://www.spinacms.com
@@ -1108,7 +1140,7 @@ metadata:
   documentation_uri: https://www.spinacms.com/docs
   changelog_uri: https://github.com/SpinaCMS/Spina/blob/master/CHANGELOG.md
   source_code_uri: https://github.com/SpinaCMS/Spina
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -1116,15 +1148,15 @@ 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:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.2.22
+signing_key:
 specification_version: 4
 summary: Spina
 test_files: []

data/app/assets/stylesheets/spina/_fonts.scss

@@ -1,114 +0,0 @@
-@font-face {
-  font-family: "Metropolis";
-  font-weight: 400;
-  src: asset_url("spina/Metropolis-Regular.woff2") format("woff2");
-}
-
-@font-face {
-  font-family: "Metropolis";
-  font-style: italic;
-  src: asset_url("spina/Metropolis-RegularItalic.woff2") format("woff2");
-}
-
-@font-face {
-  font-family: "Metropolis";
-  font-weight: 100;
-  src: asset_url("spina/Metropolis-Thin.woff2") format("woff2");
-}
-
-@font-face {
-  font-family: "Metropolis";
-  font-weight: 100;
-  font-style: italic;
-  src: asset_url("spina/Metropolis-ThinItalic.woff2") format("woff2");
-}
-
-@font-face {
-  font-family: "Metropolis";
-  font-weight: 200;
-  src: asset_url("spina/Metropolis-ExtraLight.woff2") format("woff2");
-}
-
-@font-face {
-  font-family: "Metropolis";
-  font-weight: 200;
-  src: asset_url("spina/Metropolis-ExtraLightItalic.woff2") format("woff2");
-}
-
-@font-face {
-  font-family: "Metropolis";
-  font-weight: 300;
-  src: asset_url("spina/Metropolis-Light.woff2") format("woff2");
-}
-
-@font-face {
-  font-family: "Metropolis";
-  font-weight: 300;
-  font-style: italic;
-  src: asset_url("spina/Metropolis-LightItalic.woff2") format("woff2");
-}
-
-@font-face {
-  font-family: "Metropolis";
-  font-weight: 500;
-  src: asset_url("spina/Metropolis-Medium.woff2") format("woff2");
-}
-
-@font-face {
-  font-family: "Metropolis";
-  font-weight: 500;
-  font-style: italic;
-  src: asset_url("spina/Metropolis-MediumItalic.woff2") format("woff2");
-}
-
-@font-face {
-  font-family: "Metropolis";
-  font-weight: 600;
-  src: asset_url("spina/Metropolis-SemiBold.woff2") format("woff2");
-}
-
-@font-face {
-  font-family: "Metropolis";
-  font-weight: 600;
-  font-style: italic;
-  src: asset_url("spina/Metropolis-SemiBoldItalic.woff2") format("woff2");
-}
-
-@font-face {
-  font-family: "Metropolis";
-  font-weight: 700;
-  src: asset_url("spina/Metropolis-Bold.woff2") format("woff2");
-}
-
-@font-face {
-  font-family: "Metropolis";
-  font-weight: 700;
-  font-style: italic;
-  src: asset_url("spina/Metropolis-BoldItalic.woff2") format("woff2");
-}
-
-@font-face {
-  font-family: "Metropolis";
-  font-weight: 800;
-  src: asset_url("spina/Metropolis-ExtraBold.woff2") format("woff2");
-}
-
-@font-face {
-  font-family: "Metropolis";
-  font-weight: 800;
-  font-style: italic;
-  src: asset_url("spina/Metropolis-ExtraBoldItalic.woff2") format("woff2");
-}
-
-@font-face {
-  font-family: "Metropolis";
-  font-weight: 900;
-  src: asset_url("spina/Metropolis-Black.woff2") format("woff2");
-}
-
-@font-face {
-  font-family: "Metropolis";
-  font-weight: 900;
-  font-style: italic;
-  src: asset_url("spina/Metropolis-BlackItalic.woff2") format("woff2");
-}

data/app/assets/stylesheets/spina/application.sass

@@ -1,3 +0,0 @@
-@import fonts
-@import animate
-@import tailwind

data/app/views/spina/user_mailer/forgot_password.txt.erb

@@ -1 +0,0 @@
-You forgot your password. Here's a link to setup a new one: <%= spina.edit_admin_password_reset_url(@user.password_reset_token) %>. It expires in 2 hours.