alchemy_cms 3.4.2 → 3.5.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a482527053faccf5a3d21008ed94817829efa6f
-  data.tar.gz: 69120e0dfd8aafa399b87bba05d3735b306ee853
+  metadata.gz: 4fe515cb79092ae441a7980d07d5da38e3023221
+  data.tar.gz: e5d16e9d4d83c30b7025cd69b14a9288e5c8ac23
 SHA512:
-  metadata.gz: cf528b58dda0d36a2d8d3a8cf32e91147ba657d2680ee180a6d3c887fa175d70098e0828b5c1a94b49fbdce76179bdd1d9589b2e6bd49d417cec0e26728d6dc2
-  data.tar.gz: 31a828f7c4f707a3ba7054ce8c58d4e6cb181c7e4c1dc98f31deccca416996da85492cb9d8db8b32dd5d5a755f15cbd45d3864539f37e64b87a5e51ef6d67885
+  metadata.gz: 079aab266840a0ae38173832d45bcceb9eb17a6294e53284cad2182933603b3839ab239bfb7ad601640590db4c4bfca87841f89b232b933e20f7a5a08d471c92
+  data.tar.gz: 48957ac1b40ed2f58e312e5924f427955605213a2760dfa9eda8f1d704e4ae8706ff750355999ff419aeddf4ea07ef7b32399e786ef34dd26acca557a0cd53df

data/.codeclimate.yml

@@ -8,6 +8,10 @@ engines:
     enabled: false
   duplication:
     enabled: true
+    exclude_paths:
+    - "lib/alchemy/permissions.rb"
+    - "lib/tasks/alchemy/tidy.rake"
+    - "lib/tasks/alchemy/upgrade.rake"
     config:
       languages:
       - ruby
@@ -23,6 +27,8 @@ ratings:
   - "**.erb"
   - "**.rb"
 exclude_paths:
-- config/
-- db/
-- spec/
+- "config/"
+- "db/"
+- "spec/"
+- "lib/alchemy/upgrader/"
+- "lib/rails/"

data/.teatro.yml

@@ -4,4 +4,5 @@ project:
 stage:
   before: cd spec/dummy
   database: bin/rake db:setup RAILS_ENV=production
+  assets: bin/rake assets:precompile RAILS_ENV=production
   run: bin/rails server -e production

data/.travis.yml

@@ -1,35 +1,32 @@
 language: ruby
 sudo: false
-cache: bundler
+cache:
+  bundler: true
+  directories:
+    - "travis_phantomjs"
 rvm:
 - 2.1
 - 2.2
 - 2.3.0
 branches:
   only:
-    - 3.4-stable
+    - 3.5-stable
+
 before_install:
+  - "phantomjs --version"
+  - "export PATH=$PWD/travis_phantomjs/phantomjs-2.1.1-linux-x86_64/bin:$PATH"
+  - "phantomjs --version"
+  - "if [ $(phantomjs --version) != '2.1.1' ]; then rm -rf $PWD/travis_phantomjs; mkdir -p $PWD/travis_phantomjs; fi"
+  - "if [ $(phantomjs --version) != '2.1.1' ]; then wget https://assets.membergetmember.co/software/phantomjs-2.1.1-linux-x86_64.tar.bz2 -O $PWD/travis_phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2; fi"
+  - "if [ $(phantomjs --version) != '2.1.1' ]; then tar -xvf $PWD/travis_phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2 -C $PWD/travis_phantomjs; fi"
+  - "phantomjs --version"
   - gem install bundler
 before_script: bundle exec rake alchemy:spec:prepare
 script: bundle exec rspec
+after_success: bundle exec codeclimate-test-reporter
 env:
 - DB=mysql
 - DB=postgresql
 notifications:
-  irc:
-    on_success: change
-    on_failure: always
-    use_notice: true
-    channels:
-    - irc.freenode.org#alchemy_cms
   slack:
     secure: QzOFw1Ph69pzwWBFgtIVkOnjbcRxB9HPRQ+RYjK+2tg+fsbiTJ+wYgHcZL49tPYcLAls4kymkFWzWBF3PCAXJMfKgUCqXzdQ2FuJC/JoVRTLll4wDnZFPG33jsm5tVznmycZ3ma4+ZWfJQ+C+elEBOba6v1kG9eGIy6sH2cvXfE=
