alchemy_cms 3.3.0 → 3.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b2de102b0ff3416c4b8bf164e88c121cad5b606
-  data.tar.gz: f9dbf2b258ed3432b88ec0a4e758fed0cb17abc1
+  metadata.gz: b1447225839cddd63cc43645f83ab0ed6cd98493
+  data.tar.gz: c8976f40e5106dca884d4ff4a71a295622483cd0
 SHA512:
-  metadata.gz: 2ab2060c1bc6766ae4270371bff98e1a75ca6d373851b4ba9d998c9fee0316b95de227592d356c0d50388f5d6014572d98341492a490d9e9d524a20eb2eb618e
-  data.tar.gz: b54e16e8762347eadab4dd5f9aa4e0c641bf655851a572a7eb11aaa5ede8fa94451dd60d39e5024f5e4d899ff10ffc36680545a521f574ecf53e36635e8e7caa
+  metadata.gz: 6d2fafce6f1c2ee32597a8a0c028184fcff046d4ffdbb4a79959b1b132185d7d92c571d8bd066545d6484798cc3bc99022bd33210a1ac45713e268b865303fe6
+  data.tar.gz: ba306bd99dbd07d682a7fa5e1c22f1b0719b9b46368b463ed92ed8e73f3b51ddff8fea999f8432e234cc5a1181a2da489a90d20a204c7bbc5d01da05bf4e91e1

data/.travis.yml

@@ -7,7 +7,7 @@ rvm:
 - 2.3.0
 branches:
   only:
-    - master
+    - 3.3-stable
 before_install:
   - gem install bundler
 before_script: bundle exec rake alchemy:spec:prepare

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Change Log
 
