Commit Graph

6932 Commits

Author SHA1 Message Date
Amol Hatwar
2d372d7049 Fixed generator collisions for nested controller modules.
Signed-off-by: Joshua Peek <josh@joshpeek.com>
2008-05-13 16:02:56 -05:00
Joshua Peek
4562a5b57f Add some test coverage for RailsControllerGenerator. 2008-05-13 15:50:06 -05:00
Tim Pope
3a0d8adcf2 Fix tests broken by mocha absence [#186 state:resolved]
Two ActiveRecord tests depended on mocha but were not marked as such.
Place them in a use_mocha block so the test suite passes.

Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
2008-05-13 21:02:13 +01:00
Rich Cavanaugh
d8bcec6ce6 make CGI::Cookie handle deleting a cookie properly
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
2008-05-13 10:51:55 -07:00
Andre Arko
d16fbe53b2 Fix remote_function to escape apostrophes inside the remote url passed to Ajax.Update. [#180 state:resolved]
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
2008-05-13 18:33:33 +01:00
Tarmo Tänav
3fee2378ed Use 'public' schema path when connecting to 'postgres' database. [#170 state:resolved]
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
2008-05-13 18:25:30 +01:00
Daniel Morrison
f498f221bd Include time zone offset in TimeWithZone#to_json 2008-05-13 09:50:45 -07:00
rick
74fd17346f Merge branch 'master' of git@github.com:rails/rails 2008-05-13 09:41:10 -07:00
Tarmo Tänav
4dedc7ddca Use 'postgres' database instead of 'template1'
The 'postgres' database is meant for use by utilities and third
party applications. CONNECT permission to the 'template1' database
is usually only available to superusers which is why 'postgres'
should be preferred as users whith "CREATE DATABASE" permissions
are not neccessarily superusers.
2008-05-13 17:34:47 +01:00
Matthew Brindley
9fb01ce4b1 ScaffoldGenerator to create public/stylesheets if missing. [#165 state:resolved]
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
2008-05-13 10:50:00 +01:00
Pratik Naik
2270371f5d Remove unnecessary DeprecatedInstanceVariable class 2008-05-13 10:39:45 +01:00
Xavier Noria
593e21d6ae Dirty attributes aren't cleared if save fails. [#174 state:resolved]
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
2008-05-12 17:04:17 -07:00
Rich Cavanaugh
a425cd1473 Don't double-escape cookie store data. Don't split cookie values with newlines into an array. [#130 state:resolved]
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
2008-05-12 15:26:19 -07:00
Jeremy Kemper
cde6a259bf Simpler rescue_action condition 2008-05-12 13:24:32 -07:00
Jeremy Kemper
f2e4bf218f Use #duplicable? instead of anonymous rescue 2008-05-12 13:24:32 -07:00
Jeremy Kemper
828914a062 Ruby 1.9 compat: define __setobj__ for Delegator 2008-05-12 13:24:32 -07:00
Frederick Cheung
d2212c1601 Remove AR::Base#attributes argument. [#52 state:resolved]
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
v2.1.0_RC1
2008-05-12 00:35:42 +01:00
David Heinemeier Hansson
00640de861 Updated copyright years 2008-05-11 18:34:05 -05:00
David Heinemeier Hansson
b60c8a573e Making ready for RC1 release 2008-05-11 18:29:44 -05:00
David Heinemeier Hansson
f1b6e1ae61 No more svn version numbers to rely on, use timestamps instead 2008-05-11 18:21:47 -05:00
David Heinemeier Hansson
5d9c602698 Depend on latest Rake 2008-05-11 18:21:19 -05:00
Pratik Naik
c11bd7e713 Merge branch 'master' of git@github.com:rails/rails 2008-05-11 23:59:27 +01:00
Pratik Naik
80e18e759e Ensure dbconsole respects erb in database.yml. [#157 state:resolved] [Andrew Bennett]
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
2008-05-11 23:58:04 +01:00
Michael Schuerig
9a137506a1 Added not to sanitize helper docs that it doesn't guarantee well-formed markup.
Signed-off-by: Michael Koziarski <michael@koziarski.com>

[#166 state:resolved]
2008-05-12 10:22:17 +12:00
Frederick Cheung
236f0bb67a When preloading group by reflection rather than by class [#125 state:resolved]
This avoids extra queries when several subclasses inherit the association
from their parent class, while still coping with subclasses redefining
associations.

Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
2008-05-11 22:14:07 +01:00
Jonathan Viney
0cbdd96c34 Fix blank conditions on AssociationCollection#find. [#104 state:resolved]
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
2008-05-11 21:01:18 +01:00
Duncan Beevers
0b8b582e06 Add test for named_scope#proxy_options. [#97 state:resolved] 2008-05-11 20:33:25 +01:00
Frederick Cheung
3f0dccbbc7 Ensure hm:t preloading honours reflection options. [#137 state:resolved]
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
2008-05-11 20:01:14 +01:00
Cheah Chu Yeow
8f2f88f128 Remove unused JSON methods. [#164 state:resolved]
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
2008-05-11 19:49:47 +01:00
Aslak Hellesøy
10fdf44236 Added protection against duplicate migration names (Aslak Hellesøy) [#112 state:resolved] 2008-05-11 13:37:29 -05:00
Alex MacCaw
4cc594bd70 Fix validates_uniqueness_of for SQL keywords [#23 state:resolved]
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
2008-05-11 19:30:03 +01:00
David Heinemeier Hansson
0dabb5b7ab Fixed that forgery protection can be used without session tracking (Peter Jones) [#139 state:resolved] 2008-05-11 13:28:50 -05:00
Peter Jones
2a986200b9 Bug: Earlier Check for Session in Forgery Protection
The session is used by the form_authenticity_token method before it is
tested to be valid.  This patch moves a few lines around so that the
session is validated first.

Without this patch, if you try to use forgery protection with sessions
turned off, you get this exception message:

  undefined method `session_id' for {}:Hash

The patch includes a test that can be used to see this behavior before
the request_forgery_protection.rb file is patched to fix it.
2008-05-11 13:27:34 -05:00
David Heinemeier Hansson
7013d9e52a Fix generate_app_doc task (Jaroslaw) [#70 state:resolved] 2008-05-11 13:20:53 -05:00
David Heinemeier Hansson
c43623c48b Added session(:on) to turn session management back on in a controller subclass if the superclass turned it off (Peter Jones) [#136 state:resolved] 2008-05-11 13:18:49 -05:00
David Heinemeier Hansson
8857994f92 Added session(:on) to turn session management back on in a controller subclass if the superclass turned it off (Peter Jones) [#136 state:resolved] 2008-05-11 13:13:31 -05:00
Andreas Neuhaus
74eed6290e Fixed flash.now not being accessible in tests. Flash sweeping is now done before action processing instead after
Signed-off-by: Michael Koziarski <michael@koziarski.com>

[#10 state:resolved]
2008-05-11 18:30:10 +12:00
rick
d09a8446d5 fix merge conflict with actionpack changelog 2008-05-10 17:46:55 -07:00
Jacek Becela
a7ea06b4eb Make render shorthands work with namespaced controllers
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
2008-05-10 11:28:19 +01:00
Chris Roos
6776edccf6 Escape globbed parameters in routes correctly.
:controller => 'glob', :action=> 'show', :additional => ['foo/bar', 'baz']

Should generate /glob/show/foo%2Fbar/baz not  /glob/show/foo/bar/baz
2008-05-10 14:55:41 +12:00
Pratik Naik
dc4eec1129 Merge docrails:
commit e6afd8b273
Author: Xavier Noria <fxn@hashref.com>
Date:   Thu May 8 23:49:36 2008 +0200

    Overall documentation improvement and markup corrections. Zillion changes.

commit 2fead68b31
Author: Austin Putman <austin@emmanuel.local>
Date:   Wed May 7 19:35:46 2008 -0700

    Documented class methods on ActionController::Routing.  These are dangerous, and mostly used for testing.

commit f5b84182db
Author: Teflon Ted <github@rudiment.net>
Date:   Wed May 7 16:08:49 2008 -0400

    Added explanation about errant inflections not being patched in the future in order to avoid breaking legacy applications.

commit 370f4f5172
Author: Sunny Ripert <negatif@gmail.com>
Date:   Wed May 7 14:00:59 2008 +0200

    Applied list conventions in AR::Base

commit 5bd18429f0
Author: Sunny Ripert <negatif@gmail.com>
Date:   Wed May 7 13:53:35 2008 +0200

    Renamed Options list to Attributes list whenever they weren't option hashes in AR::Base

commit d912bd5672
Author: Yaroslav Markin <yaroslav@markin.net>
Date:   Wed May 7 13:50:28 2008 +0400

    Add a filter_parameter_logging usage hint to generated ApplicationController.
    This may help to remind the developer to filter sensitive information from application logs.
    Closes #11578

commit b243de0db3
Author: Jack Danger Canty <git@6brand.com>
Date:   Tue May 6 23:39:47 2008 -0700

    doc: disambiguating an example ActiveRecord class

commit f81d771f06
Author: Jack Danger Canty <git@6brand.com>
Date:   Tue May 6 23:35:05 2008 -0700

    doc: ActiveRecord::Reflection::AssociationReflection#through_reflection

    Added documentation demonstrating the use of #through_reflection for
    finding intervening reflection objects for HasManyThrough
    and HasOneThrough.

commit ae6b46f00b
Author: Cheah Chu Yeow <chuyeow@gmail.com>
Date:   Wed May 7 13:47:41 2008 +0800

    Document AttributeAssignmentError and MultiparameterAssignmentErrors.

commit 8f463550b5
Author: John Barnette <jbarnette@gmail.com>
Date:   Tue May 6 22:46:44 2008 -0700

    Killing/fixing a bunch of outdated language in the AR README.

commit aca44bcd92
Author: Cheah Chu Yeow <chuyeow@gmail.com>
Date:   Wed May 7 13:34:52 2008 +0800

    Make a note about ActiveResource::Timeouterror being raised when ARes calls timeout.

commit 284a930a93
Author: Jonathan Dance <jd@wuputah.com>
Date:   Tue May 6 14:58:26 2008 -0400

    improvements to the page caching docs

commit 9482da6213
Author: Sunny Ripert <negatif@gmail.com>
Date:   Mon May 5 18:13:40 2008 +0200

    validates_numericality_of() "integer" option really is "only_integer"

commit e9afd6790a
Author: Sunny Ripert <negatif@gmail.com>
Date:   Mon May 5 12:11:59 2008 +0200

    Harmonized hash notation in AR::Base

commit 67ebf14a91
Author: Sunny Ripert <negatif@gmail.com>
Date:   Mon May 5 12:06:19 2008 +0200

    Turned options into rdoc-lists in AR::Base

commit 0ec7c0a41d
Author: Marshall Huss <mwhuss@Macbook.local>
Date:   Sun May 4 23:21:33 2008 -0400

    Added information of how to set element_name in the case the user has a name confliction with an existing model

Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
2008-05-09 10:40:50 +01:00
gbuesing
bfbf03ecee ActionView::InstanceTag#default_time_from_options with hash args uses Time.current as default; respects hash settings when time falls in system local spring DST gap 2008-05-08 23:40:25 -05:00
gbuesing
66728087d0 Adding Date.current, which returns Time.zone.today if config.time_zone is set; otherwise returns Date.today. ActionView date_helper uses Date.current to determine locale-appropriate default 2008-05-08 22:48:47 -05:00
gbuesing
79e44a5ee4 Base#instantiate_time_object: eliminate check for Time.zone, since we can assume this is set if time_zone_aware_attributes is set to true 2008-05-08 22:21:51 -05:00
gbuesing
4f03190f26 TimeWithZone: date part getter methods (#year #mon #day etc) are defined on class; no longer relying on method_missing 2008-05-08 22:07:21 -05:00
gbuesing
618d695f11 Updating changelogs 2008-05-08 21:58:37 -05:00
gbuesing
06a7c2948a Time.zone.parse: return nil for strings with no date information 2008-05-08 21:30:17 -05:00
gbuesing
fb9bf16e96 Time.zone.parse: compatibility with far future date with time zone offset in string. Eliminate creation of additional TimeWithZone instance to determine utc offset. 2008-05-08 20:56:38 -05:00
gbuesing
328fada610 ActiveRecord time zone aware attributes: blank string is treated as nil when assigned to writer 2008-05-08 20:31:54 -05:00
Scott Fleckenstein
eb5b93be74 Fix Time.zone.parse from stripping time zone information and make Time aware attribute methods use Time.zone.parse instead of to_time 2008-05-08 19:25:31 -05:00