alchemy_cms 3.5.0 → 3.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14e8d027122008b488a73f9b024526409ebe50f7
-  data.tar.gz: c5881956120319ae1223ba35525e29eba86d1656
+  metadata.gz: fbb80467f9060754456aff5d7ee3f93c825af361
+  data.tar.gz: c29648c89aa451268018de87774965f4892f6fdc
 SHA512:
-  metadata.gz: 785a53f247086243c4d59290eb772de017819b423c4b359aac6da424b0d25c2159274a3e7e4baf430f3044aa489208c7fd3e785571a95b9d20c83f614e775399
-  data.tar.gz: 4e34d1760942a244e941ffa38454b66c6b47c76c677cff91c39eaa40aed1c3e296825f13578aadbab9d6dae16a517459e9258568430a77668fac72bbaabeb426
+  metadata.gz: a3c7a2a710d4936710e554cb28ee68d2c14bed27b2b2e7a17bce0eacdd259a83e752dd4307a8b3517efdaadcdd6b0038e37fc48676093ef771ab6b830f7d9405
+  data.tar.gz: 3a45456f460a78af4d2eba395b9f88ca5a1029b0bc6a8b4068e83fb336d9c68a4319f01a8365a0dd8a06969eaf99a77e0cc6ac015e810ca820b4a4a87dd7fd54

data/.rubocop.yml

@@ -5,13 +5,22 @@ AllCops:
     - 'bin/rspec'
     - 'vendor/**/*'
     - 'spec/dummy/**/*'
+    - 'alchemy_cms.gemspec'
+
   TargetRubyVersion: 2.1
 
+# Really, rubocop?
+Bundler/OrderedGems:
+  Enabled: false
+
 # Sometimes I believe this reads better
 # This also causes spacing issues on multi-line fixes
 Style/BracesAroundHashParameters:
   Enabled: false
 
+Style/EmptyLiteral:
+  Enabled: false
+
 # We use class vars and will have to continue doing so for compatability
 Style/ClassVars:
   Enabled: false
@@ -30,6 +39,10 @@ Style/ClassAndModuleChildren:
 Style/GuardClause:
   Enabled: false
 
+# We support older versions of Ruby (2.1) that do not have the %i syntax
+Style/SymbolArray:
+  Enabled: false
+
 Style/WordArray:
   Enabled: false
 
@@ -39,34 +52,69 @@ Style/ConditionalAssignment:
 Performance/Count:
   Enabled: false
 
-Lint/EndAlignment:
+Layout/AlignHash:
   Enabled: false
 
-Style/ElseAlignment:
+Layout/AlignParameters:
   Enabled: false
 
-Style/IndentationWidth:
+Layout/ClosingParenthesisIndentation:
   Enabled: false
 
-Style/AlignParameters:
+Layout/DotPosition:
   Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#styledotposition
 
-Style/ClosingParenthesisIndentation:
+Layout/ElseAlignment:
   Enabled: false
 
-Style/CollectionMethods:
+Layout/EmptyLineAfterMagicComment:
   Enabled: false
 
-Style/MultilineMethodCallIndentation:
+Layout/IndentArray:
   Enabled: false
 
-Style/IndentArray:
+Layout/IndentHash:
   Enabled: false
 
-Style/IndentHash:
+Layout/IndentHeredoc:
+  EnforcedStyle: active_support
+
+Layout/IndentationWidth:
+  Enabled: false
+
+Layout/MultilineHashBraceLayout:
+  Enabled: false
+
+Layout/MultilineMethodCallBraceLayout:
+  Enabled: false
+
+Layout/MultilineMethodCallIndentation:
+  Enabled: false
+
+Layout/SpaceBeforeBlockBraces:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylespacebeforeblockbraces
+
+Layout/SpaceInsideHashLiteralBraces:
+  Enabled: false
+
+Layout/SpaceInsideParens:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylespaceinsideparens
+
+Lint/EndAlignment:
   Enabled: false
 
-Style/AlignHash:
+Lint/HandleExceptions:
+  Exclude:
+    - 'config/initializers/mini_profiler.rb'
+
+Lint/ShadowedException:
+  Exclude:
+    - 'lib/alchemy/sass_support.rb'
+
+Style/CollectionMethods:
   Enabled: false
 
 Style/AccessorMethodName:
@@ -88,14 +136,13 @@ Style/Documentation:
   Enabled: false
   StyleGuide: http://relaxed.ruby.style/#styledocumentation
 
-Style/DotPosition:
-  Enabled: false
-  StyleGuide: http://relaxed.ruby.style/#styledotposition
-
 Style/DoubleNegation:
   Enabled: false
   StyleGuide: http://relaxed.ruby.style/#styledoublenegation
 
+Style/EmptyMethod:
+  Enabled: false
+
 Style/EndBlock:
   Enabled: false
   StyleGuide: http://relaxed.ruby.style/#styleendblock
@@ -128,6 +175,9 @@ Style/NegatedWhile:
   Enabled: false
   StyleGuide: http://relaxed.ruby.style/#stylenegatedwhile
 
+Style/NumericLiteralPrefix:
+  Enabled: false
+
 Style/ParallelAssignment:
   Enabled: false
   StyleGuide: http://relaxed.ruby.style/#styleparallelassignment
@@ -159,17 +209,6 @@ Style/SingleLineMethods:
   Enabled: false
   StyleGuide: http://relaxed.ruby.style/#stylesinglelinemethods
 
-Style/SpaceBeforeBlockBraces:
-  Enabled: false
-  StyleGuide: http://relaxed.ruby.style/#stylespacebeforeblockbraces
-
-Style/SpaceInsideHashLiteralBraces:
-  Enabled: false
-
-Style/SpaceInsideParens:
-  Enabled: false
-  StyleGuide: http://relaxed.ruby.style/#stylespaceinsideparens
-
 Style/SpecialGlobalVars:
   Enabled: false
   StyleGuide: http://relaxed.ruby.style/#stylespecialglobalvars
@@ -178,10 +217,24 @@ Style/StringLiterals:
   Enabled: false
   StyleGuide: http://relaxed.ruby.style/#stylestringliterals
 
+Style/VariableNumber:
+  Enabled: false
+
 Style/WhileUntilModifier:
   Enabled: false
   StyleGuide: http://relaxed.ruby.style/#stylewhileuntilmodifier
 
+# We use a lot of
+#
+#     expect {
+#       something
+#     }.to { happen }
+#
+# syntax in the specs files.
+Lint/AmbiguousBlockAssociation:
+  Exclude:
+    - 'spec/**/*'
+
 Lint/AmbiguousRegexpLiteral:
   Enabled: false
   StyleGuide: http://relaxed.ruby.style/#lintambiguousregexpliteral
@@ -193,7 +246,7 @@ Lint/AssignmentInCondition:
 # We use eval to get the correct url proxy object of engines in:
 # - app/helpers/alchemy/admin/navigation_helper.rb:139
 # - lib/alchemy/resources_helper.rb:24
-Lint/Eval:
+Security/Eval:
   Exclude:
     - app/helpers/alchemy/admin/navigation_helper.rb
     - lib/alchemy/resources_helper.rb
@@ -201,6 +254,9 @@ Lint/Eval:
 Metrics/AbcSize:
   Enabled: false
 
+Metrics/BlockLength:
+  Enabled: false
+
 Metrics/BlockNesting:
   Enabled: false
 

data/.travis.yml

@@ -10,7 +10,7 @@ rvm:
 - 2.3.0
 branches:
   only:
-    - 3.5-stable
+    - master
 
 before_install:
   - "phantomjs --version"

data/CHANGELOG.md

@@ -1,5 +1,28 @@
 # Change Log
 
