alchemy_cms 4.0.0.rc1 → 4.0.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8546e849610240faac00b1a77f937ea2514d97a0
-  data.tar.gz: e81fd54feadee4000618c71b6a3a424695647dc8
+  metadata.gz: 2602c152298a64524d0219dae9612ddd13bb7909
+  data.tar.gz: ff1579cc4c0db34cfa5d1620426bba1622a72739
 SHA512:
-  metadata.gz: 350b2a2ba22bec1183a4fd76d25d4de7f2e6e564d0cc51a7eb064a5e3f5c572406294e858e5010838760228024623aee4a662dc7778514a49c5c127d050a7637
-  data.tar.gz: 92088cb21c0643a53d87115521ca377d8dd2993dcf25737828fda5397111da952eb5804d9bcd6786973f0be4613058ead98c6cd145b3ff91224d3caeee049d9e
+  metadata.gz: 475e535fdb68297c36fe5fa013ede09be2555d03fbc58bdff079d9978f79b6d8ce4c3ec23c4b063e563d647c028eb3762d16a564831c09a8dc2b97c40f2d64b7
+  data.tar.gz: c86d7978a829bef8c50446e5df3c7fa1e5abcfb7e1d52479603a66d780c27359349b5654ee1cef201ebee8b0b6dafe576427db9a6a1907d7888d2c6277116165

data/CHANGELOG.md

@@ -1,6 +1,20 @@
 # Change Log
 
-## 4.0.0.rc1 (2017-0817)
+## 4.0.0.rc2 (2017-08-18)
+
+* Removed deprecated `:image_size` option from `EssencePicture`
+  Use `:size` instead.
+* Remove deprecated `take_me_for_preview` content definition option
+  Use `as_element_title` instead.
+* Removed deprecated picture url helpers `show_alchemy_picture_path` and `show_alchemy_picture_url`
+  Use `picture.url` instead.
+* Removed deprecated pages helper module.
+* Removed deprecated translation methods `_t` and `Alchemy::I18n.t`.
+  Use `Alchemy.t` instead.
+* Removed deprecated `redirect_index` configuration
+  Use `redirect_to_public_child` configuration instead.
+
+## 4.0.0.rc1 (2017-08-17)
 
 * Removed `merge_params` from `Alchemy::Admin::BaseHelper`
   Use `ActionController::Parameters#merge` instead

data/alchemy_cms.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'jquery-rails',                     ['~> 4.0']
   gem.add_runtime_dependency 'jquery-ui-rails',                  ['~> 5.0.0']
   gem.add_runtime_dependency 'kaminari',                         ['~> 0.15']
-  gem.add_runtime_dependency 'magiclabs-userstamp',              ['~> 3.0']
+  gem.add_runtime_dependency 'originator',                       ['~> 3.0']
   gem.add_runtime_dependency 'non-stupid-digest-assets',         ['~> 1.0.8']
   gem.add_runtime_dependency 'rails',                            ['~> 5.0.0']
   gem.add_runtime_dependency 'ransack',                          ['~> 1.4']

data/app/controllers/alchemy/base_controller.rb

@@ -33,12 +33,6 @@ module Alchemy
       raise ActionController::RoutingError, msg
     end
 
-    # Shortcut for Alchemy::I18n.translate method
-    def _t(key, *args)
-      ActiveSupport::Deprecation.warn("Alchemys `_t` method is deprecated! Use `Alchemy.t` instead.", caller.unshift)
-      Alchemy.t(key, *args)
-    end
-
     # Store current request path into session,
     # so we can later redirect to it.
     def store_location

data/app/controllers/alchemy/messages_controller.rb

@@ -61,7 +61,7 @@ module Alchemy
     end
 
     def create #:nodoc:
-      @message = Message.new(params[:message])
+      @message = Message.new(message_params)
       @message.ip = request.remote_ip
       @element = Element.find_by(id: @message.contact_form_id)
       if @element.nil?
@@ -117,5 +117,9 @@ module Alchemy
       end
       @root_page = @page.get_language_root
     end
+
+    def message_params
+      params.require(:message).permit(*mailer_config['fields'])
+    end
   end
 end

data/app/controllers/alchemy/pages_controller.rb

