alchemy_cms 3.0.4 → 3.1.0.beta1

data/alchemy_cms.gemspec

@@ -19,32 +19,33 @@ Gem::Specification.new do |gem|
   gem.executables           = 'alchemy'
   gem.require_paths         = ['lib']
 
-  gem.add_runtime_dependency 'rails',                            '>= 4.0', '< 4.2'
+  gem.add_runtime_dependency 'rails',                            '>= 4.0', '< 5.0'
   gem.add_runtime_dependency 'actionpack-page_caching',          '~> 1.0.0'
   gem.add_runtime_dependency 'awesome_nested_set',               '~> 3.0.0.rc.2'
   gem.add_runtime_dependency 'acts-as-taggable-on',              '~> 3.1'
-  gem.add_runtime_dependency 'cancan',                           '~> 1.6.10'
+  gem.add_runtime_dependency 'cancancan',                        '~> 1.9'
   gem.add_runtime_dependency 'dragonfly',                        '~> 1.0.1'
   gem.add_runtime_dependency 'kaminari',                         '~> 0.15'
   gem.add_runtime_dependency 'acts_as_list',                     '~> 0.3.0'
   gem.add_runtime_dependency 'magiclabs-userstamp',              '~> 2.1.0'
-  gem.add_runtime_dependency 'simple_form',                      '~> 3.0.1'
+  gem.add_runtime_dependency 'simple_form',                      '~> 3.0'
   gem.add_runtime_dependency 'jquery-rails',                     '~> 3.1.0'
-  gem.add_runtime_dependency 'jquery-ui-rails',                  '~> 4.1.1'
-  gem.add_runtime_dependency 'sass-rails',                       '~> 4.0.2'
+  gem.add_runtime_dependency 'jquery-ui-rails',                  '~> 5.0.0'
+  gem.add_runtime_dependency 'sass-rails',                       '>= 4.0.4'
+  gem.add_runtime_dependency 'sass',                             '>= 3.2.19'
   gem.add_runtime_dependency 'uglifier',                         '>= 1.3.0'
   gem.add_runtime_dependency 'coffee-rails',                     '~> 4.0.0'
-  gem.add_runtime_dependency 'compass-rails',                    '~> 1.1.2'
+  gem.add_runtime_dependency 'compass-rails',                    '>= 1.1.2'
   gem.add_runtime_dependency 'sassy-buttons',                    '~> 0.2.6'
-  gem.add_runtime_dependency 'select2-rails',                    '>= 3.5.9.1', '< 4.0'
+  gem.add_runtime_dependency 'select2-rails',                    '~> 3.4'
   gem.add_runtime_dependency 'tvdeyen-handles_sortable_columns', '~> 0.1.5'
   gem.add_runtime_dependency 'spinner.rb'
   gem.add_runtime_dependency 'turbolinks',                       '~> 2.0'
   gem.add_runtime_dependency 'non-stupid-digest-assets',         '~> 1.0.3'
-  gem.add_runtime_dependency 'active_model_serializers',         '>= 0.8.1', '< 0.9.1'
+  gem.add_runtime_dependency 'active_model_serializers',         '>= 0.8.1', '< 0.10.0'
   gem.add_runtime_dependency 'request_store',                    '~> 1.1.0'
 
-  gem.add_development_dependency 'rspec-rails', '~> 2.0'
+  gem.add_development_dependency 'rspec-rails', '~> 3.0'
   gem.add_development_dependency 'capybara'
   gem.add_development_dependency 'factory_girl_rails'
 

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

@@ -1,5 +1,5 @@
-#= require jquery.ui.draggable
-#= require jquery.ui.sortable
+#= require jquery-ui/draggable
+#= require jquery-ui/sortable
 #
 window.Alchemy = {} if typeof (window.Alchemy) is "undefined"
 

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

@@ -4,7 +4,7 @@ Alchemy.ImageCropper =
 
   initialized: false
 
-  init: (box, size_x, size_y, default_box, ratio, true_size) ->
+  init: (box, min_size, default_box, ratio, true_size) ->
     crop_from_field = $("#essence_picture_crop_from")
     crop_size_field = $("#essence_picture_crop_size")
     options =
@@ -13,7 +13,7 @@ Alchemy.ImageCropper =
         crop_size_field.val coords.w + "x" + coords.h
       setSelect: box
       aspectRatio: (if ratio then ratio else `undefined`)
-      minSize: [size_x, size_y]
+      minSize: (if min_size then min_size else `undefined`)
       boxWidth: 800
       boxHeight: 600
       trueSize: true_size

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