+## 3.6.0 (2017-06-20)
+
+__Notable Changes__
+
+* The seeder does not generate default site and root page anymore (#1239) by tvdeyen
+  Alchemy handles this auto-magically now. No need to run `Alchemy::Seeder.seed!` any more |o/
+* Security: Sanitize ActiveRecord queries in `Alchemy::Element`, `Alchemy::Page` and
+  `Alchemy::PagesHelper` (#1257) by jessedoyle
+* Remove post install message reference to the `alchemy` standalone installer (#1256) by jessedoyle
+* Fixes tag filtering for pictures and attachments in overlay (#1266) by robinboening
+* Fix js error on page#update with single quote in page name (#1263) by robinboening
+* Change meta charset from 'utf8' to 'utf-8' (#1253) by rbjoern84
+* Render "text" as type for datepicker input fields (#1246) by robinboening
+* Remove unused Page attr_accessors (#1240) by tvdeyen
+* Permit search params while redirecting in library (#1236) by tvdeyen
+* Only allow floats and ints as fixed ratio for crop (#1234) by tvdeyen
+* Use at least dragonfly 1.0.7 (#1225) by tvdeyen
+* Add handlebars-assets gem (#1203) by tvdeyen
+* Add a new spinner animation (#1202) by tvdeyen
+* Re-color the Turbolinks progressbar (#1199) by tvdeyen
+* Use normal view for pages sort action (#1197) by tvdeyen
+* Add srcset and sizes support for EssencePicture (#1193) by tvdeyen
+
 ## 3.5.0 (2016-12-22)
 
 __New Features__
@@ -53,7 +76,6 @@ __Notable Changes__
 __Fixed Bugs__
 
 * The `language_links` helper now only renders languages from the current site
-* Fixes alchemy module generator (#1159)
 
 ## 3.4.1 (2016-08-31)
 

data/README.md

@@ -1,12 +1,15 @@
 [![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=3.5-stable)](https://travis-ci.org/AlchemyCMS/alchemy_cms)
+[![Build Status](https://travis-ci.org/AlchemyCMS/alchemy_cms.svg?branch=master)](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.svg)
+![Alchemy CMS](app/assets/images/alchemy/alchemy-logo.png)
 
 Alchemy is a powerful, flexible and user centric Rails CMS.
 
@@ -42,7 +45,9 @@ Read more about Alchemy on the [website](https://alchemy-cms.com) and in the [gu
 
 ## Ruby Version
 
-Alchemy runs with Ruby >= 2.0.0.
+Alchemy runs with Ruby >= 2.1.0.
+
+For a Ruby 2.0.0 compatible version use the [`3.2-stable` branch](https://github.com/AlchemyCMS/alchemy_cms/tree/3.2-stable).
 
 For a Ruby 1.9.3 compatible version use the [`3.1-stable` branch](https://github.com/AlchemyCMS/alchemy_cms/tree/3.1-stable).
 
@@ -56,9 +61,11 @@ 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: '3.5-stable'
+gem 'alchemy_cms', github: 'AlchemyCMS/alchemy_cms', branch: 'master'
 ```
 
+**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
@@ -83,9 +90,11 @@ 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: '3.5-stable'
+gem 'alchemy-devise', github: 'AlchemyCMS/alchemy-devise', branch: 'master'
 ```
 
+**NOTE:** You normally want to use a stable branch, like `3.6-stable`.
+
 Then run:
 
 ```shell

data/Rakefile

@@ -1,4 +1,3 @@
-#!/usr/bin/env rake
 begin
   require 'bundler/setup'
 rescue LoadError

data/alchemy_cms.gemspec

@@ -25,8 +25,9 @@ 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.1']
+  gem.add_runtime_dependency 'dragonfly',                        ['~> 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']
@@ -45,10 +46,6 @@ Gem::Specification.new do |gem|
             Thank you for installing Alchemy CMS
 -------------------------------------------------------------
 
-- Create a new standalone Alchemy project:
-
-  $ alchemy new my_project_name
-
 - Complete the installation in an existing Rails application:
 
   $ bin/rake alchemy:install

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

@@ -11,7 +11,6 @@
 //= require tinymce/tinymce.min
 //= require_tree ../../../../vendor/assets/javascripts/jquery_plugins/
 //= require clipboard.min
-//= require spin.min
 //= require keymaster
 //= require requestAnimationFrame
 //= require select2
@@ -22,6 +21,7 @@
 //= require select2_locale_ru
 //= require select2_locale_it
 //= require handlebars
+//= require alchemy/templates
 //= require alchemy/alchemy.base
 //= require alchemy/alchemy.autocomplete
 //= require alchemy/alchemy.browser

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

@@ -34,8 +34,8 @@ $.extend Alchemy,
   pleaseWaitOverlay: (show = true) ->
     $overlay = $('#overlay')
     if show
-      spinner = Alchemy.Spinner.medium()
-      $overlay.append(spinner.spin().el)
+      spinner = new Alchemy.Spinner('medium')
+      spinner.spin $overlay
       $overlay.show()
     else
       $overlay.find('.spinner').remove()
@@ -44,12 +44,12 @@ $.extend Alchemy,
 
   # Shows spinner while loading images and
   # fades the image after its been loaded
-  ImageLoader: (scope = document, options = {color: '#fff'}) ->
+  ImageLoader: (scope = document, options = {fill: '#fff'}) ->
     $('img', scope).each ->
       if !this.complete
         image = $(this).hide()
         $parent = image.parent()
-        spinner = Alchemy.Spinner.small options
+        spinner = new Alchemy.Spinner('small', options)
         spinner.spin $parent[0]
         image.on 'load', ->
           spinner.stop()
@@ -77,10 +77,6 @@ $.extend Alchemy,
       dropdownAutoWidth: true
     return
 
-  Buttons: (options) ->
-    $("button, input:submit, a.button").button options
-    return
-
   # Selects cell tab for given name.
   # Creates it if it's not present yet.
   selectOrCreateCellTab: (cell_name, label) ->

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

@@ -20,14 +20,14 @@ Alchemy.Buttons =
 
   disable: (button) ->
     $button = $(button)
-    spinner = Alchemy.Spinner.small()
+    spinner = new Alchemy.Spinner('small')
     $button.data('content', $button.html())
     $button.attr('disabled', true)
     $button.addClass('disabled')
     $button.css
       width: $button.outerWidth()
     $button.empty()
-    spinner.spin($button[0])
+    spinner.spin($button)
     return true
 
   enable: (scope) ->

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

@@ -3,33 +3,24 @@ window.Alchemy = {} if typeof(window.Alchemy) is 'undefined'
 $.extend Alchemy,
 
   Datepicker: (scope) ->
-    options =
-      format: Alchemy.t('formats.datetime')
-      formatDate: Alchemy.t('formats.date')
-      formatTime: Alchemy.t('formats.time')
-      dayOfWeekStart: Alchemy.t('formats.start_of_week')
-      onSelectDate: ->
-        Alchemy.setElementDirty $(this).closest(".element-editor")
-
-    datepicker_options = $.extend {}, options,
-      format: options.formatDate
-      timepicker: false
-
-    timepicker_options = $.extend {}, options,
-      format: options.formatTime
-      datepicker: false
-
     $.datetimepicker.setLocale(Alchemy.locale);
-
-    # Initializes the datepickers and disables the browsers default Datepicker
-    # unless the browser is iOS.
-    $('input[type="date"], input.date', scope)
-      .datetimepicker(datepicker_options).prop "type", "text" unless Alchemy.isiOS
-
-    $('input[type="time"], input.time', scope)
-      .datetimepicker(timepicker_options).prop "type", "text" unless Alchemy.isiOS
-
-    $('input[type="datetime"], input.datetime', scope)
-      .datetimepicker(options).prop "type", "text" unless Alchemy.isiOS
+    $datepicker_inputs = $('input[data-datepicker-type]', scope)
+
+    # Initializes the datepickers on the text inputs and sets the proper type
+    # to enable browsers default datepicker if the current OS is iOS.
+    if Alchemy.isiOS
+      $datepicker_inputs.prop "type", ->
+        return $(this).data('datepicker-type')
+    else
+      $datepicker_inputs.each ->
+        type = $(this).data('datepicker-type')
+        options =
+          format: Alchemy.t("formats.#{type}")
+          timepicker: /time/.test(type)
+          datepicker: /date/.test(type)
+          dayOfWeekStart: Alchemy.t('formats.start_of_week')
+          onSelectDate: ->
+            Alchemy.setElementDirty $(this).closest(".element-editor")
+        $(this).datetimepicker(options)
 
     return