alchemy_cms 5.1.10 → 5.2.0.b1

data/config/locales/alchemy.en.yml

@@ -130,31 +130,45 @@ en:
     # == Mime Types translations
     # These are human readable mime types used for the document-type row in archive files.
     mime_types:
-      audio/mp4: 'MP4-Audio'
-      application/msword: 'Word-Document'
-      application/rtf: 'RTF-Document'
-      audio/mpeg: 'MP3-Audio'
-      text/plain: 'Text-Document'
-      video/mp4: 'MP4-Video'
-      video/mpeg: 'MPEG-Video'
-      application/pdf: 'PDF-Document'
-      application/x-flash-video: 'Flash-Video'
-      video/x-flv: 'Flash-Video'
-      application/x-shockwave-flash: 'Flash-Movie'
-      application/zip: 'ZIP-Archive'
-      application/x-rar: 'RAR-Archive'
+      application/msexcel: Excel Spreadsheet
+      application/mspowerpoint: PowerPoint Presentation
+      application/msword: Word Document
+      application/pdf: PDF Document
+      application/rtf: RTF Document
+      application/vcard: vCard
       application/vnd:
-        ms-excel: 'Excel-Document'
-      video/quicktime: 'Quicktime-Video'
-      image/x-psd: 'Photoshop-File'
-      image/gif: 'GIF-Image'
-      image/png: 'PNG-Image'
-      image/jpeg: 'JPG-Image'
-      video/x-msvideo: 'AVI-Video'
-      video/x-ms-wmv: 'Windows Media Video'
-      image/tiff: 'TIFF-Image'
-      'text/x-vcard': 'vCard'
-      application/vcard: 'vCard'
+        ms-excel: Excel Spreadsheet
+        ms-powerpoint: PowerPoint Presentation
+        ms-word: Word Document
+        openxmlformats-officedocument:
+          presentationml:
+            presentation: PowerPoint 2007 Presentation
+          spreadsheetml:
+            sheet: Excel 2007 Spreadsheet
+          wordprocessingml:
+            document: Word 2007 Document
+      application/x-flash-video: Flash Video
+      application/x-rar: RAR Archive
+      application/x-shockwave-flash: Flash Movie
+      application/zip: ZIP Archive
+      audio/mp4: MPEG-4 Audio
+      audio/mpeg: MP3 Audio
+      audio/wav: WAV Audio
+      audio/x-wav: WAV Audio
+      image/gif: GIF Image
+      image/jpeg: JPG Image
+      image/png: PNG Image
+      image/tiff: TIFF Image
+      image/x-psd: Photoshop File
+      image/svg+xml: SVG Image
+      text/plain: Plain Text Document
+      text/x-vcard: vCard
+      video/mp4: MPEG-4 Video
+      video/mpeg: MPEG Video
+      video/quicktime: Quicktime Video
+      video/x-flv: Flash Video
+      video/x-ms-wmv: Windows Media Video
+      video/x-msvideo: AVI Video
 
     link_target_options:
       default: Same Window
@@ -295,7 +309,9 @@ en:
     "Visit page": "Visit page"
     "Warning!": "Warning!"
     content_definition_missing: "Warning: Content is missing its definition. Please check the elements.yml"
+    content_deprecated: "WARNING! This content is deprecated and will be removed soon. Please do not use it anymore."
     element_definition_missing: "WARNING! Missing element definition. Please check your elements.yml file."
+    element_deprecated: "WARNING! This element is deprecated and will be removed soon. Please do not use it anymore."
     page_definition_missing: "WARNING! Missing page layout definition. Please check your page_layouts.yml file."
     "Welcome to Alchemy": "Welcome to Alchemy"
     "Who else is online": "Who else is online"

data/lib/alchemy/deprecation.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Alchemy
-  Deprecation = ActiveSupport::Deprecation.new("5.1", "Alchemy")
+  Deprecation = ActiveSupport::Deprecation.new("6.0", "Alchemy")
 end

data/lib/alchemy/element_definition.rb

