alchemy_cms 2.1.5 → 2.1.6

data/app/views/alchemy/elements/_contactform_editor.html.erb

@@ -1,7 +1,4 @@
 <%= render_essence_editor_by_name(element, 'mail_from') %>
 <%= render_essence_editor_by_name(element, 'mail_to') %>
 <%= render_essence_editor_by_name(element, 'subject') %>
-<div class="content_editor">
-	<label><%= t('alchemy.contactform.labels.success_page') %></label>
-	<p><%= page_selector(element, 'success_page') %></p>
-</div>
+<%= page_selector(element, 'success_page', :page_attribute => :urlname) %>

data/app/views/alchemy/essences/_essence_date_editor.html.erb

@@ -1,10 +1,9 @@
-<div class="content_editor" id="<%= content_dom_id(content) %>">
+<div class="content_editor essence_date" id="<%= content_dom_id(content) %>">
 	<label><%= render_content_name(content) %></label>
 	<%= alchemy_datepicker(
 		content.essence, :date, {
 			:name => content.form_field_name,
-			:id => content.form_field_id,
-			:style => 'width: 140px'
+			:id => content.form_field_id
 		}
 	) %>
 	<label for="<%= content.form_field_id %>" style="cursor: pointer; display: inline; display: inline-block; position: relative; top: 3px; margin: 0;">

data/app/views/alchemy/essences/_essence_date_view.html.erb

@@ -1,7 +1,5 @@
-<%- if content.essence.date.blank? -%>
-<%= l(Time.now, :format => (options[:date_format])) %>
+<%- if content.essence.date.present? -%>
+<%= l(content.essence.date, :format => (options[:date_format])) -%>
 <%- elsif options[:date_format] == :rfc822 -%>
-<%= content.essence.date.to_s(:rfc822) %>
-<%- else -%>
-<%= l(content.essence.date, :format => (options[:date_format])) %>
-<%- end -%>
+<%= content.essence.date.to_s(:rfc822) -%>
+<%- end -%>

data/app/views/alchemy/essences/_essence_text_editor.html.erb

@@ -1,5 +1,5 @@
 <%- cache(content) do -%>
-<div class="content_editor" id="<%= content_dom_id(content) %>">
+<div class="content_editor<%= options[:display_inline].to_s == 'true' ? ' display_inline' : '' %>" id="<%= content_dom_id(content) %>">
   
   <%- if content.settings[:display_as] == "checkbox" -%>
   
@@ -37,7 +37,7 @@
     content.form_field_name,
     options_method,
     {
-      :class => "essence_editor_select"
+      :class => "alchemy_selectbox essence_editor_select"
     }
   ) %>
   <%- end -%>

data/app/views/layouts/alchemy/admin.html.erb

