Commit Graph

12315 Commits

Author SHA1 Message Date
Joshua Peek
02bbde4e78 Cleanup junk metal and revise API
API Change: Returning a "X-Cascade: pass" header triggers the cascade
instead of a 404 response.
2010-01-10 23:09:10 -06:00
Joshua Peek
3921586091 Rewrite Metal tests 2010-01-10 22:33:34 -06:00
David Heinemeier Hansson
2c2b84f93c Javascript tests expects the old default of escaping HTML, make it so for now 2010-01-10 18:25:17 -08:00
David Heinemeier Hansson
5ddc597066 Use safe_concat instead of trying to html_safe! what might be a frozen string 2010-01-10 18:13:43 -08:00
José Valim
d2e7c1b97d Raise an error if respond_with is invoked and no format is declared. 2010-01-10 20:21:08 +01:00
José Valim
8d72ba51ba Ensure nested namespaces work as expected. 2010-01-10 18:42:45 +01:00
Joao Carlos
36969c6ecd Fixes namespaced routes [#3673 status:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-01-10 12:49:31 +01:00
David Heinemeier Hansson
d2c4a93c69 Have to remove the environment name from ARGV or IRB will freak out 2010-01-09 09:52:16 -08:00
Yehuda Katz
8665c754cb Add a generator_paths config option 2010-01-09 11:04:06 -06:00
José Valim
7e6530b170 Merge remote branch 'eloy/master' 2010-01-09 00:23:29 +01:00
José Valim
017f5d5308 Fix typo by renaming :genre to :gender. 2010-01-09 00:18:07 +01:00
José Valim
93898b389b Ensure new validates works with uniqueness validator. 2010-01-08 23:50:31 +01:00
David Heinemeier Hansson
d4589e96ef Fixed that PrototypeHelper#update_page should return html_safe [DHH] 2010-01-08 13:46:30 -08:00
Jeffrey Hardy
652d1c19ea Allow AR::Schema's migrations_path to be overwritten by subclasses. Defaults to 'db/migrate'
[#3671 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
2010-01-08 13:08:23 -08:00
Eloy Duran
7f775ef1a9 Renamed AssociationReflection #collection_association? to #collection?. 2010-01-08 21:47:17 +01:00
Eloy Duran
f2aacd5140 Rollback the transaction when one of the autosave associations fails to save. [#3391 state:resolved] 2010-01-08 21:45:02 +01:00
Lawrence Pit
5193fe9dd7 Exclude unchanged records from the collection being considered for autosave. [#2578 state:resolved]
Signed-off-by: Eloy Duran <eloy.de.enige@gmail.com>
2010-01-08 21:45:02 +01:00
Bryan Stearns
1080351437 Add failing test that triggers the stack overflow 2010-01-08 21:45:02 +01:00
José Valim
802b08da00 Mailer should give self as payload because it contains all the information needed (as the template rendered and the mailer name). 2010-01-08 21:36:04 +01:00
José Valim
7045c4c279 Allow validates to map some types to specific options. So now you can do:
validates :email, :presence => true, :format => /@/
  validates :genre, :inclusion => %w(m f)
  validates :password, :length => 6..20
2010-01-08 21:36:04 +01:00
José Valim
fa14d6d51e Compile length validator options still at the class level, so whenever the validator is called, it just needs to check for :maximum, :minimum and :is values. 2010-01-08 21:36:04 +01:00
David Heinemeier Hansson
188d52165b Fixed that much of DateHelper wouldn't return html_safe? strings [DHH] 2010-01-08 11:49:12 -08:00
David Heinemeier Hansson
5ea130943e Fixed that fragment caching should return a cache hit as html_safe (or it would all just get escaped) [DHH] 2010-01-07 17:45:32 -08:00
Mikel Lindsaar
1ddf17dff0 Return-Path per RFC needs '<' and '>' around the addr_spec 2010-01-08 12:17:12 +11:00
Jeremy Kemper
8087d51842 Liberalize picky test 2010-01-07 17:08:02 -08:00
Jeremy Kemper
1ca9c26301 Merge remote branch 'mikel/master' 2010-01-07 16:59:23 -08:00
Jeremy Kemper
ee85f15453 Qualify constant lookup in BasicObject 2010-01-07 16:43:25 -08:00
Mikel Lindsaar
82407f94aa Merge branch 'master' of github.com:mikel/rails
Conflicts:
	actionmailer/actionmailer.gemspec
	actionmailer/lib/action_mailer/vendor/text-format-0.6.3/text/format.rb
2010-01-08 11:17:04 +11:00
Mikel Lindsaar
e2aa6712a1 Updating mail require 2010-01-08 11:13:46 +11:00
Jeremy Kemper
4300f94533 Revert "Remove connection method definition, since it's called just once."
Restore the connection method which was added so it can be overridden.

This reverts commit e428c75d2b.
2010-01-07 13:30:51 -08:00
José Valim
3022ce4f72 No more hacks to ensure generators are executed inside Rails.root. 2010-01-07 21:24:50 +01:00
José Valim
ccc9f0b7de Ensure application names are not singularized. 2010-01-07 21:09:32 +01:00
Joshua Peek
8fe66f1af0 Run railtie and plugin initializers before app specific ones 2010-01-07 14:01:34 -06:00
José Valim
19e7c524d2 Ensure config/application.rb also uses app_const instead of app_name.classify. 2010-01-07 20:59:26 +01:00
José Valim
423e2acbb7 Merge remote branch 'eloy/master' 2010-01-07 20:13:07 +01:00
José Valim
47a5fd4c4b Allow :if, :unless, :on, :allow_nil and :allow_blank as shared options in validates. 2010-01-07 19:23:59 +01:00
jamie
0a79eb7889 Add validates method as shortcut to setup validators for a given set of attributes:
class Person < ActiveRecord::Base
  include MyValidators

  validates :name, :presence => true, :uniqueness => true, :length => { :maximum => 100 }
  validates :email, :presence => true, :email => true
end

[#3058 status:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
2010-01-07 19:23:59 +01:00
Jeffrey Hardy
2dcc53bdbc Remove stray semicolon from cookie_verification_secret initialzer template 2010-01-07 11:51:54 -05:00
Jeffrey Hardy
f8352ec255 Align assignments in the session_store initializer template 2010-01-07 11:46:55 -05:00
José Valim
3b631df101 Ensure that segments in default_url_options also work with format specified. 2010-01-07 17:17:06 +01:00
José Valim
f149eb19d4 From now on, parameters defined in default_url_options can be absent from named routes.
This allows the following setup to work:

  # app/controllers/application_controller.rb
  class ApplicationController
    def default_url_options(options=nil)
      { :locale => I18n.locale }
    end
  end

  # From your views and controllers:
  I18n.locale                 #=> :en
  users_url                   #=> "/en/users"
  users_url(:pl)              #=> "/pl/users"
  user_url(1)                 #=> "/en/users/1"
  user_url(:pl, 1)            #=> "/pl/users/1"
  user_url(1, :locale => :pl) #=> "/pl/users/1"

If you provide all expected parameters, it still works as previously.
But if any parameter is missing, it tries to assign all possible ones
with the hash returned in default_url_options or the one passed straight
to the named route method.

Beware that default_url_options in ApplicationController is not shared
with ActionMailer, so you are required to always give the locale in your
email views.
2010-01-07 15:34:14 +01:00
José Valim
f564f947d9 Remove duplicated url_for code and move methods shared between ActionMailer and ActionController up to AbstractController. 2010-01-07 15:31:50 +01:00
José Valim
598456b68b Updated the documentation for helpers.label. 2010-01-07 15:31:50 +01:00
José Valim
a25ef06956 Allow to specify default attributes names translation in I18n yml files.
For example, you could easily specify :created_at and :updated_at translations as:

  en:
    attributes:
      created_at: "Created at"
      updated_at: "Updated at"

This configuration is built on ActiveModel, so it means those translations are
shared between different ORMs as well (but always as a fallback).
2010-01-07 15:31:50 +01:00
José Valim
b0572ab2b6 Be sure to dup load paths before clearing the array. 2010-01-07 15:31:50 +01:00
José Valim
c68cc49dcd Use helpers.label instead of views.labels. 2010-01-07 15:31:50 +01:00
José Valim
a091e2e4f6 errors in ActionView should not be namespaced as well. 2010-01-07 15:31:50 +01:00
José Valim
821a160a49 Add a deprecation message to activerecord.errors. 2010-01-07 15:31:49 +01:00
José Valim
190ce3ab37 Errors messages are now moved from :activerecord.errors to simply :errors on I18n yml files. 2010-01-07 15:31:49 +01:00
Eloy Duran
9550916903 Raise a RecordNotFound if an ID in nested attributes is given but doesn't return a record. [#2415 state:resolved] 2010-01-07 13:19:49 +01:00