alchemy_cms 4.0.0.rc2 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2602c152298a64524d0219dae9612ddd13bb7909
-  data.tar.gz: ff1579cc4c0db34cfa5d1620426bba1622a72739
+  metadata.gz: 32cd97a2d51613e7b97f0a369d52fdcea5390b1f
+  data.tar.gz: aa26582f94ed95c780a07773ce7f40c1cca1e391
 SHA512:
-  metadata.gz: 475e535fdb68297c36fe5fa013ede09be2555d03fbc58bdff079d9978f79b6d8ce4c3ec23c4b063e563d647c028eb3762d16a564831c09a8dc2b97c40f2d64b7
-  data.tar.gz: c86d7978a829bef8c50446e5df3c7fa1e5abcfb7e1d52479603a66d780c27359349b5654ee1cef201ebee8b0b6dafe576427db9a6a1907d7888d2c6277116165
+  metadata.gz: b95d61495b2bce7683cecbdea814c08673e8688da61f3a690c9fbb6a1ba6560c031e1980377ef7f7e5fff785d334d9c0c7380f6951d4d214c5e4714ceec86f39
+  data.tar.gz: 67022c61db2f6163f64bed4daf2cb5b51001ac424f18581cdf983b5e922db7dfb1c1184a61f819948e9fb8a1643178f1183d8101fda392c7c6db643bd476aede

data/.codeclimate.yml

@@ -10,7 +10,7 @@ engines:
     enabled: true
     exclude_paths:
     - "lib/alchemy/permissions.rb"
-    - "lib/tasks/alchemy/tidy.rake"
+    - "lib/alchemy/tasks/tidy.rb"
     - "lib/tasks/alchemy/upgrade.rake"
     config:
       languages:

data/.travis.yml

@@ -7,8 +7,8 @@ cache:
     - "travis_phantomjs"
 rvm:
 - 2.2.7
-- 2.3.4
-- 2.4.1
+- 2.3.5
+- 2.4.2
 before_install:
   - "phantomjs --version"
   - "export PATH=$PWD/travis_phantomjs/phantomjs-2.1.1-linux-x86_64/bin:$PATH"

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Change Log
 
