Browse files

Generate methods for all suffixes

  • Loading branch information...
1 parent c2b075b commit 94dabf9b4bf14de665cb17570209078f16920e54 @josh josh committed Jul 28, 2009
View
15 activerecord/lib/active_record/attribute_methods.rb
@@ -65,8 +65,7 @@ def generated_methods?
def define_attribute_methods
return if generated_methods?
columns_hash.keys.each do |name|
- # TODO: Generate for all defined suffixes
- ["", "=", "?"].each do |suffix|
+ attribute_method_suffixes.each do |suffix|
method_name = "#{name}#{suffix}"
unless instance_method_already_implemented?(method_name)
generate_method = "define_attribute_method#{suffix}"
@@ -81,14 +80,10 @@ def define_attribute_methods
end
# Checks whether the method is defined in the model or any of its subclasses
- # that also derive from Active Record. Raises DangerousAttributeError if the
- # method is defined by Active Record though.
+ # that also derive from Active Record.
def instance_method_already_implemented?(method_name)
method_name = method_name.to_s
- return true if method_name =~ /^id(=$|\?$|$)/ # TODO: Check against all defined suffixes
- @_defined_class_methods ||= ancestors.first(ancestors.index(ActiveRecord::Base)).sum([]) { |m| m.public_instance_methods(false) | m.private_instance_methods(false) | m.protected_instance_methods(false) }.map {|m| m.to_s }.to_set
- @@_defined_activerecord_methods ||= (ActiveRecord::Base.public_instance_methods(false) | ActiveRecord::Base.private_instance_methods(false) | ActiveRecord::Base.protected_instance_methods(false)).map{|m| m.to_s }.to_set
- raise DangerousAttributeError, "#{method_name} is defined by ActiveRecord" if @@_defined_activerecord_methods.include?(method_name)
+ @_defined_class_methods ||= ancestors.first(ancestors.index(ActiveRecord::Base)).sum([]) { |m| m.public_instance_methods(false) | m.private_instance_methods(false) | m.protected_instance_methods(false) }.map(&:to_s).to_set
@_defined_class_methods.include?(method_name)
end
@@ -124,9 +119,7 @@ def attribute_method_suffixes
# Evaluate the definition for an attribute related method
def evaluate_attribute_method(attr_name, method_definition, method_name)
- unless method_name.to_s == primary_key.to_s
- generated_methods << method_name
- end
+ generated_methods << method_name
begin
class_eval(method_definition, __FILE__, __LINE__)
View
11 activerecord/lib/active_record/attribute_methods/read.rb
@@ -3,9 +3,9 @@ module AttributeMethods
module Read
extend ActiveSupport::Concern
- # included do
- # attribute_method_suffix ""
- # end
+ included do
+ attribute_method_suffix ""
+ end
module ClassMethods
protected
@@ -74,6 +74,11 @@ def unserialize_attribute(attr_name)
"#{attr_name} was supposed to be a #{self.class.serialized_attributes[attr_name]}, but was a #{unserialized_object.class.to_s}"
end
end
+
+ private
+ def attribute(attribute_name)
+ read_attribute(attribute_name)
+ end
end
end
end
View
4 activerecord/lib/active_record/base.rb
@@ -144,10 +144,6 @@ class ReadOnlyRecord < ActiveRecordError
class Rollback < ActiveRecordError
end
- # Raised when attribute has a name reserved by Active Record (when attribute has name of one of Active Record instance methods).
- class DangerousAttributeError < ActiveRecordError
- end
-
# Raised when you've tried to access a column which wasn't loaded by your finder.
# Typically this is because <tt>:select</tt> has been specified.
class MissingAttributeError < NoMethodError
View
14 activerecord/test/cases/attribute_methods_test.rb
@@ -74,10 +74,6 @@ def test_kernel_methods_not_implemented_in_activerecord
end
end
- def test_primary_key_implemented
- assert Class.new(ActiveRecord::Base).instance_method_already_implemented?('id')
- end
-
def test_defined_kernel_methods_implemented_in_model
%w(test name display y).each do |method|
klass = Class.new ActiveRecord::Base
@@ -96,16 +92,6 @@ def test_defined_kernel_methods_implemented_in_model_abstract_subclass
end
end
- def test_raises_dangerous_attribute_error_when_defining_activerecord_method_in_model
- %w(save create_or_update).each do |method|
- klass = Class.new ActiveRecord::Base
- klass.class_eval "def #{method}() 'defined #{method}' end"
- assert_raise ActiveRecord::DangerousAttributeError do
- klass.instance_method_already_implemented?(method)
- end
- end
- end
-
def test_only_time_related_columns_are_meant_to_be_cached_by_default
expected = %w(datetime timestamp time date).sort
assert_equal expected, ActiveRecord::Base.attribute_types_cached_by_default.map(&:to_s).sort

0 comments on commit 94dabf9

Please sign in to comment.