@@ -0,0 +1,70 @@
+# frozen_string_literal: true
+
+module Alchemy
+  class ElementDefinition
+    class << self
+      # Returns the definitions from elements.yml file.
+      #
+      # Place a +elements.yml+ file inside your apps +config/alchemy+ folder to define
+      # your own set of elements
+      #
+      def all
+        @definitions ||= read_definitions_file.map(&:with_indifferent_access)
+      end
+
+      # Add additional page definitions to collection.
+      #
+      # Useful for extending the elements from an Alchemy module.
+      #
+      # === Usage Example
+      #
+      #   Call +Alchemy::ElementDefinition.add(your_definition)+ in your engine.rb file.
+      #
+      # @param [Array || Hash]
+      #   You can pass a single element definition as Hash, or a collection of elements as Array.
+      #
+      def add(element)
+        all
+        if element.is_a?(Array)
+          @definitions += element
+        elsif element.is_a?(Hash)
+          @definitions << element
+        else
+          raise TypeError
+        end
+      end
+
+      # Returns one element definition by given name.
+      #
+      def get(name)
+        return {} if name.blank?
+
+        all.detect { |a| a["name"] == name }
+      end
+
+      private
+
+      # Reads the element definitions from +config/alchemy/elements.yml+.
+      #
+      def read_definitions_file
+        if File.exist?(definitions_file_path)
+          YAML.safe_load(
+            ERB.new(File.read(definitions_file_path)).result,
+            YAML_WHITELIST_CLASSES,
+            [],
+            true
+          ) || []
+        else
+          raise LoadError,
+                "Could not find elements.yml file! Please run `rails generate alchemy:install`"
+        end
+      end
+
+      # Returns the elements.yml file path
+      #
+      def definitions_file_path
+        Rails.root.join "config/alchemy/elements.yml"
+      end
+    end
+  end
+end

data/lib/alchemy/elements_finder.rb

@@ -26,8 +26,6 @@ module Alchemy
     #   Randomize the output of elements
     # @option options [Boolean] :reverse (false)
     #   Reverse the load order
-    # @option options [Hash] :fallback
-    #   Define elements that are loaded from another page if no element was found on given page.
     def initialize(options = {})
       @options = options
     end
@@ -83,6 +81,9 @@ module Alchemy
       when Alchemy::Page
         page_or_layout
       when String