@@ -51,13 +51,7 @@ module Alchemy
     # If no public page can be found it renders a 404 error.
     #
     def index
-      if Alchemy::Config.get(:redirect_index)
-        ActiveSupport::Deprecation.warn("The configuration option `redirect_index` is deprecated and will be removed with the release of Alchemy v4.0")
-        raise "Remove deprecated `redirect_index` configuration!" if Alchemy.version == "4.0.0.rc1"
-        redirect_permanently_to page_redirect_url
-      else
-        show
-      end
+      show
     end
 
     # == The show action gets invoked if one requests '/:urlname' or '/:locale/:urlname'

data/app/helpers/alchemy/base_helper.rb

@@ -2,11 +2,6 @@
 
 module Alchemy
   module BaseHelper
-    def _t(key, *args)
-      ActiveSupport::Deprecation.warn("Alchemys `_t` method is deprecated! Use `Alchemy.t` instead.", caller.unshift)
-      Alchemy.t(key, *args)
-    end
-
     # An alias for truncate.
     # Left here for downwards compatibilty.
     def shorten(text, length)

data/app/helpers/alchemy/pages_helper.rb

@@ -4,7 +4,6 @@ module Alchemy
   module PagesHelper
     include Alchemy::BaseHelper
     include Alchemy::ElementsHelper
-    include Alchemy::DeprecatedPagesHelper
 
     def picture_essence_caption(content)
       content.try(:essence).try(:caption)

data/app/helpers/alchemy/url_helper.rb

@@ -16,36 +16,6 @@ module Alchemy
       alchemy.show_page_url(show_page_path_params(page, optional_params))
     end
 
-    # This helper returns a path to picture for use inside a image_tag helper.
-    #
-    # Any additional options are passed to the url_helper, so you can add arguments to your url.
-    #
-    # Example:
-    #
-    #   <%= image_tag show_alchemy_picture_path(picture, size: '320x200', format: :png) %>
-    #
-    # @deprecated Use Alchemy::Picture#url instead
-    #
-    def show_alchemy_picture_path(picture, optional_params = {})
-      ActiveSupport::Deprecation.warn("`show_alchemy_picture_path` helper is deprecated and will be removed in Alchemy 4.0. Please use the `picture.url` method instead.")
-      picture.url(optional_params)
-    end
-
-    # This helper returns an url to picture for use inside a image_tag helper.
-    #
-    # Any additional options are passed to the url_helper, so you can add arguments to your url.
-    #
-    # Example:
-    #
-    #   <%= image_tag show_alchemy_picture_url(picture, size: '320x200', format: :png) %>
-    #
-    # @deprecated Use Alchemy::Picture#url instead
-    #
-    def show_alchemy_picture_url(picture, optional_params = {})
-      ActiveSupport::Deprecation.warn("`show_alchemy_picture_url` helper is deprecated and will be removed in Alchemy 4.0. Please use the `picture.url` method instead.")
-      picture.url(optional_params)
-    end
-
     # Returns the correct params-hash for passing to show_page_path
     def show_page_path_params(page, optional_params = {})
       raise ArgumentError, 'Page is nil' if page.nil?

data/app/models/alchemy/content.rb

@@ -219,10 +219,7 @@ module Alchemy
 
     # Returns true if this content should be taken for element preview.
     def preview_content?
-      if definition['take_me_for_preview']
-        ActiveSupport::Deprecation.warn("Content definition's `take_me_for_preview` key is deprecated. Please use `as_element_title` instead.")
-      end
-      !!definition['take_me_for_preview'] || !!definition['as_element_title']
+      !!definition['as_element_title']
     end
 
     # Proxy method that returns the preview text from essence.

data/app/models/alchemy/element_to_page.rb

@@ -3,7 +3,7 @@
 module Alchemy
   class ElementToPage
     def self.table_name
-      [Element.table_name, Page.table_name].join('_')
+      [Alchemy::Element.table_name, Alchemy::Page.table_name].join('_')
     end
   end
 end

data/app/models/alchemy/essence_picture_view.rb

@@ -19,13 +19,6 @@ module Alchemy
     def initialize(content, options = {}, html_options = {})
       @content = content
       @options = DEFAULT_OPTIONS.merge(content.settings).merge(options)
