alchemy_cms 2.3.2 → 2.4.beta2

data/.gitignore

@@ -18,5 +18,4 @@ spec/dummy/uploads/
 spec/dummy/db/test.sqlite3-journal
 spec/dummy/db/seeds.rb
 .rvmrc
-spec/dummy/config/locales/**/*
-/coverage/
+spec/dummy/config/locales/**/*

data/.travis.yml

@@ -1,11 +1,10 @@
 language: ruby
 rvm:
-  - ree
   - 1.9.2
   - 1.9.3
 branches:
   only:
-    - 2.3-stable
+    - master
 before_script:
   - "phantomjs -v"
   - "sh -c 'cd spec/dummy && RAILS_ENV=test bundle exec rake db:create db:schema:load --trace'"
@@ -13,6 +12,3 @@ script: "bundle exec rspec spec"
 env:
   - DB=mysql
   - DB=postgresql
-matrix:
-  allow_failures:
-    - rvm: ree

data/Gemfile

@@ -10,7 +10,7 @@ group :test do
   gem 'sqlite3'               if ENV['DB'].nil? || ENV['DB'] == 'sqlite'
   gem 'mysql2'                if ENV['DB'] == 'mysql'
   gem 'pg'                    if ENV['DB'] == 'postgresql'
-  gem 'poltergeist'
+  gem 'poltergeist', '0.7.0'
   unless ENV['CI']
     gem 'launchy'
   end
@@ -24,9 +24,9 @@ end
 
 group :development do
   unless ENV['CI']
-    #gem 'localeapp'
     gem 'guard-spork'
-    gem 'debugger', :platform => :ruby_19
-    gem 'ruby-debug', :platform => :ruby_18
+    gem 'debugger'
+    gem 'quiet_assets' # Mute assets loggin
+    gem 'thin' # Get rid off 'Could not determine content-length of response body' Warning. Start with 'rails s thin'
   end
 end

data/README.md

@@ -1,14 +1,15 @@
 Alchemy CMS
 ===========
 