+        Alchemy::Deprecation.warn "Passing a String as `from_page` option to " \
+          "`render_elements` is deprecated and will be removed with Alchemy 6.0. " \
+          "Please load the page beforehand and pass it as an object instead."
         Alchemy::Page.find_by(
           language: Alchemy::Language.current,
           page_layout: page_or_layout,
@@ -92,6 +93,9 @@ module Alchemy
     end
 
     def fallback_required?(elements)
+      if options[:fallback]
+        Alchemy::Deprecation.warn "Passing `fallback` options to `render_elements` is deprecated an will be removed with Alchemy 6.0."
+      end
       options[:fallback] && elements
         .where(Alchemy::Element.table_name => {name: options[:fallback][:for]})
         .none?

data/lib/alchemy/engine.rb

@@ -40,16 +40,9 @@ module Alchemy
       if Alchemy.user_class
         ActiveSupport.on_load(:active_record) do
           Alchemy.user_class.model_stamper
-          Alchemy.user_class.stampable(stamper_class_name: Alchemy.user_class.name)
+          Alchemy.user_class.stampable(stamper_class_name: Alchemy.user_class_name)
         end
       end
     end
-
-    initializer "alchemy.error_tracking" do
-      if defined?(Airbrake)
-        require_relative "error_tracking/airbrake_handler"
-        Alchemy::ErrorTracking.notification_handler = Alchemy::ErrorTracking::AirbrakeHandler
-      end
-    end
   end
 end

data/lib/alchemy/essence.rb

@@ -83,7 +83,7 @@ module Alchemy #:nodoc:
 
         if configuration[:belongs_to]
           class_eval <<-RUBY, __FILE__, __LINE__ + 1
-            belongs_to :ingredient_association, #{configuration[:belongs_to]}
+            belongs_to :ingredient_association, **#{configuration[:belongs_to]}
 
             alias_method :#{configuration[:ingredient_column]}, :ingredient_association
             alias_method :#{configuration[:ingredient_column]}=, :ingredient_association=
@@ -108,9 +108,9 @@ module Alchemy #:nodoc:
       # Register the current class as has_many association on +Alchemy::Page+ and +Alchemy::Element+ models
       def register_as_essence_association!
         klass_name = model_name.to_s
-        arguments = [:has_many, klass_name.demodulize.tableize.to_sym, through: :contents,
-                                                                       source: :essence, source_type: klass_name]
-        %w(Page Element).each { |k| "Alchemy::#{k}".constantize.send(*arguments) }
+        arguments = [:has_many, klass_name.demodulize.tableize.to_sym]
+        kwargs = { through: :contents, source: :essence, source_type: klass_name }
+        %w(Page Element).each { |k| "Alchemy::#{k}".constantize.send(*arguments, **kwargs) }
       end
     end
 

data/lib/alchemy/filetypes.rb

@@ -40,7 +40,20 @@ module Alchemy
     EXCEL_FILE_TYPES = [
       "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
       "application/vnd.ms-excel",
+      "application/msexcel",
       "text/csv",
     ]
+
+    WORD_FILE_TYPES = [
+      "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
+      "application/vnd.ms-word",
+      "application/msword",
+    ]
+
+    POWERPOINT_FILE_TYPES = [
+      "application/vnd.openxmlformats-officedocument.presentationml.presentation",
+      "application/vnd.ms-powerpoint",
+      "application/mspowerpoint",
+    ]
   end
 end

data/lib/alchemy/forms/builder.rb

@@ -11,7 +11,7 @@ module Alchemy
         if object.respond_to?(:attribute_fixed?) && object.attribute_fixed?(attribute_name)
           options[:disabled] = true
           options[:input_html] = options.fetch(:input_html, {}).merge(
-            "data-alchemy-tooltip" => Alchemy.t(:attribute_fixed, attribute_name),
+            "data-alchemy-tooltip" => Alchemy.t(:attribute_fixed, attribute: attribute_name),
           )
         end
 

data/lib/alchemy/i18n.rb

@@ -12,8 +12,8 @@ module Alchemy
     #
     #     Alchemy.t(:hello)
     #
-    def t(msg, *args)
-      Alchemy::I18n.translate(msg, *args)
+    def t(msg, **kwargs)
+      Alchemy::I18n.translate(msg, **kwargs)
     end
   end
 
@@ -47,11 +47,10 @@ module Alchemy
       #       world:
       #         hello: Hallo
       #
-      def translate(msg, *args)
-        options = args.extract_options!
+      def translate(msg, **options)
         humanize_default_string!(msg, options)
         scope = alchemy_scoped_scope(options)
-        ::I18n.t(msg, options.merge(scope: scope))
+        ::I18n.t(msg, **options.merge(scope: scope))
       end
 
       def available_locales

data/lib/alchemy/page_layout.rb

@@ -74,6 +74,7 @@ module Alchemy
         end
         mapped_layouts_for_select(layouts)
       end
+      deprecate :layouts_with_own_for_select, deprecator: Alchemy::Deprecation
 
       # Returns all layouts that can be used for creating a new page.
       #

data/lib/alchemy/resource.rb

@@ -132,9 +132,7 @@ module Alchemy
     end
 
     def namespaced_resource_name
-      @_namespaced_resource_name ||= begin
-        namespaced_resources_name.to_s.singularize
-      end.to_sym # Rails >= 6.0.3.7 needs symbols in polymorphic routes
+      @_namespaced_resource_name ||= namespaced_resources_name.singularize
     end
 
     def namespaced_resources_name
@@ -142,13 +140,13 @@ module Alchemy
         resource_name_array = resource_array.dup
         resource_name_array.delete(engine_name) if in_engine?
         resource_name_array.join("_")
-      end.to_sym # Rails >= 6.0.3.7 needs symbols in polymorphic routes
+      end
     end
 
     def namespace_for_scope
       namespace_array = namespace_diff
       namespace_array.delete(engine_name) if in_engine?
-      namespace_array.map(&:to_sym) # Rails >= 6.0.3.7 needs symbols in polymorphic routes
+      namespace_array
     end
 
     # Returns an array of underscored association names

data/lib/alchemy/test_support/integration_helpers.rb

@@ -6,16 +6,16 @@ module Alchemy
     # This file is included in spec_helper.rb
     #
     module IntegrationHelpers
-      # Used to stub the current_alchemy_user
+      # Used to stub the current_user in integration specs
       #
       # Pass either a user object or a symbol in the format of ':as_admin'.
-      # The browser language is set to english ('en')
       #
       def authorize_user(user_or_role = nil)
-        if user_or_role.is_a?(Alchemy.user_class)
-          user = user_or_role
-        else
+        case user_or_role
+        when Symbol, String
           user = build(:alchemy_dummy_user, user_or_role)
+        else
+          user = user_or_role
         end
         allow_any_instance_of(ApplicationController).to receive(:current_user).and_return(user)
       end

data/lib/alchemy/upgrader/five_point_zero.rb

@@ -1,19 +1,9 @@
 # frozen_string_literal: true
 
 require_relative "tasks/harden_gutentag_migrations"
-require "rails/generators"
-require "thor"
-require "alchemy/install/tasks"
-require "alchemy/version"
 
 module Alchemy
   class Upgrader::FivePointZero < Upgrader
-    include Rails::Generators::Actions
-    include Thor::Base
-    include Thor::Actions
-
-    source_root File.expand_path("../../generators/alchemy/install/files", __dir__)
-
     class << self
       def install_gutentag_migrations
         desc "Install Gutentag migrations"
@@ -46,28 +36,6 @@ module Alchemy
           log "Root page not found.", :skip
         end
       end
-
-      def run_webpacker_installer
-        # Webpacker does not create a package.json, but we need one
-        unless File.exist? app_root.join("package.json")
-          in_root { run "echo '{}' > package.json" }
-        end
-        new.rake("webpacker:install", abort_on_failure: true)
-      end
-
-      def add_npm_package
-        new.run "yarn add @alchemy_cms/admin@~#{Alchemy.version}"
-      end
-
-      def copy_alchemy_entry_point
-        webpack_config = YAML.load_file(app_root.join("config", "webpacker.yml"))[Rails.env]
-        new.copy_file "alchemy_admin.js",
-          app_root.join(webpack_config["source_path"], webpack_config["source_entry_path"], "alchemy/admin.js")
-      end
-
-      def app_root
-        @_app_root ||= Rails.root
-      end
     end
   end
 end

data/lib/alchemy/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Alchemy
-  VERSION = "5.1.10"
+  VERSION = "5.2.0.b1"
 
   def self.version
     VERSION

data/lib/alchemy_cms.rb

@@ -35,8 +35,8 @@ require_relative "alchemy/config"
 require_relative "alchemy/configuration_methods"
 require_relative "alchemy/controller_actions"
 require_relative "alchemy/deprecation"
+require_relative "alchemy/element_definition"
 require_relative "alchemy/elements_finder"
-require_relative "alchemy/error_tracking"
 require_relative "alchemy/errors"
 require_relative "alchemy/essence"
 require_relative "alchemy/filetypes"

data/lib/generators/alchemy/install/install_generator.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 require "rails/generators"
 require "alchemy/install/tasks"
-require "alchemy/version"
 
 module Alchemy
   module Generators
@@ -89,7 +88,7 @@ module Alchemy
       end
 
       def add_npm_package
-        run "yarn add @alchemy_cms/admin@~#{Alchemy.version}"
+        run "yarn add @alchemy_cms/admin"
       end
 
       def copy_alchemy_entry_point

data/lib/tasks/alchemy/thumbnails.rake

@@ -4,8 +4,8 @@ namespace :alchemy do
   namespace :generate do
     desc "Generates all thumbnails for Alchemy Pictures and EssencePictures."
     task thumbnails: [
-      "alchemy:generate:picture_thumbnails",
-      "alchemy:generate:essence_picture_thumbnails",
+      "alchemy_dragonfly_s3:generate:picture_thumbnails",
+      "alchemy_dragonfly_s3:generate:essence_picture_thumbnails",
     ]
 
     desc "Generates thumbnails for Alchemy Pictures."
@@ -14,8 +14,6 @@ namespace :alchemy do
       puts "Please wait..."
 
       Alchemy::Picture.find_each do |picture|
-        next unless picture.has_convertible_format?
-
         puts Alchemy::PictureThumb.generate_thumbs!(picture)
       end
 

data/lib/tasks/alchemy/upgrade.rake

@@ -42,9 +42,6 @@ namespace :alchemy do
         "alchemy:upgrade:5.0:install_gutentag_migrations",
         "alchemy:upgrade:5.0:remove_layout_roots",
         "alchemy:upgrade:5.0:remove_root_page",
-        "alchemy:upgrade:5.0:run_webpacker_installer",
-        "alchemy:upgrade:5.0:add_npm_package",
-        "alchemy:upgrade:5.0:copy_alchemy_entry_point",
       ]
 
       desc "Install Gutentag migrations"
