alchemy_cms 2.2.rc3 → 2.2.rc6

data/app/models/alchemy/folded_page.rb

@@ -1,5 +1,6 @@
 module Alchemy
   class FoldedPage < ActiveRecord::Base
     belongs_to :page
+    belongs_to :user
   end
 end

data/app/models/alchemy/language.rb

@@ -1,6 +1,17 @@
 module Alchemy
   class Language < ActiveRecord::Base
 
+    attr_accessible(
+      :name,
+      :language_code,
+      :frontpage_name,
+      :page_layout,
+      :public,
+      :default,
+      :country_code,
+      :code
+    )
+
     validates_presence_of :name
     validates_presence_of :language_code
     validates_presence_of :page_layout

data/app/models/alchemy/message.rb

@@ -1,16 +1,13 @@
-# This is a tableless model only used for validating Contactform Fields.
-# You can specify the fields for your contactform in the +config/alchemy/config.yml+ file in the +:mailer+ options
+# This is a tableless model only used for validating contactform fields.
+# 
+# You can specify the fields for your contactform in the +config/alchemy/config.yml+ file in the +:mailer+ options.
 # 
 # === Example Contactform Configuration:
 # 
 #   :mailer:
 #     :form_layout_name: contact
 #     :fields: [subject, name, email, message, info]
-#     :validate_fields:
-#       :name:
-#         :message: blank_name
-#       :email:
-#         :message: blank_email
+#     :validate_fields: [name, email]
 
 module Alchemy
   class Message
@@ -31,9 +28,9 @@ module Alchemy
     end
 
     @@config[:validate_fields].each do |field|
-      validates_presence_of field[0], :message => '^' + I18n.t(field[1][:message].to_s, :scope => [:contactform, :validations])
-      if field[0].to_s.include?('email')
-        validates_format_of field[0], :with => ::Authlogic::Regex.email, :message => '^' + I18n.t(:wrong_email_format, :scope => [:contactform, :validations]), :if => :email_is_filled
+      validates_presence_of field
+      if field.to_s == 'email'
+        validates_format_of field, :with => ::Authlogic::Regex.email, :if => :email_is_filled
       end
     end
 

data/app/models/alchemy/page.rb

@@ -2,6 +2,27 @@
 module Alchemy
   class Page < ActiveRecord::Base
 
+    attr_accessible(
+      :do_not_sweep,
+      :language_code,
+      :language_id,
+      :language_root,
+      :layoutpage,
+      :meta_description,
+      :meta_keywords,
+      :name,
+      :page_layout,
+      :parent_id,
+      :public,
+      :restricted,
+      :robot_index,
+      :robot_follow,
+      :sitemap,
+      :title,
+      :urlname,
+      :visible
+    )
+
     RESERVED_URLNAMES = %w(admin messages)
 
     acts_as_nested_set(:dependent => :destroy)
@@ -13,18 +34,18 @@ module Alchemy
     has_and_belongs_to_many :to_be_sweeped_elements, :class_name => 'Alchemy::Element', :uniq => true, :join_table => 'alchemy_elements_alchemy_pages'
     belongs_to :language
 
-    validates_presence_of :name, :message => '^' + I18n.t("please enter a name")
-    validates_presence_of :page_layout, :message => '^' + I18n.t("Please choose a page layout."), :unless => :systempage?
-    validates_presence_of :parent_id, :message => '^' + I18n.t("No parent page was given."), :if => proc { Page.count > 1 }
-    validates_length_of :urlname, :minimum => 3, :too_short => I18n.t("urlname_to_short"), :if => :urlname_entered?
-    validates_uniqueness_of :urlname, :message => '^' + I18n.t("URL-Name already token"), :scope => [:language_id, :layoutpage], :if => :urlname_entered?
-    validates :urlname, :exclusion => {:in => RESERVED_URLNAMES, :message => '^' + I18n.t("This urlname is reserved.")}
+    validates_presence_of :name
+    validates_presence_of :page_layout, :unless => :systempage?
+    validates_presence_of :parent_id, :if => proc { Page.count > 1 }
+    validates_length_of :urlname, :minimum => 3, :if => :urlname_entered?
+    validates_uniqueness_of :urlname, :scope => [:language_id, :layoutpage], :if => :urlname_entered?
+    validates :urlname, :exclusion => {:in => RESERVED_URLNAMES}
 
     attr_accessor :do_not_autogenerate
     attr_accessor :do_not_sweep
     attr_accessor :do_not_validate_language
 
