new version of Aloha 0.23.2

Gemfile.lock

@@ -1,45 +1,46 @@
 PATH
   remote: .
   specs:
-    locomotive-aloha-rails (0.20.1.3)
-      actionpack (~> 3.2.1)
+    locomotive-aloha-rails (0.23.2.1)
+      actionpack (~> 3.2.13)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    actionpack (3.2.3)
-      activemodel (= 3.2.3)
-      activesupport (= 3.2.3)
+    actionpack (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
-      journey (~> 1.0.1)
-      rack (~> 1.4.0)
+      journey (~> 1.0.4)
+      rack (~> 1.4.5)
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
-      sprockets (~> 2.1.2)
-    activemodel (3.2.3)
-      activesupport (= 3.2.3)
+      sprockets (~> 2.2.1)
+    activemodel (3.2.13)
+      activesupport (= 3.2.13)
       builder (~> 3.0.0)
-    activesupport (3.2.3)
-      i18n (~> 0.6)
+    activesupport (3.2.13)
+      i18n (= 0.6.1)
       multi_json (~> 1.0)
-    builder (3.0.0)
+    builder (3.0.4)
     erubis (2.7.0)
     hike (1.2.1)
-    i18n (0.6.0)
-    journey (1.0.3)
-    multi_json (1.3.2)
-    rack (1.4.1)
+    i18n (0.6.1)
+    journey (1.0.4)
+    multi_json (1.7.1)
+    rack (1.4.5)
     rack-cache (1.2)
       rack (>= 0.4)
-    rack-test (0.6.1)
+    rack-test (0.6.2)
       rack (>= 1.0)
     rake (0.9.2)
-    sprockets (2.1.2)
+    sprockets (2.2.2)
       hike (~> 1.2)
+      multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    tilt (1.3.3)
+    tilt (1.3.6)
 
 PLATFORMS
   ruby

Rakefile

@@ -31,16 +31,21 @@ desc "Update Aloha Editor to version specified in lib/aloha/rails/version.rb"
 task :update => [ :fetch, :extract, :process ]
 
 task :fetch do
-  download("https://github.com/downloads/alohaeditor/Aloha-Editor/alohaeditor-#{Aloha::VERSION}.zip", "alohaeditor.zip")
+  download("https://github.com/alohaeditor/Aloha-Editor/archive/alohaeditor-#{Aloha::VERSION}.zip", "alohaeditor.zip")
 end
 
 task :extract do
   step "Extracting core files" do
     `rm -rf tmp/aloha`
     `unzip -u tmp/alohaeditor.zip -d tmp`
+    `mv tmp/Aloha-Editor-alohaeditor-#{Aloha::VERSION}/src tmp/aloha`
+    `rm -rf tmp/Aloha-Editor-alohaeditor-#{Aloha::VERSION}`
 
-    %w(build.txt package.json plugins/extra/browser/css/browsercombined.css.backup).each { |file| `rm tmp/aloha/#{file}` }
-    %w(demo test plugins/extra/speak plugins/extra/flag-icons plugins/extra/googletranslate plugins/extra/wai-lang plugins/extra/zemanta).each { |folder| `rm -rf tmp/aloha/#{folder}` }
+    %w(package.json).each { |file| `rm tmp/aloha/#{file}` }
+    %w(demo test plugins/extra/speak plugins/extra/flag-icons plugins/extra/googletranslate plugins/extra/wai-lang plugins/extra/zemanta plugins/extra/proxy).each { |folder| `rm -rf tmp/aloha/#{folder}` }
+    %w(1.5.1 1.6.1 1.6 1.7.1).each { |version| `rm tmp/aloha/lib/vendor/jquery-#{version}.js` }
+    Dir['tmp/aloha/**/demo'].each { |file| `rm -rf #{file}` if File.directory?(file) }
+    Dir['tmp/aloha/**/test'].each { |file| `rm -rf #{file}` if File.directory?(file) }
 
     `rm -rf vendor/assets/javascripts/aloha`
     `mkdir -p vendor/assets/javascripts/aloha`
@@ -50,11 +55,15 @@ end
 
 task :process do
   step "Fixing file encoding" do
-    require 'iconv'
-    converter = Iconv.new('UTF-8', 'ISO-8859-1')
     Dir["vendor/assets/javascripts/aloha/**/*.js"].each do |file|
-      contents = converter.iconv(File.read(file)).force_encoding('UTF-8')
+      contents = File.read(file).encode('UTF-8', 'ISO-8859-1')
       File.open(file, 'w') { |f| f.write(contents) }
     end
   end
+  step "Wrong color in the aloha.css file" do
+    file = 'vendor/assets/javascripts/aloha/css/aloha.css'
+    content = File.read(file)
+    content.gsub!('#NaNbbaaNaN00NaN00NaN00NaN00NaN', '#000')
+    File.open(file, 'w') { |f| f.write(content) }
+  end
 end

app/assets/javascripts/aloha.js

@@ -1,2 +1,3 @@
 //= require aloha/preinit.js
+//= require aloha/lib/require.js
 //= require aloha/lib/aloha.js

lib/aloha/rails/engine.rb

@@ -2,7 +2,7 @@ module Aloha
   module Rails
     class Engine < ::Rails::Engine
       initializer 'precompile', :group => :all do |app|
-        app.config.assets.precompile << 'aloha.js'
+        app.config.assets.precompile += ['aloha.js', 'aloha/css/aloha.css']
       end
     end
   end

lib/aloha/rails/version.rb

@@ -1,7 +1,7 @@
 module Aloha
-  VERSION   = '0.20.10'
+  VERSION   = '0.23.2'
 
   module Rails
-    VERSION = '0.20.1.5'
+    VERSION = '0.23.2.1'
   end
 end

locomotive-aloha-rails.gemspec

@@ -5,14 +5,14 @@ require 'aloha/rails/version'
 Gem::Specification.new do |s|
   s.name        = 'locomotive-aloha-rails'
   s.version     = Aloha::Rails::VERSION
-  s.summary     = 'Rails 3.1 integration for Aloha Editor.'
-  s.description = 'Seamlessly integrates Aloha Editor into the Rails 3.1 asset pipeline.'
+  s.summary     = 'Rails 3.2 integration for Aloha Editor.'
+  s.description = 'Seamlessly integrates Aloha Editor into the Rails 3.2 asset pipeline.'
   s.homepage    = 'https://github.com/locomotivecms/aloha-rails'
   s.files       = Dir['README.md', 'LICENSE', 'Rakefile', 'app/**/*', 'lib/**/*', 'vendor/**/*']
   s.authors     = ['Didier Lafforgue']
   s.email       = 'didier.lafforgue@gmail.com'
 
-  s.add_dependency 'actionpack',  '~> 3.2.1'
+  s.add_dependency 'actionpack',  '~> 3.2.13'
 
   s.add_development_dependency 'rake', '0.9.2'
 end

vendor/assets/javascripts/aloha/css/aloha-common-extra.css

@@ -0,0 +1,24 @@
+/* This file should only contain import statements, only one each for
+ * the core and plugins, so that it is easy to make variations of this
+ * file that exclude some plugins.
+ */
+@import "aloha-core.css";
+@import "../plugins/common/abbr/css/abbr.css";
+@import "../plugins/common/ui/css/ui.css";
+@import "../plugins/common/link/css/link.css";
+@import "../plugins/common/characterpicker/css/characterpicker.css";
+@import "../plugins/common/highlighteditables/css/highlighteditables.css";
+@import "../plugins/common/horizontalruler/css/horizontalruler.css";
+@import "../plugins/common/block/css/block.css";
+@import "../plugins/common/align/css/align.css";
+@import "../plugins/common/image/css/image.css";
+@import "../plugins/common/table/css/table.css";
+@import "../plugins/extra/cite/css/cite.css";
+@import "../plugins/extra/formatlesspaste/css/formatless.css";
+@import "../plugins/extra/wai-lang/css/wai-lang.css";
+@import	"../plugins/extra/numerated-headers/css/numerated-headers.css";
+@import "../plugins/extra/ribbon/css/ribbon.css";
+@import "../plugins/extra/headerids/css/headerids.css";
+@import "../plugins/extra/metaview/css/metaview.css";
+@import "../plugins/extra/textcolor/css/textcolor.css";
+

vendor/assets/javascripts/aloha/css/aloha-core.css

@@ -1,3 +1,7 @@
+@import "aloha-reset.css";
+@import "aloha-sidebar.css";
+@import "../lib/vendor/repository-browser/css/repository-browser.css";
+
 .aloha-editable {
 	min-height: 1.2em;
 	outline: none;
@@ -7,35 +11,6 @@
 	background: #80B5F2;
 	color: white;
 }
-.aloha-editable-zerowidthfix {
-	padding: 0px 5px 0px 5px !important;
-}
-
-
-
-.aloha-logo {
-	width:37px !important;
-	height:25px !important;
-	background-image: url('../img/gentics-logo.png') !important;
-}
-.aloha-maximize {
-	background-image: url('../img/gentics-logo.png') !important;
-}
-.aloha-fade-out {
-	background-image: url('../img/fade-out.png') !important;
-	width:20px !important;
-	height:20px !important;
-}
-.aloha-fade-in {
-	background-image: url('../img/fade-in.png') !important;
-	width:20px !important;
-	height:20px !important;
-}
-.aloha-maximize {
-	width:20px !important;
-	height:20px !important;
-	background-image: url('../img/maximize.png') !important;
-}
 .aloha-textarea {
 	overflow: hidden;
 	border:1px solid #ccc;

vendor/assets/javascripts/aloha/css/aloha-reset.css

@@ -0,0 +1,24 @@
+/**
+ * Aloha CSS reset.
+ * Original by Eric Meyer. Modified for use in Aloha.
+ * Every element used in the Aloha Editor UI should have a an appropriate reset here.
+ */
+
+/* http://meyerweb.com/eric/tools/css/reset/ 
+   v2.0 | 20110126
+   License: none (public domain)
+*/
+
+.aloha div, .aloha span, .aloha button, .aloha a, .aloha img,
+.aloha ol, .aloha ul, .aloha li, .aloha label {
+	margin: 0;
+	padding: 0;
+	border: 0;
+	font-size: 100%;
+	font: inherit;
+	vertical-align: baseline;
+}
+/* HTML5 display-role reset for older browsers */
+.aloha ol, .aloha ul {
+	list-style: none;
+}