@@ -61,23 +58,6 @@ namespace :alchemy do
       task remove_root_page: [:environment] do
         Alchemy::Upgrader::FivePointZero.remove_root_page
       end
-
-      desc "Run webpacker installer"
-      task run_webpacker_installer: [:environment] do
-        Alchemy::Upgrader::FivePointZero.run_webpacker_installer
-      end
-
-      desc "Add NPM package"
-      task add_npm_package: [:environment] do
-        puts "adding npm_package..."
-        Alchemy::Upgrader::FivePointZero.add_npm_package
-      end
-
-      desc "Copy alchemy entry point"
-      task copy_alchemy_entry_point: [:environment] do
-        puts "copying alchemy entry point"
-        Alchemy::Upgrader::FivePointZero.copy_alchemy_entry_point
-      end
     end
   end
 end

data/package/admin.js

@@ -1,5 +1,4 @@
 import translate from "./src/i18n"
-import translationData from "./src/translations"
 import NodeTree from "./src/node_tree"
 
 // Global Alchemy object
@@ -11,6 +10,5 @@ if (typeof window.Alchemy === "undefined") {
 Object.assign(Alchemy, {
   // Global utility method for translating a given string
   t: translate,
-  translations: Object.assign(Alchemy.translations || {}, translationData),
   NodeTree
 })

data/package/src/__tests__/i18n.spec.js

@@ -15,20 +15,12 @@ describe("translate", () => {
     })
 
     describe("if translation is present", () => {
-      beforeEach(() => {
-        Alchemy.translations = { en: { help: "Help" } }
-      })
-
       it("Returns translated string", () => {
         expect(translate("help")).toEqual("Help")
       })
 
       describe("if key includes a period", () => {
         describe("that is translated", () => {
-          beforeEach(() => {
-            Alchemy.translations = { en: { formats: { date: "Y-m-d" } } }
-          })
-
           it("splits into group", () => {
             expect(translate("formats.date")).toEqual("Y-m-d")
           })
@@ -48,10 +40,6 @@ describe("translate", () => {
       })
 
       describe("if replacement is given", () => {
-        beforeEach(() => {
-          Alchemy.translations = { en: { allowed_chars: "of %{number} chars" } }
-        })
-
         it("replaces it", () => {
           expect(translate("allowed_chars", 5)).toEqual("of 5 chars")
         })
@@ -79,15 +67,4 @@ describe("translate", () => {
       spy.mockRestore()
     })
   })
-
-  describe("if Alchemy.translations is not set", () => {
-    it("Returns passed string and logs a warning", () => {
-      const spy = jest.spyOn(console, "warn").mockImplementation(() => {})
-      expect(translate("help")).toEqual("help")
-      expect(spy.mock.calls).toEqual([
-        ["Translations for locale kl not found!"]
-      ])
-      spy.mockRestore()
-    })
-  })
 })

data/package/src/i18n.js

@@ -1,3 +1,5 @@
+import translationData from "./translations"
+
 const KEY_SEPARATOR = /\./
 
 function currentLocale() {
@@ -9,7 +11,7 @@ function currentLocale() {
 
 function getTranslations() {
   const locale = currentLocale()
-  const translations = Alchemy.translations && Alchemy.translations[locale]
+  const translations = translationData[locale]
 
   if (translations) {
     return translations

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alchemy_cms/admin",
-  "version": "5.1.10",
+  "version": "0.2.0",
   "description": "AlchemyCMS",
   "browser": "package/admin.js",
   "files": [