+## 3.3.1 (2016-06-20)
+
+* Fix use of Alchemy::Resource with namespaced models (#729)
+* Allow setting the type of EssenceText input fields in the elements.yml via `settings[:input_type]`
+* Admin locale switching does not switch language tree any more (#1065)
+* Fixes bug where old site session causes not found errors (#1047)
+* Fix inability to add nested elements on pages with cells (#1039)
+* Skip upgrader if no element definitions are found (#1060)
+* Fix selecting the active cell for elements with nested elements (#1041)
+
 ## 3.3.0 (2016-05-18)
 
 __New Features__

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

@@ -72,7 +72,7 @@ Alchemy.ElementEditors =
   selectCellForElement: ($element) ->
     $cells = $("#cells .sortable_cell")
     if $cells.size() > 0
-      $cell = $element.parent(".sortable_cell")
+      $cell = $element.closest(".sortable_cell")
       $("#cells").tabs("option", "active", $cells.index($cell))
 
   # Marks an element as selected in the element window and scrolls to it.

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

@@ -28,7 +28,7 @@ Alchemy.Initializer = ->
   $('select#change_locale').on 'change', (e) ->
     url = window.location.pathname
     delimiter = if url.match(/\?/) then '&' else '?'
-    window.location.href = "#{url}#{delimiter}locale=#{$(this).val()}"
+    window.location.href = "#{url}#{delimiter}admin_locale=#{$(this).val()}"
 
   # Site select handler
   $('select#change_site').on 'change', (e) ->

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

@@ -2,7 +2,7 @@ module Alchemy
   module Admin
     class BaseController < Alchemy::BaseController
       include Userstamp
-      include Alchemy::Locale
+      include Locale
 
       before_action { enforce_ssl if ssl_required? && !request.ssl? }
       before_action :load_locked_pages
@@ -172,14 +172,10 @@ module Alchemy
       #
       def current_alchemy_site
         @current_alchemy_site ||= begin
-          site_id = params[:site_id] || session[:site_id]
-          if site_id.nil?
-            session.delete :site_id
-            Site.find_for_host(request.host)
-          else
-            session[:site_id] = site_id
-            Site.find(site_id)
-          end
+          site_id = params[:site_id] || session[:alchemy_site_id]
+          site = Site.find_by(id: site_id) || super
+          session[:alchemy_site_id] = site.id
+          site
         end
       end
     end

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

@@ -49,7 +49,7 @@ module Alchemy
         resource_instance_variable.save
         render_errors_or_redirect(
           resource_instance_variable,
-          resources_path(resource_handler.resources_name, current_location_params),
+          resources_path(resource_handler.namespaced_resources_name, current_location_params),
           flash_notice_for_resource_action
         )
       end
@@ -58,7 +58,7 @@ module Alchemy
         resource_instance_variable.update_attributes(resource_params)
         render_errors_or_redirect(
           resource_instance_variable,
-          resources_path(resource_handler.resources_name, current_location_params),
+          resources_path(resource_handler.namespaced_resources_name, current_location_params),
           flash_notice_for_resource_action
         )
       end

data/app/models/alchemy/content.rb

@@ -241,7 +241,7 @@ module Alchemy
     # Returns true if there is a tinymce setting defined on the content definiton
     # or if the +essence.has_tinymce?+ returns true.
     def has_tinymce?
-      settings[:tinymce].present? || essence.has_tinymce?
+      settings[:tinymce].present? || (essence.present? && essence.has_tinymce?)
     end
 
     # Returns true if there is a tinymce setting defined that contains settings.

data/app/views/alchemy/admin/elements/_new_element_form.html.erb

@@ -6,7 +6,7 @@
 <%- else -%>
   <%= alchemy_form_for [:admin, @element] do |form| %>
     <%= form.hidden_field :page_id %>
-  <%- if @page.can_have_cells? -%>
+  <%- if @page.can_have_cells? && @parent_element.blank? -%>
     <%= form.input :name,
       label: Alchemy.t(:element_of_type),
       collection: grouped_elements_for_select(@elements),

data/app/views/alchemy/essences/_essence_text_editor.html.erb

@@ -5,7 +5,8 @@
       content.form_field_name,
       content.ingredient,
       class: ["thin_border #{content.settings[:linkable] ? ' text_with_icon' : ''}", html_options[:class]].join(' '),
-      style: html_options[:style]
+      style: html_options[:style],
+      type: content.settings_value(:input_type) || "text"
     ) %>
     <% if content.settings[:linkable] %>
       <%= hidden_field_tag content.form_field_name(:link), content.essence.link %>

data/lib/alchemy/admin/locale.rb

@@ -0,0 +1,66 @@
+module Alchemy
+  module Admin
+    module Locale
+      extend ActiveSupport::Concern
+
+      included do
+        before_action :set_translation
+      end
+
+      private
+
+      # Sets Alchemy's GUI translation.
+      #
+      # Uses the most preferred locale or falls back to the default locale if none of the preferred is available.
+      #
+      # It respects the default translation from your +config/application.rb+ +default_locale+ config option.
+      #
+      def set_translation
+        if locale_change_needed?
+          locale = available_locale || ::I18n.default_locale
+        else
+          locale = session[:alchemy_locale]
+        end
+        ::I18n.locale = session[:alchemy_locale] = locale
+      end
+
+      # Checks if we need to change to locale or not.
+      def locale_change_needed?
+        params[:admin_locale].present? || session[:alchemy_locale].blank?
+      end
+
+      # Returns either the most preferred locale that is within the list of available locales or nil
+      #
+      # The availability of the locales is checked in the exact order of either
+      #
+      #  * the passed parameter: +params[:admin_locale]+
+      #  * the user's locale
+      #  * the locale of the browser
+      #
+      def available_locale
+        locales = [params[:admin_locale], locale_from_user, locale_from_browser].compact
+        locales.detect { |locale| ::I18n.available_locales.include?(locale.to_sym) }
+      end
+
+      # Try to get the locale from user settings.
+      def locale_from_user
+        return if !current_alchemy_user
+        if user_has_preferred_language?
+          current_alchemy_user.language
+        end
+      end
+
+      # Checks if the +current_alchemy_user+ has a preferred language set or not.
+      def user_has_preferred_language?
+        return if !current_alchemy_user
+        current_alchemy_user.respond_to?(:language) &&
+          current_alchemy_user.language.present?
+      end
+
+      # Try to get the locale from browser headers.
+      def locale_from_browser
+        request.env['HTTP_ACCEPT_LANGUAGE'].try(:scan, /\A[a-z]{2}/).try(:first)
+      end
+    end
+  end
+end

data/lib/alchemy/engine.rb

@@ -23,6 +23,7 @@ require 'turbolinks'
 require 'userstamp'
 
 # Require globally used Alchemy mixins
+require_relative './admin/locale'
 require_relative './auth_accessors'
 require_relative './cache_digests/template_tracker'
 require_relative './config'
@@ -34,7 +35,6 @@ require_relative './filetypes'
 require_relative './forms/builder'
 require_relative './hints'
 require_relative './i18n'
-require_relative './locale'
 require_relative './logger'
 require_relative './modules'
 require_relative './mount_point'

data/lib/alchemy/resource.rb

@@ -117,10 +117,15 @@ module Alchemy
     end
 
     def namespaced_resource_name
-      return @_namespaced_resource_name unless @_namespaced_resource_name.nil?
-      resource_name_array = resource_array
-      resource_name_array.delete(engine_name) if in_engine?
-      @_namespaced_resource_name = resource_name_array.join('_').singularize
+      @_namespaced_resource_name ||= namespaced_resources_name.singularize
+    end
+
+    def namespaced_resources_name
+      @_namespaced_resources_name ||= begin
+        resource_name_array = resource_array.dup
+        resource_name_array.delete(engine_name) if in_engine?
+        resource_name_array.join('_')
+      end
     end
 
     def namespace_for_scope

data/lib/alchemy/resources_helper.rb

@@ -31,16 +31,16 @@ module Alchemy
       @_resource_scope ||= [resource_url_proxy].concat(resource_handler.namespace_for_scope)
     end
 
-    def resources_path(resource_or_name = resource_handler.resources_name, options = {})
+    def resources_path(resource_or_name = resource_handler.namespaced_resources_name, options = {})
       polymorphic_path (resource_scope + [resource_or_name]), options
     end
 
-    def resource_path(resource = resource_handler.resource_name, options = {})
+    def resource_path(resource = resource_handler.namespaced_resource_name, options = {})
       resources_path(resource, options)
     end
 
     def new_resource_path(options = {})
-      new_polymorphic_path (resource_scope + [resource_handler.resource_name]), options
+      new_polymorphic_path (resource_scope + [resource_handler.namespaced_resource_name]), options
     end
 
     def edit_resource_path(resource = nil, options = {})

data/lib/alchemy/upgrader/tasks/available_contents_upgrader.rb

@@ -9,6 +9,10 @@ module Alchemy::Upgrader::Tasks
     no_tasks do
       def convert_available_contents
         config = read_config
+        unless config
+          puts "\nNo elements config found. Skipping."
+          return
+        end
 
         elements_with_available_contents, new_elements = config.partition do |e|
           e['available_contents']
@@ -39,7 +43,9 @@ module Alchemy::Upgrader::Tasks
       old_config_file = Rails.root.join('config', 'alchemy', 'elements.yml')
       config = YAML.load_file(old_config_file)
 
-      puts "done.\n"
+      if config
+        puts "done.\n"
+      end
 
       config
     end

data/lib/alchemy/version.rb

@@ -1,5 +1,5 @@
 module Alchemy
-  VERSION = "3.3.0"
+  VERSION = "3.3.1"
 
   def self.version
     VERSION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.3.1
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-18 00:00:00.000000000 Z
+date: 2016-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack-page_caching
@@ -812,6 +812,7 @@ files:
 - db/migrate/20150608204610_add_parent_element_id_to_alchemy_elements.rb
 - db/migrate/20150729151825_add_link_text_to_alchemy_essence_files.rb
 - db/migrate/20150906195818_add_locale_to_alchemy_languages.rb
+- lib/alchemy/admin/locale.rb
 - lib/alchemy/auth_accessors.rb
 - lib/alchemy/cache_digests/template_tracker.rb
 - lib/alchemy/config.rb
@@ -825,7 +826,6 @@ files:
 - lib/alchemy/hints.rb
 - lib/alchemy/i18n.rb
 - lib/alchemy/kaminari/scoped_pagination_url_helper.rb
-- lib/alchemy/locale.rb
 - lib/alchemy/logger.rb
 - lib/alchemy/modules.rb
 - lib/alchemy/mount_point.rb

data/lib/alchemy/locale.rb

@@ -1,64 +0,0 @@
-module Alchemy
-  module Locale
-    extend ActiveSupport::Concern
-
-    included do
-      before_action :set_translation
-    end
-
-    private
-
-    # Sets Alchemy's GUI translation.
-    #
-    # Uses the most preferred locale or falls back to the default locale if none of the preferred is available.
-    #
-    # It respects the default translation from your +config/application.rb+ +default_locale+ config option.
-    #
-    def set_translation
-      if locale_change_needed?
-        locale = available_locale || ::I18n.default_locale
-      else
-        locale = session[:alchemy_locale]
-      end
-      ::I18n.locale = session[:alchemy_locale] = locale
-    end
-
-    # Checks if we need to change to locale or not.
-    def locale_change_needed?
-      params[:locale].present? || session[:alchemy_locale].blank?
-    end
-
-    # Returns either the most preferred locale that is within the list of available locales or nil
-    #
-    # The availability of the locales is checked in the exact order of either
-    #
-    #  * the passed parameter: +params[:locale]+
-    #  * the user's locale
-    #  * the locale of the browser
-    #
-    def available_locale
-      locales = [params[:locale], locale_from_user, locale_from_browser].compact
-      locales.detect { |locale| ::I18n.available_locales.include?(locale.to_sym) }
-    end
-
-    # Try to get the locale from user settings.
-    def locale_from_user
-      return if !current_alchemy_user
-      if user_has_preferred_language?
-        current_alchemy_user.language
-      end
-    end
-
-    # Checks if the +current_alchemy_user+ has a preferred language set or not.
-    def user_has_preferred_language?
-      return if !current_alchemy_user
-      current_alchemy_user.respond_to?(:language) &&
-        current_alchemy_user.language.present?
-    end
-
-    # Try to get the locale from browser headers.
-    def locale_from_browser
-      request.env['HTTP_ACCEPT_LANGUAGE'].try(:scan, /\A[a-z]{2}/).try(:first)
-    end
-  end
-end