alchemy_cms 2.1.12 → 2.2.rc1

data/lib/alchemy/upgrader.rb

@@ -1,115 +1,115 @@
 module Alchemy
-	class Upgrader < Alchemy::Seeder
+  class Upgrader < Alchemy::Seeder
 
-		class << self
+    class << self
 
-			# Runs all ugrades
-			def run!
-				Rake::Task['alchemy:install:migrations'].invoke
-				strip_alchemy_from_schema_version_table
-				Rake::Task['db:migrate'].invoke
-				upgrade_to_language
-				upgrade_layoutpages
-				upgrade_essence_link_target_default
-				upgrade_to_namespaced_essence_type
-			end
+      # Runs all ugrades
+      def run!
+        Rake::Task['alchemy:install:migrations'].invoke
+        strip_alchemy_from_schema_version_table
+        Rake::Task['db:migrate'].invoke
+        upgrade_to_language
+        upgrade_layoutpages
+        upgrade_essence_link_target_default
+        upgrade_to_namespaced_essence_type
+      end
 
-		private
+      private
 
-			# Creates Language model if it does not exist (Alchemy CMS prior v1.5)
-			# Also creates missing associations between pages and languages
-			def upgrade_to_language
-				desc "Creating languages for pages"
-				Alchemy::Page.all.each do |page|
-					if !page.language_code.blank? && page.language.nil?
-						root = page.get_language_root
-						lang = Alchemy::Language.find_or_create_by_code(
-							:name => page.language_code.capitalize,
-							:code => page.language_code,
-							:frontpage_name => root.name,
-							:page_layout => root.page_layout,
-							:public => true
-						)
-						page.language = lang
-						if page.save(:validate => false)
-							log "Set language for page #{page.name} to #{lang.name}."
-						end
-					else
-						log("Language for page #{page.name} already set.", :skip)
-					end
-				end
-			end
+      # Creates Language model if it does not exist (Alchemy CMS prior v1.5)
+      # Also creates missing associations between pages and languages
+      def upgrade_to_language
+        desc "Creating languages for pages"
+        Alchemy::Page.all.each do |page|
+          if !page.language_code.blank? && page.language.nil?
+            root = page.get_language_root
+            lang = Alchemy::Language.find_or_create_by_code(
+              :name => page.language_code.capitalize,
+              :code => page.language_code,
+              :frontpage_name => root.name,
+              :page_layout => root.page_layout,
+              :public => true
+            )
+            page.language = lang
+            if page.save(:validate => false)
+              log "Set language for page #{page.name} to #{lang.name}."
+            end
+          else
+            log("Language for page #{page.name} already set.", :skip)
+          end
+        end
+      end
 
-			def upgrade_layoutpages
-				desc "Setting language of layoutpages"
-				default_language = Alchemy::Language.get_default
-				layoutpages = Alchemy::Page.layoutpages
-				if layoutpages.any?
-					layoutpages.each do |page|
-						if page.language.class == String || page.language.nil?
-							page.language = default_language
-							if page.save(:validate => false)
-								log "Set language for page #{page.name} to #{default_language.name}."
-							end
-						else
-							log "Language for page #{page.name} already set.", :skip
-						end
-					end
-				else
-					log "No layoutpages found.", :skip
-				end
-			end
+      def upgrade_layoutpages
+        desc "Setting language of layoutpages"
+        default_language = Alchemy::Language.get_default
+        layoutpages = Alchemy::Page.layoutpages
+        if layoutpages.any?
+          layoutpages.each do |page|
+            if page.language.class == String || page.language.nil?
+              page.language = default_language
+              if page.save(:validate => false)
+                log "Set language for page #{page.name} to #{default_language.name}."
+              end
+            else
+              log "Language for page #{page.name} already set.", :skip
+            end
+          end
+        else
+          log "No layoutpages found.", :skip
+        end
+      end
 