-    before_save :set_url_name, :unless => proc { |page| page.systempage? || page.redirects_to_external? }
+    before_validation :set_url_name, :unless => proc { |page| page.systempage? || page.redirects_to_external? }
     before_save :set_title, :unless => proc { |page| page.systempage? || page.redirects_to_external? || !page.title.blank? }
     before_save :set_language_code, :unless => :systempage?
     before_save :set_restrictions_to_child_pages, :if => proc { |page| !page.systempage? && page.restricted_changed? }

data/app/models/alchemy/picture.rb

@@ -15,6 +15,14 @@ module Alchemy
       end
     end
 
+    attr_accessible(
+      :image_file,
+      :image_filename,
+      :image_height,
+      :image_width,
+      :name
+    )
+
     stampable
 
     def self.find_paginated(params, per_page)

data/app/models/alchemy/user.rb

@@ -8,6 +8,18 @@ module Alchemy
       c.logged_in_timeout = Config.get(:auto_logout_time).minutes
     end
 
+    attr_accessible(
+      :firstname,
+      :lastname,
+      :login,
+      :email,
+      :gender,
+      :role,
+      :language,
+      :password,
+      :password_confirmation
+    )
+
     has_many :folded_pages
 
     before_destroy :unlock_pages
@@ -66,13 +78,5 @@ module Alchemy
       ]
     end
 
-    def self.all_online
-      User.logged_in
-    end
-
-    def self.all_others_online
-      User.logged_in.to_a.delete(self)
-    end
-
   end
 end

data/app/views/alchemy/admin/pages/_page.html.erb

@@ -90,7 +90,7 @@
     <div class="sitemap_sitename">
     <%- if page.redirects_to_external? -%>
       <span class="sitemap_pagename_link <%= cycle('even', 'odd') %> inactive"><%= page.name %></span>
-      <span class="redirect_url">
+      <span class="redirect_url" title="<%= h page.urlname %>">
         &raquo; <%= t('Redirects to') %>:
         <%= h page.urlname %>
       </span>

data/app/views/alchemy/admin/pictures/show_in_window.html.erb

@@ -2,6 +2,6 @@
   alchemy.zoom_picture_path(
     :id => @picture.id,
     :name => @picture.urlname,
-    :format => (Alchemy::Config.get(:image_output_format) or 'png')
+    :format => :png
   )
 ) %>

data/app/views/alchemy/pictures/zoom.jpg.flexi

@@ -0,0 +1,3 @@
+@picture.operate do |image|
+  image
+end

data/config/alchemy/config.yml

@@ -81,20 +81,20 @@ default_language:
 # ==== Options:
 # 
 #   page_layout_name:           [String] # A +Alchemy::PageLayout+ name. Used to render the contactform on a page with this layout.
-#   fields:                     [Array]  # An Array of fieldnames
-#   validate_fields:            [Hash]   # A Hash with fieldname as key and a Hash (with :message as key and a message_id as value) as value
+#   fields:                     [Array]  # An Array of fieldnames.
+#   validate_fields:            [Array]  # An Array of fieldnames to be validated on presence.
 # 
 # ==== Translating validation messages:
 # 
-# The message_id is passed through Alchemy::I18n.t so you can translate it in your language yml file.
+# The validation messages are passed through ::I18n.t so you can translate it in your language yml file.
 # 
-# Example:
+# ==== Example:
 # 
 #   de:  
