alchemy_cms 5.1.2 → 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/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/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/version.rb

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

data/lib/alchemy_cms.rb

@@ -35,6 +35,7 @@ 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/errors"
 require_relative "alchemy/essence"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 5.1.2
+  version: 5.2.0.b1
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-26 00:00:00.000000000 Z
+date: 2021-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -276,7 +276,7 @@ dependencies:
         version: '1.8'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 2.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -286,7 +286,7 @@ dependencies:
         version: '1.8'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 2.4.2
 - !ruby/object:Gem::Dependency
   name: request_store
   requirement: !ruby/object:Gem::Requirement
@@ -513,14 +513,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.1
+        version: '0.20'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.1
+        version: '0.20'
 - !ruby/object:Gem::Dependency
   name: webdrivers
   requirement: !ruby/object:Gem::Requirement
@@ -1086,6 +1086,7 @@ files:
 - lib/alchemy/configuration_methods.rb
 - lib/alchemy/controller_actions.rb
 - lib/alchemy/deprecation.rb
+- lib/alchemy/element_definition.rb
 - lib/alchemy/elements_finder.rb
 - lib/alchemy/engine.rb
 - lib/alchemy/errors.rb
@@ -1273,9 +1274,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements:
 - ImageMagick (libmagick), v6.6 or greater.
 rubygems_version: 3.1.4