alchemy_cms 2.1.rc6 → 2.1

data/spec/integration/admin/resources_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+describe "Resources" do
+
+	before(:all) do
+		Factory.build(:admin_user).save_without_session_maintenance
+	end
+
+	describe "index view" do
+
+		it "should have a button for creating a new resource" do
+			login_into_alchemy
+			visit '/alchemy/admin/languages'
+			page.should have_selector('#toolbar div.button_with_label a.icon_button span.icon.create')
+		end
+
+	end
+
+end

data/spec/models/content_spec.rb

@@ -2,11 +2,12 @@ require 'spec_helper'
 
 describe Alchemy::Content do
 
-  it "should return the ingredient from its essence" do
-    Factory(:element)
-		Alchemy::EssenceText.first.update_attributes(:body => "Hello")
-		Alchemy::Content.first.ingredient.should == Alchemy::EssenceText.first.ingredient
-  end
+	it "should return the ingredient from its essence" do
+		@element = Factory(:element, :name => 'headline')
+		@content = @element.contents.find_by_essence_type('Alchemy::EssenceText')
+		@content.essence.update_attributes(:body => "Hello")
+		@content.ingredient.should == "Hello"
+	end
 
 	describe '.normalize_essence_type' do
 

data/spec/support/alchemy/controller_hacks.rb

@@ -0,0 +1,41 @@
+# Based on spree commerce controller hacks.
+# https://github.com/spree/spree/blob/master/core/spec/support/controller_hacks.rb
+# Thanks!
+
+module Alchemy
+	module Specs
+		module ControllerHacks
+
+			def get(action, parameters = nil, session = nil, flash = nil)
+				process_alchemy_action(action, parameters, session, flash, "GET")
+			end
+
+			# Executes a request simulating POST HTTP method and set/volley the response
+			def post(action, parameters = nil, session = nil, flash = nil)
+				process_alchemy_action(action, parameters, session, flash, "POST")
+			end
+
+			# Executes a request simulating PUT HTTP method and set/volley the response
+			def put(action, parameters = nil, session = nil, flash = nil)
+				process_alchemy_action(action, parameters, session, flash, "PUT")
+			end
+
+			# Executes a request simulating DELETE HTTP method and set/volley the response
+			def delete(action, parameters = nil, session = nil, flash = nil)
+				process_alchemy_action(action, parameters, session, flash, "DELETE")
+			end
+
+		private
+
+			def process_alchemy_action(action, parameters = nil, session = nil, flash = nil, method = "GET")
+				parameters ||= {}
+				process(action, parameters.merge!(:use_route => :alchemy), session, flash, method)
+			end
+
+		end
+	end
+end
+
+RSpec.configure do |c|
+	c.include Alchemy::Specs::ControllerHacks, :type => :controller
+end

data/spec/support/alchemy/specs_helpers.rb

@@ -0,0 +1,32 @@
+module Alchemy
+	module Specs
+		# Helpers for integration specs
+		# This file is auto included in rspec integration/request tests.
+		module Helpers
+
+			# Capybara actions to login into Alchemy Backend
+			# 
+			# === IMPORTANT NOTE:
+			# 
+			# Because of a very strange bug in capybara, or rspec, or what ever, you **MUST** create the user inside a +before(:all)+ block inside your integrations specs.
+			# 
+			# === Example:
+			# 
+			#   before(:all) do
+			#     Factory.build(:admin_user).save_without_session_maintenance
+			#   end
+			# 
+			def login_into_alchemy
+				visit '/alchemy/admin/login'
+				fill_in('alchemy_user_session_login', :with => 'jdoe')
+				fill_in('alchemy_user_session_password', :with => 's3cr3t')
+				click_on('login')
+			end
+
+		end
+	end
+end
+
+RSpec.configure do |c|
+	c.include Alchemy::Specs::Helpers, :type => :request
+end

data/vendor/assets/javascripts/tiny_mce/plugins/autoresize/editor_plugin.js

