alchemy_cms 7.0.11 → 7.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: deabc73ce8b0c2eade517bfe45f105dda4163f3c783733f831c469cae17119e5
-  data.tar.gz: cdd7d1692459a1ba8250db2742f4d7ae408ca618fa24a91e6f909499cc46b463
+  metadata.gz: 7e1e1f44ae24e197683a4022bc888322ad87557119ab90f85fe455e3d0871a11
+  data.tar.gz: d88442e6659689d233994892136e531ed45727cea4a771ff3947589d01964fbf
 SHA512:
-  metadata.gz: 2787d3437e95a26164374d9fb70b12023f19f674972a94952731d527085ed118880aa7aa070caeb17c869ce41d9776134e059dd909b2a9952b9843c2d1fb40be
-  data.tar.gz: e1c9daaca6fe230b6973f9cfcba6c5d4b0cfa586ddf02be80dd649db6834f481f8c92d889a7ea73b03dbc1401117e587f7f79c46594a9019a8d22b34ab1f18ff
+  metadata.gz: a881a0032cfd6c600e71513982d172db9f5d8bd1276d53de1ca045c758c2a6b256937f68df26375bcc085cf1cff52a4e5db087ba8b33595b5b9884447d419f12
+  data.tar.gz: 7701f3c046c5bef17f75be1121fc4908d3aeba17abc88cadf04a5a59656c5c66bf0fcdb76cf395783d0cf5aaff27fab5b5549c512d00427485a5dbbf7407a8a0

data/.gem_release.yml

@@ -0,0 +1,8 @@
+bump:
+  file: lib/alchemy/version.rb
+  remote: upstream
+  version: patch
+tag:
+  remote: upstream
+release:
+  repo: AlchemyCMS/alchemy_cms

data/.gitignore

@@ -29,3 +29,5 @@ yarn-debug.log*
 .yarn-integrity
 yarn.lock
 /spec/dummy/public/pictures
+.byebug_history
+.vscode/

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changelog
 