-[![Build Status](https://secure.travis-ci.org/magiclabs/alchemy_cms.png?branch=2.3-stable)](http://travis-ci.org/magiclabs/alchemy_cms)
+[![Build Status](https://secure.travis-ci.org/magiclabs/alchemy_cms.png?branch=master)](http://travis-ci.org/magiclabs/alchemy_cms)
 [![Maintenance Status](http://stillmaintained.com/magiclabs/alchemy_cms.png)](http://stillmaintained.com/magiclabs/alchemy_cms)
 [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/magiclabs/alchemy_cms)
-[![Dependency Status](https://gemnasium.com/magiclabs/alchemy_cms.png)](https://gemnasium.com/magiclabs/alchemy_cms)
 
 About
 -----
 
+**This branch is a beta development branch. For productive environments use the current rubygems version, or the [latest stable branch (2.3-stable)](https://github.com/magiclabs/alchemy_cms/tree/2.3-stable).**
+
 Alchemy is a Rails 3 CMS with a flexible content storing architecture.
 
 Read more on the [website](http://alchemy-cms.com) and in the [guidelines](http://guides.alchemy-cms.com).
@@ -37,24 +38,25 @@ Rails Version
 
 This version of Alchemy runs with Rails 3.2.8+.
 
-If you are looking for a Rails 3.1 compatible version check the 2.1-stable branch.
+If you are looking for a Rails 3.1 compatible version check the [2.1-stable branch](https://github.com/magiclabs/alchemy_cms/tree/2.1-stable).
 
-If you are looking for a Rails 3.0 compatible version check the 2.0-stable branch.
+If you are looking for a Rails 3.0 compatible version check the [2.0-stable branch](https://github.com/magiclabs/alchemy_cms/tree/2.0-stable).
 
-If you are looking for a Rails 2.3 compatible version check the 1.6-stable branch.
+If you are looking for a Rails 2.3 compatible version check the [1.6-stable branch](https://github.com/magiclabs/alchemy_cms/tree/1.6-stable).
 
 Ruby Version
 ------------
 
-Alchemy runs under Ruby 1.8.7, Ruby 1.9.2, Ruby 1.9.3 and REE (Ruby Enterprise Edition).
-We strongly recommend Ruby 1.9.3 for best performance and maximum security.
+Alchemy runs with Ruby 1.9.2 and Ruby 1.9.3.
+
+For a Ruby 1.8.7 compatible version use the [2.3-stable branch](https://github.com/magiclabs/alchemy_cms/tree/2.3-stable).
 
 Installation
 ------------
 
 Use the installer (recommended):
 
-    gem install alchemy_cms
+    gem install alchemy_cms --pre
     alchemy new my_magicpage
 
 Start the local server:
@@ -66,9 +68,9 @@ Then just switch to your browser and open `http://localhost:3000`
 Upgrading
 ------------
 
-Projects running with Alchemy CMS version < 2.2 needs to be upgraded.
+After updating Alchemy you should run the upgrader.
 
-Use the following Upgrade-Task:
+Run in terminal:
 
     rake alchemy:upgrade
 
@@ -78,14 +80,18 @@ Add to existing Rails project
 
 In your Gemfile:
 
-    gem 'alchemy_cms', :github => 'magiclabs/alchemy_cms', :branch => '2.3-stable'
+    gem 'alchemy_cms', :github => 'magiclabs/alchemy_cms'
 
 Run in terminal:
 
-    bundle install
-    rake alchemy:install:migrations
-    rake db:migrate
-    rake alchemy:db:seed
+    bundle update
+    rake alchemy:install
+
+Note: If you did not mounted Alchemy on the root route `'/'`, then you have to add Alchemy's view helpers manually to your app.
+
+Just paste this in your `app/controllers/application_controller.rb`
+
+`helper Alchemy::PagesHelper`
 
 Tipps
 -----
@@ -112,6 +118,7 @@ Resources
 * Issue-Tracker: <http://issues.alchemy-cms.com>
 * Sourcecode: <http://source.alchemy-cms.com>
 * User Group: <http://groups.google.com/group/alchemy-cms>
+* Changelog: <http://revision.io/alchemy_cms>
 
 Authors
 ---------

data/alchemy_cms.gemspec

@@ -3,46 +3,46 @@ $:.push File.expand_path("../lib", __FILE__)
 require "alchemy/version"
 
 Gem::Specification.new do |s|
-  s.name        = "alchemy_cms"
-  s.version     = Alchemy::VERSION
-  s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Thomas von Deyen", "Robin Böning", "Marc Schettke", "Carsten Fregin"]
-  s.email       = ["alchemy@magiclabs.de"]
-  s.homepage    = "http://alchemy-cms.com"
-  s.summary     = %q{An extremly flexbile CMS for Rails 3.2}
-  s.description = %q{Alchemy is a Rails 3 CMS with a flexible content storing architecture.}
-  s.requirements << 'ImageMagick (libmagick), v6.6 or greater.'
-  s.required_ruby_version = '>= 1.8.7'
-  s.license = 'BSD New'
+  s.name                  = "alchemy_cms"
+  s.version               = Alchemy::VERSION
+  s.platform              = Gem::Platform::RUBY
+  s.authors               = ["Thomas von Deyen", "Robin Boening", "Marc Schettke", "Carsten Fregin"]
+  s.email                 = ["alchemy@magiclabs.de"]
+  s.homepage              = "http://alchemy-cms.com"
+  s.summary               = %q{An extremly flexbile CMS for Rails 3.2}
+  s.description           = %q{Alchemy is a Rails 3 CMS with a flexible content storing architecture.}
+  s.requirements         << 'ImageMagick (libmagick), v6.6 or greater.'
+  s.required_ruby_version = '~> 1.9.2'
+  s.license               = 'BSD New'
 
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
+  s.files                 = `git ls-files`.split("\n")
+  s.test_files            = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables           = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths         = ["lib"]
 
-  s.add_runtime_dependency(%q<rails>, ["~> 3.2.11"])
-  s.add_runtime_dependency(%q<authlogic>)
-  s.add_runtime_dependency(%q<awesome_nested_set>, ["~> 2.0"])
-  s.add_runtime_dependency(%q<acts-as-taggable-on>, ["~> 2.1"])
-  s.add_runtime_dependency(%q<declarative_authorization>, ["~> 0.5.4"])
-  s.add_runtime_dependency(%q<tvdeyen-fleximage>, ["~> 1.2.0"])
-  s.add_runtime_dependency(%q<kaminari>, ["~> 0.13.0"])
-  s.add_runtime_dependency(%q<acts_as_ferret>, ["~> 0.5"])
-  s.add_runtime_dependency(%q<acts_as_list>, ["~> 0.1"])
-  s.add_runtime_dependency(%q<magiclabs-userstamp>, ["~> 2.0.2"])
-  s.add_runtime_dependency(%q<dynamic_form>, ["~> 1.1"])
-  s.add_runtime_dependency(%q<jquery-rails>, ["~> 2.0.0"])
-  s.add_runtime_dependency(%q<attachment_magic>, ["~> 0.2.1"])
-  s.add_runtime_dependency(%q<sass-rails>, ['~> 3.2.3'])
-  s.add_runtime_dependency(%q<coffee-rails>, ['~> 3.2.1'])
-  s.add_runtime_dependency(%q<compass-rails>, ['~> 1.0.3'])
-  s.add_runtime_dependency(%q<sassy-buttons>, ['~> 0.1.3'])
+  s.add_runtime_dependency %q<rails>,                     ["~> 3.2.8"]
+  s.add_runtime_dependency %q<authlogic>,                 ["~> 3.1.3"]
+  s.add_runtime_dependency %q<awesome_nested_set>,        ["~> 2.0"]
+  s.add_runtime_dependency %q<acts-as-taggable-on>,       ["~> 2.1"]
+  s.add_runtime_dependency %q<declarative_authorization>, ["= 0.5.5"]
+  s.add_runtime_dependency %q<tvdeyen-fleximage>,         ["~> 1.2.0"]
+  s.add_runtime_dependency %q<kaminari>,                  ["~> 0.13.0"]
+  s.add_runtime_dependency %q<acts_as_ferret>,            ["~> 0.5"]
+  s.add_runtime_dependency %q<acts_as_list>,              ["~> 0.1"]
+  s.add_runtime_dependency %q<magiclabs-userstamp>,       ["~> 2.0.2"]
+  s.add_runtime_dependency %q<dynamic_form>,              ["~> 1.1"]
+  s.add_runtime_dependency %q<jquery-rails>,              ["~> 2.1.3"]
+  s.add_runtime_dependency %q<attachment_magic>,          ["~> 0.2.1"]
+  s.add_runtime_dependency %q<sass-rails>,                ['~> 3.2.3']
+  s.add_runtime_dependency %q<coffee-rails>,              ['~> 3.2.1']
+  s.add_runtime_dependency %q<compass-rails>,             ['~> 1.0.3']
+  s.add_runtime_dependency %q<sassy-buttons>,             ['~> 0.1.3']
 
-  s.add_development_dependency(%q<bumpy>)
-  s.add_development_dependency(%q<capybara>)
-  s.add_development_dependency(%q<factory_girl_rails>, ['~> 1.7.0'])
-  s.add_development_dependency(%q<rspec-rails>,        ['2.12.0'])
-  s.add_development_dependency(%q<sqlite3>)
-  s.add_development_dependency(%q<yard>)
+  s.add_development_dependency %q<bumpy>
+  s.add_development_dependency %q<capybara>
+  s.add_development_dependency %q<factory_girl_rails>
+  s.add_development_dependency %q<rspec-rails>
+  s.add_development_dependency %q<sqlite3>
+  s.add_development_dependency %q<yard>
 
 end

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

@@ -111,7 +111,7 @@ if (typeof(Alchemy) === 'undefined') {
     setElementSaved: function(selector) {
       var $element = $(selector);
       Alchemy.setElementClean(selector);
-      Alchemy.enableButton('button.button', $element);
+      Alchemy.Buttons.enable($element);
     },
 
     resizeFrame: function() {
@@ -166,7 +166,7 @@ if (typeof(Alchemy) === 'undefined') {
     },
 
     SelectBox: function(scope) {
-      $('select', scope).selectBoxIt();
+      $('select.alchemy_selectbox', scope).selectBoxIt();
     },
 
     Buttons: function(options) {

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

@@ -0,0 +1,31 @@
+window.Alchemy = {} if window.Alchemy == undefined
+
+Alchemy.Buttons =
+
+  observe: (scope) ->
+    $('form', scope).not('.button_with_label form').on 'submit', (event) ->
+      $btn = $(this).find(':submit')
+      if $btn.attr('disabled') == 'disabled'
+        event.preventDefault()
+        event.stopPropagation()
+        false
+      else
+        Alchemy.Buttons.disable($btn)
+
+  disable: (button) ->
+    $button = $(button)
+    spinner = '<img src="/assets/alchemy/ajax_loader.gif" style="width: 16px; height: 16px">'
+    $button.data('label', $button.text())
+    $button.attr('disabled', true)
+    $button.addClass('disabled')
+    $button.css
+      width: $button.outerWidth()
+    $button.html(spinner)
+    return true
+
+  enable: (scope) ->
+    $button = $('form :submit:disabled', scope)
+    $button.removeClass('disabled')
+    $button.removeAttr('disabled')
+    $button.text($button.data('label'))
+    return true

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

@@ -100,7 +100,7 @@ if (typeof(Alchemy) === 'undefined') {
         $(this).draggable({
           helper: 'clone',
           iframeFix: 'iframe#alchemyPreviewWindow',
-          connectToSortable: cell_classes,
+          connectToSortable: cell_classes.replace(/,.$/, ''),
           start: function(event, ui) {
             $(this).hide().addClass('dragged');
             ui.helper.css({

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

@@ -10,16 +10,20 @@ if (typeof(Alchemy) === 'undefined') {
   Alchemy.ElementsWindow = {
 
     init: function(path, options, callback) {
+      var self = Alchemy.ElementsWindow;
       var $dialog = $('<div style="display: none" id="alchemyElementWindow"></div>');
       var closeCallback = function() {
           $dialog.dialog("destroy");
           $('#alchemyElementWindow').remove();
           Alchemy.ElementsWindow.button.enable();
         };
+      self.path = path;
+      self.callback = callback;
       $dialog.html(Alchemy.getOverlaySpinner({
         x: 420,
         y: 300
       }));
+      self.dialog = $dialog;
       Alchemy.ElementsWindow.currentWindow = $dialog.dialog({
         modal: false,
         minWidth: 422,
@@ -35,21 +39,7 @@ if (typeof(Alchemy) === 'undefined') {
         },
         open: function(event, ui) {
           Alchemy.ElementsWindow.button.disable();
-          $.ajax({
-            url: path,
-            success: function(data, textStatus, XMLHttpRequest) {
-              $dialog.html(data);
-              Alchemy.ButtonObserver('#alchemyElementWindow .button');
-              Alchemy.overlayObserver('#alchemyElementWindow');
-              Alchemy.Datepicker('#alchemyElementWindow input.date, #alchemyElementWindow input[type="date"]');
-              if (callback) {
-                callback.call();
-              }
-            },
-            error: function(XMLHttpRequest, textStatus, errorThrown) {
-              Alchemy.AjaxErrorHandler($dialog, XMLHttpRequest.status, textStatus, errorThrown);
-            }
-          });
+          Alchemy.ElementsWindow.reload(callback);
         },
         beforeClose: function() {
           if (Alchemy.isPageDirty()) {
@@ -104,6 +94,25 @@ if (typeof(Alchemy) === 'undefined') {
         }));
       }
       return $toolbar;
+    },
+
+    reload: function() {
+      var self = Alchemy.ElementsWindow;
+      $.ajax({
+        url: self.path,
+        success: function(data, textStatus, XMLHttpRequest) {
+          self.dialog.html(data);
+          Alchemy.Buttons.observe('#alchemyElementWindow');
+          Alchemy.overlayObserver('#alchemyElementWindow');
+          Alchemy.Datepicker('#alchemyElementWindow input.date, #alchemyElementWindow input[type="date"]');
+          if (self.callback) {
+            self.callback.call();
+          }
+        },
+        error: function(XMLHttpRequest, textStatus, errorThrown) {
+          Alchemy.AjaxErrorHandler($dialog, XMLHttpRequest.status, textStatus, errorThrown);
+        }
+      });
     }
 
   }

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

@@ -1,11 +1,17 @@
-if typeof window.Alchemy == 'undefined'
-  window.Alchemy = {}
+window.Alchemy = {} if window.Alchemy == undefined
 
 Alchemy.GUI =
 
+  init: ->
+    Alchemy.Tooltips()
+    Alchemy.SelectBox()
+    Alchemy.Datepicker()
+    Alchemy.Buttons.observe()
+    Alchemy.resizeFrame()
+
   initElement: ($el) ->
     Alchemy.ElementDirtyObserver($el)
     Alchemy.SelectBox($el)
-    Alchemy.ButtonObserver('button.button', $el)
+    Alchemy.Buttons.observe($el)
     Alchemy.Datepicker('input[type="date"]', $el)
     Alchemy.overlayObserver($el)

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

@@ -30,12 +30,12 @@ Alchemy.loadjQuery = function(callback) {
     head.appendChild(script);
   }
 
-  getScript('//code.jquery.com/jquery.min.js', function() {
+  getScript('//ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js', function() {
     if (typeof(jQuery) !== 'undefined') {
       if (thisPageUsingOtherJSLibrary) {
         jQuery.noConflict();
       }
-      callback(jQuery);
+      callback();
     }
   });
 

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

@@ -18,6 +18,7 @@
 //= require alchemy/alchemy.image_cropper
 //= require alchemy/alchemy.js_extensions
 //= require alchemy/alchemy.link_overlay
+//= require alchemy/alchemy.onload
 //= require alchemy/alchemy.page_sorter
 //= require alchemy/alchemy.uploader
 //= require alchemy/alchemy.file_progress

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

@@ -6,20 +6,12 @@ Alchemy.loadAlchemyMenuBar = function(options) {
 
   Alchemy.Menubar = {
 
-    init: function ($) {
-      var self = Alchemy.Menubar;
-      self._$ = $;
-      self.show();
-    },
-
     show: function() {
-      var self = Alchemy.Menubar;
-      self._$('body').prepend(Alchemy.Menubar.build());
+      $('body').prepend(Alchemy.Menubar.build());
     },
 
     build: function() {
-      var self = Alchemy.Menubar;
-      var bar = self._$('<div id="alchemy_menubar"/>').append('<ul/>');
+      var bar = $('<div id="alchemy_menubar"/>').append('<ul/>');
       bar.find('ul').append('<li><a href="' + options.route + '/admin">' + Alchemy.Menubar.t("to_alchemy") + '</a></li>').append('<li><a href="' + options.route + '/admin/pages/' + options.page_id + '/edit">' + Alchemy.Menubar.t("edit_page") + '</a></li>').append('<li><a href="' + options.route + '/admin/logout">' + Alchemy.Menubar.t("logout") + '</a></li>');
       return bar;
     },
@@ -51,9 +43,9 @@ Alchemy.loadAlchemyMenuBar = function(options) {
   };
 
   if (typeof(jQuery) === 'undefined') {
-    Alchemy.loadjQuery(Alchemy.Menubar.init);
+    Alchemy.loadjQuery(Alchemy.Menubar.show);
   } else {
-    Alchemy.Menubar.init(jQuery);
+    Alchemy.Menubar.show();
   }
 
 };

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

@@ -0,0 +1,32 @@
+$ ->
+  # Preloading all background images from CSS files.
+  $.preloadCssImages()
+
+  # We obviously have javascript enabled.
+  $('html').removeClass('no-js')
+
+  # Initialize the GUI.
+  Alchemy.GUI.init()
+
+  # Fade all growl notifications.
+  if $('#flash_notices').length > 0
+    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], #subnav_additions .subnavi_tab button')
+    .click ->
+      Alchemy.pleaseWaitOverlay()
+
+  # Hack for enabling tab focus for <a>'s styled as button.
+  $('a.button').attr({tabindex: 0})
+
+  # Locale select handler
+  $('select#change_locale').on 'change', (e) ->
+    url = Alchemy.current_url
+    delimiter = url.match(/\?/) ? '&' : '?'
+    window.location = url + delimiter + 'locale=' + $(this).val()
+
+# Resize the Alchemy frame on every browser resize.
+jQuery(window).resize ->
+  Alchemy.resizeFrame()