alchemy_cms 5.1.0.beta1 → 5.1.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b10d39bfe40bc834b734a824c9fbce68e1acf178b5cbd3ecbf6613dd4ac33261
-  data.tar.gz: 909f0164f71e95ed26c0b7a194b3464fc8c5974f8b28161eb3da4cb8e6c0c473
+  metadata.gz: 9e12f510dae37d181a93e110634f158c8f3fac7231c489579d61118528c1174a
+  data.tar.gz: 467204837b948c660077c45e0dab282d23fff3c79a1fea854658d05098a3b8b7
 SHA512:
-  metadata.gz: 58367dca12c34272d159b8346bddddd729df2d2670b9e159d617ab1958c40937f58a6deb557a2cec1951bfaa4bb4b29cb34071eb08df14583b4cfdf58985619e
-  data.tar.gz: f1f861bfbc18c988597189e5dd87db0e905a70d6d78ad8bde8f2f70bba012f564fa9cfe8febf6d53834eddfde425e231ea9549b12b1bf177a8ae337f21609661
+  metadata.gz: 3037cd0a408e63b6edde1c58bc398ec4d377d6a9452caf0e6d8b418b438eb8e7176ca8336f5987089caf355c90e68fbca04ab7df3ac67fca76654efcf00d2cab
+  data.tar.gz: d5a363910f6e4bfb221094c15f33c550dc3650c5eae35a375ea187e92bdac102e31c155168f336c1fa8f11a22235ff1558cc5433ad34fadc79cf59d28e0d883e

data/CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ### Features
 