+## 7.0.13 (2024-05-29)
+
+- [7.0-stable] Fix preview window width for smaller viewports [#2889](https://github.com/AlchemyCMS/alchemy_cms/pull/2889) ([alchemycms-bot](https://github.com/alchemycms-bot))
+- [7.0-stable] Fix Preview Window width [#2880](https://github.com/AlchemyCMS/alchemy_cms/pull/2880) ([alchemycms-bot](https://github.com/alchemycms-bot))
+- [7.0-stable] Fix preview window resize transition [#2871](https://github.com/AlchemyCMS/alchemy_cms/pull/2871) ([alchemycms-bot](https://github.com/alchemycms-bot))
+
+## 7.0.12 (2024-04-12)
+
+- [7.0-stable] Fix Ingredient Boolean View [#2837](https://github.com/AlchemyCMS/alchemy_cms/pull/2837) ([alchemycms-bot](https://github.com/alchemycms-bot))
+- [7.0-stable] Nullify Ingredients::Page on Page destroy [#2830](https://github.com/AlchemyCMS/alchemy_cms/pull/2830) ([alchemycms-bot](https://github.com/alchemycms-bot))
+- [7.0-stable] Fix module error [#2821](https://github.com/AlchemyCMS/alchemy_cms/pull/2821) ([alchemycms-bot](https://github.com/alchemycms-bot))
+- [7.0-stable] Mark ingredient output as html_safe [#2781](https://github.com/AlchemyCMS/alchemy_cms/pull/2781) ([alchemycms-bot](https://github.com/alchemycms-bot))
+
 ## 7.0.11 (2024-03-05)
 
 - [7.0-stable] Do not include timezone in datepickers only displaying date [#2769](https://github.com/AlchemyCMS/alchemy_cms/pull/2769) ([tvdeyen](https://github.com/tvdeyen))

data/Gemfile

@@ -61,3 +61,5 @@ if Gem.ruby_version >= Gem::Version.new("3.1.0")
   end
   gem "net-smtp", "~> 0.3.0", require: false
 end
+
+gem "gem-release", "~> 2.2"

data/app/assets/stylesheets/alchemy/preview_window.scss

@@ -7,7 +7,7 @@
   border: 0 none;
   background: #fff;
   border-right: $default-border;
-  transition: $transition-duration ease-in-out;
+  transition: width $transition-duration ease-in-out;
 
   .collapsed-menu & {
     left: $collapsed-main-menu-width;
@@ -15,10 +15,14 @@
   }
 
   .collapsed-menu.elements-window-visible & {
-    width: calc(100vw - #{$collapsed-main-menu-width - $default-border-width} - #{$elements-window-width});
+    width: calc(
+      100vw - #{$collapsed-main-menu-width - $default-border-width} - #{$elements-window-min-width}
+    );
 
-    @media screen and (min-width: $large-screen-break-point) {
-      max-width: calc(100vw - #{$collapsed-main-menu-width - $default-border-width} - #{$elements-window-min-width});
+    @media screen and (min-width: 1777px) {
+      width: calc(
+        100vw - #{$collapsed-main-menu-width - $default-border-width} - #{$elements-window-width}
+      );
     }
   }
 }

data/app/components/alchemy/ingredients/audio_view.rb

@@ -4,7 +4,7 @@ module Alchemy
       def call
         content_tag(:audio, **html_options) do
           tag(:source, src: src, type: type)
-        end
+        end.html_safe
       end
 
       def render?

data/app/components/alchemy/ingredients/base_view.rb

@@ -16,7 +16,7 @@ module Alchemy
       end
 
       def call
-        value
+        value.html_safe
       end
 
       def render?

data/app/components/alchemy/ingredients/boolean_view.rb

@@ -2,7 +2,7 @@ module Alchemy
   module Ingredients
     class BooleanView < BaseView
       def call
-        Alchemy.t(value, scope: "ingredient_values.boolean")
+        Alchemy.t(value.to_s, scope: "ingredient_values.boolean").html_safe
       end
 
       def render?

data/app/components/alchemy/ingredients/datetime_view.rb

@@ -15,7 +15,7 @@ module Alchemy
           ingredient.value.to_s(:rfc822)
         else
           ::I18n.l(ingredient.value, format: date_format)
-        end
+        end.html_safe
       end
     end
   end

data/app/components/alchemy/ingredients/file_view.rb

@@ -23,7 +23,7 @@ module Alchemy
             class: ingredient.css_class.presence,
             title: ingredient.title.presence
           }.merge(html_options)
-        )
+        ).html_safe
       end
 
       def render?

data/app/components/alchemy/ingredients/headline_view.rb

@@ -7,13 +7,22 @@ module Alchemy
       end
 
       def call
-        content_tag "h#{@level || ingredient.level}",
-          ingredient.value,
-          id: ingredient.dom_id.presence,
-          class: [
-            ingredient.size ? "h#{ingredient.size}" : nil,
-            html_options[:class]
-          ]
+        content_tag tag_name, id: dom_id, class: css_classes do
+          ingredient.value
+        end.html_safe
+      end
+
+      private
+
+      def tag_name = "h#{@level || ingredient.level}"
+
+      def dom_id = ingredient.dom_id.presence
+
+      def css_classes
+        [
+          ingredient.size ? "h#{ingredient.size}" : nil,
+          html_options[:class]
+        ]
       end
     end
   end

data/app/components/alchemy/ingredients/link_view.rb

@@ -12,7 +12,7 @@ module Alchemy
       end
 
       def call
-        link_to(link_text, value, {target: link_target}.merge(html_options))
+        link_to(link_text, value, {target: link_target}.merge(html_options)).html_safe
       end
 
       private

data/app/components/alchemy/ingredients/page_view.rb

@@ -4,7 +4,7 @@ module Alchemy
       delegate :page, to: :ingredient
 
       def call
-        link_to page.name, alchemy.show_page_path(urlname: page.urlname)
+        link_to(page.name, alchemy.show_page_path(urlname: page.urlname)).html_safe
       end
 
       def render?

data/app/components/alchemy/ingredients/picture_view.rb

@@ -57,7 +57,7 @@ module Alchemy
           content_tag(:figure, output, {class: ingredient.css_class.presence}.merge(html_options))
         else
           output
-        end
+        end.html_safe
       end
 
       private

data/app/components/alchemy/ingredients/richtext_view.rb

@@ -15,7 +15,7 @@ module Alchemy
           ingredient.stripped_body
         else
           value.to_s.html_safe
-        end
+        end.html_safe
       end
     end
   end

data/app/components/alchemy/ingredients/text_view.rb

@@ -24,7 +24,7 @@ module Alchemy
             target: ((link_target == "blank") ? "_blank" : nil),
             data: {link_target: link_target}
           }.merge(html_options))
-        end
+        end.html_safe
       end
 
       private

data/app/components/alchemy/ingredients/video_view.rb

@@ -6,7 +6,7 @@ module Alchemy
       def call
         content_tag(:video, html_options) do
           tag(:source, src: src, type: attachment.file_mime_type)
-        end
+        end.html_safe
       end
 
       def render?

data/app/models/alchemy/page.rb

@@ -121,6 +121,8 @@ module Alchemy
     has_one :draft_version, -> { drafts }, class_name: "Alchemy::PageVersion"
     has_one :public_version, -> { published }, class_name: "Alchemy::PageVersion", autosave: -> { persisted? }
 
+    has_many :page_ingredients, class_name: "Alchemy::Ingredients::Page", foreign_key: :related_object_id, dependent: :nullify
+
     before_validation :set_language,
       if: -> { language.nil? }
 

data/lib/alchemy/modules.rb

@@ -35,7 +35,7 @@ module Alchemy
             defined_controllers.concat(definition_hash["navigation"]["sub_navigation"].map { |x| x["controller"] })
           end
 
-          validate_controllers_existence(defined_controllers)
+          validate_controllers_existence(defined_controllers, definition_hash)
         end
 
         @@alchemy_modules |= [definition_hash]
@@ -43,7 +43,7 @@ module Alchemy
 
       private
 
-      def validate_controllers_existence(controllers)
+      def validate_controllers_existence(controllers, definition_hash)
         controllers.each do |controller_val|
           next if controller_val.blank?
 

data/lib/alchemy/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Alchemy
-  VERSION = "7.0.11"
+  VERSION = "7.0.13"
 
   def self.version
     VERSION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 7.0.11
+  version: 7.0.13
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -13,7 +13,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-05 00:00:00.000000000 Z
+date: 2024-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -712,6 +712,7 @@ extra_rdoc_files: []
 files:
 - ".codeclimate.yml"
 - ".editorconfig"
+- ".gem_release.yml"
 - ".github/FUNDING.yml"
 - ".github/ISSUE_TEMPLATE/Bug_report.md"
 - ".github/ISSUE_TEMPLATE/Feature_request.md"
@@ -1455,7 +1456,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - ImageMagick (libmagick), v6.6 or greater.
-rubygems_version: 3.4.19
+rubygems_version: 3.5.9
 signing_key:
 specification_version: 4
 summary: A powerful, userfriendly and flexible CMS for Rails