Commit Graph

5587 Commits

Author SHA1 Message Date
Jeremy Kemper
b1968708e1 Hash#to_json takes :only or :except options to specific or omit certain hash keys. Enumerable#to_json passes through its options to each element. Closes #9751.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7736 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-10-04 03:28:42 +00:00
Jeremy Kemper
a30a1a9d5f Try loading activerecord-<adaptername>-adapter gem before trying a plain require so you can use custom gems for the bundled adapters. Also stops gems from requiring an adapter from an old Active Record gem.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7735 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-10-04 01:08:10 +00:00
Jeremy Kemper
f2d7e51da2 Explicitly convert the buffer array to a string before writing to head off compatibility issues with outputs that don't fully quack like an IO.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7734 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-10-03 23:56:34 +00:00
Jeremy Kemper
d9dac76f53 Some platforms include colon in timezone offset, some don't. References #9744.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7733 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-10-03 23:54:45 +00:00
Jeremy Kemper
748e6873c2 BufferedLogger#auto_flushing = N flushes the log every N messages. Buffers with an array instead of string.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7732 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-10-03 23:43:12 +00:00
Tobias Lütke
406ea8f31d only create custom accessors for Kernel:: methods
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7731 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-10-03 21:48:49 +00:00
Tobias Lütke
b31aa639e7 Allow column accessors to be created even if Kernel. or Object# methods of the same name exist.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7729 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-10-03 20:47:33 +00:00
Jeremy Kemper
12d740dd57 Move #query_string to AbstractRequest
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7727 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-10-03 16:39:18 +00:00
Rick Olson
3dc62ab8f9 rescue LoadError if memcache isn't available while loading the MemCache fragment store
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7726 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-10-03 16:15:42 +00:00
Rick Olson
408f496402 Use #require_library_or_gem to load the memcache library for the MemCache session and fragment cache stores. Closes #8662. [Rick]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7725 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-10-03 14:52:56 +00:00
Rick Olson
904df818d6 Move ActionController::Routing.optimise_named_routes to ActionController::Base.optimise_named_routes. Now you can set it in the config.
ActionController::Routing::DynamicSegment#interpolation_chunk should call #to_s on all values before calling URI.escape.  [Rick]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7724 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-10-03 05:47:41 +00:00
Michael Koziarski
b4ec9904c6 Cache the descends_from_activerecord? call to speed up query generation. [skaes] Closes #9765
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7723 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-10-03 05:31:36 +00:00
Michael Koziarski
eb5033ad6b Merge session fixation fixes from stable
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7722 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-10-02 05:58:16 +00:00
Jeremy Kemper
0ee1cb2cd3 Ruby 1.9 compat, consistent load paths
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7719 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-10-02 05:32:14 +00:00
Jeremy Kemper
9264bdc8f6 db:create works with remote databases whereas db:create:all only createsdatabases on localhost. Closes #9753.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7718 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-10-02 03:20:52 +00:00
Michael Koziarski
f854ecd126 Add --prefix option to script/server when using mongrel. [dacat] Closes #9716
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7708 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-10-01 03:15:51 +00:00
David Heinemeier Hansson
22dc11c6b1 Fixed Date#xmlschema for dates outside the range of what can be created with Time (closes #9744) [gbuesing]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7707 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-10-01 02:16:15 +00:00
David Heinemeier Hansson
ec4989618e Removed calls to fixtures in generated tests as fixtures :all is now present by default in test_helper.rb [DHH]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7705 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-10-01 02:08:15 +00:00
David Heinemeier Hansson
4af5dbbfcc A set secret causes trouble with the cookie store
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7704 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-10-01 02:02:50 +00:00
David Heinemeier Hansson
860cf2d44e Fixed that render template did not honor exempt_from_layout (closes #9698) [pezra]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7701 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-09-30 22:59:24 +00:00
David Heinemeier Hansson
6ca789bf00 Fixed that La Paz was included in -25200 and -14400 offsets when it should only be in -14400 (closes #9735) [bermi]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7700 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-09-30 22:56:37 +00:00
David Heinemeier Hansson
81da956188 Docfix (closes #9740) [chuyeow]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7699 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-09-30 22:55:39 +00:00
David Heinemeier Hansson
00cecf83b5 Fixed that installing plugins from SVN repositories that use trunk/ will work (closes #8188) [evan]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7698 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-09-30 22:53:27 +00:00
David Heinemeier Hansson
7275d2749c Fixed JSON encoding to use quoted keys according to the JSON standard (closes #8762) [choonkat/chuyeow]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7697 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
v2.0.0_PR
2007-09-30 20:57:50 +00:00
Rick Olson
66d05f5e2c Add attr_readonly to specify columns that are skipped during a normal ActiveRecord #save operation. Closes #6896 [dcmanges]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7693 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-09-30 07:09:44 +00:00
Rick Olson
30a652ad41 Make size for has_many :through use counter cache if it exists. Closes #9734 [xaviershay]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7692 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-09-30 06:47:20 +00:00
Jeremy Kemper
e5a60fb2bf Don't implicitly assign instance variables by using them as block arguments
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7691 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-09-30 06:22:39 +00:00
Jeremy Kemper
c9bfd7d543 Remove DB2 adapter since IBM chooses to maintain their own adapter instead.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7690 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-09-29 23:20:36 +00:00
Jeremy Kemper
4158e54d75 Extract Oracle, SQLServer, and Sybase adapters into gems.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7689 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-09-29 23:18:38 +00:00
Jeremy Kemper
d41ea51d39 Ruby 1.9 compat for instance method check in Mysql adapter.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7688 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-09-29 23:18:24 +00:00
Jeremy Kemper
63eb9cae14 Ruby 1.9 compat for hash_ext_test
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7686 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-09-29 22:33:17 +00:00
David Heinemeier Hansson
f18356edb7 Updated CHANGELOGs. They need to be filtered for duplicates
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7685 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-09-29 22:18:26 +00:00
David Heinemeier Hansson
752721c072 Updated
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7684 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-09-29 22:13:10 +00:00
David Heinemeier Hansson
660c945f84 Updated
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7683 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-09-29 22:11:39 +00:00
Jeremy Kemper
6ea4dd4a65 Mark Test::Unit#assert_difference incompatibility with Ruby 2 due to Proc#binding usage
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7682 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-09-29 22:08:41 +00:00
David Heinemeier Hansson
8e067b0b44 Fixed that a response has to be available for that exact mime type for it to be called (otherwise 406 should occur)
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7681 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-09-29 21:56:21 +00:00
David Heinemeier Hansson
1b56d32893 Remind that you need a server restart for initializer defaults
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7680 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-09-29 21:47:38 +00:00
Jeremy Kemper
85a08bd99e Test::Unit#assert_difference Ruby 1.9 compat
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7679 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-09-29 21:29:34 +00:00
Jeremy Kemper
8f68804fba JSON decoding Ruby 1.9 compat. Mark a section that's unnecessarily slow.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7678 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-09-29 21:27:29 +00:00
David Heinemeier Hansson
826f0bd42f Fixed that strip_tags blows up with invalid html (closes #9730) [lifo]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7677 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-09-29 20:19:33 +00:00
Michael Koziarski
4953563e08 Ensure request is present, as well as defined. [nzkoz]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7676 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-09-29 02:19:16 +00:00
Jeremy Kemper
26174b2881 Failing counter cache test. References #6896.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7675 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-09-28 23:55:50 +00:00
David Heinemeier Hansson
191a0484f0 Missing test
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7674 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-09-28 21:11:14 +00:00
Michael Koziarski
9660360d6b Re-enable Routing optimisation code for _url methods, add defined?(request) to the guard conditions
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7673 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-09-28 20:57:39 +00:00
Rick Olson
8c33359ce8 Moved the SourceAnnotationExtractor to a separate file in case libraries try to load the rails rake tasks twice. rspec_on_rails, I'm looking at you. [Rick]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7672 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-09-28 17:02:40 +00:00
Rick Olson
82ff27766d Better error messages if you leave out the :secret option for request forgery protection. Closes #9670 [rick]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7671 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-09-28 16:50:48 +00:00
Michael Koziarski
c1bdf027d8 Add missing require
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7670 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-09-28 16:48:59 +00:00
Rick Olson
03f318718e [7668] part deux (forgot to add the railties love to the mix)
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7669 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-09-28 16:08:42 +00:00
Rick Olson
5edc81dcc2 Allow ability to disable request forgery protection, disable it in test mode by default. Closes #9693 [lifofifo]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7668 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-09-28 15:55:45 +00:00
Jeremy Kemper
b095ce63f2 Fixtures test fixes and general cleanup. Closes #9682 [norbert]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7667 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-09-28 14:56:07 +00:00