-#     alchemy:
-#      contactform:
-#         validations:
-#           enter_name: 'Bitte geben Sie einen Namen an'
+#     activemodel:
+#       attributes:
+#         alchemy/message:
+#           firstname: Vorname
 # 
 :mailer:
   :page_layout_name: contact
@@ -103,11 +103,7 @@ default_language:
   :mail_from: your.mail@your-domain.com
   :mail_to: your.mail@your-domain.com
   :fields: [salutation, firstname, lastname, address, zip, city, phone, email, message]
-  :validate_fields:
-    :lastname:
-      :message: enter_name
-    :email:
-      :message: enter_email
+  :validate_fields: [lastname, email]
 
 # === User roles
 # You can add own user roles. To set permissions for this roles please add an authorization_rules.rb file in your config folder.

data/config/locales/alchemy.de.yml

@@ -113,12 +113,6 @@ de:
         message: 'Nachricht'
         send: 'absenden'
         mandatory_fields: '*Pflichtfelder. Bitte füllen Sie diese Felder aus.'
-      # Translations for the contactform validations.
-      # Validations are set in the config/alchemy/config.yml mailer section.
-      validations:
-        enter_name: 'Bitte geben Sie Ihren Namen an'
-        enter_email: Bitte geben Sie Ihre E-Mail-Adresse an
-        wrong_email_format: 'Die E-Mail-Adresse scheint nicht richtig zu sein.'
       # The flash message shown after succesfully sending the message.
       messages:
         success: 'Ihre Nachricht wurde erfolgreich übermittelt.'
@@ -232,7 +226,7 @@ de:
     "No EssenceType given": ""
     "No image found. Did you saved the element?": "Es wurde kein Bild gefunden. Haben Sie das Element auch gespeichert?"
     "No items in your clipboard": "Ihre Zwischenablage ist leer"
-    "None": ""
+    "None": "keine"
     "Open Link in": "Link öffnen in"
     "Page deleted": "%{name} wurde gelöscht"
     "Page saved": "%{name} wurde gespeichert"
@@ -253,13 +247,11 @@ de:
     "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 choose": "Bitte wählen"
-    "Please choose a page layout.": "Bitte wählen Sie einen Seitentyp."
-    choose_element: "Bitte wählen Sie ein Element."
     "Please log in": "Bitte melden Sie sich an."
     use_alternative_uploader_instead: "Benutzen Sie bitte diesen alternativen Uploader."
     "Publish page": "veröffentlichen"
     "Read the License": "Lizenz lesen"
-    "Redirects to": ""
+    "Redirects to": "Leitet weiter auf"
     "Remove item from clipboard": "Inhalt aus der Zwischenablage entfernen"
     "Remove this content": "Diesen Inhalt entfernen"
     "Reset Imagemask": "Bildmaske zurücksetzen"
@@ -273,7 +265,6 @@ de:
     "Show trash": "Papierkorb anzeigen"
     "Size": "Größe"
     "Sort pages": "Seiten sortieren"
-    "Status": ""
     "Successfully added content": "%{content} wurde hinzugefügt"
     "Successfully deleted content": "%{content} wurde gelöscht"
     "Successfully saved content position": "Die Position wurde gespeichert."
@@ -285,8 +276,6 @@ de:
     "Title": "Titel"
     "To manage your website open a browser and go to": "Um die Inhalte Ihrer Webseite zu bearbeiten klicken Sie bitte auf folgenden Link"
     "Trash": "Papierkorb"
-    "URL": ""
-    "URL-Name already token": "Der URL-Name ist bereits vergeben."
     "User created": "%{name} wurde erstellt"
     "User deleted": "%{name} wurde gelöscht"
     "User updated": "%{name} wurde aktualisiert"
@@ -483,7 +472,6 @@ de:
     picture_gallery_editor: 'Bilder'
     place_link: "Text verlinken"
     player_version: "Flashplayer Version"
