Commit Graph

11243 Commits

Author SHA1 Message Date
Jeremy Kemper
428c0bd4ba Kill rake bundle 2009-10-15 00:29:21 -07:00
Jeremy Kemper
d5de94d6b7 Fix AM tests by configuring AV 2009-10-15 00:22:15 -07:00
Jeremy Kemper
deafa10e6c AP tests depend on AR 2009-10-15 00:22:15 -07:00
Michael Koziarski
b1201792a7 Make the erubis implementation easier for plugins to change. 2009-10-15 17:54:01 +13:00
Michael Koziarski
cc1ad46ead Add a read-only method which plugin authors can use to determine if xss escaping.
This doesn't provide a way to turn off the escaping, but alternative template engine authors
can figure out what their default should be by calling this.  Avoids a messy version + plugin check.
2009-10-15 17:22:50 +13:00
Jeremy Kemper
4484f0bccf Don't push siblings on load path if using bundled env 2009-10-14 20:59:45 -07:00
Jeremy Kemper
5b8e6279ac AV expects options[:locals] to be a Hash 2009-10-14 20:59:33 -07:00
Jeremy Kemper
e19ab99134 CI bundles Active Record dependencies before running (pulls in Arel) 2009-10-14 19:36:55 -07:00
Jeremy Kemper
c09a5ffea7 Merge branch 'arel' 2009-10-14 19:32:09 -07:00
Jeremy Kemper
6eee1dd62c Clarify AR dependency 2009-10-14 19:31:29 -07:00
Jeremy Kemper
6be5f45019 Fix env path 2009-10-14 19:30:06 -07:00
Jeremy Kemper
9c52f96acb Include bundled env in toplevel require, if present 2009-10-14 19:15:33 -07:00
Jeremy Kemper
df55781458 No more toplevel arel sibling 2009-10-14 19:05:06 -07:00
Jeremy Kemper
a9f9ae385e Explicitly require logger 2009-10-14 18:03:07 -07:00
Joshua Peek
bc1a18d7bd Punt on ConcurrentHash [#3322 state:resolved] 2009-10-14 19:53:52 -05:00
Joshua Peek
8cbf825425 Rename Orchestra to Notifications [#3321 state:resolved] 2009-10-14 19:50:36 -05:00
Jeremy Kemper
5ad0e315e4 Merge branch 'master' into arel 2009-10-14 17:24:17 -07:00
Jeremy Kemper
4cbd3f050b Move from git submodule to gem bundle 2009-10-14 17:19:24 -07:00
Carl Lerche
bf9819f73d Have Rails.root be based off of config.ru 2009-10-14 16:40:25 -07:00
Jeremy Kemper
00eb09e016 Revert "Get AS TestCase off deprecated callbacks"
This reverts commit 29b280666b.
2009-10-14 16:12:57 -07:00
Jeremy Kemper
efdc062454 Revert "Rewrite AS::TestCase setup/teardown as a single callback chain"
This reverts commit 610e94c097.
2009-10-14 16:12:57 -07:00
Michael Koziarski
d5d242660c Avoid warning spam by flipping to the new callbacks mechanism. These callbacks are actually never called by rails itself, merely there for plugins 2009-10-15 11:21:53 +13:00
George Ogata
3de8b44b26 Make IntegrationTest::Runner propagate method_missing to ancestors.
Fixes RSpec integration example groups, which mixes its Matchers
module into ActiveSupport::TestCase.

Signed-off-by: Michael Koziarski <michael@koziarski.com>
2009-10-15 11:01:42 +13:00
Craig Smith
316f4704ea Test cases should see all the cookies, not just cookies that have been set in the controller.
Previously this example would always pass, even when cookies.delete was not called.

@request.cookies['foo'] = 'bar'
get :delete_cookie
assert_nil cookies['foo']

Signed-off-by: Michael Koziarski <michael@koziarski.com>
[#2768 state:committed]
2009-10-15 10:58:55 +13:00
Jacob Lauemoeller
fc46c9b220 Added CDATA support to the XmlMini LibXML engine, adjusted whitespace handling to closer match that of the REXML engine, and added a LibXML engine test
Signed-off-by: Michael Koziarski <michael@koziarski.com>
2009-10-15 10:54:30 +13:00
Jeremy Kemper
3fa7e2fc98 Revert "Missing requires"
These rely on constant autoloads.

This reverts commit d39f397dc6.
2009-10-14 14:48:43 -07:00
Jeremy Kemper
3e62503903 Fix tests 2009-10-14 14:47:11 -07:00
Michael Koziarski
d39f397dc6 Missing requires 2009-10-15 10:42:18 +13:00
pivotal
945d999aad Digest auth option for ActiveResource.
Signed-off-by: Michael Koziarski <michael@koziarski.com>
2009-10-15 10:37:04 +13:00
Michael Koziarski
1d01bad3ce Make sure non-escaped urls aren't considered safe 2009-10-15 09:58:35 +13:00
Michael Koziarski
5d5e34fa52 Use ERB::Util.h over CGI.escapeHTML as the former is safety aware and the latter isn't 2009-10-15 09:58:17 +13:00
Phil Darnowsky
1b3195b63c ActionView.url_for doesn't escape by default
ActionView::Helpers::UrlHelper#url_for used to escape the URLs it generated by
default.  This was most commonly seen when generating a path with multiple
query parameters, e.g.

  url_for(:controller => :foo, :action => :bar, :this => 123, :that => 456)

would return

  http://example.com/foo/bar?that=456&amp;this=123

escaping an ampersand that shouldn't be escaped.  This is both wrong and
inconsistent with the behavior of ActionController#url_for, and is changed.

Signed-off-by: Michael Koziarski <michael@koziarski.com>
2009-10-15 09:49:07 +13:00
Yehuda Katz
a41c6c35ca Start adding configuration to ActionView instead of using constants.
By using config rather than hardcoded constants, we can evolve the
  configuration system over time (we'd just need to update the config
  method with more robust capabilities and all consumers would get
  the capabilities with no code changes)
2009-10-14 13:36:41 -07:00
Jeffrey Hardy
a8dc9fd27b CookieJar#delete should return the key's value, consistent with a Hash
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
2009-10-14 11:50:51 -07:00
Carl Lerche
ff8be66f24 Finish porting over the initializers to the app object and fix all the tests 2009-10-14 11:47:37 -07:00
Yehuda Katz + Carl Lerche
5ffb877d3a Add Gemfile to the rails application generator 2009-10-14 11:18:45 -07:00
Yehuda Katz + Carl Lerche
d56984c016 Make rails configuration's path object's root lazy 2009-10-14 11:18:45 -07:00
Emilio Tagua
5da109d105 Merge commit 'rails/master' 2009-10-14 09:50:23 -03:00
Joshua Peek
7ec947d59c Refactor AS concern to avoid hacking the "include" method.
Ruby Magic!
2009-10-13 23:32:32 -05:00
Joshua Peek
7b169ed1bb Extend Callbacks and Rescuable with AS concern 2009-10-13 23:30:06 -05:00
Emilio Tagua
06ad817f92 Use ActiveSupport::Callbacks instead of
ActiveSupport::DeprecatedCallbacks.
2009-10-13 15:15:00 -03:00
Emilio Tagua
991d1bc200 Merge commit 'rails/master' 2009-10-13 15:06:43 -03:00
Yehuda Katz
9cd50e7752 Make logger work again (h/t Sam Ruby) 2009-10-13 10:43:28 -07:00
Joshua Peek
610e94c097 Rewrite AS::TestCase setup/teardown as a single callback chain 2009-10-12 23:23:02 -05:00
Joshua Peek
29b280666b Get AS TestCase off deprecated callbacks 2009-10-12 23:03:02 -05:00
Joshua Peek
4552dabba7 Add erubis gem to ci 2009-10-12 22:23:29 -05:00
Joshua Peek
eff61fcfa8 Insert a deprecation warn notice when using AS::DeprecatedCallbacks.
We are still using DeprecatedCallbacks in AS and AR. This is meant to annoy the
shit out of Rails core until we fix it.
2009-10-12 22:18:41 -05:00
Joshua Peek
21e7b84621 Callbacks, DeprecatedCallbacks = NewCallbacks, Callbacks 2009-10-12 22:15:43 -05:00
Joshua Peek
9bc8defe38 Use "run_callbacks :foo" since it is the public api for callbacks [#3329
state:resolved]
2009-10-12 21:58:49 -05:00
Joshua Peek
2a5c92c101 Kill unused SafelyMemoizable [#3323 state:resolved] 2009-10-12 21:44:30 -05:00