alchemy_cms 2.1.12 → 2.2.rc1

data/app/models/alchemy/picture.rb

@@ -1,114 +1,115 @@
 module Alchemy
-	class Picture < ActiveRecord::Base
+  class Picture < ActiveRecord::Base
 
-		acts_as_fleximage do
-			image_directory					'uploads/pictures'
-			image_storage_format			Config.get(:image_store_format).to_sym
-			require_image					true
-			missing_image_message			I18n.t("missing_image")
-			invalid_image_message			I18n.t("not a valid image")
-			output_image_jpg_quality  		Config.get(:output_image_jpg_quality) if Config.get(:image_output_format) == "jpg"
-			unless Config.get(:preprocess_image_resize).blank?
-				preprocess_image do |image|
-					image.resize Config.get(:preprocess_image_resize)
-				end
-			end
-		end
+    acts_as_fleximage do
+      image_directory 'uploads/pictures'
+      image_storage_format Config.get(:image_store_format).to_sym
+      require_image true
+      missing_image_message I18n.t("missing_image")
+      invalid_image_message I18n.t("not a valid image")
+      output_image_jpg_quality Config.get(:output_image_jpg_quality) if Config.get(:image_output_format) == "jpg"
+      unless Config.get(:preprocess_image_resize).blank?
+        preprocess_image do |image|
+          image.resize Config.get(:preprocess_image_resize)
+        end
+      end
+    end
 
-		stampable
+    stampable
 
-		def self.find_paginated(params, per_page)
-			Picture.where("name LIKE '%#{params[:query]}%'").page(params[:page] || 1).per(per_page).order(:name)
-		end
+    def self.find_paginated(params, per_page)
+      Picture.where("name LIKE '%#{params[:query]}%'").page(params[:page] || 1).per(per_page).order(:name)
+    end
 
-		# Returning the filepath relative to Rails.root public folder.
-		def public_file_path
-			self.file_path.gsub("#{::Rails.root}/public", '')
-		end
+    # Returning the filepath relative to Rails.root public folder.
+    def public_file_path
+      self.file_path.gsub("#{::Rails.root}/public", '')
+    end
 
-		def urlname
-			if self.name.blank?
-				"image_#{self.id}"
-			else
-				::CGI.escape(self.name.gsub(/\.(gif|png|jpe?g|tiff?)/i, '').gsub(/\./, ' '))
-			end
-		end
+    def urlname
+      if self.name.blank?
+        "image_#{self.id}"
+      else
+        ::CGI.escape(self.name.gsub(/\.(gif|png|jpe?g|tiff?)/i, '').gsub(/\./, ' '))
+      end
+    end
 
-		def suffix
-			if image_filename =~ /\./
-				image_filename.split('.').last.downcase
-			else
-				""
-			end
-		end
+    def suffix
+      if image_filename =~ /\./
+        image_filename.split('.').last.downcase
+      else
+        ""
+      end
+    end
 