-			def upgrade_essence_link_target_default
-				desc "Setting new link_target default"
-				essences = (Alchemy::EssencePicture.all + Alchemy::EssenceText.all)
-				if essences.any?
-					essences.each do |essence|
-						case essence.link_target
-						when '1'
-							if essence.update_attribute(:link_target, 'blank')
-								log("Updated #{essence.preview_text} link target to #{essence.link_target}.")
-							end
-						when '0'
-							essence.update_attribute(:link_target, nil)
-							log("Updated #{essence.preview_text} link target to #{essence.link_target.inspect}.")
-						else
-							log("#{essence.preview_text} already upgraded.", :skip)
-						end
-					end
-				else
-					log("No essences to upgrade found.", :skip)
-				end
-			end
+      def upgrade_essence_link_target_default
+        desc "Setting new link_target default"
+        essences = (Alchemy::EssencePicture.all + Alchemy::EssenceText.all)
+        if essences.any?
+          essences.each do |essence|
+            case essence.link_target
+            when '1'
+              if essence.update_attribute(:link_target, 'blank')
+                log("Updated #{essence.preview_text} link target to #{essence.link_target}.")
+              end
+            when '0'
+              essence.update_attribute(:link_target, nil)
+              log("Updated #{essence.preview_text} link target to #{essence.link_target.inspect}.")
+            else
+              log("#{essence.preview_text} already upgraded.", :skip)
+            end
+          end
+        else
+          log("No essences to upgrade found.", :skip)
+        end
+      end
 
-			# Updates all essence_type of Content if not already namespaced.
-			def upgrade_to_namespaced_essence_type
-				desc "Namespacing essence_type columns"
-				depricated_contents = Alchemy::Content.where("essence_type LIKE ?", "Essence%")
-				if depricated_contents.any?
-					success = 0
-					errors = []
-					depricated_contents.each do |c|
-						if c.update_attribute(:essence_type, c.essence_type.gsub(/^Essence/, 'Alchemy::Essence'))
-							success += 1
-						else
-							errors << c.errors.full_messages
-						end
-					end
-					log("Namespaced #{success} essence_type columns.") if success > 0
-					log("#{errors.count} errors while namespacing essence_type columns.\n#{errors.join('\n')}", :error) if errors.count > 0
-				else
-					log "No essence_type columns to be namespaced found.", :skip
-				end
-			end
+      # Updates all essence_type of Content if not already namespaced.
+      def upgrade_to_namespaced_essence_type
+        desc "Namespacing essence_type columns"
+        depricated_contents = Alchemy::Content.where("essence_type LIKE ?", "Essence%")
+        if depricated_contents.any?
+          success = 0
+          errors = []
+          depricated_contents.each do |c|
+            if c.update_attribute(:essence_type, c.essence_type.gsub(/^Essence/, 'Alchemy::Essence'))
+              success += 1
+            else
+              errors << c.errors.full_messages
+            end
+          end
+          log("Namespaced #{success} essence_type columns.") if success > 0
+          log("#{errors.count} errors while namespacing essence_type columns.\n#{errors.join('\n')}", :error) if errors.count > 0
+        else
+          log "No essence_type columns to be namespaced found.", :skip
+        end
+      end
 
-			def strip_alchemy_from_schema_version_table
-				database_yml = YAML.load_file(Rails.root.join("config", "database.yml"))
-				connection = Mysql2::Client.new(database_yml.fetch(Rails.env.to_s).symbolize_keys)
-				connection.query "UPDATE schema_migrations SET `schema_migrations`.`version` = REPLACE(`schema_migrations`.`version`,'-alchemy','')"
-			end
+      def strip_alchemy_from_schema_version_table
+        database_yml = YAML.load_file(Rails.root.join("config", "database.yml"))
+        connection = Mysql2::Client.new(database_yml.fetch(Rails.env.to_s).symbolize_keys)
+        connection.query "UPDATE schema_migrations SET `schema_migrations`.`version` = REPLACE(`schema_migrations`.`version`,'-alchemy','')"
+      end
 
-		end
+    end
 
-	end
+  end
 end

data/lib/alchemy/version.rb

@@ -1,5 +1,5 @@
 module Alchemy
 
-	VERSION = "2.1.12"
+  VERSION = "2.2.rc1"
 
 end

data/lib/alchemy_cms.rb

