Ruby on Rails | Screencasts | Download | Documentation | Weblog | Community | Source

Navigation

← Previous Changeset
Next Changeset →

Changeset 7235

Timestamp:

07/25/07 02:50:35 (1 year ago)

Author:

rick

Message:

misc doc fixes + Add ActiveResource to Rails::Info. Closes #8741, #9008, #9089 [kampers]

Files:

trunk/activerecord/lib/active_record/validations.rb (modified) (11 diffs)
trunk/railties/builtin/rails_info/rails/info.rb (modified) (2 diffs)
trunk/railties/CHANGELOG (modified) (1 diff)
trunk/railties/doc/README_FOR_APP (modified) (1 diff)
trunk/railties/test/rails_info_test.rb (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

trunk/activerecord/lib/active_record/validations.rb

r7215	r7235
361	361	# * <tt>allow_nil</tt> - Skip validation if attribute is nil.
362	362	# * <tt>if</tt> - Specifies a method, proc or string to call to determine if the validation should
363		# occur (e.g. :if => :allow_validation, or :if => Proc.new { \|user\| user.signup_step > 2 }). The
364		# method, proc or string should return or evaluate to a true or false value.
365		# * <tt>unless</tt> - Specifies a method, proc or string to call to determine if the validation should
366		# not occur (e.g. :unless => :skip_validation, or :unless => Proc.new { \|user\| user.signup_step <= 2 }). The
367		# method, proc or string should return or evaluate to a true or false value.
	363	# occur (e.g. :if => :allow_validation, or :if => Proc.new { \|user\| user.signup_step > 2 }). The
	364	# method, proc or string should return or evaluate to a true or false value.
	365	# * <tt>unless</tt> - Specifies a method, proc or string to call to determine if the validation should
	366	# not occur (e.g. :unless => :skip_validation, or :unless => Proc.new { \|user\| user.signup_step <= 2 }). The
	367	# method, proc or string should return or evaluate to a true or false value.
368	368	def validates_each(*attrs)
369	369	options = attrs.last.is_a?(Hash) ? attrs.pop.symbolize_keys : {}
…	…
403	403	# * <tt>on</tt> - Specifies when this validation is active (default is :save, other options :create, :update)
404	404	# * <tt>if</tt> - Specifies a method, proc or string to call to determine if the validation should
405		# occur (e.g. :if => :allow_validation, or :if => Proc.new { \|user\| user.signup_step > 2 }). The
406		# method, proc or string should return or evaluate to a true or false value.
407		# * <tt>unless</tt> - Specifies a method, proc or string to call to determine if the validation should
408		# not occur (e.g. :unless => :skip_validation, or :unless => Proc.new { \|user\| user.signup_step <= 2 }). The
409		# method, proc or string should return or evaluate to a true or false value.
	405	# occur (e.g. :if => :allow_validation, or :if => Proc.new { \|user\| user.signup_step > 2 }). The
	406	# method, proc or string should return or evaluate to a true or false value.
	407	# * <tt>unless</tt> - Specifies a method, proc or string to call to determine if the validation should
	408	# not occur (e.g. :unless => :skip_validation, or :unless => Proc.new { \|user\| user.signup_step <= 2 }). The
	409	# method, proc or string should return or evaluate to a true or false value.
410	410	def validates_confirmation_of(*attr_names)
411	411	configuration = { :message => ActiveRecord::Errors.default_error_messages[:confirmation], :on => :save }
…	…
434	434	# * <tt>allow_nil</tt> - Skip validation if attribute is nil. (default is true)
435	435	# * <tt>accept</tt> - Specifies value that is considered accepted. The default value is a string "1", which
436		# makes it easy to relate to an HTML checkbox.
437		# * <tt>if</tt> - Specifies a method, proc or string to call to determine if the validation should
438		# occur (e.g. :if => :allow_validation, or :if => Proc.new { \|user\| user.signup_step > 2 }). The
439		# method, proc or string should return or evaluate to a true or false value.
440		# * <tt>unless</tt> - Specifies a method, proc or string to call to determine if the validation should
441		# not occur (e.g. :unless => :skip_validation, or :unless => Proc.new { \|user\| user.signup_step <= 2 }). The
442		# method, proc or string should return or evaluate to a true or false value.
	436	# makes it easy to relate to an HTML checkbox.
	437	# * <tt>if</tt> - Specifies a method, proc or string to call to determine if the validation should
	438	# occur (e.g. :if => :allow_validation, or :if => Proc.new { \|user\| user.signup_step > 2 }). The
	439	# method, proc or string should return or evaluate to a true or false value.
	440	# * <tt>unless</tt> - Specifies a method, proc or string to call to determine if the validation should
	441	# not occur (e.g. :unless => :skip_validation, or :unless => Proc.new { \|user\| user.signup_step <= 2 }). The
	442	# method, proc or string should return or evaluate to a true or false value.
443	443	def validates_acceptance_of(*attr_names)
444	444	configuration = { :message => ActiveRecord::Errors.default_error_messages[:accepted], :on => :save, :allow_nil => true, :accept => "1" }
…	…
468	468	# * <tt>on</tt> - Specifies when this validation is active (default is :save, other options :create, :update)
469	469	# * <tt>if</tt> - Specifies a method, proc or string to call to determine if the validation should
470		# occur (e.g. :if => :allow_validation, or :if => Proc.new { \|user\| user.signup_step > 2 }). The
471		# method, proc or string should return or evaluate to a true or false value.
472		# * <tt>unless</tt> - Specifies a method, proc or string to call to determine if the validation should
473		# not occur (e.g. :unless => :skip_validation, or :unless => Proc.new { \|user\| user.signup_step <= 2 }). The
474		# method, proc or string should return or evaluate to a true or false value.
	470	# occur (e.g. :if => :allow_validation, or :if => Proc.new { \|user\| user.signup_step > 2 }). The
	471	# method, proc or string should return or evaluate to a true or false value.
	472	# * <tt>unless</tt> - Specifies a method, proc or string to call to determine if the validation should
	473	# not occur (e.g. :unless => :skip_validation, or :unless => Proc.new { \|user\| user.signup_step <= 2 }). The
	474	# method, proc or string should return or evaluate to a true or false value.
475	475	#
476	476	# === Warning
…	…
525	525	# * <tt>on</tt> - Specifies when this validation is active (default is :save, other options :create, :update)
526	526	# * <tt>if</tt> - Specifies a method, proc or string to call to determine if the validation should
527		# occur (e.g. :if => :allow_validation, or :if => Proc.new { \|user\| user.signup_step > 2 }). The
528		# method, proc or string should return or evaluate to a true or false value.
529		# * <tt>unless</tt> - Specifies a method, proc or string to call to determine if the validation should
530		# not occur (e.g. :unless => :skip_validation, or :unless => Proc.new { \|user\| user.signup_step <= 2 }). The
531		# method, proc or string should return or evaluate to a true or false value.
	527	# occur (e.g. :if => :allow_validation, or :if => Proc.new { \|user\| user.signup_step > 2 }). The
	528	# method, proc or string should return or evaluate to a true or false value.
	529	# * <tt>unless</tt> - Specifies a method, proc or string to call to determine if the validation should
	530	# not occur (e.g. :unless => :skip_validation, or :unless => Proc.new { \|user\| user.signup_step <= 2 }). The
	531	# method, proc or string should return or evaluate to a true or false value.
532	532	def validates_length_of(*attrs)
533	533	# Merge given options with defaults.
…	…
613	613	# * <tt>allow_nil</tt> - If set to true, skips this validation if the attribute is null (default is: false)
614	614	# * <tt>if</tt> - Specifies a method, proc or string to call to determine if the validation should
615		# occur (e.g. :if => :allow_validation, or :if => Proc.new { \|user\| user.signup_step > 2 }). The
616		# method, proc or string should return or evaluate to a true or false value.
617		# * <tt>unless</tt> - Specifies a method, proc or string to call to determine if the validation should
618		# not occur (e.g. :unless => :skip_validation, or :unless => Proc.new { \|user\| user.signup_step <= 2 }). The
619		# method, proc or string should return or evaluate to a true or false value.
	615	# occur (e.g. :if => :allow_validation, or :if => Proc.new { \|user\| user.signup_step > 2 }). The
	616	# method, proc or string should return or evaluate to a true or false value.
	617	# * <tt>unless</tt> - Specifies a method, proc or string to call to determine if the validation should
	618	# not occur (e.g. :unless => :skip_validation, or :unless => Proc.new { \|user\| user.signup_step <= 2 }). The
	619	# method, proc or string should return or evaluate to a true or false value.
620	620	def validates_uniqueness_of(*attr_names)
621	621	configuration = { :message => ActiveRecord::Errors.default_error_messages[:taken], :case_sensitive => true }
…	…
664	664	# * <tt>on</tt> Specifies when this validation is active (default is :save, other options :create, :update)
665	665	# * <tt>if</tt> - Specifies a method, proc or string to call to determine if the validation should
666		# occur (e.g. :if => :allow_validation, or :if => Proc.new { \|user\| user.signup_step > 2 }). The
667		# method, proc or string should return or evaluate to a true or false value.
668		# * <tt>unless</tt> - Specifies a method, proc or string to call to determine if the validation should
669		# not occur (e.g. :unless => :skip_validation, or :unless => Proc.new { \|user\| user.signup_step <= 2 }). The
670		# method, proc or string should return or evaluate to a true or false value.
	666	# occur (e.g. :if => :allow_validation, or :if => Proc.new { \|user\| user.signup_step > 2 }). The
	667	# method, proc or string should return or evaluate to a true or false value.
	668	# * <tt>unless</tt> - Specifies a method, proc or string to call to determine if the validation should
	669	# not occur (e.g. :unless => :skip_validation, or :unless => Proc.new { \|user\| user.signup_step <= 2 }). The
	670	# method, proc or string should return or evaluate to a true or false value.
671	671	def validates_format_of(*attr_names)
672	672	configuration = { :message => ActiveRecord::Errors.default_error_messages[:invalid], :on => :save, :with => nil }
…	…
692	692	# * <tt>allow_nil</tt> - If set to true, skips this validation if the attribute is null (default is: false)
693	693	# * <tt>if</tt> - Specifies a method, proc or string to call to determine if the validation should
694		# occur (e.g. :if => :allow_validation, or :if => Proc.new { \|user\| user.signup_step > 2 }). The
695		# method, proc or string should return or evaluate to a true or false value.
696		# * <tt>unless</tt> - Specifies a method, proc or string to call to determine if the validation should
697		# not occur (e.g. :unless => :skip_validation, or :unless => Proc.new { \|user\| user.signup_step <= 2 }). The
698		# method, proc or string should return or evaluate to a true or false value.
	694	# occur (e.g. :if => :allow_validation, or :if => Proc.new { \|user\| user.signup_step > 2 }). The
	695	# method, proc or string should return or evaluate to a true or false value.
	696	# * <tt>unless</tt> - Specifies a method, proc or string to call to determine if the validation should
	697	# not occur (e.g. :unless => :skip_validation, or :unless => Proc.new { \|user\| user.signup_step <= 2 }). The
	698	# method, proc or string should return or evaluate to a true or false value.
699	699	def validates_inclusion_of(*attr_names)
700	700	configuration = { :message => ActiveRecord::Errors.default_error_messages[:inclusion], :on => :save }
…	…
722	722	# * <tt>allow_nil</tt> - If set to true, skips this validation if the attribute is null (default is: false)
723	723	# * <tt>if</tt> - Specifies a method, proc or string to call to determine if the validation should
724		# occur (e.g. :if => :allow_validation, or :if => Proc.new { \|user\| user.signup_step > 2 }). The
725		# method, proc or string should return or evaluate to a true or false value.
726		# * <tt>unless</tt> - Specifies a method, proc or string to call to determine if the validation should
727		# not occur (e.g. :unless => :skip_validation, or :unless => Proc.new { \|user\| user.signup_step <= 2 }). The
728		# method, proc or string should return or evaluate to a true or false value.
	724	# occur (e.g. :if => :allow_validation, or :if => Proc.new { \|user\| user.signup_step > 2 }). The
	725	# method, proc or string should return or evaluate to a true or false value.
	726	# * <tt>unless</tt> - Specifies a method, proc or string to call to determine if the validation should
	727	# not occur (e.g. :unless => :skip_validation, or :unless => Proc.new { \|user\| user.signup_step <= 2 }). The
	728	# method, proc or string should return or evaluate to a true or false value.
729	729	def validates_exclusion_of(*attr_names)
730	730	configuration = { :message => ActiveRecord::Errors.default_error_messages[:exclusion], :on => :save }
…	…
765	765	# * <tt>on</tt> Specifies when this validation is active (default is :save, other options :create, :update)
766	766	# * <tt>if</tt> - Specifies a method, proc or string to call to determine if the validation should
767		# occur (e.g. :if => :allow_validation, or :if => Proc.new { \|user\| user.signup_step > 2 }). The
768		# method, proc or string should return or evaluate to a true or false value.
769		# * <tt>unless</tt> - Specifies a method, proc or string to call to determine if the validation should
770		# not occur (e.g. :unless => :skip_validation, or :unless => Proc.new { \|user\| user.signup_step <= 2 }). The
771		# method, proc or string should return or evaluate to a true or false value.
	767	# occur (e.g. :if => :allow_validation, or :if => Proc.new { \|user\| user.signup_step > 2 }). The
	768	# method, proc or string should return or evaluate to a true or false value.
	769	# * <tt>unless</tt> - Specifies a method, proc or string to call to determine if the validation should
	770	# not occur (e.g. :unless => :skip_validation, or :unless => Proc.new { \|user\| user.signup_step <= 2 }). The
	771	# method, proc or string should return or evaluate to a true or false value.
772	772	def validates_associated(*attr_names)
773	773	configuration = { :message => ActiveRecord::Errors.default_error_messages[:invalid], :on => :save }
…	…
801	801	# * <tt>even</tt> Specifies the value must be an even number
802	802	# * <tt>if</tt> - Specifies a method, proc or string to call to determine if the validation should
803		# occur (e.g. :if => :allow_validation, or :if => Proc.new { \|user\| user.signup_step > 2 }). The
804		# method, proc or string should return or evaluate to a true or false value.
805		# * <tt>unless</tt> - Specifies a method, proc or string to call to determine if the validation should
806		# not occur (e.g. :unless => :skip_validation, or :unless => Proc.new { \|user\| user.signup_step <= 2 }). The
807		# method, proc or string should return or evaluate to a true or false value.
	803	# occur (e.g. :if => :allow_validation, or :if => Proc.new { \|user\| user.signup_step > 2 }). The
	804	# method, proc or string should return or evaluate to a true or false value.
	805	# * <tt>unless</tt> - Specifies a method, proc or string to call to determine if the validation should
	806	# not occur (e.g. :unless => :skip_validation, or :unless => Proc.new { \|user\| user.signup_step <= 2 }). The
	807	# method, proc or string should return or evaluate to a true or false value.
808	808	def validates_numericality_of(*attr_names)
809	809	configuration = { :on => :save, :only_integer => false, :allow_nil => false }

trunk/railties/builtin/rails_info/rails/info.rb

r4134	r7235
20	20
21	21	def components
22		%w( active_record action_pack action_web_service action_mailer active_support )
	22	%w( active_record action_pack action_web_service active_resource action_mailer active_support )
23	23	end
24	24
…	…
90	90
91	91	# Versions of each Rails component (Active Record, Action Pack,
92		# Action Web Service, Action Mailer, and Active Support).
	92	# Action Web Service, Active Resource, Action Mailer, and Active Support).
93	93	components.each do \|component\|
94	94	property "#{component.titlecase} version" do

trunk/railties/CHANGELOG

r7233	r7235
1	1	SVN
	2
	3	* Add ActiveResource to Rails::Info. Closes #8741 [kampers]
2	4
3	5	* use Gem.find_name instead of search when freezing gems. Prevent false positives for other gems with rails in the name. Closes #8729 [wselman]

trunk/railties/doc/README_FOR_APP

r7102	r7235
1	1	Use this README file to introduce your application and point to useful places in the API for learning more.
2		Run "rake doc:app" to generate API documentation for your models ~~and controller~~s.
	2	Run "rake doc:app" to generate API documentation for your models, controllers, helpers, and libraries.

trunk/railties/test/rails_info_test.rb

r4912	r7235
71	71	assert_property 'Active Support version', ActiveSupport::VERSION::STRING
72	72	end
	73
	74	def test_components_exist
	75	Rails::Info.components.each do \|component\|
	76	dir = File.dirname(__FILE__) + "/../../" + component.gsub('_', '')
	77	assert File.directory?(dir), "#{component.classify} does not exist"
	78	end
	79	end
73	80
74	81	protected

Download in other formats: