diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-10-09 20:15:00 -0300 | 
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-10-09 20:15:00 -0300 | 
| commit | 3c27b6ee7e34a3ee2e73c3e77f7a13c60b53c3d2 (patch) | |
| tree | 2b236ccecb15521165ed9744021efc2a8aa6a6c4 | |
| parent | b83f3645c0e2a962720942f54bc258531632593e (diff) | |
| download | rails-3c27b6ee7e34a3ee2e73c3e77f7a13c60b53c3d2.tar.gz rails-3c27b6ee7e34a3ee2e73c3e77f7a13c60b53c3d2.tar.bz2 rails-3c27b6ee7e34a3ee2e73c3e77f7a13c60b53c3d2.zip | |
Make validate_options a class method
| -rw-r--r-- | activerecord/lib/active_record/associations/builder/association.rb | 6 | 
1 files changed, 3 insertions, 3 deletions
| diff --git a/activerecord/lib/active_record/associations/builder/association.rb b/activerecord/lib/active_record/associations/builder/association.rb index d5fd9d7aa6..c731d3a080 100644 --- a/activerecord/lib/active_record/associations/builder/association.rb +++ b/activerecord/lib/active_record/associations/builder/association.rb @@ -45,7 +45,7 @@ module ActiveRecord::Associations::Builder        @scope   = scope        @options = options -      validate_options +      self.class.validate_options(options)        if scope && scope.arity == 0          @scope = proc { instance_exec(&scope) } @@ -64,8 +64,8 @@ module ActiveRecord::Associations::Builder        VALID_OPTIONS + Association.extensions.flat_map(&:valid_options)      end -    def validate_options -      options.assert_valid_keys(self.class.valid_options(options)) +    def self.validate_options(options) +      options.assert_valid_keys(valid_options(options))      end      def self.define_extensions(model, name) | 