@@ -1,33 +1,32 @@
 if defined?(Rails) && Rails::VERSION::MAJOR == 3
-	require 'acts_as_list'
-	require 'attachment_magic'
-	require 'authlogic'
-	require 'awesome_nested_set'
-	require 'dynamic_form'
-	require 'fleximage'
-	require 'jquery-rails'
-	require 'kaminari'
-	require 'userstamp'
-	require 'yaml'
-	require 'sass-rails'
-	require 'declarative_authorization'
-	require 'extensions/hash'
-	require 'extensions/array'
-	require 'extensions/action_view'
-	require 'alchemy/mount_point'
-	require 'alchemy/version'
-	require 'alchemy/auth_engine'
-	require 'alchemy/engine'
-	%w(config essence page_layout modules tinymce i18n scoped_pagination_url_helper).each do |class_name|
-		require File.join(File.dirname(__FILE__), "alchemy", class_name)
-	end
-	require File.join(File.dirname(__FILE__), "alchemy", "seeder")
+  require 'acts_as_list'
+  require 'attachment_magic'
+  require 'authlogic'
+  require 'awesome_nested_set'
+  require 'dynamic_form'
+  require 'fleximage'
+  require 'jquery-rails'
+  require 'kaminari'
+  require 'userstamp'
+  require 'yaml'
+  require 'sass-rails'
+  require 'declarative_authorization'
+  require 'extensions/hash'
+  require 'extensions/array'
+  require 'extensions/action_view'
+  require 'alchemy/mount_point'
+  require 'alchemy/version'
+  require 'alchemy/auth_engine'
+  require 'alchemy/engine'
+  %w(config essence page_layout modules tinymce i18n scoped_pagination_url_helper resource resources_helper).each do |class_name|
+    require File.join(File.dirname(__FILE__), "alchemy", class_name)
+  end
+  require File.join(File.dirname(__FILE__), "alchemy", "seeder")
 else
-	raise "Alchemy 2.1 needs Rails 3.1 or higher. You are currently using Rails #{Rails::VERSION::STRING}"
+  raise "Alchemy 2.1 needs Rails 3.1 or higher. You are currently using Rails #{Rails::VERSION::STRING}"
 end
 
 module Alchemy
-
-	class EssenceError < StandardError; end
-
+  class EssenceError < StandardError;
+  end
 end

data/lib/extensions/action_view.rb

@@ -7,7 +7,7 @@ module ActionView
         end
       end
     end
-    
+
     class FormBuilder
       def button(label, options = {})
         @template.button(label, options)

data/lib/extensions/array.rb

@@ -1,5 +1,5 @@
 Array.class_eval do
-  
+
   def stringify
     map do |value|
       if value.is_a?(Hash) || value.is_a?(Array)
@@ -9,7 +9,7 @@ Array.class_eval do
       end
     end
   end
-  
+
   def stringify!
     a = []
     each do |value|
@@ -21,5 +21,5 @@ Array.class_eval do
     end
     replace(a)
   end
-  
+
 end

data/lib/extensions/hash.rb

@@ -8,7 +8,7 @@ class Hash
   def add_key_for_checkboxes name
     self[name.to_s] = [] if self.stringify_keys[name.to_s].nil?
   end
-  
+
   def stringify
     inject({}) do |options, (key, value)|
       if value.is_a?(Hash) || value.is_a?(Array)
@@ -19,7 +19,7 @@ class Hash
       options
     end
   end
-  
+
   def stringify!
     each do |key, value|
       delete(key)
@@ -30,5 +30,5 @@ class Hash
       end
     end
   end
-  
+
 end

data/lib/middleware/flash_session_cookie.rb

@@ -12,7 +12,7 @@ module Alchemy
       def call(env)
         if env['HTTP_USER_AGENT'] =~ /^(Adobe|Shockwave) Flash/
           params = ::Rack::Utils.parse_query(env['QUERY_STRING'])
-          env['HTTP_COOKIE'] = [ @session_key, params[@session_key] ].join('=').freeze unless params[@session_key].nil?
+          env['HTTP_COOKIE'] = [@session_key, params[@session_key]].join('=').freeze unless params[@session_key].nil?
         end
         @app.call(env)
       end

