alchemy_cms 2.1.11 → 2.1.12

data/Gemfile

@@ -18,8 +18,10 @@ group :assets do
 end
 
 group :development do
-	gem 'ruby-debug19', :require => 'ruby-debug', :platform => :ruby_19
-	gem 'ruby-debug', :platform => :ruby_18
-	gem 'guard-spork'
-	gem 'yard'
+	if !ENV["CI"]
+		gem 'debugger', :platform => :ruby_19
+		gem 'ruby-debug', :platform => :ruby_18
+		gem 'guard-spork'
+		gem 'yard'
+	end
 end

data/app/controllers/alchemy/user_sessions_controller.rb

@@ -51,7 +51,7 @@ module Alchemy
 		end
 
 		def leave
-			::I18n.locale = current_user.language.to_sym
+			::I18n.locale = current_user.try(:language)
 			render :layout => false
 		end
 

data/app/helpers/alchemy/admin/base_helper.rb

@@ -340,7 +340,7 @@ module Alchemy
 					:active => false,
 					:link_options => {},
 					:overlay_options => {},
-					:loading_indicator => false
+					:loading_indicator => true
 				}
 				options = defaults.merge(options)
 				button = content_tag('div', :class => 'button_with_label' + (options[:active] ? ' active' : '')) do
@@ -355,7 +355,7 @@ module Alchemy
 							}
 						)
 					else
-						link_to options[:url], {:class => "icon_button#{options[:loading_indicator] ? nil : ' please_wait'}", :title => options[:title]}.merge(options[:link_options]) do
+						link_to options[:url], {:class => "icon_button#{options[:loading_indicator] ? ' please_wait' : nil}", :title => options[:title]}.merge(options[:link_options]) do
 							render_icon(options[:icon])
 						end
 					end

data/lib/alchemy/essence.rb

@@ -5,13 +5,13 @@ module Alchemy #:nodoc:
     def self.included(base)
       base.extend(ClassMethods)
     end
-    
+
     # Delivers various methods we need for Essences in Alchemy.
     # To turn a model into an essence call acts_as_essence inside your model and you will get:
     #   * validations
     #   * several getters (ie: page, element, content, ingredient, preview_text)
     module ClassMethods
-      
+
       # Configuration options are:
       #
       # * +ingredient_column+ - specifies the column name you use for storing the content in the database (default: +body+)
@@ -24,64 +24,60 @@ module Alchemy #:nodoc:
         ingredient_column = configuration[:ingredient_column].blank? ? 'body' : configuration[:ingredient_column]
         preview_text_column = configuration[:preview_text_column].blank? ? ingredient_column : configuration[:preview_text_column]
         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
 					has_many :contents, :as => :essence
-          
+
           def acts_as_essence_class
             #{self.name}
           end
-          
+
           def validation_column
             '#{validate_column}'
           end
-          
+
           def ingredient_column
             '#{ingredient_column}'
           end
-          
-          def ingredient
-            send('#{ingredient_column}')
-          end
-          
+
           def preview_text_column
             '#{preview_text_column}'
           end
-          
+
           def preview_text_method
             '#{configuration[:preview_text_method]}'
           end
-          
+
         EOV
       end
-      
+
     end
-    
+
     module InstanceMethods
-      
+
       # Essence Validations:
-      # 
+      #
       # Essence validations can be set inside the config/elements.yml file.
       # Currently supported validations are:
       #   * presence
       #   * format
       #   * uniqueness
-      # 
+      #
       # If you want to validate the format you must additionally pass validate_format_as or validate_format_with:
-      # 
+      #
       # * validate_format_with has to be regex
       # * validate_format_as can be one of:
       # ** url
       # ** email
-      # 
+      #
       # Example:
-      # 
+      #
       #   - name: person
-      #     contents:  
+      #     contents:
       #     - name: name
       #       type: EssenceText
       #       validate: [presence]
@@ -93,7 +89,7 @@ module Alchemy #:nodoc:
       #       type: EssenceText
       #       validate: [format]
       #       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?
@@ -127,29 +123,36 @@ module Alchemy #:nodoc:
         end
 			end
 
+      # Returns the value stored from the database column that is configured as ingredient column.
+      def ingredient
+        if self.respond_to?(ingredient_column)
+          self.send(ingredient_column)
+        end
+      end
+
       # Essence description from config/elements.yml
       def description
         return {} if element.nil? or element.content_descriptions.nil?
         element.content_descriptions.detect { |c| c['name'] == self.content.name }
       end
-      
+
       # Returns the Content Essence is in
       def content
         Alchemy::Content.find_by_essence_type_and_essence_id(acts_as_essence_class.to_s, self.id)
       end
-      
+
       # Returns the Element Essence is in
       def element
         return nil if content.nil?
         content.element
       end
-      
+
       # Returns the Page Essence is on
       def page
         return nil if element.nil?
         element.page
       end
-      
+
       # Returns the first x (default 30) characters of ingredient for the Element#preview_text method.
       def preview_text(maxlength = 30)
         if preview_text_method.blank?
@@ -159,17 +162,17 @@ module Alchemy #:nodoc:
           ingredient.send(preview_text_method).to_s[0..maxlength]
         end
       end
-      
+
       def open_link_in_new_window?
         respond_to?(:link_target) && link_target == 'blank'
       end
-      
+
 			def partial_name
 				self.class.name.split('::').last.underscore
 			end
 
     end
-    
+
   end
 end
 ActiveRecord::Base.class_eval { include Alchemy::Essence } if defined?(Alchemy::Essence)

data/lib/alchemy/version.rb

@@ -1,5 +1,5 @@
 module Alchemy
 
-	VERSION = "2.1.11"
+	VERSION = "2.1.12"
 
 end

data/spec/models/element_spec.rb

@@ -48,7 +48,7 @@ describe Alchemy::Element do
 
 	it "should raise an error if no descriptions are found" do
 		FileUtils.mv(File.join(File.dirname(__FILE__), '..', '..', 'config', 'alchemy', 'elements.yml'), File.join(File.dirname(__FILE__), '..', '..', 'config', 'alchemy', 'elements.yml.bak'))
-		expect { Alchemy::Element.descriptions }.should raise_error
+		expect { Alchemy::Element.descriptions }.to raise_error
 		FileUtils.mv(File.join(File.dirname(__FILE__), '..', '..', 'config', 'alchemy', 'elements.yml.bak'), File.join(File.dirname(__FILE__), '..', '..', 'config', 'alchemy', 'elements.yml'))
 	end
 
@@ -100,7 +100,7 @@ describe Alchemy::Element do
 	end
 
 	it "should raise error if all_for_page method has no page" do
-	  expect { Alchemy::Element.all_for_page(nil) }.should raise_error(TypeError)
+	  expect { Alchemy::Element.all_for_page(nil) }.to raise_error(TypeError)
 	end
 
 	describe "#content_by_type" do

data/spec/models/language_spec.rb

@@ -58,7 +58,7 @@ describe Alchemy::Language do
 		if !@default_language
 			@default_language = Factory(:language, :name => "default", :code => "aa", :frontpage_name => "intro", :default => true)
 		end
-		expect { @default_language.destroy }.should raise_error
+		expect { @default_language.destroy }.to raise_error
 	end
 
 	describe "before save" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 2.1.11
+  version: 2.1.12
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-15 00:00:00.000000000 Z
+date: 2012-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -889,18 +889,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3542557089447580413
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3542557089447580413
 requirements:
 - ImageMagick (libmagick), v6.6 or greater.
 rubyforge_project: