github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-02-10 14:15:00 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into erbout

Browse Source
This commit is contained in:
Jeremy Kemper
2008-06-06 20:43:28 -07:00
parent fe9d2ad6e8 1d1ea92f40
commit deee9d22fe
4 changed files with 21 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
activerecord/lib/active_record/base.rb
View File

@@ -2252,12 +2252,12 @@ module ActiveRecord #:nodoc:
end
end
# Updates a single attribute and saves the record. This is especially useful for boolean flags on existing records.
# Note: This method is overwritten by the Validation module that'll make sure that updates made with this method
# aren't subjected to validation checks. Hence, attributes can be updated even if the full object isn't valid.
# Updates a single attribute and saves the record without going through the normal validation procedure.
# This is especially useful for boolean flags on existing records. The regular +update_attribute+ method
# in Base is replaced with this when the validations module is mixed in, which it is by default.
def update_attribute(name, value)
send(name.to_s + '=', value)
save
save(false)
end
# Updates all the attributes from the passed-in Hash and saves the record. If the object is invalid, the saving will

9
activerecord/lib/active_record/validations.rb
View File

@@ -277,7 +277,6 @@ module ActiveRecord
base.class_eval do
alias_method_chain :save, :validation
alias_method_chain :save!, :validation
alias_method_chain :update_attribute, :validation_skipping
end
base.send :include, ActiveSupport::Callbacks
@@ -914,14 +913,6 @@ module ActiveRecord
end
end
# Updates a single attribute and saves the record without going through the normal validation procedure.
# This is especially useful for boolean flags on existing records. The regular +update_attribute+ method
# in Base is replaced with this when the validations module is mixed in, which it is by default.
def update_attribute_with_validation_skipping(name, value)
send(name.to_s + '=', value)
save(false)
end
# Runs +validate+ and +validate_on_create+ or +validate_on_update+ and returns true if no errors were added otherwise false.
def valid?
errors.clear

4
activesupport/lib/active_support/inflector.rb
View File

@@ -15,7 +15,7 @@ module ActiveSupport
# A singleton instance of this class is yielded by Inflector.inflections, which can then be used to specify additional
# inflection rules. Examples:
#
# Inflector.inflections do |inflect|
# ActiveSupport::Inflector.inflections do |inflect|
# inflect.plural /^(ox)$/i, '\1\2en'
# inflect.singular /^(ox)en/i, '\1'
#
@@ -97,7 +97,7 @@ module ActiveSupport
# inflector rules.
#
# Example:
# Inflector.inflections do |inflect|
# ActiveSupport::Inflector.inflections do |inflect|
# inflect.uncountable "rails"
# end
def inflections

31
railties/lib/rails/gem_dependency.rb
View File

@@ -98,27 +98,26 @@ module Rails
self.name == other.name && self.requirement == other.requirement
end
private ###################################################################
def specification
@spec ||= Gem.source_index.search(Gem::Dependency.new(@name, @requirement)).sort_by { |s| s.version }.last
end
def gem_command
RUBY_PLATFORM =~ /win32/ ? 'gem.bat' : 'gem'
end
private
def gem_command
RUBY_PLATFORM =~ /win32/ ? 'gem.bat' : 'gem'
end
def install_command
cmd = %w(install) << @name
cmd << "--version" << %("#{@requirement.to_s}") if @requirement
cmd << "--source" << @source if @source
cmd
end
def install_command
cmd = %w(install) << @name
cmd << "--version" << %("#{@requirement.to_s}") if @requirement
cmd << "--source" << @source if @source
cmd
end
def unpack_command
cmd = %w(unpack) << @name
cmd << "--version" << %("#{@requirement.to_s}") if @requirement
cmd
end
def unpack_command
cmd = %w(unpack) << @name
cmd << "--version" << %("#{@requirement.to_s}") if @requirement
cmd
end
end
end