-    "please enter a name": "Bitte geben Sie einen Namen ein."
     "please enter subject and mail address": "Bitte geben Sie den Betreff und eine Empfängeradresse an."
     please_confirm: "Bitte bestätigen"
     please_wait: "Bitte warten"
@@ -522,7 +510,6 @@ de:
     upload_file: "Datei(en) hochladen"
     upload_image: "Bild(er) hochladen"
     url_name: "URL-Name"
-    urlname_to_short: "Der URL-Name der Seite ist zu kurz (min. 3 Zeichen)"
     username: "Benutzername"
     visible: "sichtbar"
     want_to_create_new_language: "Wollen Sie einen neuen leeren Sprachbaum erstellen?"
@@ -663,6 +650,19 @@ de:
       words_connector: ", "
       two_words_connector: " und "
       last_word_connector: " und "
+
+  activemodel:
+    attributes:
+      alchemy/message:
+        salutation: Anrede
+        firstname: Vorname
+        lastname: Nachname
+        address: Adresse
+        zip: PLZ
+        city: Ort
+        phone: Telefon
+        email: E-Mail
+        message: Nachricht
   
   # Translations for active record database models and error messages.
   activerecord:
@@ -803,11 +803,25 @@ de:
           attributes:
             essence:
               validation_failed: 'Validierung fehlgeschlagen.'
+        alchemy/element:
+          attributes:
+            name:
+              blank: "^Bitte wählen Sie ein Element."
         alchemy/language:
           attributes:
             language_code:
               invalid: 'ist nicht korrekt. Bitte exakt zwei Kleinbuchstaben verwenden.'
               taken: 'ist für dieses Länderkürzel bereits vergeben.'
+        alchemy/page:
+          attributes:
+            name:
+              blank: "^Bitte geben Sie einen Namen ein."
+            page_layout:
+              blank: "^Bitte wählen Sie einen Seitentyp."
+            urlname:
+              too_short: "^Der URL-Name der Seite ist zu kurz (min. 3 Zeichen)"
+              taken: "^Der URL-Name ist bereits vergeben."
+              exclusion: "^Der URL-Name der Seite kann nicht benutzt werden."
   
   # Translations for the authentication system used in alchemy.
   authlogic:

data/config/locales/alchemy.en.yml

@@ -96,12 +96,6 @@ en:
         message: 'Message'
         send: 'Send'
         mandatory_fields: '*Mandatory fields.'
-      # Translations for the contactform validations.
-      # Validations are set in the config/alchemy/config.yml mailer section.
-      validations:
-        enter_name: 'Please enter your name'
-        enter_email: 'Please enter your email'
-        wrong_email_format: 'Email has wrong format'
       # The flash message shown after succesfully sending the message.
       messages:
         success: 'Your message was delivered succesfully.'
@@ -186,7 +180,6 @@ en:
     big_thumbnails: "Big thumbnails"
     choose_element_as_target: "Please choose an element as target"
     choose_element_to_link: "Please choose an element"
-    choose_element: "Please choose an element."
     choose_file_to_link: "Please choose a file to link"
     click_to_show_all: "Click to show all again."
     confirm_to_delete_file: "Do you really want to delete this file from the server?"
@@ -326,7 +319,6 @@ en:
     "Picture deleted successfully": "Picture %{name} deleted"
     place_link: "Link text"
     player_version: "Flashplayer Version"
-    "please enter a name": "Please enter a name."
     "please enter subject and mail address": "Please enter recipient and subject."
     please_confirm: "Please confirm"
     please_wait: "Please wait"
@@ -359,7 +351,6 @@ en:
     upload_file: "Upload file(s)"
     upload_image: "Upload image(s)"
     url_name: "URL-Name"
-    urlname_to_short: "The pages urlname is too short (minimum of 3 characters)"
     username: "Username"
     want_to_create_new_language: "Do you want to create a new empty language tree?"
     want_to_make_copy_of_existing_language: "Do you want to copy an existing language tree?"
