Commit Graph

5631 Commits

Author SHA1 Message Date
José Valim
69abbe8934 Avoid using Pathname on Resolver and AS::Dependencies. 2010-06-24 01:06:37 +02:00
Michael Lovitt
49f52c3d91 Sessions should not be created until written to and session data should be destroyed on reset.
[#4938]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
2010-06-23 11:56:35 -07:00
David Chelimsky
32b8be9533 Expose view via the view() method in AV::TestCase::Behavior
- was exposed as _view, which suggested it was private
- left _view as an alias of view as not to break any extensions that are
  relying on _view

[#4932 state:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
2010-06-23 17:45:48 +02:00
David Chelimsky
0e0df4b0c5 In ActionView::TestCase::Behavior, assign variables right before
rendering the view.

- Previously, _assigns were locked down the first time _view was
  referenced.

[#4931 state:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
2010-06-23 15:07:44 +02:00
Jeff Dean
ac8d3e3aca make text_field and hidden_field omit the value attribute if the developer explicitly passes in :value => nil [#4839 state:resolved]
Signed-off-by: Michael Koziarski <michael@koziarski.com>
2010-06-23 16:23:54 +12:00
knapo
995b1a243c Fix controller_name for non default controller paths [#4901 state:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-06-23 01:37:52 +02:00
José Valim
ed5c096d60 Tidy up asset tag a bit and make railties tests green again. 2010-06-23 01:34:25 +02:00
Josh Kalderimis
97b773303d refactored the javascript asset tag helpers and moved the default scripts setup within the railtie
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-06-23 01:02:59 +02:00
José Valim
a6eeb0865e Update CHANGELOG. 2010-06-23 00:52:20 +02:00
Carlos Antonio da Silva
9651ca751c Add the :path option to match routes when given as symbols. This is specially useful in http helpers for generating routes in scenarios like:
resources :users, :path => 'usuarios' do
    get :search, :on => :collection, :path => 'pesquisar'
  end

Signed-off-by: José Valim <jose.valim@gmail.com>
2010-06-23 00:49:15 +02:00
José Valim
61317b643a Provive resources_path_names helpers in the router. 2010-06-23 00:43:25 +02:00
José Valim
e5444f84df Stop filling the blocks scope array with nil. 2010-06-22 23:52:12 +02:00
Carlos Antonio da Silva
aacb83143f Allow namespace accept options in routes [#4936 state:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-06-22 23:37:49 +02:00
José Valim
fef5cf92ed Deprecate :name_prefix in the new router DSL. 2010-06-22 23:30:19 +02:00
Paco Guzman
ec37452f68 Remove unused variable on assert_recognizes [#4912 state:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-06-22 17:37:18 +02:00
David Chelimsky
f29fb0dd9e update the list of instance variables that are excluded from assigns in view tests
[#4930 state:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
2010-06-22 17:15:56 +02:00
RainerBlessing
70c932f794 adds minus to value part of id [#4862 state:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-06-22 15:10:56 +02:00
Neeraj Singh
dcfb9805f2 test for #4862
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-06-22 15:10:49 +02:00
David Chelimsky
0576ec4ddd Add support for specifying locals in view tests with assert template [#4927 state:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-06-22 14:51:22 +02:00
José Valim
02399a1184 Ensure overwritten callbacks conditions in controllers work [#4761 state:resolved] [#3913 state:resolved] 2010-06-22 07:57:45 +02:00
Jeremy Kemper
1b369be02f Bump rack-mount to 0.6.5 for tokenizer speedup 2010-06-21 18:28:00 -07:00
Josh Kalderimis
dad71c6099 removed 'unless const_defined?' code smell
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-06-21 23:34:45 +02:00
Xavier Noria
207fa59675 Merge remote branch 'rails/master'
Conflicts:
	actionpack/lib/abstract_controller/base.rb
2010-06-20 23:13:19 +02:00
Rizwan Reza
c20cfe477a Take out documentation from DeprecatedMapper to discourage its usage. 2010-06-21 01:02:25 +04:30
Rizwan Reza
3ec7b1cba3 Use h1 for titles. 2010-06-21 01:00:42 +04:30
Rizwan Reza
ab7830d66c Final touches and fixes. 2010-06-21 00:56:31 +04:30
Rizwan Reza
96b927d9db Action View is now titled. 2010-06-21 00:50:26 +04:30
Rizwan Reza
1a0dc267f1 Action View is now titled. 2010-06-21 00:50:08 +04:30
Paco Guzman
46dd8af179 Update integrated logging format 2010-06-20 19:36:46 +02:00
José Valim
772c2b0b86 Use the new ActiveSupport::FileUpdateChecker instead of RoutesReloader. 2010-06-20 13:37:58 +02:00
Thibaud Guillaume-Gentil
5522578d16 Fixed date_select date_separator when discard_month and/or discard_day are true [#4856 state:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-06-20 12:33:02 +02:00
Carlos Antonio da Silva
f9abbf9a4d Adding missing test to autolink with other protocols (file) [#4886 state:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-06-20 12:32:41 +02:00
Jan De Poorter
96f5e59a26 Make sure a namespaced <%= render form %> still renders the _form partial [#4784 state:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-06-20 00:58:10 +02:00
Tarsoly András
bb6cd6d3ec Use Rack::Utils.bytesize when calculating content-length of exception pages. [#4727 state:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-06-20 00:52:35 +02:00
rohit
95a8f252c0 remove executable permission from files that don't need it. [#4802 state:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-06-20 00:50:48 +02:00
David Chelimsky
86002a0dfe Support render_template in view tests. Useful for specifying which
partials are rendered under different conditions.

[#4903 state:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
2010-06-20 00:26:42 +02:00
Andrew White
1f84061c5c Don't use module to work out shallow name prefix and path as it may not accurately reflect the actual namespace [#4899 state:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-06-20 00:15:48 +02:00
Andrew White
ed3f042e99 Make polymorphic_url and scaffolding work with uncountable resources [#3930 state:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-06-20 00:15:41 +02:00
Andrew White
65ce3d1297 Accept an object for :constraints option [#4904 state:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-06-20 00:15:30 +02:00
José Valim
72725d7b7f Merge branch 'master' of github.com:rails/rails 2010-06-20 00:12:54 +02:00
José Valim
312f433241 Clear DescendantsTracker on each request. 2010-06-19 17:51:44 +02:00
Wincent Colaiuta
728b9eccad option_groups_from_collection_for_select should return HTML-safe string [#4879 state:resolved]
Signed-off-by: Xavier Noria <fxn@hashref.com>
2010-06-19 17:22:49 +02:00
wycats
f368b21cb6 Remove a relic of #request being in RackDelegation 2010-06-19 08:19:15 -07:00
José Valim
033e0a041f ActiveRecord and ActionPack now use the new descendants implementation. 2010-06-19 17:15:21 +02:00
Andrew White
bf59717b43 Custom resource routes should be scoped
[#3765]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
2010-06-19 00:15:06 -07:00
David Genord II
a186431414 form_for without :html and with :remote should not error
[#4902 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
2010-06-18 13:59:28 -07:00
Josh Kalderimis
9d3eeb9053 fix for :shallow in router not generating helpers for create, update, and destroy actions when :only or :except are used
[#4900 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
2010-06-18 13:59:14 -07:00
Jeremy Kemper
a55d83292f Credit for the heavy lifting! 2010-06-17 22:18:12 -07:00
Santiago Pastorino
84d387bc0f Make text_helpers methods which return valid html to return it as safe and sanitize the input always unless :sanitize => false is set
[#4825 state:committed]

Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
2010-06-17 13:34:10 -05:00
Andrew White
6db9558416 Add shallow routing option to new router [#3765 status:committed]
Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
2010-06-17 09:52:55 -05:00