-  webhooks:
-    urls:
-      - https://webhooks.gitter.im/e/4dc02992aca8b4fd883b
-    on_success: always
-    on_failure: always
-    on_start: never
-addons:
-  code_climate:
-    secure: qmOMqc4FUBRP25XqaYIKuxZQ/GrGLKjIc3vUqZa+XfkQKh6xLXvOF7YUM/XJZ5u6D6hk0Ly8UxjctvDY+tQxEAK49lFwK51i7bODfkQjfVBrFzfht7QhxY5HJKx7F0HHmpyNJet4n8mR0gGlhwVyXv+Tz7Rm6O3Hq3+TEbY9+pk=

data/CHANGELOG.md

@@ -1,14 +1,49 @@
 # Change Log
 
-## 3.4.2 (2016-12-22)
+## 3.5.0 (unreleased)
+
+__New Features__
+
+* New API endpoint for retrieving a nested page tree (#1155)
+  `api/pages/nested` returns a nested JSON tree of all pages.
+* Add page and user seeding support (#1160)
+* Files of attachments are replaceable now (#1167)
+* Add fixed page attributes (#1168)
+  Page attributes can be defined as fixed_attributes to prevent changes by the user.
+* Allow to declare which user role can edit page content on the page layout level.
 
 __Notable Changes__
 
-* Allow users to manually publish changes on global pages
+* The essence view partials don't get cached anymore (#1099)
+* The essence editor partials don't get cached anymore (#1171)
+* Removes update_essence_select_elements (#1103)
+* The admin resource form now uses the datetime-picker instead of the date-picker for datetime fields.
+* The `preview_mode_code` helper is moved to a partial in `alchemy/preview_mode_code`. (#1110)
+* The `render_meta_data` helper is moved to a partial in `alchemy/pages/meta_data` and can be rendered with the same options as before but now passed in as locals. (#1110)
+* The view helpers `preview_mode_code`, `render_meta_data`, `render_meta_tag`, `render_page_title`, `render_title_tag` are now deprecated. (#1110)
+* An easy way to include several edit mode related partials is now available (#1120):
+  `render 'alchemy/edit_mode'` loads `menubar` and `preview_mode_code` at once
+* Add support for Turbolinks 5.0 (#1095)
+* Use Dragonfly middleware to render pictures and remove our custom solution (#1084)
+* `image_size` option is now deprecated. Please use just `size` (#1084)
+* `show_alchemy_picture_path` helper is now deprecated. Please use `picture.url` instead (#1084)
+* Display download information on the Attachment Modal Dialog (#1137)
+* Added foreign keys to important associations (#1149)
+* Also destroy trashed elements when page gets destroyed (#1149)
+* Upgrade tasks can now be run separately (#1152)
+* Update to Tinymce 4.4.3
+* New sitemap UI (#1172)
 
 __Fixed Bugs__
 
-* Fixes alchemy module generator (#1159)
+* Fix setting of locale when `current_alchemy_user.language` doesn't return a Symbol (#1097)
+* Presence validation of EssenceFile is not working (#1096)
+
+## 3.4.2 (unreleased)
+
+__Notable Changes__
+
+* Allow users to manually publish changes on global pages
 
 ## 3.4.1 (2016-08-31)
 
@@ -57,16 +92,19 @@ __Notable Changes__
 * List pages from all sites in currently locked pages tabs and Dashboard widget (#1067)
 * The locked value on page is now a timestamp (`locked_at`), so we can order locked pages by (#1070)
 * Persist user in dummy app
+* When publishing a page with the publish button, `Page#public_on` does not get
+  reset to the current time when it is already set and in the past, and
+  `Page#public_until` does not get nilled when it is in the future.
 
 __Fixed Bugs__
 
+* Fix table width for attachments and resources on small window sizes.
 * Generators don't delete directories any more (#850)
 * Some elements crashed the backend's JS when being saved (#1091)
 
-## 3.3.3 (2016-08-31)
+## 3.3.3 (2016-09-11)
 
-* Fix bug that rendered duplicate nested elements within a cell (#1100)
-* Merge `html_options` in EssenceFile view (#1115)
+* Fix bug that rendered duplicate nested elements within a cell after copying a parent element.
 
 ## 3.3.2 (2016-08-02)
 

data/Gemfile

@@ -2,17 +2,20 @@ source 'https://rubygems.org'
 
 gemspec
 
+# Profiling
+gem 'rack-mini-profiler', group: :development, require: false
+
 gem 'sqlite3' if ENV['DB'].nil? || ENV['DB'] == 'sqlite'
 gem 'mysql2', '~> 0.3.18' if ENV['DB'] == 'mysql'
 gem 'pg'      if ENV['DB'] == 'postgresql'
+gem 'sassc-rails'
 
 group :development, :test do
   gem 'jasmine-rails',        github: 'searls/jasmine-rails'
   gem 'jasmine-jquery-rails', github: 'travisjeffery/jasmine-jquery-rails'
+  gem 'simplecov', require: false
   if ENV['TRAVIS']
-    gem "codeclimate-test-reporter", require: false
-  else
-    gem 'simplecov',                 require: false
+    gem 'codeclimate-test-reporter', '~> 1.0', require: false
   end
   unless ENV['CI']
     gem 'launchy'
@@ -28,7 +31,7 @@ group :development, :test do
   gem 'capybara', '~> 2.4'
   gem 'database_cleaner', '~> 1.3'
   gem 'factory_girl_rails', '~> 4.5'
-  gem 'poltergeist', '~> 1.5'
+  gem 'poltergeist', '~> 1.10'
   gem 'rspec-activemodel-mocks', '~> 1.0'
   gem 'rspec-rails', '~> 3.0'
   gem 'shoulda-matchers', '~> 3.1'

data/README.md

@@ -1,5 +1,5 @@
 [![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.4-stable)](https://travis-ci.org/AlchemyCMS/alchemy_cms)
+[![Build Status](https://travis-ci.org/AlchemyCMS/alchemy_cms.svg?branch=3.5-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)
@@ -22,7 +22,7 @@ Read more about Alchemy on the [website](https://alchemy-cms.com) and in the [gu
 - User Access Control
 - Build in contact form mailer
 - Attachments and downloads
-- Powerful image rendering
+- On-the-fly image rendering
 - Extendable via Rails engines
 - Integrates into existing Rails Apps
 - Flexible caching
@@ -56,7 +56,7 @@ For a Ruby 1.8.7 compatible version use the [`2.3-stable` branch](https://github
 Use the installer:
 
 ```shell
-$ gem install alchemy_cms
+$ gem install alchemy_cms --pre
 $ alchemy new my_magicpage
 ```
 
@@ -75,7 +75,7 @@ $ alchemy --help
 Put this into your `Gemfile`:
 
 ```ruby
-gem 'alchemy_cms', github: 'AlchemyCMS/alchemy_cms', branch: '3.4-stable'
+gem 'alchemy_cms', github: 'AlchemyCMS/alchemy_cms', branch: '3.5-stable'
 ```
 
 If you want to use Russian translation and have better i18n support, you should put:
@@ -102,11 +102,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: '3.4-stable'
+gem 'alchemy-devise', github: 'AlchemyCMS/alchemy-devise', branch: '3.5-stable'
 ```
 
-**NOTE:** You normally want to use a stable branch, like `3.3-stable`.
-
 Then run:
 
 ```shell
@@ -185,9 +183,25 @@ Alchemy.admin_constraints = {subdomain: 'hidden'}
 
 will move the dashboard to <http://hidden.example.com/backend>.
 
+### Picture caching
+
+Alchemy uses the Dragonfly gem to render pictures on-the-fly.
+
+To make this as performant as possible the rendered picture gets stored into `public/pictures`
+so the web server can pick up the file and serve it without hitting the Rails process at all.
+
+This may or may not what you want. Especially for multi server setups you eventually want to use
+something like S3.
+
+Please follow the guidelines about picture caching on the Dragonfly homepage for further instructions:
+
+http://markevans.github.io/dragonfly/cache/
+
+
 ## Upgrading
 
-The Alchemy team takes upgrades very seriously and tries to make them as smooth as we can. Therefore we have build in upgrade tasks, that try to automate as much as possible.
+The Alchemy team takes upgrades very seriously and tries to make them as smooth as we can.
+Therefore we have build in upgrade tasks, that try to automate as much as possible.
 
 That's why after updating the Alchemy gem you should **always run the upgrader**:
 
@@ -196,12 +210,48 @@ $ bundle update alchemy_cms
 $ bin/rake alchemy:upgrade
 ```
 
-Alchemy will print out useful information after running the automated tasks that help a smooth upgrade path. So please **take your time and read them**.
+Alchemy will print out useful information after running the automated tasks that help a smooth upgrade path.
+So please **take your time and read them**.
 
 Always be sure to keep an eye on the `config/alchemy/config.yml.defaults` file and update your `config/alchemy/config.yml` accordingly.
 
-Also, `git diff` is your friend. You are using git to track changes of your projects, right?
+Also, `git diff` is your friend.
+
+### Customize the upgrade preparation
+
+The Alchemy upgrader comes prepared with with several rake tasks in a specific order.
+This is sometimes not what you want or could even break upgrades.
+In order to customize the upgrade preparation process you can instead run each of the tasks on their own.
+
+```shell
+$ bin/rake alchemy:install:migrations
+$ bin/rake db:migrate
+$ bin/rake alchemy:db:seed
+$ bin/rake alchemy:upgrade:config
+$ bin/rake alchemy:upgrade:run
+```
+
+**WARNING:** This is only recommended, if you have problems with the default `rake alchemy:upgrade` task and need to
+repair your data in between. The upgrader depends on these upgrade tasks running in this specific order, otherwise
+we can't ensure smooth upgrades for you.
+
+### Run an individual upgrade
+
+You can also run an individual upgrade on its own:
+
+```shell
+$ bin/rake -T alchemy:upgrade
+```
+
+provides you with a list of each upgrade you can run individually.
+
+#### Example
+
+```shell
+$ bin/rake alchemy:upgrade:3.2
+```
 
+runs only the Alchemy 3.2 upgrade
 
 ## Deployment
 

data/Rakefile

@@ -40,7 +40,7 @@ namespace :alchemy do
   namespace :spec do
     desc "Prepares database for testing Alchemy"
     task :prepare do
-      system 'cd spec/dummy && RAILS_ENV=test bundle exec rake db:setup && cd -'
+      system 'cd spec/dummy && RAILS_ENV=test bundle exec rake db:drop db:create db:migrate:reset && cd -'
     end
   end
 end

data/alchemy_cms.gemspec

@@ -19,30 +19,27 @@ Gem::Specification.new do |gem|
   gem.executables           = 'alchemy'
   gem.require_paths         = ['lib']
 
-  gem.add_runtime_dependency 'actionpack-page_caching',          ['~> 1.0.0']
   gem.add_runtime_dependency 'active_model_serializers',         ['~> 0.9.0']
   gem.add_runtime_dependency 'acts_as_list',                     ['~> 0.3']
-  gem.add_runtime_dependency 'acts-as-taggable-on',              ['~> 3.1']
-  gem.add_runtime_dependency 'awesome_nested_set',               ['~> 3.0.0']
+  gem.add_runtime_dependency 'acts-as-taggable-on',              ['~> 4.0']
+  gem.add_runtime_dependency 'awesome_nested_set',               ['~> 3.1']
+  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 'compass-rails',                    ['>= 2.0.4', '< 4.0']
   gem.add_runtime_dependency 'dragonfly',                        ['~> 1.0.1']
   gem.add_runtime_dependency 'dragonfly_svg',                    ['~> 0.0.4']
   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',              ['~> 2.1.0']
+  gem.add_runtime_dependency 'magiclabs-userstamp',              ['~> 3.0']
   gem.add_runtime_dependency 'non-stupid-digest-assets',         ['~> 1.0.8']
   gem.add_runtime_dependency 'rails',                            ['>= 4.2.0', '< 5.0']
   gem.add_runtime_dependency 'ransack',                          ['~> 1.4']
   gem.add_runtime_dependency 'request_store',                    ['~> 1.2']
   gem.add_runtime_dependency 'responders',                       ['~> 2.0']
-  gem.add_runtime_dependency 'sass-rails',                       ['~> 5.0']
-  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 'simple_form',                      ['~> 3.0']
-  gem.add_runtime_dependency 'turbolinks',                       ['~> 2.5']
+  gem.add_runtime_dependency 'turbolinks',                       ['>= 2.5']
 
   gem.post_install_message = <<-MSG
 -------------------------------------------------------------

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

@@ -10,6 +10,7 @@
 //= require jquery-ui/tabs
 //= require tinymce/tinymce.min
 //= require_tree ../../../../vendor/assets/javascripts/jquery_plugins/
+//= require clipboard.min
 //= require spin.min
 //= require keymaster
 //= require requestAnimationFrame
@@ -49,5 +50,6 @@
 //= require alchemy/alchemy.sitemap
 //= require alchemy/alchemy.spinner
 //= require alchemy/alchemy.tinymce
+//= require alchemy/alchemy.tooltips
 //= require alchemy/alchemy.translations
 //= require alchemy/alchemy.trash_window

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

@@ -47,6 +47,7 @@ class window.Alchemy.Dialog
 
   # Closes the Dialog and removes it from the DOM
   close: ->
+    @dialog.trigger 'DialogClose.Alchemy'
     @$document.off 'keydown'
     @dialog_container.removeClass('open')
     @overlay.removeClass('open') if @overlay?

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

@@ -7,6 +7,7 @@ Alchemy.GUI =
   init: (scope) ->
     Alchemy.SelectBox(scope)
     Alchemy.Datepicker(scope)
+    Alchemy.Tooltips(scope)
     Alchemy.Buttons.observe(scope)
     Alchemy.watchForDialogs(scope)
     Alchemy.Hotkeys(scope)

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

@@ -13,7 +13,7 @@ Alchemy.Hotkeys = (scope) ->
       key.unbind(hotkey)
 
   # Binds keyboard shortcuts to search fields.
-  $search_fields = $('#search_field, #search_input_field', scope)
+  $search_fields = $('.search_input_field', scope)
   $search_fields_clear = $('.search_field_clear, .js_filter_field_clear', scope)
 
   key 'alt+f', ->

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

@@ -15,8 +15,8 @@ Alchemy.Initializer = ->
     Alchemy.Growler.fade()
 
   # Add observer for please wait overlay.
-  $('a.please_wait, #main_navi a.main_navi_entry, div.button_with_label form :submit, #sub_navigation .subnavi_tab a, .pagination a')
-    .not('*[data-alchemy-confirm], #locked_pages .subnavi_tab button')
+  $('.please_wait, #main_navi a, .button_with_label form :submit, .locked_page a, .pagination a')
+    .not('*[data-alchemy-confirm], .locked_page button')
     .click ->
       unless Alchemy.isPageDirty()
         Alchemy.pleaseWaitOverlay()
@@ -55,16 +55,18 @@ Alchemy.Initializer = ->
     scrollingTop: 122,
     zIndex: 1
 
-# Enabling the Turbolinks Progress Bar
-Turbolinks.enableProgressBar()
+# Enabling the Turbolinks Progress Bar for v2.5
+Turbolinks.enableProgressBar() if Turbolinks.enableProgressBar
 
-# Turbolinks DOM Ready
-$(document).on 'page:change', ->
+# Turbolinks DOM Ready.
+# Handle both v2.5(page:change), and v.5.0 (turbolinks:load)
+$(document).on 'page:change turbolinks:load', ->
   Alchemy.Initializer()
   return
 
 # Turbolinks before parsing a new page
-$(document).on 'page:receive', ->
+# Handle both v2.5(page:receive), and v.5.0 (turbolinks:request-end)
+$(document).on 'page:receive turbolinks:request-end', ->
   # Ensure that all tinymce editors get removed before parsing a new page
   Alchemy.Tinymce.removeFrom $('.has_tinymce')
   return