@@ -488,6 +479,18 @@ en:
         one:  "over 1 year" 
         many: "over %{count} years"
   
+  activemodel:
+    attributes:
+      alchemy/message:
+        salutation: 'Salutation'
+        firstname: 'Firstname'
+        lastname: 'Lastname'
+        address: 'Street / No.'
+        zip: 'Zipcode / City'
+        phone: 'Telephone'
+        email: 'Email'
+        message: 'Message'
+
   # Translations for active record database models and error messages.
   activerecord:
     
@@ -589,10 +592,24 @@ en:
           attributes:
             essence:
               validation_failed: 'Validation failed.'
+        alchemy/element:
+          attributes:
+            name:
+              blank: "^Please choose an element."
         alchemy/language:
           attributes:
             code:
-              invalid: 'Format of languagecode is not valid. Please use exactly two lowercase characters.'
+              invalid: '^Format of languagecode is not valid. Please use exactly two lowercase characters.'
+        alchemy/page:
+          attributes:
+            name:
+              blank: "^Please enter a name."
+            page_layout:
+              blank: "^Please choose a page layout."
+            urlname:
+              too_short: "^The pages urlname is too short (minimum of 3 characters)."
+              taken: "^URL-Name already taken."
+              exclusion: "^URL-Name reserved."
 
   # Translations for the authentication system used in alchemy.
   authlogic:

data/lib/alchemy/version.rb

@@ -1,5 +1,5 @@
 module Alchemy
 
-  VERSION = "2.2.rc3"
+  VERSION = "2.2.rc6"
 
 end

data/lib/rails/generators/alchemy/scaffold/scaffold_generator.rb

@@ -28,7 +28,7 @@ module Alchemy
           page_layouts_path = File.expand_path('../../../../../app/views/alchemy/page_layouts', File.dirname(__FILE__))
           copy_file "#{@config_path}/elements.yml", "#{Rails.root}/config/alchemy/elements.yml"
           copy_file "#{@config_path}/page_layouts.yml", "#{Rails.root}/config/alchemy/page_layouts.yml"
-          copy_file "#{layouts_path}/pages.html.erb", "#{Rails.root}/app/views/layouts/alchemy/pages.html.erb"
+          copy_file "#{layouts_path}/pages.html.erb", "#{Rails.root}/app/views/layouts/application.html.erb"
           Dir.glob("#{elements_path}/*").reject { |file_path| !(File.basename(file_path) =~ /(.+)_(view|editor).html.erb/) }.each do |file_path|
             copy_file file_path, "#{Rails.root}/app/views/alchemy/elements/#{File.basename(file_path)}"
           end

data/spec/controllers/pages_controller_spec.rb

@@ -121,10 +121,10 @@ describe Alchemy::PagesController do
 
     context "with incorrect levelnames in params" do
 
-      it "should raise a RoutingError that is in turn handled by rails (as 404 status)" do
-        expect {
-          get :show, {:level1 => 'catalog', :level2 => 'faqs', :urlname => 'screwdriver'}
-        }.to raise_error(ActionController::RoutingError)
+      it "should render a 404 page" do
+        get :show, {:level1 => 'catalog', :level2 => 'faqs', :urlname => 'screwdriver'}
+        response.status.should == 404
+        response.body.should have_content('The page you were looking for doesn\'t exist')
       end
 
     end
@@ -132,11 +132,11 @@ describe Alchemy::PagesController do
   end
 
   context "when a non-existent page is requested" do
-    it "should raise a RoutingError (that is handled by rails, see integration specs)" do
+    it "should rescue a RoutingError with rendering a 404 page." do
       Factory(:admin_user) # otherwise we are redirected to create_user
-      expect {
-        get :show, {:urlname => 'doesntexist'}
-      }.to raise_error(ActionController::RoutingError)
+      get :show, {:urlname => 'doesntexist'}
+      response.status.should == 404
+      response.body.should have_content('The page you were looking for doesn\'t exist')
     end
   end