+- Allow multiple preview sources [#1959](https://github.com/AlchemyCMS/alchemy_cms/pull/1959) ([tvdeyen](https://github.com/tvdeyen))
+- Add Publish Targets [#1957](https://github.com/AlchemyCMS/alchemy_cms/pull/1957) ([tvdeyen](https://github.com/tvdeyen))
 - Persist rendered picture variants [#1882](https://github.com/AlchemyCMS/alchemy_cms/pull/1882) ([tvdeyen](https://github.com/tvdeyen))
 - Store current pictures size in session [#1927](https://github.com/AlchemyCMS/alchemy_cms/pull/1927) ([tvdeyen](https://github.com/tvdeyen))
 - Add support for custom mount points in Page::UrlPath [#1921](https://github.com/AlchemyCMS/alchemy_cms/pull/1921) ([tvdeyen](https://github.com/tvdeyen))
@@ -36,6 +38,7 @@
 
 ### Misc
 
+- [ruby - main] Upgrade rubocop to version 1.1.0 [#1958](https://github.com/AlchemyCMS/alchemy_cms/pull/1958) ([depfu](https://github.com/apps/depfu))
 - Remove greetings action [#1956](https://github.com/AlchemyCMS/alchemy_cms/pull/1956) ([tvdeyen](https://github.com/tvdeyen))
 - [ruby] Upgrade rubocop to version 1.0.0 [#1952](https://github.com/AlchemyCMS/alchemy_cms/pull/1952) ([depfu](https://github.com/apps/depfu))
 - [ruby] Upgrade rubocop to version 0.93.1 [#1948](https://github.com/AlchemyCMS/alchemy_cms/pull/1948) ([depfu](https://github.com/apps/depfu))

data/Gemfile

@@ -22,7 +22,7 @@ group :development, :test do
     gem "yard"
     gem "redcarpet"
     gem "pry-byebug"
-    gem "rubocop", "~> 1.0.0", require: false
+    gem "rubocop", "~> 1.1.0", require: false
     gem "listen"
     gem "localeapp", "~> 3.0", require: false
     gem "dotenv", "~> 2.2"

data/app/assets/javascripts/alchemy/alchemy.element_editors.js.coffee

@@ -38,10 +38,7 @@ Alchemy.ElementEditors =
       @onSaveElement(e, data)
     # Listen to postMessage messages from the preview frame
     window.addEventListener 'message', (e) =>
-      if e.origin == window.location.origin
-        @onMessage(e.data)
-      else
-        console.warn 'Unsafe message origin!', e.origin
+      @onMessage(e.data)
       true
     return
 

data/app/assets/javascripts/alchemy/alchemy.preview.js.coffee

@@ -22,9 +22,6 @@ Alchemy.initAlchemyPreviewMode = ->
 
       init: ->
         window.addEventListener "message", (event) =>
-          if event.origin != window.location.origin
-            console.warn 'Unsafe message origin!', event.origin
-            return
           switch event.data.message
             when "Alchemy.blurElements" then @blurElements()
             when "Alchemy.focusElement" then @focusElement(event.data)

data/app/assets/javascripts/alchemy/alchemy.preview_window.js.coffee

@@ -4,8 +4,10 @@ Alchemy.PreviewWindow =
   MIN_WIDTH: 240
   HEIGHT: 75 # Top menu height
 
-  init: (url) ->
-    $iframe = $("<iframe name=\"alchemy_preview_window\" src=\"#{url}\" id=\"alchemy_preview_window\" frameborder=\"0\"/>")
+  init: (previewUrl) ->
+    @select = document.querySelector('#preview_url')
+    @previewUrl = @_getCurrentPreviewUrl() || previewUrl[1]
+    $iframe = $("<iframe name=\"alchemy_preview_window\" src=\"#{@previewUrl}\" id=\"alchemy_preview_window\" frameborder=\"0\"/>")
     $reload = $('#reload_preview_button')
     @_showSpinner()
     $iframe.load =>
@@ -13,6 +15,10 @@ Alchemy.PreviewWindow =
     $('body').append($iframe)
     @currentWindow = $iframe
     @_bindReloadButton()
+    if @select
+      @select.value = @previewUrl
+      @_bindSelect()
+    return
 
   resize: (width) ->
     width = @MIN_WIDTH if width < @MIN_WIDTH
@@ -29,12 +35,12 @@ Alchemy.PreviewWindow =
       @_hideSpinner()
       if callback
         callback.call(e, $iframe)
-    $iframe.attr 'src', $iframe.attr('src')
+    $iframe.attr('src', @previewUrl)
     true
 
   postMessage: (data) ->
     frameWindow = @currentWindow[0].contentWindow
-    frameWindow.postMessage(data, window.location.origin)
+    frameWindow.postMessage(data, "*")
 
   _showSpinner: ->
     @reload = $('#reload_preview_button')
@@ -53,5 +59,24 @@ Alchemy.PreviewWindow =
       e.preventDefault()
       @refresh()
 
+  _getCurrentPreviewUrl: ->
+    if @select
+      option = Array.from(@select.options).find (o) =>
+        o.text == window.localStorage.getItem("alchemyPreview")
+      if option
+        option.value
+      else
+        null
+    else
+      null
+
+  _bindSelect: ->
+    $(@select).change (e) =>
+      @previewUrl = e.target.value
+      option = e.target.querySelector("option[value='#{@previewUrl}']")
+      window.localStorage.setItem("alchemyPreview", option.text)
+      @refresh()
+      return
+
 Alchemy.reloadPreview = ->
   Alchemy.PreviewWindow.refresh()

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

@@ -159,6 +159,8 @@ $datepicker_day_color: $text-color !default;
 
 $select-hover-bg-color: $dark-blue !default;
 $select-hover-text-color: $white !default;
+$medium-select-box-width: 90px;
+$large-select-box-width: 120px;
 
 $thumbnail-background-color: opacify($default-border-color, 1) !default;
 $medium-screen-break-point: 700px;

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

@@ -1,5 +1,3 @@
-$medium-select-box-width: 90px;
-
 select {
   @include button-defaults(
     $background-color: $form-field-background-color,
@@ -76,6 +74,10 @@ select {
       width: $medium-select-box-width;
     }
 
+    &.large {
+      width: $large-select-box-width;
+    }
+
     &.select2-container-active {
 
       .select2-choice, .select2-choices {

data/app/controllers/alchemy/admin/pages_controller.rb

@@ -85,7 +85,12 @@ module Alchemy
         elsif page_needs_lock?
           @page.lock_to!(current_alchemy_user)
         end
-        @preview_url = Alchemy::Admin::PREVIEW_URL.url_for(@page)
+        @preview_urls = Alchemy.preview_sources.map do |klass|
+          [
+            klass.model_name.human,
+            klass.new(routes: Alchemy::Engine.routes).url_for(@page),
+          ]
+        end
         @layoutpage = @page.layoutpage?
       end
 
@@ -178,6 +183,10 @@ module Alchemy
       def publish
         # fetching page via before filter
         @page.publish!
+
+        # Send publish notification to all registered publish targets
+        Alchemy.publish_targets.each { |p| p.perform_later(@page) }
+
         flash[:notice] = Alchemy.t(:page_published, name: @page.name)
         redirect_back(fallback_location: admin_pages_path)
       end

data/app/views/alchemy/admin/pages/edit.html.erb

@@ -88,6 +88,14 @@
       class: 'alchemy_selectbox medium' %>
   </div>
   <div class="toolbar_spacer"></div>
+  <% if @preview_urls.many? %>
+    <div class="select_with_label">
+      <label><%= Alchemy.t(:preview_url) %></label>
+      <%= select_tag 'preview_url',
+        options_for_select(@preview_urls),
+        class: 'alchemy_selectbox large' %>
+    </div>
+  <% end %>
   <div class="button_with_label">
     <%= link_to render_icon(:redo), nil, {
       title: Alchemy.t('Reload Preview'),
@@ -190,7 +198,7 @@
       }
     });
 
-    Alchemy.PreviewWindow.init('<%= @preview_url %>');
+    Alchemy.PreviewWindow.init(<%== @preview_urls.first %>);
 
     $('#preview_size').bind('open.selectBoxIt', function (e) {
       $('#top_menu').css('z-index', 5000);

data/config/locales/alchemy.en.yml

@@ -521,6 +521,7 @@ en:
       '768': '768px (iPad - Portrait)'
       '1024': '1024px (iPad - Landscape)'
       '1280': '1280px (Desktop)'
+    preview_url: Preview
     recently_uploaded_only: 'Recently uploaded only'
     "regular method": "Regular method"
     remove: "Remove"
@@ -690,6 +691,7 @@ en:
       alchemy/message:
         one: Message
         other: Messages
+      alchemy/admin/preview_url: Internal
     attributes:
       alchemy/message:
         salutation: 'Salutation'

data/lib/alchemy.rb

@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+require "alchemy/admin/preview_url"
+
+module Alchemy
+  YAML_WHITELIST_CLASSES = %w(Symbol Date Regexp)
+
+  # Define page preview sources
+  #
+  # A preview source is a Ruby class returning an URL
+  # that is used as source for the preview frame in the
+  # admin UI.
+  #
+  # == Example
+  #
+  #     # lib/acme/preview_source.rb
+  #     class Acme::PreviewSource < Alchemy::Admin::PreviewUrl
+  #       def url_for(page)
+  #         if page.site.name == "Next"
+  #           "https://user:#{ENV['PREVIEW_HTTP_PASS']}@next.acme.com"
+  #         else
+  #           "https://www.acme.com"
+  #         end
+  #       end
+  #     end
+  #
+  #     # config/initializers/alchemy.rb
+  #     require "acme/preview_source"
+  #     Alchemy.preview_sources << Acme::PreviewSource
+  #
+  #     # config/locales/de.yml
+  #     de:
+  #       activemodel:
+  #         models:
+  #           acme/preview_source: Acme Vorschau
+  #
+  def self.preview_sources
+    @_preview_sources ||= begin
+      Set.new << Alchemy::Admin::PreviewUrl
+    end
+  end
+
+  # Define page publish targets
+  #
+  # A publish target is a ActiveJob that gets performed
+  # whenever a user clicks the publish page button.
+  #
+  # Use this to trigger deployment hooks of external
+  # services in an asychronous way.
+  #
+  # == Example
+  #
+  #     # app/jobs/publish_job.rb
+  #     class PublishJob < ApplicationJob
+  #       def perform(page)
+  #         RestClient.post(ENV['BUILD_HOOK_URL'])
+  #       end
+  #     end
+  #
+  #     # config/initializers/alchemy.rb
+  #     Alchemy.publish_targets << PublishJob
+  #
+  def self.publish_targets
+    @_publish_targets ||= Set.new
+  end
+end

data/lib/alchemy/admin/preview_url.rb

@@ -31,6 +31,8 @@ module Alchemy
     #           password: <%= ENV["BASIC_AUTH_PASSWORD"] %>
     #
     class PreviewUrl
+      extend ActiveModel::Translation
+
       class MissingProtocolError < StandardError; end
 
       def initialize(routes:)

data/lib/alchemy/engine.rb

@@ -9,10 +9,6 @@ module Alchemy
       Alchemy::LOOKUP_CONTEXT = ActionView::LookupContext.new(Rails.root.join("app", "views", "alchemy"))
     end
 
-    initializer "alchemy.admin.preview_url" do
-      Alchemy::Admin::PREVIEW_URL = Alchemy::Admin::PreviewUrl.new(routes: Alchemy::Engine.routes)
-    end
-
     initializer "alchemy.dependency_tracker" do
       [:erb, :slim, :haml].each do |handler|
         ActionView::DependencyTracker.register_tracker(handler, CacheDigests::TemplateTracker)

data/lib/alchemy/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Alchemy
-  VERSION = "5.1.0.beta1"
+  VERSION = "5.1.0.beta2"
 
   def self.version
     VERSION

data/lib/alchemy_cms.rb

@@ -1,8 +1,7 @@
 # frozen_string_literal: true
+
 # Instantiate the global Alchemy namespace
-module Alchemy
-  YAML_WHITELIST_CLASSES = %w(Symbol Date Regexp)
-end
+require "alchemy"
 
 # Require globally used external libraries
 require "acts_as_list"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 5.1.0.beta1
+  version: 5.1.0.beta2
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -13,7 +13,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-30 00:00:00.000000000 Z
+date: 2020-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -1077,6 +1077,7 @@ files:
 - db/migrate/20200519073500_remove_visible_from_alchemy_pages.rb
 - db/migrate/20200617110713_create_alchemy_picture_thumbs.rb
 - db/migrate/20200907111332_remove_tri_state_booleans.rb
+- lib/alchemy.rb
 - lib/alchemy/ability_helper.rb
 - lib/alchemy/admin/locale.rb
 - lib/alchemy/admin/preview_url.rb