Skip to content

Commit

Permalink
Fixed error messages not evaluating inner expressions.
Browse files Browse the repository at this point in the history
  • Loading branch information
obrie committed Oct 26, 2006
1 parent dbea321 commit 8d826a0
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions lib/acts_as_preferenced.rb
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ def define_preference_accessors(name, type) #:nodoc:
end

definition = self::PreferenceDefinition.find_by_name(name)
raise InvalidPreferenceDefinition, 'Preference definition for #{name} not found for #{self.name}' if definition.nil?
raise InvalidPreferenceDefinition, "Preference definition for #{name} not found for #{self.name}" if definition.nil?

class_eval <<-end_eval
def #{prefix}_#{name}#{suffix}
Expand Down Expand Up @@ -227,10 +227,10 @@ def get_definition(name, preferenced_type)
preferenced_type = preferenced_type.nil? ? self : preferenced_type.constantize

name_definitions = read_inheritable_attribute(:preference_definitions)[name]
raise InvalidPreferenceDefinition, 'Preference definition for #{name} not found for #{self.name}' if name_definitions.nil?
raise InvalidPreferenceDefinition, "Preference definition for #{name} not found for #{self.name}" if name_definitions.nil?

preferenced_type = name_definitions.keys.find {|type| preferenced_type <= type}
raise InvalidPreferenceDefinition, '#{preferenced_type} is not a preferenced type for #{name}' if preferenced_type.nil?
raise InvalidPreferenceDefinition, "#{preferenced_type} is not a preferenced type for #{name}" if preferenced_type.nil?

name_definitions[preferenced_type]
end
Expand Down

0 comments on commit 8d826a0

Please sign in to comment.