+## 4.0.0 (2017-11-06)
+
+* Fixes image cropping issues [#1320](https://github.com/AlchemyCMS/alchemy_cms/pull/1320) and [#1321](https://github.com/AlchemyCMS/alchemy_cms/pull/1321) by [tvdeyen](https://github.com/tvdeyen)
+  This includes the change that images will not be cropped anymore unless `crop: true` is explicitly given in either the contents settings or passed via options to `render_essence`. The former behavior of implicitly cropping only because crop values (`crop_from` or `crop_size`) were present on the `EssencePicture` database record was erroneous and confusing.
+* Allow Dragonfly 1.1 and above [#1314](https://github.com/AlchemyCMS/alchemy_cms/pull/1314) by [tvdeyen](https://github.com/tvdeyen)
+* Added Rails 5.1 support [#1310](https://github.com/AlchemyCMS/alchemy_cms/pull/1310) by [tvdeyen](https://github.com/tvdeyen)
+* Always use `border-box` box model for all CSS components in the admin [#1309](https://github.com/AlchemyCMS/alchemy_cms/pull/1309) by [tvdeyen](https://github.com/tvdeyen)
+
 ## 4.0.0.rc2 (2017-08-18)
 
 * Removed deprecated `:image_size` option from `EssencePicture`
@@ -36,6 +44,16 @@
 
 * Rails 5
 
+## 3.6.3 (2017-10-24)
+
+* Remove `:display` cancan alias [#1318](https://github.com/AlchemyCMS/alchemy_cms/pull/1318) by [tvdeyen](https://github.com/tvdeyen)
+
+## 3.6.2 (2017-09-01)
+
+* Handle custom errors in `Alchemy::Picture#url` [#1305](https://github.com/AlchemyCMS/alchemy_cms/pull/1305) by [tvdeyen](https://github.com/tvdeyen)
+* Do not move elements in tidy cells task [#1303](https://github.com/AlchemyCMS/alchemy_cms/pull/1303) by [tvdeyen](https://github.com/tvdeyen)
+* Add a store image file format rake task [#1302](https://github.com/AlchemyCMS/alchemy_cms/pull/1302) by [tvdeyen](https://github.com/tvdeyen)
+
 ## 3.6.1 (2017-08-16)
 
 * Do not ask `systempage?` everytime we load the page definition [#1239](https://github.com/AlchemyCMS/alchemy_cms/pull/1283) by [tvdeyen](https://github.com/tvdeyen)

data/Gemfile

@@ -27,10 +27,11 @@ group :development, :test do
     gem 'spring'
     gem 'spring-commands-rspec'
     gem 'rubocop', require: false
+    gem 'listen'
   end
   gem 'capybara', '~> 2.4'
   gem 'database_cleaner', '~> 1.3'
-  gem 'factory_girl_rails', '~> 4.5'
+  gem 'factory_bot_rails', '~> 4.5'
   gem 'poltergeist', '~> 1.10'
   gem 'rspec-activemodel-mocks', '~> 1.0'
   gem 'rspec-rails', '~> 3.0'

data/README.md

@@ -1,12 +1,9 @@
 [![Gem Version](https://badge.fury.io/rb/alchemy_cms.svg)](http://badge.fury.io/rb/alchemy_cms)
-[![Build Status](https://travis-ci.org/AlchemyCMS/alchemy_cms.svg?branch=master)](https://travis-ci.org/AlchemyCMS/alchemy_cms)
+[![Build Status](https://travis-ci.org/AlchemyCMS/alchemy_cms.svg?branch=4.0-stable)](https://travis-ci.org/AlchemyCMS/alchemy_cms)
 [![Code Climate](https://codeclimate.com/github/AlchemyCMS/alchemy_cms.svg)](https://codeclimate.com/github/AlchemyCMS/alchemy_cms)
 [![Test Coverage](https://codeclimate.com/github/AlchemyCMS/alchemy_cms/badges/coverage.svg)](https://codeclimate.com/github/AlchemyCMS/alchemy_cms)
 [![Slack Status](http://slack.alchemy-cms.com/badge.svg)](http://slack.alchemy-cms.com)
 
-**CAUTION: This master branch is a development branch that *can* contain bugs. For productive environments you should use the [current Ruby gem version](https://rubygems.org/gems/alchemy_cms), or the [latest stable branch (3.6-stable)](https://github.com/AlchemyCMS/alchemy_cms/tree/3.6-stable).**
-
-
 ## About
 
 ![Alchemy CMS](app/assets/images/alchemy/alchemy-logo.png)
@@ -34,7 +31,7 @@ Read more about Alchemy on the [website](https://alchemy-cms.com) and in the [gu
 
 ## Rails Version
 
-**This version of Alchemy CMS runs with Rails 5.0 only**
+**This version of Alchemy CMS runs with Rails 5 only**
 
 * For a Rails 4.2 compatible version use the [`3.6-stable` branch](https://github.com/AlchemyCMS/alchemy_cms/tree/3.6-stable).
 * For a Rails 4.0/4.1 compatible version use the [`3.1-stable` branch](https://github.com/AlchemyCMS/alchemy_cms/tree/3.1-stable).
@@ -64,11 +61,9 @@ For a Ruby 1.8.7 compatible version use the [`2.3-stable` branch](https://github
 Put this into your `Gemfile`:
 
 ```ruby
-gem 'alchemy_cms', github: 'AlchemyCMS/alchemy_cms', branch: 'master'
+gem 'alchemy_cms', github: 'AlchemyCMS/alchemy_cms', branch: '4.0-stable'
 ```
 
-**NOTE:** You normally want to use a stable branch, like `3.6-stable`.
-
 If you want to use Russian translation and have better i18n support, you should put:
 
 ```ruby
@@ -93,11 +88,9 @@ the Devise based user model that Alchemy provides and was extracted [into its ow
 If you don't have your own user class, you can use the Alchemy user model. Just add the following gem into your `Gemfile`:
 
 ```ruby
-gem 'alchemy-devise', github: 'AlchemyCMS/alchemy-devise', branch: 'master'
+gem 'alchemy-devise', github: 'AlchemyCMS/alchemy-devise', branch: '4.0-stable'
 ```
 
-**NOTE:** You normally want to use a stable branch, like `3.6-stable`.
-
 Then run:
 
 ```shell

data/alchemy_cms.gemspec

@@ -25,15 +25,15 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'bourbon',                          ['~> 4.2']
   gem.add_runtime_dependency 'cancancan',                        ['~> 1.9']
   gem.add_runtime_dependency 'coffee-rails',                     ['~> 4.0']
-  gem.add_runtime_dependency 'dragonfly',                        ['~> 1.0.7']
+  gem.add_runtime_dependency 'dragonfly',                        ['~> 1.0', '>= 1.0.7']
   gem.add_runtime_dependency 'dragonfly_svg',                    ['~> 0.0.4']
   gem.add_runtime_dependency 'handlebars_assets',                ['~> 0.23']
   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 'originator',                       ['~> 3.0']
+  gem.add_runtime_dependency 'originator',                       ['~> 3.1']
   gem.add_runtime_dependency 'non-stupid-digest-assets',         ['~> 1.0.8']
-  gem.add_runtime_dependency 'rails',                            ['~> 5.0.0']
+  gem.add_runtime_dependency 'rails',                            ['~> 5.0', '< 6.0']
   gem.add_runtime_dependency 'ransack',                          ['~> 1.4']
   gem.add_runtime_dependency 'request_store',                    ['~> 1.2']
   gem.add_runtime_dependency 'responders',                       ['~> 2.0']

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

@@ -33,7 +33,6 @@
 }
 
 %default-input-style {
-  box-sizing: border-box;
   @extend %rounded-border;
   box-shadow: inset 0px 1px 1px $medium-gray;
   font: $default-font-style;
@@ -66,5 +65,5 @@
 %gradiated-toolbar {
   background: $toolbar-bg-color;
   padding: 8px 4px;
-  height: $default-form-field-height;
+  height: $toolbar-height;
 }

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

@@ -74,7 +74,6 @@
 }
 
 @mixin form-label {
-  @extend .border-box-sizing;
   width: $form-left-width;
   padding-right: 2*$default-padding;
   padding-top: $default-padding + 1;
@@ -105,7 +104,6 @@
   min-height: $default-form-field-height;
   background: white;
   @extend %rounded-border;
-  @extend .border-box-sizing;
 }
 
 @mixin form-hint($background-color: $light_yellow, $border-color: $medium-gray) {
@@ -146,12 +144,6 @@
   box-shadow: $shadow;
 }
 
-@mixin box-sizing($box-sizing-type: content-box) {
-  -webkit-box-sizing: $box-sizing-type;
-  -moz-box-sizing: $box-sizing-type;
-  box-sizing: $box-sizing-type;
-}
-
 @mixin tag-base($margin: 2*$default-margin 0, $padding: $default-padding 4*$default-padding $default-padding 6*$default-padding) {
   padding: $padding;
   margin: $margin;

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

@@ -70,6 +70,8 @@ $main-menu-active-bg-color: $light-blue !default;
 $main-menu-text-color: #222 !default;
 $main-menu-entry-max-width: 100px !default;
 $toolbar-bg-color: $medium-gray !default;
+$toolbar-height: 46px !default;
+$element-toolbar-height: 37px !default;
 $header-height: 29px !default;
 $text-shadow-light: rgba($white, 0.5) 0 0 4px !default;
 $transition-duration: 200ms !default;

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

@@ -23,6 +23,7 @@ div#image_assign_filter_and_image_sizing {
   border: 1px solid #c0c0c0;
   position: relative;
   @extend %rounded-border;
+  width: 170px;
 
   img {
     width: auto;
@@ -38,28 +39,20 @@ div#image_assign_filter_and_image_sizing {
   }
 
   .picture_name {
-    height: 14px;
     display: block;
+    width: 100%;
     text-align: center;
     white-space: nowrap;
     overflow: hidden;
-    position: absolute;
-    bottom: 1px;
+    bottom: 0;
     left: 0;
     font-family: "Courier New", Courier, mono;
-    line-height: 11px;
-    padding: 2px 0;
-    margin-right: 4px;
-    margin-left: 4px;
+    line-height: 16px;
+    padding: $default-padding 0 0;
   }
 
   &.small {
-    width: 80px;
-    height: 80px;
-
-    .picture_name {
-      width: 80px;
-    }
+    width: 90px;
 
     .thumbnail_background {
       width: 80px;
@@ -67,27 +60,8 @@ div#image_assign_filter_and_image_sizing {
     }
   }
 
-  &.medium {
-    width: 160px;
-    height: 140px;
-
-    .picture_name {
-      width: 160px;
-    }
-
-    .thumbnail_background {
-      width: 160px;
-      height: 120px;
-    }
-  }
-
   &.large {
-    width: 240px;
-    height: 200px;
-
-    .picture_name {
-      width: 240px;
-    }
+    width: 250px;
 
     .thumbnail_background {
       width: 240px;
@@ -106,11 +80,11 @@ div#image_assign_filter_and_image_sizing {
 #pictures {
   margin-right: 232px;
   padding-bottom: 60px;
+  overflow: hidden;
 
   .picture_thumbnail {
-    margin: 0 8px 8px 0;
-    display: inline-block;
-    float: none;
+    margin: 0 2*$default-margin 2*$default-margin 0;
+    float: left;
 
     .thumbnail_background {
       @include zoom-in;
@@ -129,12 +103,12 @@ div.assign_image_list_image {
 }
 
 .picture_tool {
-  width: 16px;
-  height: 16px;
+  width: 20px;
+  height: 20px;
   position: absolute;
   background-color: white;
-  top: 3px;
-  padding: 1px;
+  top: $default-padding;
+  padding: $default-padding/2;
   z-index: 10;
   display: none;
 
@@ -147,7 +121,7 @@ div.assign_image_list_image {
   }
 
   &.select {
-    left: 4px;
+    left: $default-padding;
 
     input {
       margin: 0;
@@ -156,7 +130,7 @@ div.assign_image_list_image {
   }
 
   &.delete {
-    right: 4px;
+    right: $default-padding;
 
     a {
       background: image-url('alchemy/icons.png') no-repeat -63px -72px;
@@ -172,7 +146,6 @@ div.assign_image_list_image {
 }
 
 div#library_sidebar {
-  box-sizing: border-box;
   position: fixed;
   border-left: 1px solid $default-border-color;
   top: 0;
@@ -201,7 +174,6 @@ div#filter_bar {
 }
 
 .tag-list {
-  box-sizing: border-box;
   height: 100%;
   padding-bottom: 138px;
 
@@ -237,7 +209,6 @@ div#filter_bar {
   }
 
   ul {
-    box-sizing: border-box;
     list-style-type: none;
     padding: 0;
     margin: 40px 0 4px 0;
@@ -277,7 +248,7 @@ div#filter_bar {
 
 #assign_image_list, #assign_file_list {
   position: relative;
-  height: 519px;
+  height: 535px;
 }
 
 #assign_image_list {
@@ -328,7 +299,7 @@ div#filter_bar {
       display: block;
       line-height: 25px;
       text-decoration: none;
-      padding: 0px 4px 2px 4px;
+      padding: 2px $default-padding;
     }
 
     .icon {
@@ -339,12 +310,12 @@ div#filter_bar {
 }
 
 .picture_tags {
-  box-sizing: border-box;
-  width: 50%;
-  max-height: 100%;
+  overflow: hidden;
   position: absolute;
-  top: 16px;
-  left: 0;
+  top: 22px;
+  left: $default-padding;
+  width: 50%;
+  max-height: 80%;
   padding: $default-padding;
   pointer-events: none;
   display: none;

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

@@ -1,4 +1,5 @@
 html {
+  box-sizing: border-box;
   height: 100%;
 
   &.turbolinks-progress-bar::before,
@@ -8,6 +9,12 @@ html {
   }
 }
 
+*,
+*::before,
+*::after {
+  box-sizing: inherit;
+}
+
 noscript {
   position: fixed;
   top: 0;
@@ -44,7 +51,7 @@ body {
 
 h1 {
   padding: 0;
-  margin: 8px;
+  margin: 2*$default-margin;
   font-weight: bold;
   font-size: $default-font-size;
 
@@ -62,7 +69,7 @@ h1 {
 
 h2 {
   margin: $default-margin 0;
-  padding-bottom: 5px;
+  padding-bottom: $default-padding;
   clear: both;
   font-weight: bold;
   font-size: $default-font-size;
@@ -70,7 +77,7 @@ h2 {
 
 h3 {
   margin: $default-margin 0;
-  padding-bottom: 5px;
+  padding-bottom: $default-padding;
   font-size: $default-font-size;
   font-weight: bold;
 }
@@ -160,10 +167,6 @@ kbd {
   user-select: none;
 }
 
-.border-box-sizing {
-  box-sizing: border-box;
-}
-
 span.updated_at {
   float: right;
 }
@@ -507,7 +510,6 @@ div.browse {
 }
 
 #alchemy_preview_window {
-  box-sizing: border-box;
   position: absolute;
   left: $main-menu-width;
   top: 75px;

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

@@ -17,9 +17,9 @@ button, input[type="submit"], a.button, input.button {
     padding: 6px 18px 6px 6px;
 
     span.icon {
-      margin-top: -5px;
-      padding-right: 0.25em;
-      height: 15px;
+      margin-top: -$default-margin;
+      margin-right: $default-margin;
+      height: 14px;
     }
   }
 
@@ -43,7 +43,6 @@ button, input[type="submit"], a.button, input.button {
 }
 
 .icon_button {
-  box-sizing: border-box;
   width: 27px;
   height: 27px;
   line-height: 21px;