@@ -3,12 +3,12 @@
 //= require jquery
 //= require jquery_ujs
 //= require turbolinks
-//= require jquery.ui.datepicker
-//= require jquery.ui.draggable
-//= require jquery.ui.effect-drop
-//= require jquery.ui.effect-fade
-//= require jquery.ui.sortable
-//= require jquery.ui.tabs
+//= require jquery-ui/datepicker
+//= require jquery-ui/draggable
+//= require jquery-ui/effect-drop
+//= require jquery-ui/effect-fade
+//= require jquery-ui/sortable
+//= require jquery-ui/tabs
 //= require tinymce/tinymce.min
 //= require_tree ../../../../vendor/assets/javascripts/jquery_plugins/
 //= require spin.min
@@ -16,7 +16,6 @@
 //= require requestAnimationFrame
 //= require select2
 //= require select2_locale_de
-//= require select2_locale_ru
 //= require alchemy/alchemy.base
 //= require alchemy/alchemy.autocomplete
 //= require alchemy/alchemy.browser

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

@@ -87,46 +87,4 @@ Alchemy.translations =
     'File is too small': 'Le fichier est trop petit.'
     'File type not allowed': 'Type de document non autorisé.'
     'Maximum number of files exceeded': 'Le nombre maximum de fichiers est atteint.'
-    'Uploaded bytes exceed file size': 'Taille de fichier maximale autorisée atteint.'
-
-  # Russian
-  ru:
-    allowed_chars: '%{count} знаков'
-    cancel: 'Отмена'
-    cancelled: 'Отменено'
-    click_to_edit: 'нажмите, чтобы редактировать'
-    complete: 'Завершено'
-    element_dirty_notice: 'Для этого элемента есть несохраненные изменения. Вы действительно хотите их сбросить?'
-    help: 'Помощь'
-    ok: 'Ок'
-    page_dirty_notice: 'На странице есть несохраненные изменения. Если вы продолжите, то они пропадут.'
-    page_found: 'Страница найдена'
-    pages_found: 'Страницы найдены'
-    url_validation_failed: 'Адрес (URL) имеет неверный формат.'
-    warning: 'Внимание!'
-    'File is too large': 'Файл слишком большой'
-    'File is too small': 'Файл слишком маленький'
-    'File type not allowed': 'Этот тип файла не разрешен'
-    'Maximum number of files exceeded': 'Исчерпано максимальное количество файлов.'
-    'Uploaded bytes exceed file size': 'Превышен максимальный размер файла'
-      
-  # Spanish
-  es:
-    allowed_chars: 'de %{count} caracteres'
-    cancel: 'Cancelar'
-    cancelled: 'Cancelado'
-    click_to_edit: 'Pulsar para editar'
-    complete: 'Completado'
-    element_dirty_notice: 'Este elemento tiene cambios sin guardar. ¿Realmente quieres plegarlo?'
-    help: 'Ayuda'
-    ok: 'Aceptar'
-    page_dirty_notice: 'Tienes cambios sin guardar en esta página. Si continúas se perderán.'
-    page_found: 'Página encontrada'
-    pages_found: 'Páginas encontradas'
-    url_validation_failed: 'La url no tiene un formato válido.'
-    warning: '¡Atención!'
-    'File is too large': 'El archivo es demasiado grande'
-    'File is too small': 'El archivo es demasiado pequeño'
-    'File type not allowed': 'El tipo de archivo no está permitido'
-    'Maximum number of files exceeded': 'Número máximo de archivos excedido.'
-    'Uploaded bytes exceed file size': 'Los bytes subidos exceden el tamaño del archivo'
+    'Uploaded bytes exceed file size': 'Taille de fichier maximale autorisée atteint.'

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

@@ -1,4 +1,4 @@
-#= require jquery.ui.widget
+#= require jquery-ui/widget
 #= require alchemy/alchemy.file_progress
 #= require fileupload/jquery.iframe-transport
 #= require fileupload/jquery.fileupload

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

@@ -1,7 +1,8 @@
 @mixin default-focus-style {
   border-color: $blue;
-  @include box-shadow(0 0 1px 2px $blue);
+  @include box-shadow(0 0 2px 2px $blue);
   outline: none;
+  @include transition(all 0.25s ease-in-out);
 
   &::-moz-focus-inner {
     border: none !important;

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

@@ -196,11 +196,6 @@ button.icon_button {
     border: $default-border;
     padding: 2px;
     @extend %rounded-border;
-
-    &:focus {
-      border: 0;
-      padding: 3px;
-    }
   }
 
   .select2-container {

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

@@ -48,6 +48,7 @@
 .alchemy-dialog {
   position: relative;
   max-width: 100%;
+  max-height: 100%;
   display: inline-block;
   vertical-align: middle;
   text-align: left;

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

@@ -122,12 +122,12 @@ div#overlay_text_box {
   left: 0;
   text-align: center;
   width: 65px;
+  padding-top: 4px;
+  padding-bottom: 8px;
   background: $light-blue;
 
   a {
     display: block;
-    padding-top: 4px;
-    padding-bottom: 8px;
 
     &:hover {
       text-decoration: none;
@@ -197,22 +197,20 @@ div#user_info {
     text-shadow: 0px 1px 1px #FFFFFF;
     @extend .disable-user-select;
     cursor: default;
-    line-height: 27px;
+    line-height: 22px;
     float: left;
     @extend .top-rounded-border;
     border: $default-border;
     border-bottom-style: none;
     height: 24px;
     margin-right: 1px;
-
-    .page_name {
-      position: relative;
-      bottom: 2px;
-    }
   }
 
   .page_name {
+    position: relative;
     margin-right: $default-margin;
+    line-height: 27px;
+    bottom: 2px;
   }
 
   .page_language {
@@ -230,6 +228,7 @@ div#user_info {
 
   .subnavi_tab {
     float: left;
+    padding: 0px 8px;
     line-height: 21px;
     height: 23px;
     text-shadow: #fff 0 0px 4px;
@@ -258,7 +257,9 @@ div#user_info {
     }
 
     &.active {
+      float: left;
       position: relative;
+      padding: 0px 8px;
       height: 24px;
       color: $text-color;
       background-color: $medium-gray;
@@ -267,10 +268,6 @@ div#user_info {
       cursor: default;
       z-index: 10;
     }
-
-    > a {
-      padding: 0px 8px;
-    }
   }
 }
 

data/app/assets/stylesheets/tinymce/skins/alchemy/content.min.css.scss

@@ -2,13 +2,22 @@
  *= require_self
  */
 @import "alchemy/variables";
+@import "compass/css3";
+
+html {
+  @include box-shadow(inset 0px 1px 1px $medium-gray);
+  @include border-radius($default-border-radius);
+}
 
 body {
   background-color: #fff;
   color: $text-color;
   font: $default-font-style;
-  margin: 0 2*$default-margin;
-  padding-bottom: $default-padding !important;
+  margin: 6px 0 !important;
+  padding-left: 2*$default-margin !important;
+  padding-right: 2*$default-margin !important;
+  padding-top: 0px !important;
+  padding-bottom: 0px !important;
 }
 
 td,th {

data/app/assets/stylesheets/tinymce/skins/alchemy/skin.min.css.scss

@@ -98,6 +98,8 @@ div.mce-fullscreen {
 div.mce-edit-area {
   background: #FFF;
   filter: none;
+  border-top: 0;
+  @include border-radius($default-border-radius);
 }
 
 .mce-statusbar {
@@ -246,6 +248,11 @@ div.mce-tinymce-inline {
 .mce-panel {
   border: 0 solid $default-border-color;
   background-color: $medium-gray;
+  @include box-sizing(border-box);
+}
+
+.mce-toolbar-grp {
+  border-bottom: 1px solid $default-border-color;
 }
 
 .mce-floatpanel {
@@ -1397,6 +1404,7 @@ div.mce-menu .mce-menu-item-sep,.mce-menu-item-sep:hover {
 
 i.mce-i-resize {
   color: #333;
+  font-size: 16px;
 }
 
 .mce-spacer {
@@ -1555,7 +1563,7 @@ i.mce-i-resize {
   font-size: 12px;
   line-height: 16px;
   vertical-align: text-top;
-  -webkit-font-smoothing: antialiased;
+  -webkit-font-smoothing: subpixel-antialiased;
   display: inline-block;
   background: transparent center center;
   width: 16px;

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

@@ -40,7 +40,6 @@ module Alchemy
       end
 
       def update
-        @attachment = Attachment.find(params[:id])
         @attachment.update_attributes(attachment_attributes)
         render_errors_or_redirect(
           @attachment,
@@ -50,7 +49,6 @@ module Alchemy
       end
 
       def destroy
-        @attachment = Attachment.find(params[:id])
         name = @attachment.name
         @attachment.destroy
         @url = admin_attachments_url(
@@ -76,7 +74,7 @@ module Alchemy
       end
 
       def archive_overlay
-        @content = Content.select('id').find_by(id: params[:content_id])
+        @content = Content.find_by(id: params[:content_id])
         @options = options_from_params
         respond_to do |format|
           format.html { render partial: 'archive_overlay' }
@@ -90,7 +88,7 @@ module Alchemy
 
       def set_instance_variables
         @while_assigning = true
-        @content = Content.select('id').find_by(id: params[:content_id])
+        @content = Content.find_by(id: params[:content_id])
         @swap = params[:swap]
         @options = options_from_params
       end

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

@@ -18,9 +18,13 @@ module Alchemy
         if @picture = @essence_picture.picture
           @content = @essence_picture.content
           @options[:format] ||= (configuration(:image_store_format) or 'png')
-          @size_x, @size_y = sizes_from_essence_or_params
-          @initial_box, @default_box = cropping_boxes
+
+          @min_size = sizes_from_essence_or_params
           @ratio = ratio_from_size_or_params
+          infer_width_or_height_from_ratio
+
+          @default_box = @essence_picture.default_mask(@min_size)
+          @initial_box = @essence_picture.cropping_mask || @default_box
         else
           @no_image_notice = _t(:no_image_for_cropper_found)
         end
@@ -35,15 +39,16 @@ module Alchemy
       # When the user press save on the element, it gets saved.
       #
       def assign
-        @picture = Picture.find_by_id(params[:picture_id])
+        @picture = Picture.find_by(id: params[:picture_id])
         @content.essence.picture = @picture
+        @content.touch # We need to touch manually because its not saved yet.
         @element = @content.element
         @dragable = @options[:grouped]
         @options = @options.merge(dragable: @dragable)
       end
 
       def destroy
-        @content = Content.find_by_id(params[:id])
+        @content = Content.find_by(id: params[:id])
         @element = @content.element
         @content_id = @content.id
         @content.destroy
@@ -64,49 +69,40 @@ module Alchemy
         @content = Content.find(params[:content_id])
       end
 
+      # Gets the minimum size of the image to be rendered. the database render_size
+      # has preference over the image_size parameter.
+      #
       def sizes_from_essence_or_params
-        sizes_from_essence || sizes_from_params
-      end
-
-      def sizes_from_params
-        return [0, 0] if @options[:image_size].blank?
-        @options[:image_size].split('x')
-      end
-
-      def sizes_from_essence
-        return if @essence_picture.render_size.blank?
-        size_x, size_y = @essence_picture.render_size.split('x').map(&:to_i)
-        if size_x.zero? || size_y.nil? || size_y.zero?
-          size_x_of_original = @essence_picture.picture.image_file_width 
-          size_y_of_original = @essence_picture.picture.image_file_height
-          size_x = size_x_of_original * size_y / size_y_of_original if size_x.zero?
-          size_y = size_y_of_original * size_x / size_x_of_original if size_y.nil? || size_y.zero?
+        if @essence_picture.render_size? && !@essence_picture.render_size.blank?
+          @essence_picture.sizes_from_string(@essence_picture.render_size)
+        elsif @options[:image_size]
+          @essence_picture.sizes_from_string(@options[:image_size])
+        else
+          { width: 0, height: 0 }
         end
-        [size_x, size_y]
       end
 
-      def sizes_string
-        @sizes_string ||= "#{@size_x}x#{@size_y}"
-      end
-
-      def cropping_boxes
-        if @essence_picture.crop_from.blank? || @essence_picture.crop_size.blank?
-          initial_box = @picture.default_mask(sizes_string)
-          default_box = initial_box
+      # Infers the aspect ratio from size or parameters. If you don't want a fixed
+      # aspect ratio, don't specify a size or only width or height.
+      #
+      def ratio_from_size_or_params
+        if @min_size.has_value?(0) && @options[:fixed_ratio]
+          @options[:fixed_ratio].to_f
+        elsif !@min_size[:width].zero? && !@min_size[:height].zero?
+          @min_size[:width].to_f / @min_size[:height].to_f
         else
-          initial_box = @essence_picture.cropping_mask
-          default_box = @picture.default_mask(sizes_string)
+          false
         end
-        [initial_box, default_box]
       end
 
-      def ratio_from_size_or_params
-        if @options[:fixed_ratio] == false
-          false
-        elsif @size_y == 0
-          1
+      # Infers the minimum width or height if the aspect ratio and one dimension
+      # is specified.
+      #
+      def infer_width_or_height_from_ratio
+        if @min_size[:height].zero?
+          @min_size[:height] = (@min_size[:width] / @ratio).to_i if @ratio
         else
-          @size_x.to_f / @size_y.to_f
+          @min_size[:width] = (@min_size[:height] * @ratio).to_i if @ratio
         end
       end