-      if @options[:image_size].present?
-        ActiveSupport::Deprecation.warn(
-          "Passing `image_size` to EssencePicture is deprecated. Please use `size` instead.",
-          caller.unshift
-        )
-        @options[:size] = @options.delete(:image_size)
-      end
       @html_options = html_options
       @essence = content.essence
       @picture = essence.picture

data/lib/alchemy/i18n.rb

@@ -19,11 +19,6 @@ module Alchemy
 
   module I18n
     class << self
-      def t(msg, *args)
-        ActiveSupport::Deprecation.warn('`Alchemy::I18n.t` is deprecated! Use `Alchemy.t` instead.', caller.unshift)
-        Alchemy::I18n.translate(msg, *args)
-      end
-
       # Alchemy translation methods
       #
       # Instead of having to translate strings and defining a default value:

data/lib/alchemy/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Alchemy
-  VERSION = "4.0.0.rc1"
+  VERSION = "4.0.0.rc2"
 
   def self.version
     VERSION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 4.0.0.rc1
+  version: 4.0.0.rc2
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-17 00:00:00.000000000 Z
+date: 2017-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -198,7 +198,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.15'
 - !ruby/object:Gem::Dependency
-  name: magiclabs-userstamp
+  name: originator
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -499,7 +499,6 @@ files:
 - app/helpers/alchemy/admin/pictures_helper.rb
 - app/helpers/alchemy/admin/tags_helper.rb
 - app/helpers/alchemy/base_helper.rb
-- app/helpers/alchemy/deprecated_pages_helper.rb
 - app/helpers/alchemy/elements_block_helper.rb
 - app/helpers/alchemy/elements_helper.rb
 - app/helpers/alchemy/essences_helper.rb

data/app/helpers/alchemy/deprecated_pages_helper.rb

@@ -1,56 +0,0 @@
-# frozen_string_literal: true
-
-module Alchemy
-  module DeprecatedPagesHelper
-    # All these helper methods are deprecated.
-    # They are mixed into Alchemy::PagesHelper but will be removed in the future.
-
-    def alchemy_preview_mode_code
-      ActiveSupport::Deprecation.warn('PageHelper `alchemy_preview_mode_code` is deprecated and will be removed with Alchemy v4.0. Please use `render "alchemy/preview_mode_code"` in your layout instead.')
-      render "alchemy/preview_mode_code"
-    end
-
-    def render_meta_data(options = {})
-      ActiveSupport::Deprecation.warn('PageHelper `render_meta_data` is deprecated and will be removed with Alchemy v4.0. Please use `render "alchemy/pages/meta_data"` in your view instead.')
-      render "alchemy/pages/meta_data", options
-    end
-
-    def render_page_title(options = {})
-      ActiveSupport::Deprecation.warn('PageHelper `render_page_title` is deprecated and will be removed with Alchemy v4.0. Please use `render "alchemy/pages/meta_data"` in your view instead.')
-      return "" if @page.title.blank?
-      options = {
-        prefix: "",
-        separator: ""
-      }.update(options)
-      title_parts = [options[:prefix]]
-      if response.status == 200
-        title_parts << @page.title
-      else
-        title_parts << response.status
-      end
-      title_parts.join(options[:separator]).html_safe
-    end
-
-    def render_title_tag(options = {})
-      ActiveSupport::Deprecation.warn('PageHelper `render_title_tag` is deprecated and will be removed with Alchemy v4.0. Please use `render "alchemy/pages/meta_data"` in your view instead.')
-      default_options = {
-        prefix: "",
-        separator: ""
-      }
-      options = default_options.merge(options)
-      content_tag(:title, render_page_title(options))
-    end
-
-    def render_meta_tag(options = {})
-      ActiveSupport::Deprecation.warn('PageHelper `render_meta_tag` is deprecated and will be removed with Alchemy v4.0. Please use `tag()` instead. (http://api.rubyonrails.org/classes/ActionView/Helpers/TagHelper.html#method-i-tag)')
-      default_options = {
-        name: "",
-        default_language: "de",
-        content: ""
-      }
-      options = default_options.merge(options)
-      lang = (@page.language.blank? ? options[:default_language] : @page.language.code)
-      tag(:meta, name: options[:name], content: options[:content], lang: lang)
-    end
-  end
-end