@@ -1 +1,137 @@
-(function(){tinymce.create("tinymce.plugins.AutoResizePlugin",{init:function(a,c){var d=this,e=0;if(a.getParam("fullscreen_is_enabled")){return}function b(){var i=a.getDoc(),f=i.body,k=i.documentElement,h=tinymce.DOM,j=d.autoresize_min_height,g;g=tinymce.isIE?f.scrollHeight:i.body.offsetHeight;if(g>d.autoresize_min_height){j=g}if(d.autoresize_max_height&&g>d.autoresize_max_height){j=d.autoresize_max_height;a.getBody().style.overflowY="auto"}else{a.getBody().style.overflowY="hidden"}if(j!==e){h.setStyle(h.get(a.id+"_ifr"),"height",j+"px");e=j}if(d.throbbing){a.setProgressState(false);a.setProgressState(true)}}d.editor=a;d.autoresize_min_height=parseInt(a.getParam("autoresize_min_height",a.getElement().offsetHeight));d.autoresize_max_height=parseInt(a.getParam("autoresize_max_height",0));a.onInit.add(function(f){f.dom.setStyle(f.getBody(),"paddingBottom",f.getParam("autoresize_bottom_margin",50)+"px")});a.onChange.add(b);a.onSetContent.add(b);a.onPaste.add(b);a.onKeyUp.add(b);a.onPostRender.add(b);if(a.getParam("autoresize_on_init",true)){a.onInit.add(function(g,f){g.setProgressState(true);d.throbbing=true;g.getBody().style.overflowY="hidden"});a.onLoadContent.add(function(g,f){b();setTimeout(function(){b();g.setProgressState(false);d.throbbing=false},1250)})}a.addCommand("mceAutoResize",b)},getInfo:function(){return{longname:"Auto Resize",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/autoresize",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("autoresize",tinymce.plugins.AutoResizePlugin)})();
+/**
+ * editor_plugin_src.js
+ *
+ * Copyright 2009, Moxiecode Systems AB
+ * Released under LGPL License.
+ *
+ * License: http://tinymce.moxiecode.com/license
+ * Contributing: http://tinymce.moxiecode.com/contributing
+ */
+
+(function() {
+	/**
+	 * Auto Resize
+	 * 
+	 * This plugin automatically resizes the content area to fit its content height.
+	 * It will retain a minimum height, which is the height of the content area when
+	 * it's initialized.
+	 */
+	tinymce.create('tinymce.plugins.AutoResizePlugin', {
+		/**
+		 * Initializes the plugin, this will be executed after the plugin has been created.
+		 * This call is done before the editor instance has finished it's initialization so use the onInit event
+		 * of the editor instance to intercept that event.
+		 *
+		 * @param {tinymce.Editor} ed Editor instance that the plugin is initialized in.
+		 * @param {string} url Absolute URL to where the plugin is located.
+		 */
+		init : function(ed, url) {
+			var t = this, oldSize = 0;
+
+			if (ed.getParam('fullscreen_is_enabled'))
+				return;
+
+			/**
+			 * This method gets executed each time the editor needs to resize.
+			 */
+			function resize() {
+				var d = ed.getDoc(), b = d.body, de = d.documentElement, DOM = tinymce.DOM, resizeHeight = t.autoresize_min_height, myHeight;
+
+				// Get height differently depending on the browser used
+				myHeight = tinymce.isIE ? b.scrollHeight : (tinymce.isWebKit && b.clientHeight == 0 ? 0 : b.offsetHeight);
+
+				// Don't make it smaller than the minimum height
+				if (myHeight > t.autoresize_min_height)
+					resizeHeight = myHeight;
+
+				// If a maximum height has been defined don't exceed this height
+				if (t.autoresize_max_height && myHeight > t.autoresize_max_height) {
+					resizeHeight = t.autoresize_max_height;
+					ed.getBody().style.overflowY = "auto";
+				} else
+					ed.getBody().style.overflowY = "hidden";
+
+				// Resize content element
+				if (resizeHeight !== oldSize) {
+					DOM.setStyle(DOM.get(ed.id + '_ifr'), 'height', resizeHeight + 'px');
+					oldSize = resizeHeight;
+				}
+
+				// if we're throbbing, we'll re-throb to match the new size
+				if (t.throbbing) {
+					ed.setProgressState(false);
+					ed.setProgressState(true);
+				}
+			};
+
+			t.editor = ed;
+
+			// Define minimum height
+			t.autoresize_min_height = parseInt( ed.getParam('autoresize_min_height', ed.getElement().offsetHeight) );
+
+			// Define maximum height	
+			t.autoresize_max_height = parseInt( ed.getParam('autoresize_max_height', 0) );
+
+			// Add padding at the bottom for better UX
+			ed.onInit.add(function(ed){
+				ed.dom.setStyle(ed.getBody(), 'paddingBottom', ed.getParam('autoresize_bottom_margin', 50) + 'px');
+			});
+
+			// Add appropriate listeners for resizing content area
+			ed.onChange.add(resize);
+			ed.onSetContent.add(resize);
+			ed.onPaste.add(resize);
+			ed.onKeyUp.add(resize);
+			ed.onPostRender.add(resize);
+
+			if (ed.getParam('autoresize_on_init', true)) {
+				// Things to do when the editor is ready
+				ed.onInit.add(function(ed, l) {
+					// Show throbber until content area is resized properly
+					ed.setProgressState(true);
+					t.throbbing = true;
+
+					// Hide scrollbars
+					ed.getBody().style.overflowY = "hidden";
+				});
+
+				ed.onLoadContent.add(function(ed, l) {
+					resize();
+
+					// Because the content area resizes when its content CSS loads,
+					// and we can't easily add a listener to its onload event,
+					// we'll just trigger a resize after a short loading period
+					setTimeout(function() {
+						resize();
+
+						// Disable throbber
+						ed.setProgressState(false);
+						t.throbbing = false;
+					}, 1250);
+				});
+			}
+
+			// Register the command so that it can be invoked by using tinyMCE.activeEditor.execCommand('mceExample');
+			ed.addCommand('mceAutoResize', resize);
+		},
+
+		/**
+		 * Returns information about the plugin as a name/value array.
+		 * The current keys are longname, author, authorurl, infourl and version.
+		 *
+		 * @return {Object} Name/value array containing information about the plugin.
+		 */
+		getInfo : function() {
+			return {
+				longname : 'Auto Resize',
+				author : 'Moxiecode Systems AB',
+				authorurl : 'http://tinymce.moxiecode.com',
+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/autoresize',
+				version : tinymce.majorVersion + "." + tinymce.minorVersion
+			};
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('autoresize', tinymce.plugins.AutoResizePlugin);
+})();

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 2.1.rc6
-  prerelease: 4
+  version: '2.1'
+  prerelease: 
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-20 00:00:00.000000000 Z
+date: 2012-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70135245578000 !ruby/object:Gem::Requirement
+  requirement: &70285756045860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -23,10 +23,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70135245578000
+  version_requirements: *70285756045860
 - !ruby/object:Gem::Dependency
   name: authlogic
-  requirement: &70135245577560 !ruby/object:Gem::Requirement
+  requirement: &70285756045440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70135245577560
+  version_requirements: *70285756045440
 - !ruby/object:Gem::Dependency
   name: awesome_nested_set
-  requirement: &70135245576980 !ruby/object:Gem::Requirement
+  requirement: &70285756061260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -45,10 +45,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70135245576980
+  version_requirements: *70285756061260
 - !ruby/object:Gem::Dependency
   name: declarative_authorization
-  requirement: &70135245576460 !ruby/object:Gem::Requirement
+  requirement: &70285756060720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -56,10 +56,10 @@ dependencies:
         version: 0.5.4
   type: :runtime
   prerelease: false
-  version_requirements: *70135245576460
+  version_requirements: *70285756060720
 - !ruby/object:Gem::Dependency
   name: tvdeyen-fleximage
-  requirement: &70135245575980 !ruby/object:Gem::Requirement
+  requirement: &70285756060240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -67,10 +67,10 @@ dependencies:
         version: 1.0.9
   type: :runtime
   prerelease: false
-  version_requirements: *70135245575980
+  version_requirements: *70285756060240
 - !ruby/object:Gem::Dependency
   name: will_paginate
-  requirement: &70135245575500 !ruby/object:Gem::Requirement
+  requirement: &70285756059740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -78,10 +78,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70135245575500
+  version_requirements: *70285756059740
 - !ruby/object:Gem::Dependency
   name: acts_as_ferret
-  requirement: &70135245575020 !ruby/object:Gem::Requirement
+  requirement: &70285756059240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -89,10 +89,10 @@ dependencies:
         version: '0.5'
   type: :runtime
   prerelease: false
-  version_requirements: *70135245575020
+  version_requirements: *70285756059240
 - !ruby/object:Gem::Dependency
   name: acts_as_list
-  requirement: &70135245574540 !ruby/object:Gem::Requirement
+  requirement: &70285756058760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -100,10 +100,10 @@ dependencies:
         version: '0.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70135245574540
+  version_requirements: *70285756058760
 - !ruby/object:Gem::Dependency
   name: magiclabs-userstamp
-  requirement: &70135245574060 !ruby/object:Gem::Requirement
+  requirement: &70285756058280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -111,10 +111,10 @@ dependencies:
         version: 2.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70135245574060
+  version_requirements: *70285756058280
 - !ruby/object:Gem::Dependency
   name: dynamic_form
-  requirement: &70135245573580 !ruby/object:Gem::Requirement
+  requirement: &70285756057800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -122,10 +122,10 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70135245573580
+  version_requirements: *70285756057800
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &70135245573100 !ruby/object:Gem::Requirement
+  requirement: &70285756057320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -133,10 +133,10 @@ dependencies:
         version: 1.0.16
   type: :runtime
   prerelease: false
-  version_requirements: *70135245573100
+  version_requirements: *70285756057320
 - !ruby/object:Gem::Dependency
   name: attachment_magic
-  requirement: &70135245572620 !ruby/object:Gem::Requirement
+  requirement: &70285756056840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -144,10 +144,10 @@ dependencies:
         version: 0.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *70135245572620
+  version_requirements: *70285756056840
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70135245572120 !ruby/object:Gem::Requirement
+  requirement: &70285756056360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -155,10 +155,10 @@ dependencies:
         version: '2.8'
   type: :development
   prerelease: false
-  version_requirements: *70135245572120
+  version_requirements: *70285756056360
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70135245571740 !ruby/object:Gem::Requirement
+  requirement: &70285756055980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -166,7 +166,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70135245571740
+  version_requirements: *70285756055980
 description: Alchemy is an awesome Rails CMS with an extremely flexible content storing
   architecture.
 email:
@@ -198,6 +198,7 @@ files:
 - app/assets/images/alchemy/jquery-sb/select_arrow.gif
 - app/assets/images/alchemy/jquery-sb/select_arrow_bg.gif
 - app/assets/images/alchemy/jquery-sb/select_arrow_bg_hover.gif
+- app/assets/images/alchemy/lupe.cur
 - app/assets/images/alchemy/placeholder.png
 - app/assets/images/alchemy/shading.png
 - app/assets/images/alchemy/swfupload/browse_button.png
@@ -231,16 +232,27 @@ files:
 - app/assets/stylesheets/alchemy/_defaults.scss
 - app/assets/stylesheets/alchemy/alchemy.css
 - app/assets/stylesheets/alchemy/base.css.scss
+- app/assets/stylesheets/alchemy/buttons.css.scss
+- app/assets/stylesheets/alchemy/dashboard.css.scss
 - app/assets/stylesheets/alchemy/elements.css.scss
 - app/assets/stylesheets/alchemy/flags.css.scss
+- app/assets/stylesheets/alchemy/flash.css.scss
+- app/assets/stylesheets/alchemy/frame.css.scss
+- app/assets/stylesheets/alchemy/icons.css.scss
 - app/assets/stylesheets/alchemy/jquery-ui.alchemy.css.scss
 - app/assets/stylesheets/alchemy/jquery.Jcrop.css.scss
 - app/assets/stylesheets/alchemy/jquery.sb.css.scss
+- app/assets/stylesheets/alchemy/login.css.scss
 - app/assets/stylesheets/alchemy/menubar.css.scss
+- app/assets/stylesheets/alchemy/modules.css.scss
+- app/assets/stylesheets/alchemy/pagination.css.scss
 - app/assets/stylesheets/alchemy/print.css
+- app/assets/stylesheets/alchemy/sitemap.css.scss
 - app/assets/stylesheets/alchemy/standard_set.css
+- app/assets/stylesheets/alchemy/tables.css.scss
 - app/assets/stylesheets/alchemy/tinymce_content.css.scss
 - app/assets/stylesheets/alchemy/tinymce_dialog.css.scss
+- app/assets/stylesheets/alchemy/upload.css.scss
 - app/controllers/alchemy/admin/attachments_controller.rb
 - app/controllers/alchemy/admin/base_controller.rb
 - app/controllers/alchemy/admin/clipboard_controller.rb
@@ -346,7 +358,6 @@ files:
 - app/views/alchemy/admin/essence_pictures/edit.html.erb
 - app/views/alchemy/admin/essence_pictures/save_link.js.erb
 - app/views/alchemy/admin/essence_pictures/update.js.erb
-- app/views/alchemy/admin/languages/_language.html.erb
 - app/views/alchemy/admin/layoutpages/_layoutpage.html.erb
 - app/views/alchemy/admin/layoutpages/index.html.erb
 - app/views/alchemy/admin/pages/_contactform_links.html.erb
@@ -656,6 +667,7 @@ files:
 - spec/helpers/pages_helper_spec.rb
 - spec/helpers/url_helpers_spec.rb
 - spec/integration/admin/pages_controller_spec.rb
+- spec/integration/admin/resources_spec.rb
 - spec/integration/navigation_spec.rb
 - spec/integration/pages_controller_spec.rb
 - spec/integration/security_spec.rb
@@ -669,7 +681,8 @@ files:
 - spec/page_layout_spec.rb
 - spec/routing_spec.rb
 - spec/spec_helper.rb
-- spec/support/controller_hacks.rb
+- spec/support/alchemy/controller_hacks.rb
+- spec/support/alchemy/specs_helpers.rb
 - vendor/assets/javascripts/jquery_plugins/jquery.Jcrop.min.js
 - vendor/assets/javascripts/jquery_plugins/jquery.dialogextend.min.js
 - vendor/assets/javascripts/jquery_plugins/jquery.in-place-edit.js
@@ -793,13 +806,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4092920375307944882
+      hash: -2746034174098475999
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
+      segments:
+      - 0
+      hash: -2746034174098475999
 requirements:
 - ImageMagick (libmagick), v6.6 or greater.
 rubyforge_project: 
@@ -859,6 +875,7 @@ test_files:
 - spec/helpers/pages_helper_spec.rb
 - spec/helpers/url_helpers_spec.rb
 - spec/integration/admin/pages_controller_spec.rb
+- spec/integration/admin/resources_spec.rb
 - spec/integration/navigation_spec.rb
 - spec/integration/pages_controller_spec.rb
 - spec/integration/security_spec.rb
@@ -872,5 +889,6 @@ test_files:
 - spec/page_layout_spec.rb
 - spec/routing_spec.rb
 - spec/spec_helper.rb
-- spec/support/controller_hacks.rb
+- spec/support/alchemy/controller_hacks.rb
+- spec/support/alchemy/specs_helpers.rb
 has_rdoc: