Commit Graph

10316 Commits

Author SHA1 Message Date
Jeremy Kemper
706f313231 Use Array.wrap 2009-04-26 20:24:45 -07:00
Jeremy Kemper
f58c322e7e Use __send__ for BasicObject friendliness 2009-04-26 20:05:17 -07:00
Jeremy Kemper
ee46ffedb8 Now that we have a separate internal rails_to_json, use a separate circular reference stack instead of sticking it in the options hash 2009-04-26 20:04:47 -07:00
Jeremy Kemper
678385d307 Use javascript_object_for 2009-04-26 19:59:22 -07:00
Jeremy Kemper
5cef0cbad2 Check for to_str rather than String 2009-04-26 19:08:04 -07:00
Jeremy Kemper
f5b4a9d02b Array splitting strings on newlines is deprecated 2009-04-26 18:27:41 -07:00
Jeremy Kemper
1850aea7fc Not sure why Request#session is missing 2009-04-26 18:26:06 -07:00
Jeremy Kemper
f7d7dc5aa8 Use session= writer methods 2009-04-26 17:19:14 -07:00
Jeremy Kemper
8aaed3d456 Convert encoding before escaping 2009-04-26 16:21:57 -07:00
Stephen Bannasch
1d71a34afa add JRuby-JDOM backend for XmlMini
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
2009-04-26 16:13:55 -07:00
Jeremy Kemper
3f63202781 Don't assume :params is a Hash 2009-04-26 16:04:29 -07:00
Jeremy Kemper
c9d9bd7227 Check for to_str rather than String 2009-04-26 16:04:11 -07:00
Jeremy Kemper
ea712364e2 Don't undefine object_id 2009-04-26 15:56:08 -07:00
Jeremy Kemper
3bd32754e2 Privatize rails_to_json 2009-04-26 15:54:28 -07:00
Jeremy Kemper
4a8d2ef0a5 Extract json string escaping 2009-04-26 15:53:59 -07:00
Jeremy Kemper
5577d561f9 Merge branch 'master' of git@github.com:rails/rails 2009-04-26 15:18:51 -07:00
Jeremy Kemper
8d64085138 Only Object to_json alias is needed. Prefer nil options. 2009-04-26 15:18:33 -07:00
Jeremy Kemper
be7e21a85c Qualify toplevel constant references since we're in a BasicObject 2009-04-26 15:05:50 -07:00
Jeremy Kemper
da3a80dd4f Track object ids so the objects needn't respond to == 2009-04-26 15:04:02 -07:00
Joshua Peek
0494909679 Inherit TestSession from Session::AbstractStore and add indifferent access to Session::AbstractStore. 2009-04-26 14:33:57 -05:00
Joshua Peek
c8919f4c7c Require an ActionDispatch::Request to use response assertions 2009-04-26 11:52:45 -05:00
Joshua Peek
6940c0de12 Unify functional and integration tests cookie helpers 2009-04-26 11:37:11 -05:00
Hongli Lai (Phusion)
3cb97aeea8 Fix environment variable testing code in failsafe.rb.
Signed-off-by: Joshua Peek <josh@joshpeek.com>
2009-04-26 11:23:10 -05:00
Hongli Lai (Phusion)
cd9bb88eef Remove reference to Rack::RewindableInput, which has been removed a while ago.
Signed-off-by: Joshua Peek <josh@joshpeek.com>
2009-04-26 11:22:03 -05:00
Joshua Peek
82bc768dad Fix typo in stale session check [#2404 state:resolved] 2009-04-26 11:19:42 -05:00
Joshua Peek
5ea8d40156 Deprecate response.redirect_url_match?, use assert_match instead. 2009-04-26 11:16:14 -05:00
Joshua Peek
5352a2417b Move useful response test helpers into request 2009-04-26 11:12:33 -05:00
Joshua Peek
dbbe2e74ff Create a new file for response tests 2009-04-26 10:26:53 -05:00
Yehuda Katz
d0ace15c01 Updated for Rack 1.0 2009-04-25 12:33:14 -07:00
Joshua Peek
4f412a10b6 Remove RewindableInput middleware since all input MUST be rewindable according to a recent change in the Rack 1.0 SPEC 2009-04-25 14:04:03 -05:00
Joshua Peek
b69da86ea5 Remove vendored version of Rack 2009-04-25 13:56:37 -05:00
Joshua Peek
044794fc9e Remove pending rack specifications until they are official 2009-04-25 13:41:30 -05:00
Jeremy Kemper
dc2caea9dc test uses Pathname 2009-04-24 23:17:15 -07:00
Joshua Peek
dd2ed32418 Start to integrate some of the features in Rack::Test.
Eventually commit ActionDispatch::Test::MockRequest and ActionDispatch::Test:: UploadedFile upstream.
2009-04-24 20:24:54 -05:00
Jeremy Kemper
cbcc0ca57b Use Symbol#to_proc in rails plugin internals 2009-04-24 10:41:45 -07:00
Emilio Tagua
a841cd2503 Fix models load order to be able to run unit tests.
[#2550 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
2009-04-23 16:02:11 -07:00
rick
3c4c6bd0df * Add pluggable JSON backends with support for the JSON gem. [rick]
Example: ActiveSupport::JSON.backend = "JSONGem"

  All internal Rails JSON encoding is now handled by ActiveSupport::JSON.encode().  Use of #to_json is not recommended, as it may clash with other libraries that overwrite it.  However, you can recover Rails specific functionality
  if you really want to use #to_json.

    gem 'json'
    ActiveSupport::JSON.backend = "JSONGem"

    class ActiveRecord::Base
      alias to_json rails_to_json
    end
2009-04-23 00:08:40 -07:00
Jeremy Kemper
bab2bfa692 Removed rest of Symbol#to_proc from railties tests 2009-04-22 19:52:28 -07:00
Jeremy Kemper
236169e85e Missed one 2009-04-22 19:50:24 -07:00
Jeremy Kemper
d23ab4fbb6 Remove Symbol#to_proc dependency 2009-04-22 19:35:58 -07:00
Jeremy Kemper
85b1a55f6d Merge branch 'master' of git@github.com:rails/rails 2009-04-22 18:54:55 -07:00
Jeremy Kemper
f28bd9557c Fix dependencies revealed by testing in isolation 2009-04-22 18:54:13 -07:00
Yehuda Katz + Carl Lerche
0a132c2fe1 Refactor ActionView::Path
* Decouple from ActionController and ActionMailer
  * Bring back localization support.
  * Prepare to decouple templates from the filesystem.
  * Prepare to decouple localization from ActionView
  * Fix ActionMailer to take advantage of ActionView::Path
2009-04-22 17:24:41 -07:00
Jeremy Kemper
5c4ba6e3fc new_callbacks core extensions 2009-04-22 17:17:31 -07:00
Jeremy Kemper
b2d6fdae35 Fix tests on 1.9 2009-04-22 17:07:04 -07:00
Jeremy Kemper
7f6779c1d5 Merge branch 'master' into cherry
Conflicts:
	activesupport/lib/active_support.rb
2009-04-22 16:53:58 -07:00
Jeremy Kemper
6fee981fa4 Opt in to JSON 2009-04-22 16:48:58 -07:00
Jeremy Kemper
f5d720fb96 Opt in to Dependencies 2009-04-22 16:42:14 -07:00
Jeremy Kemper
ab321268f8 No more free lunch 2009-04-22 16:10:49 -07:00
Jeremy Kemper
42a06d2d62 stdlib autoloads were hanging on 1.9.1 2009-04-22 09:10:48 -07:00