data/lib/rails/generators/alchemy/deploy_script/deploy_script_generator.rb

@@ -1,31 +1,31 @@
 require 'rails/generators'
 
 module Alchemy
-	module Generators
-		class DeployScriptGenerator < ::Rails::Generators::Base
+  module Generators
+    class DeployScriptGenerator < ::Rails::Generators::Base
 
-			desc "This generator generates a Capistrano deploy script."
-			class_option :scm, :type => :string, :desc => "Set the type of scm you use for deployment.", :default => 'svn'
-			class_option :db, :type => :string, :desc => "Set the type of database you use on your server.", :default => 'mysql'
-			source_root File.expand_path('templates', File.dirname(__FILE__))
+      desc "This generator generates a Capistrano deploy script."
+      class_option :scm, :type => :string, :desc => "Set the type of scm you use for deployment.", :default => 'svn'
+      class_option :db, :type => :string, :desc => "Set the type of database you use on your server.", :default => 'mysql'
+      source_root File.expand_path('templates', File.dirname(__FILE__))
 
-			def copy_script
-				@ssh_user = ask('Please enter SSH username:')
-				@ssh_password = ask('Please enter SSH password:')
-				port = ask('Please enter SSH port (22):')
-				@ssh_port = port.blank? ? 22 : port
-				@server = ask('Please enter server ip or domain:')
-				@deploy_path = ask('Please enter the path to the public html folder:')
-				@scm = options[:scm]
-				@repository_url = ask('Please enter the URL to your projects repository:')
-				if @scm == "svn" && yes?('Is your repository private? (y/N)')
-					@scm_user = ask('Please enter the username for your repository:')
-					@scm_password = ask('Please enter the password to your repository:')
-				end
-				@database_type = options[:db]
-				template "deploy.rb.tt", Rails.root.join('config', 'deploy.rb')
-			end
+      def copy_script
+        @ssh_user = ask('Please enter SSH username:')
+        @ssh_password = ask('Please enter SSH password:')
+        port = ask('Please enter SSH port (22):')
+        @ssh_port = port.blank? ? 22 : port
+        @server = ask('Please enter server ip or domain:')
+        @deploy_path = ask('Please enter the path to the public html folder:')
+        @scm = options[:scm]
+        @repository_url = ask('Please enter the URL to your projects repository:')
+        if @scm == "svn" && yes?('Is your repository private? (y/N)')
+          @scm_user = ask('Please enter the username for your repository:')
+          @scm_password = ask('Please enter the password to your repository:')
+        end
+        @database_type = options[:db]
+        template "deploy.rb.tt", Rails.root.join('config', 'deploy.rb')
+      end
 
-		end
-	end
+    end
+  end
 end

data/lib/rails/generators/alchemy/elements/elements_generator.rb

@@ -5,31 +5,31 @@ module Alchemy
     class ElementsGenerator < ::Rails::Generators::Base
       desc "This generator generates your elements view partials."
       source_root File.expand_path('templates', File.dirname(__FILE__))
-      
+
       def create_directory
         @elements_dir = "#{Rails.root}/app/views/alchemy/elements"
         empty_directory @elements_dir
       end
-      
+
       def create_partials
         @elements = get_elements_from_yaml
         @elements.each do |element|
           @element = element
-          @contents = ( element["contents"] or [] )
+          @contents = (element["contents"] or [])
           @element_name = element["name"].underscore
           template "editor.html.erb", "#{@elements_dir}/_#{@element_name}_editor.html.erb"
           template "view.html.erb", "#{@elements_dir}/_#{@element_name}_view.html.erb"
         end if @elements
       end
-      
-    private
-      
+
+      private
+
       def get_elements_from_yaml
         YAML.load_file "#{Rails.root}/config/alchemy/elements.yml"
       rescue Errno::ENOENT
         puts "\nERROR: Could not read config/alchemy/elements.yml file. Please run: rails generate alchemy:scaffold"
       end
-      
+
     end
   end
 end