diff options
| author | Mikel Lindsaar <raasdnil@gmail.com> | 2010-02-02 14:04:23 +1100 |
|---|---|---|
| committer | Mikel Lindsaar <raasdnil@gmail.com> | 2010-02-02 14:04:23 +1100 |
| commit | 12681c2a71f6272aaa8e1fa7cc6b5df588c96b1a (patch) | |
| tree | a7a7b097f59eaddc8cb209a1e83505843eab99fa /activemodel/lib | |
| parent | 535ae3b946b387af7eb6cb4bb4aed3d5cac1cf81 (diff) | |
| parent | df8852d04d030330efcb86f16977b837473bf022 (diff) | |
| download | rails-12681c2a71f6272aaa8e1fa7cc6b5df588c96b1a.tar.gz rails-12681c2a71f6272aaa8e1fa7cc6b5df588c96b1a.tar.bz2 rails-12681c2a71f6272aaa8e1fa7cc6b5df588c96b1a.zip | |
Merge branch 'master' of git://github.com/rails/rails
Conflicts:
activemodel/README
activemodel/lib/active_model/errors.rb
activemodel/lib/active_model/serialization.rb
railties/guides/source/3_0_release_notes.textile
Diffstat (limited to 'activemodel/lib')
| -rw-r--r-- | activemodel/lib/active_model.rb | 2 | ||||
| -rw-r--r-- | activemodel/lib/active_model/attribute_methods.rb | 1 | ||||
| -rw-r--r-- | activemodel/lib/active_model/errors.rb | 2 | ||||
| -rw-r--r-- | activemodel/lib/active_model/lint.rb | 2 | ||||
| -rw-r--r-- | activemodel/lib/active_model/serialization.rb | 1 |
5 files changed, 3 insertions, 5 deletions
diff --git a/activemodel/lib/active_model.rb b/activemodel/lib/active_model.rb index 1609075f7e..026430fee3 100644 --- a/activemodel/lib/active_model.rb +++ b/activemodel/lib/active_model.rb @@ -1,5 +1,5 @@ #-- -# Copyright (c) 2004-2009 David Heinemeier Hansson +# Copyright (c) 2004-2010 David Heinemeier Hansson # # Permission is hereby granted, free of charge, to any person obtaining # a copy of this software and associated documentation files (the diff --git a/activemodel/lib/active_model/attribute_methods.rb b/activemodel/lib/active_model/attribute_methods.rb index 32ddf1d579..f7fb66bdfc 100644 --- a/activemodel/lib/active_model/attribute_methods.rb +++ b/activemodel/lib/active_model/attribute_methods.rb @@ -273,6 +273,7 @@ module ActiveModel @attribute_methods_generated = nil end + # Returns true if the attribute methods defined have been generated. def generated_attribute_methods #:nodoc: @generated_attribute_methods ||= begin mod = Module.new diff --git a/activemodel/lib/active_model/errors.rb b/activemodel/lib/active_model/errors.rb index f1d74db5f3..d8320275df 100644 --- a/activemodel/lib/active_model/errors.rb +++ b/activemodel/lib/active_model/errors.rb @@ -62,8 +62,6 @@ module ActiveModel # @errors = ActiveModel::Errors.new(self) # end # end - # - # def initialize(base) @base = base super() diff --git a/activemodel/lib/active_model/lint.rb b/activemodel/lib/active_model/lint.rb index e8a39130a6..7bf0ad712d 100644 --- a/activemodel/lib/active_model/lint.rb +++ b/activemodel/lib/active_model/lint.rb @@ -58,7 +58,7 @@ module ActiveModel # # Returns an object that has :[] and :full_messages defined on it. See below # for more details. - + # # Returns an Array of Strings that are the errors for the attribute in # question. If localization is used, the Strings should be localized # for the current locale. If no error is present, this method should diff --git a/activemodel/lib/active_model/serialization.rb b/activemodel/lib/active_model/serialization.rb index 28f95f0cdc..1c48d4613a 100644 --- a/activemodel/lib/active_model/serialization.rb +++ b/activemodel/lib/active_model/serialization.rb @@ -2,7 +2,6 @@ require 'active_support/core_ext/hash/except' require 'active_support/core_ext/hash/slice' module ActiveModel - # Provides a basic serialization to a serializable_hash for your object. # # A minimal implementation could be: |