-		def humanized_name
-			(image_filename.to_s.downcase.gsub(/\.#{::Regexp.quote(suffix)}$/, '')).humanize
-		end
+    def humanized_name
+      return "" if image_filename.blank?
+      (image_filename.downcase.gsub(/\.#{::Regexp.quote(suffix)}$/, '')).humanize
+    end
 
-		# Returning true if picture's width is greater than it's height
-		def landscape_format?
-			return (self.image_width > self.image_height) ? true : false
-		end
+    # Returning true if picture's width is greater than it's height
+    def landscape_format?
+      return (self.image_width > self.image_height) ? true : false
+    end
 
-		# Returning true if picture's width is smaller than it's height
-		def portrait_format?
-			return (self.image_width < self.image_height) ? true : false
-		end
+    # Returning true if picture's width is smaller than it's height
+    def portrait_format?
+      return (self.image_width < self.image_height) ? true : false
+    end
 
-		# Returning true if picture's width and height is equal
-		def square_format?
-			return (self.image_width == self.image_height) ? true : false
-		end
+    # Returning true if picture's width and height is equal
+    def square_format?
+      return (self.image_width == self.image_height) ? true : false
+    end
 
-		# Returns the default centered image mask for a given size
-		def default_mask(size)
-			raise "No size given" if size.blank?
-			width = size.split('x')[0].to_i
-			height = size.split('x')[1].to_i
-			if (width > height)
-				zoom_factor = image_width.to_f / width
-				mask_height = (height * zoom_factor).round
-				x1 = 0
-				x2 = image_width
-				y1 = (image_height - mask_height) / 2
-				y2 = y1 + mask_height
-			elsif (width == 0 && height == 0)
-				x1 = 0
-				x2 = image_width
-				y1 = 0
-				y2 = image_height
-			else
-				zoom_factor = image_height.to_f / height
-				mask_width = (width * zoom_factor).round
-				x1 = (image_width - mask_width) / 2
-				x2 = x1 + mask_width
-				y1 = 0
-				y2 = image_height
-			end
-			{
-				:x1 => x1,
-				:y1 => y1,
-				:x2 => x2,
-				:y2 => y2
-			}
-		end
+    # Returns the default centered image mask for a given size
+    def default_mask(size)
+      raise "No size given" if size.blank?
+      width = size.split('x')[0].to_i
+      height = size.split('x')[1].to_i
+      if (width > height)
+        zoom_factor = image_width.to_f / width
+        mask_height = (height * zoom_factor).round
+        x1 = 0
+        x2 = image_width
+        y1 = (image_height - mask_height) / 2
+        y2 = y1 + mask_height
+      elsif (width == 0 && height == 0)
+        x1 = 0
+        x2 = image_width
+        y1 = 0
+        y2 = image_height
+      else
+        zoom_factor = image_height.to_f / height
+        mask_width = (width * zoom_factor).round
+        x1 = (image_width - mask_width) / 2
+        x2 = x1 + mask_width
+        y1 = 0
+        y2 = image_height
+      end
+      {
+        :x1 => x1,
+        :y1 => y1,
+        :x2 => x2,
+        :y2 => y2
+      }
+    end
 
-		def cropped_thumbnail_size(size)
-			return "111x93" if size == "111x93" || size.blank?
-			x = size.split('x')[0].to_i
-			y = size.split('x')[1].to_i
-			if (x > y)
-				zoom_factor = 111.0 / x
-				new_x = 111
-				new_y = y * zoom_factor
-			else
-				zoom_factor = 93.0 / y
-				new_x = x * zoom_factor
-				new_y = 93
-			end
-			"#{new_x.round}x#{new_y.round}"
-		end
+    def cropped_thumbnail_size(size)
+      return "111x93" if size == "111x93" || size.blank?
+      x = size.split('x')[0].to_i
+      y = size.split('x')[1].to_i
+      if (x > y)
+        zoom_factor = 111.0 / x
+        new_x = 111
+        new_y = y * zoom_factor
+      else
+        zoom_factor = 93.0 / y
+        new_x = x * zoom_factor
+        new_y = 93
+      end
+      "#{new_x.round}x#{new_y.round}"
+    end
 
-	end
+  end
 end

data/app/models/alchemy/user.rb

@@ -1,76 +1,78 @@
 module Alchemy
-	class User < ActiveRecord::Base
-
-		model_stamper
-		stampable
-		acts_as_authentic do |c|
-			c.transition_from_restful_authentication = true
-			c.logged_in_timeout = Config.get(:auto_logout_time).minutes
-		end
-		
-		has_many :folded_pages
-		
-		before_destroy :unlock_pages
-		
-		scope :admins, where(:role => 'admin')
-		
-		ROLES = Config.get(:user_roles)
-		
-		def role_symbols
-			[role.to_sym]
-		end
-		
-		def is_admin?
-			true if self.role == "admin"
-		end
-		alias :admin? :is_admin?
-		
-		def unlock_pages
-			for page in pages_locked_by_me
-				page.unlock
-			end
-		end
-		
-		def pages_locked_by_me
-			Page.where(:locked => true).where(:locked_by => self.id).order(:updated_at)
-		end
-		
-		# Returns the firstname and lastname as a string
-		# If both are blank, returns the login
-		# options
-		#   :flipped=false  : returns "lastname, firstname"
-		def fullname(options = {})
-			unless(self.lastname.blank? && self.firstname.blank?)
-				options = (default_options = { :flipped => false }.merge(options))
-				options[:flipped] ? "#{self.lastname}, #{self.firstname}".squeeze(" ") : "#{self.firstname} #{self.lastname}".squeeze(" ")
-			else
-				self.login
-			end
-		end
-		alias :name :fullname
-
-		def human_role_name
-			self.class.human_rolename(self.role)
-		end
-
-		def self.human_rolename(role)
-			I18n.t("user_roles.#{role}")
-		end
-		
-		def self.genders_for_select
-			[
-				[I18n.t('male'), 'male'],
-				[I18n.t('female'), 'female']
-			]
-		end
-		
-		def self.all_online
-			User.logged_in
-		end
-		
-		def self.all_others_online
-			User.logged_in.to_a.delete(self)
-		end
-
-	end
+  class User < ActiveRecord::Base
+
+    model_stamper
+    stampable
+    acts_as_authentic do |c|
+      c.transition_from_restful_authentication = true
+      c.logged_in_timeout = Config.get(:auto_logout_time).minutes
+    end
+
+    has_many :folded_pages
+
+    before_destroy :unlock_pages
+
+    scope :admins, where(:role => 'admin')
+
+    ROLES = Config.get(:user_roles)
+
+    def role_symbols
+      [role.to_sym]
+    end
+
+    def is_admin?
+      true if self.role == "admin"
+    end
+
+    alias :admin? :is_admin?
+
+    def unlock_pages
+      for page in pages_locked_by_me
+        page.unlock
+      end
+    end
+
+    def pages_locked_by_me
+      Page.where(:locked => true).where(:locked_by => self.id).order(:updated_at)
+    end
+
+    # Returns the firstname and lastname as a string
+    # If both are blank, returns the login
+    # options
+    #   :flipped=false  : returns "lastname, firstname"
+    def fullname(options = {})
+      unless (self.lastname.blank? && self.firstname.blank?)
+        options = (default_options = {:flipped => false}.merge(options))
+        options[:flipped] ? "#{self.lastname}, #{self.firstname}".squeeze(" ") : "#{self.firstname} #{self.lastname}".squeeze(" ")
+      else
+        self.login
+      end
+    end
+
+    alias :name :fullname
+
+    def human_role_name
+      self.class.human_rolename(self.role)
+    end
+
+    def self.human_rolename(role)
+      I18n.t("user_roles.#{role}")
+    end
+
+    def self.genders_for_select
+      [
+        [I18n.t('male'), 'male'],
+        [I18n.t('female'), 'female']
+      ]
+    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/models/alchemy/user_session.rb

@@ -1,14 +1,14 @@
 module Alchemy
-	class UserSession < Authlogic::Session::Base
-		logout_on_timeout(::Rails.env != 'development')
+  class UserSession < Authlogic::Session::Base
+    logout_on_timeout(::Rails.env != 'development')
 
-		generalize_credentials_error_messages true
+    generalize_credentials_error_messages true
 
-		before_destroy :unlock_pages
+    before_destroy :unlock_pages
 
-		def unlock_pages
-			self.user.unlock_pages if self.user
-		end
+    def unlock_pages
+      self.user.unlock_pages if self.user
+    end
 
-	end
+  end
 end

data/app/sweepers/alchemy/content_sweeper.rb

@@ -1,22 +1,22 @@
 module Alchemy
-	class ContentSweeper < ActionController::Caching::Sweeper
-		observe Element
+  class ContentSweeper < ActionController::Caching::Sweeper
+    observe Element
 
-		def after_update(element)
-			expire_cache_for(element.contents)
-		end
+    def after_update(element)
+      expire_cache_for(element.contents)
+    end
 
-		def after_destroy(element)
-			expire_cache_for(element.contents)
-		end
+    def after_destroy(element)
+      expire_cache_for(element.contents)
+    end
 
-	private
+    private
 
-		def expire_cache_for(contents)
-			contents.each do |content|
-				expire_fragment(content)
-			end
-		end
+    def expire_cache_for(contents)
+      contents.each do |content|
+        expire_fragment(content)
+      end
+    end
 
-	end
+  end
 end

data/app/sweepers/alchemy/pages_sweeper.rb

@@ -1,60 +1,60 @@
 module Alchemy
-	class PagesSweeper < ActionController::Caching::Sweeper
+  class PagesSweeper < ActionController::Caching::Sweeper
 
-		observe Page
+    observe Page
 
-		def after_update(page)
-			unless page.layoutpage?
-				expire_page(page)
-				check_multipage_elements(page)
-			end
-		end
+    def after_update(page)
+      unless page.layoutpage?
+        expire_page(page)
+        check_multipage_elements(page)
+      end
+    end
 
-		def after_destroy(page)
-			unless page.layoutpage?
-				expire_page(page)
-				check_multipage_elements(page)
-			end
-		end
+    def after_destroy(page)
+      unless page.layoutpage?
+        expire_page(page)
+        check_multipage_elements(page)
+      end
+    end
 
-	private
+    private
 
-		def check_multipage_elements(page)
-			page.elements.each do |element|
-				# are their pages beneath mine?
-				if !element.to_be_sweeped_pages.detect{ |p| p != page }.nil?
-					# yepp! there are more pages then mine
-					pages = element.to_be_sweeped_pages.find_all_by_public_and_locked(true, false)
-					if !pages.blank?
-						# expire current page, even if it's locked
-						pages.push(page).each do |page|
-							expire_page(page)
-						end
-					end
-				end
-			end
-		end
+    def check_multipage_elements(page)
+      page.elements.each do |element|
+        # are their pages beneath mine?
+        if !element.to_be_sweeped_pages.detect { |p| p != page }.nil?
+          # yepp! there are more pages then mine
+          pages = element.to_be_sweeped_pages.find_all_by_public_and_locked(true, false)
+          if !pages.blank?
+            # expire current page, even if it's locked
+            pages.push(page).each do |page|
+              expire_page(page)
+            end
+          end
+        end
+      end
+    end
 
-		def expire_page(page)
-			return if page.do_not_sweep
-			# TODO: We should change this back to expire_action after Rails 3.2 was released.
-			# expire_action(
-			# 	alchemy.show_page_url(
-			# 		:urlname => page.urlname_was,
-			# 		:lang => multi_language? ? page.language_code : nil
-			# 	)
-			# )
-			# Temporarily fix for Rails 3 bug
+    def expire_page(page)
+      return if page.do_not_sweep
+      # TODO: We should change this back to expire_action after Rails 3.2 was released.
+      # expire_action(
+      # alchemy.show_page_url(
+      #     :urlname => page.urlname_was,
+      #     :lang => multi_language? ? page.language_code : nil
+      #   )
+      # )
+      # Temporarily fix for Rails 3 bug
       return if alchemy.nil?
-			expire_fragment(ActionController::Caching::Actions::ActionCachePath.new(
-				self,
-				alchemy.show_page_url(
-					:urlname => page.urlname_was,
-					:lang => multi_language? ? page.language_code : nil
-				),
-				false
-			).path)
-		end
+      expire_fragment(ActionController::Caching::Actions::ActionCachePath.new(
+        self,
+        alchemy.show_page_url(
+          :urlname => page.urlname_was,
+          :lang => multi_language? ? page.language_code : nil
+        ),
+        false
+      ).path)
+    end
 
-	end
+  end
 end