@@ -66,7 +66,7 @@
 				Alchemy.resizeFrame();
 				Alchemy.Tooltips();
 				if (typeof(jQuery().sb) === 'function') {
-					Alchemy.SelectBox('body#alchemy select');
+					Alchemy.SelectBox('body#alchemy select.alchemy_selectbox');
 				}
 				Alchemy.Datepicker();
 				if ($('#flash_notices').length > 0) {

data/config/alchemy/elements.yml

@@ -227,5 +227,7 @@
       - presence
   - name: success_page
     type: EssenceText
+    settings:
+      display_as: select
     validate:
       - presence

data/config/locales/alchemy.de.yml

@@ -71,8 +71,13 @@ de:
       image_mosaic:
         caption: "Mosaik Bildunterschrift"
       file: Datei
-    
+      contactform:
+        success_page: 'Folgeseite'
+
     content_validations:
+      contactform:
+        success_page:
+          blank: 'Bitte wählen Sie eine Folgeseite'
       errors:
         blank: '%{field} darf nicht leer sein.'
         wrong_format: '%{field} hat das falsche Format.'
@@ -108,7 +113,6 @@ de:
         message: 'Nachricht'
         send: 'Nachricht absenden!'
         mandatory_fields: 'Pflichtfelder. Bitte füllen Sie diese Felder aus. Vielen Dank!'
-        success_page: 'Folgeseite'
       # Translations for the contactform validations.
       # Validations are set in the config/alchemy/config.yml mailer section.
       validations:
@@ -196,6 +200,7 @@ de:
     "Do you really want to delete this content?": "Wollen Sie diesen Inhalt wirklich löschen?"
     "Drag an element over to the element window to restore it": "Ziehen Sie ein Element mit der Maus in das Elemente Fenster, um es wieder herzustellen."
     "Edit Picturemask": "Bildmaske bearbeiten"
+    "Elements": "Elemente"
     "Element trashed": "Das Element wurde in den Papierkorb gelegt"
     "Error with the Flash® Uploader!": "Fehler mit dem Flash® Uploader!"
     "Excerpt": "Auszug"
@@ -247,7 +252,6 @@ de:
     "Picture deleted successfully": "%{name} wurde gelöscht"
     "Picture cache flushed": "Bildercache wurde geleert"
     "Please Signup": "Um Ihre Homepage bearbeiten zu können, müssen Sie als erstes einen Admin Benutzer einrichten."
-    "Please check contents below.": "Bitte überprüfen Sie die markierten Felder."
     "Please choose": "Bitte wählen"
     "Please choose a page layout.": "Bitte wählen Sie einen Seitentyp."
     choose_element: "Bitte wählen Sie ein Element."
@@ -337,6 +341,7 @@ de:
     contactform_body: "Nachrichten Vorlage"
     content_essence_not_found: "Essenz wurde nicht gefunden"
     content_not_found: "Das Feld für diesen Inhalt ist nicht vorhanden."
+    content_validations_headline: "Bitte überprüfen Sie die markierten Felder."
     copy: "kopieren"
     copy_element: "Element kopieren"
     copy_page: "Seite kopieren"

data/config/locales/alchemy.en.yml

@@ -68,7 +68,9 @@ en:
       news_headline: "News Headline"
       image_mosaic:
         caption: "Mosaic Caption"
-    
+      contactform:
+        success_page: 'Followup page'
+
     # == Translations for the build in full text search.
     search_result_page:
       no_results: 'No results found'
@@ -94,7 +96,6 @@ en:
         message: 'Message'
         send: 'Send Message'
         mandatory_fields: 'Mandatory fields.'
-        success_page: 'Followup page'
       # Translations for the contactform validations.
       # Validations are set in the config/alchemy/config.yml mailer section.
       validations:
@@ -170,7 +171,6 @@ en:
     "Page saved": "Page: '%{name}' saved."
     "Password": "Password"
     "Paste from clipboard": "Paste from clipboard"
-    "Please check contents below.": "Please check marked fields below"
     "Successfully added content": "Succesfully added %{content}"
     "Successfully deleted content": "Succesfully deleted %{content}"
     "User created": "User created"
@@ -196,6 +196,7 @@ en:
     contactform_body: "Message Template"
     content_essence_not_found: "Content essence not found"
     content_not_found: "Field for content not present."
+    content_validations_headline: "Please check marked fields below"
     copy_element: "Copy this element"
     copy_language_tree_heading: "Copy page tree"
     copy_page: "Copy page"

data/lib/alchemy/capistrano.rb

@@ -6,7 +6,7 @@ require "alchemy/mount_point"
 Capistrano::Configuration.instance(:must_exist).load do
 
 	after "deploy:setup", "alchemy:shared_folders:create"
-	after "deploy:symlink", "alchemy:shared_folders:symlink"
+	after "deploy:finalize_update", "alchemy:shared_folders:symlink"
 	before "deploy:start", "alchemy:db:seed"
 
 	namespace :alchemy do
@@ -27,11 +27,11 @@ Capistrano::Configuration.instance(:must_exist).load do
 			# Call after deploy:symlink like +after "deploy:symlink", "alchemy:symlink_folders"+ in your +deploy.rb+.
 			desc "Sets the symlinks for uploads, picture cache and ferret index folder. Call after deploy:symlink"
 			task :symlink, :roles => :app do
-				run "rm -rf #{current_path}/uploads"
-				run "ln -nfs #{shared_path}/uploads #{current_path}/"
-				run "ln -nfs #{shared_path}/cache/* #{current_path}/public/"
-				run "rm -rf #{current_path}/index"
-				run "ln -nfs #{shared_path}/index #{current_path}/"
+				run "rm -rf #{release_path}/uploads"
+				run "ln -nfs #{shared_path}/uploads #{release_path}/"
+				run "ln -nfs #{shared_path}/cache/* #{release_path}/public/"
+				run "rm -rf #{release_path}/index"
+				run "ln -nfs #{shared_path}/index #{release_path}/"
 			end
 
 		end

data/lib/alchemy/essence.rb

@@ -26,6 +26,7 @@ module Alchemy #:nodoc:
         validate_column = configuration[:validate_column].blank? ? ingredient_column : configuration[:validate_column]
         
         class_eval <<-EOV
+          attr_accessor :validation_errors
           include Alchemy::Essence::InstanceMethods
           stampable
           validate :essence_validations, :on => :update
@@ -94,10 +95,11 @@ module Alchemy #:nodoc:
       #       validate_format_with: '^[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}(:[0-9]{1,5})?(\/.*)?$'
       # 
 			def essence_validations
+        self.validation_errors ||= []
 				return true if description.blank? || description['validate'].blank?
 				description['validate'].each do |validation|
 					if validation == 'presence' && ingredient.blank?
-						errors.add(ingredient_column.to_sym, :blank)
+						self.validation_errors << :blank
 					elsif validation == 'format'
 						if description['validate_format_as'].blank? && !description['validate_format_with'].blank?
 							matcher = Regexp.new(description['validate_format_with'])
@@ -114,14 +116,17 @@ module Alchemy #:nodoc:
 							raise 'No validation format matcher given'
 						end
 						if ingredient.match(matcher).nil?
-							errors.add(ingredient_column.to_sym, :invalid)
+							self.validation_errors << :invalid
 						end
 					elsif validation == 'uniqueness' && !acts_as_essence_class.send("find_by_#{ingredient_column}", ingredient).blank?
-						errors.add(ingredient_column.to_sym, :taken)
+						self.validation_errors << :taken
 					end
 				end
+        self.validation_errors.each do |validation_error|
+          self.errors.add(self.ingredient_column, validation_error)
+        end
 			end
-      
+
       # Essence description from config/elements.yml
       def description
         return {} if element.nil? or element.content_descriptions.nil?

data/lib/alchemy/version.rb

@@ -1,5 +1,5 @@
 module Alchemy
 
-	VERSION = "2.1.5"
+	VERSION = "2.1.6"
 
 end

data/spec/helpers/admin/elements_helper_spec.rb

@@ -27,7 +27,7 @@ describe Alchemy::Admin::ElementsHelper do
 		end
 
 		it "should return string of elements grouped by cell for select_tag helper" do
-			helper.grouped_elements_for_select(@elements).should == helper.grouped_options_for_select({"FooCell"=>[["1", "1#foo_cell"], ["2", "2#foo_cell"]]})
+			helper.grouped_elements_for_select(@elements).should == helper.grouped_options_for_select({"Foo cell"=>[["1", "1#foo_cell"], ["2", "2#foo_cell"]]})
 		end
 
 		context "with empty elements array" do

data/spec/integration/security_spec.rb

@@ -12,7 +12,7 @@ describe "Security: " do
 		
 		it "render the signup view" do
 			visit '/alchemy/'
-			within('#alchemy_greeting') { page.should have_content('Signup') }
+			within('#alchemy_greeting') { page.should have_content('signup') }
 		end
 	end
 	
@@ -39,7 +39,7 @@ describe "Security: " do
 				visit '/alchemy/admin/login'
 				fill_in('alchemy_user_session_login', :with => 'jdoe')
 				fill_in('alchemy_user_session_password', :with => 's3cr3t')
-				click_on('login')
+				click_on('Login')
 			end
 			
 			it "should be redirected to dashboard" do

data/spec/models/page_spec.rb

@@ -107,7 +107,12 @@ describe Alchemy::Page do
 
 	describe '#create' do
 
-		context "generate urlnames" do
+		context "before/after filter" do
+
+			it "should automatically set the title from its name" do
+				page = Factory(:page, :name => 'My Testpage', :language => @language, :parent_id => @language_root.id)
+				page.title.should == 'My Testpage'
+			end
 
 			it "should get a webfriendly urlname" do
 				page = Factory(:page, :name => 'klingon$&stößel ', :language => @language, :parent_id => @language_root.id)
@@ -133,6 +138,28 @@ describe Alchemy::Page do
 
 	end
 
+	describe '#update' do
+
+		context "before/after filter" do
+
+			it "should not set the title automatically if the name changed but title is not blank" do
+				page = Factory(:page, :name => 'My Testpage', :language => @language, :parent_id => @language_root.id)
+				page.name = "My Renaming Test"
+				page.save; page.reload
+				page.title.should == "My Testpage"
+			end
+
+			it "should not automatically set the title if it changed its value" do
+				page = Factory(:page, :name => 'My Testpage', :language => @language, :parent_id => @language_root.id)
+				page.title = "I like SEO"
+				page.save; page.reload
+				page.title.should == "I like SEO"
+			end
+
+		end
+
+	end
+
 	context "with children" do
 
 		before(:each) do

data/spec/support/alchemy/specs_helpers.rb

@@ -20,7 +20,7 @@ module Alchemy
 				visit '/alchemy/admin/login'
 				fill_in('alchemy_user_session_login', :with => 'jdoe')
 				fill_in('alchemy_user_session_password', :with => 's3cr3t')
-				click_on('login')
+				click_on('Login')
 			end
 
 		end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 2.1.5
+  version: 2.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-17 00:00:00.000000000 Z
+date: 2012-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70122821443420 !ruby/object:Gem::Requirement
+  requirement: &70206693498780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -23,10 +23,10 @@ dependencies:
         version: 3.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *70122821443420
+  version_requirements: *70206693498780
 - !ruby/object:Gem::Dependency
   name: authlogic
-  requirement: &70122821442860 !ruby/object:Gem::Requirement
+  requirement: &70206693492700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70122821442860
+  version_requirements: *70206693492700
 - !ruby/object:Gem::Dependency
   name: awesome_nested_set
-  requirement: &70122821442160 !ruby/object:Gem::Requirement
+  requirement: &70206693490340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -45,10 +45,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70122821442160
+  version_requirements: *70206693490340
 - !ruby/object:Gem::Dependency
   name: declarative_authorization
-  requirement: &70122821441600 !ruby/object:Gem::Requirement
+  requirement: &70206693488500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -56,10 +56,10 @@ dependencies:
         version: 0.5.4
   type: :runtime
   prerelease: false
-  version_requirements: *70122821441600
+  version_requirements: *70206693488500
 - !ruby/object:Gem::Dependency
   name: tvdeyen-fleximage
-  requirement: &70122821441080 !ruby/object:Gem::Requirement
+  requirement: &70206693266780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -67,10 +67,10 @@ dependencies:
         version: 1.0.9
   type: :runtime
   prerelease: false
-  version_requirements: *70122821441080
+  version_requirements: *70206693266780
 - !ruby/object:Gem::Dependency
   name: will_paginate
-  requirement: &70122821440520 !ruby/object:Gem::Requirement
+  requirement: &70206693264480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -78,10 +78,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70122821440520
+  version_requirements: *70206693264480
 - !ruby/object:Gem::Dependency
   name: acts_as_ferret
-  requirement: &70122821440020 !ruby/object:Gem::Requirement
+  requirement: &70206693263140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -89,10 +89,10 @@ dependencies:
         version: '0.5'
   type: :runtime
   prerelease: false
-  version_requirements: *70122821440020
+  version_requirements: *70206693263140
 - !ruby/object:Gem::Dependency
   name: acts_as_list
-  requirement: &70122821439520 !ruby/object:Gem::Requirement
+  requirement: &70206693261540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -100,10 +100,10 @@ dependencies:
         version: '0.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70122821439520
+  version_requirements: *70206693261540
 - !ruby/object:Gem::Dependency
   name: magiclabs-userstamp
-  requirement: &70122821438780 !ruby/object:Gem::Requirement
+  requirement: &70206693260620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -111,10 +111,10 @@ dependencies:
         version: 2.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70122821438780
+  version_requirements: *70206693260620
 - !ruby/object:Gem::Dependency
   name: dynamic_form
-  requirement: &70122821466660 !ruby/object:Gem::Requirement
+  requirement: &70206693432660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -122,10 +122,10 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70122821466660
+  version_requirements: *70206693432660
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &70122821466160 !ruby/object:Gem::Requirement
+  requirement: &70206693432100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -133,10 +133,10 @@ dependencies:
         version: 1.0.16
   type: :runtime
   prerelease: false
-  version_requirements: *70122821466160
+  version_requirements: *70206693432100
 - !ruby/object:Gem::Dependency
   name: attachment_magic
-  requirement: &70122821465340 !ruby/object:Gem::Requirement
+  requirement: &70206693431480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -144,10 +144,10 @@ dependencies:
         version: 0.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *70122821465340
+  version_requirements: *70206693431480
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70122821464760 !ruby/object:Gem::Requirement
+  requirement: &70206693430680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -155,10 +155,10 @@ dependencies:
         version: '2.8'
   type: :development
   prerelease: false
-  version_requirements: *70122821464760
+  version_requirements: *70206693430680
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70122821464280 !ruby/object:Gem::Requirement
+  requirement: &70206693430180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -166,7 +166,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70122821464280
+  version_requirements: *70206693430180
 description: Alchemy is a Rails 3 CMS with a flexible content storing architecture.
 email:
 - alchemy@magiclabs.de
@@ -343,7 +343,6 @@ files:
 - app/views/alchemy/admin/elements/_new_element_form.html.erb
 - app/views/alchemy/admin/elements/_picture_editor.html.erb
 - app/views/alchemy/admin/elements/create.js.erb
-- app/views/alchemy/admin/elements/destroy.js.erb
 - app/views/alchemy/admin/elements/fold.js.erb
 - app/views/alchemy/admin/elements/index.html.erb
 - app/views/alchemy/admin/elements/list.js.erb
@@ -806,7 +805,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -450139732445472521
+      hash: 2472603467692044268
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -815,11 +814,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -450139732445472521
+      hash: 2472603467692044268
 requirements:
 - ImageMagick (libmagick), v6.6 or greater.
 rubyforge_project: 
-rubygems_version: 1.8.16
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: An extremly flexbile CMS for Rails 3.1.