github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity
9,781 Commits 34 Branches 105 Tags
f503a5dc97d18794cc0eda5ffe77e2cd7d762d47
Commit Graph

688 Commits

Author SHA1 Message Date
Andy Stewart
5e190ef138 Truncate helper accepts a :separator for a more legible result [#1807 state:resolved] 
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
 2009-05-18 20:46:19 +02:00
Travis Briggs
98eaa2c683 Ensure number_to_human_size does not strip zeros from the end [#1763 state:resolved] 
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
 2009-05-17 19:02:50 +02:00
Lance Ivy
11bac70078 Ensure auto_link does not ignore multiple trailing punctuations [#2504 state:resolved] 
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
 2009-05-17 18:56:06 +02:00
José Valim
eb021707f5 Allow strings to be sent as collection to select. 
Signed-off-by: Michael Koziarski <michael@koziarski.com>
 2009-05-15 15:30:17 +12:00
Yehuda Katz + Carl Lerche
00a9d4b91c Merge branch 'master' into wip_abstract_controller 
Conflicts:
	actionpack/lib/action_controller/abstract/callbacks.rb
	actionpack/lib/action_controller/abstract/renderer.rb
	actionpack/lib/action_controller/base/base.rb
	actionpack/lib/action_controller/dispatch/dispatcher.rb
	actionpack/lib/action_controller/routing/route_set.rb
	actionpack/lib/action_controller/testing/process.rb
	actionpack/test/abstract_controller/layouts_test.rb
	actionpack/test/controller/filters_test.rb
	actionpack/test/controller/helper_test.rb
	actionpack/test/controller/render_test.rb
	actionpack/test/new_base/test_helper.rb
 2009-05-11 17:07:05 -07:00
Joshua Peek
a8b75c480f Functional test runner finalizes response just like the integration test runner. In both runners, the @response object will now behave the same. 
Some functional tests will need to be updated if they are relying on preprocessed data on the response.
 2009-05-02 14:57:40 -05:00
Joshua Peek
c0a372ba87 Deprecate template, session, assigns, and layout accessors on response object. Instead access them through the controller instance. This mainly affects functional test assertions. 2009-04-28 23:29:46 -05:00
Yehuda Katz + Carl Lerche
cecafc52ee Refactor ActionView::Template 
ActionView::Template is now completely independent from template
  storage, which allows different back ends such as the database.
  ActionView::Template's only responsibility is to take in the
  template source (passed in from ActionView::Path), compile it,
  and render it.
 2009-04-27 11:49: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
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
Carl Lerche & Yehuda Katz
3c1187699a Makes rails-dev-boost work again 2009-04-14 18:32:31 -07:00
Carl Lerche & Yehuda Katz
906aebceed Bring abstract_controller up to date with rails/master 
Resolved all the conflicts since 2.3.0 -> HEAD. Following is a list
of commits that could not be applied cleanly or are obviated with the
abstract_controller refactor. They all need to be revisited to ensure
that fixes made in 2.3 do not reappear in 3.0:

2259ecf368
AR not available
  * This will be reimplemented with ActionORM or equivalent

06182ea02e
implicitly rendering a js response should not use the default layout
[#1844 state:resolved]
  * This will be handled generically

893e9eb995
Improve view rendering performance in development mode and reinstate
template recompiling in production [#1909 state:resolved]
  * We will need to reimplement rails-dev-boost on top of the refactor;
    the changes here are very implementation specific and cannot be
    cleanly applied. The following commits are implicated:

      199e750d46
      3942cb406e
      f8ea9f85d4
      e3b166aab3
      ae9f258e03
      44423126c6

0cb020b4d6
workaround for picking layouts based on wrong view_paths
[#1974 state:resolved]
  * The specifics of this commit no longer apply. Since it is a two-line
    commit, we will reimplement this change.

8c5cc66a83
make action_controller/layouts pick templates from the current instance's
view_paths instead of the class view_paths [#1974 state:resolved]
  * This does not apply at all. It should be trivial to apply the feature
    to the reimplemented ActionController::Base.

87e8b16246
fix HTML fallback for explicit templates [#2052 state:resolved]
  * There were a number of patches related to this that simply compounded
    each other. Basically none of them apply cleanly, and the underlying
    issue needs to be revisited. After discussing the underlying problem
    with Koz, we will defer these fixes for further discussion.
 2009-04-13 15:18:45 -07:00
Yehuda Katz and Carl Lerche
6c05b5e938 Temporarily modifies setup to call super directly. This can support more T::U runners. 2009-04-08 17:33:41 -07:00
José Valim
1ab7c37671 Object names with underscore do the wrong lookup in I18n on error_messages_for. 
Signed-off-by: Michael Koziarski <michael@koziarski.com>
[#2390 state:committed]
 2009-04-05 21:08:14 +12:00
Cezary Baginski
44423126c6 Additional template render test for backup files [#2367 state:resolved] 
Signed-off-by: Joshua Peek <josh@joshpeek.com>
 2009-04-02 11:58:29 -05:00
thedarkone
ae9f258e03 Fix template extension parsing. [#2315 state:resolved] [#2284 state:resolved] 
Signed-off-by: Joshua Peek <josh@joshpeek.com>
 2009-03-24 10:54:18 -05:00
Jeremy Kemper
0d5b50ee3a pluginize concurrent block body part 2009-03-19 03:31:55 -07:00
Jeremy Kemper
70e3dfb2e9 Pare down unit test 2009-03-16 12:09:34 -07:00
Jeremy Kemper
4a7b11d5d8 Less ceremony 2009-03-13 18:49:53 -07:00
Jeremy Kemper
2f998fc81f Extract output buffer test 2009-03-13 03:23:13 -07:00
Jeremy Kemper
b2f98c13a3 Simplify parts and tests 2009-03-13 03:16:14 -07:00
Jeremy Kemper
d54d97b07c Fix tests 2009-03-13 03:01:47 -07:00
Jeremy Kemper
5d76dee329 Example using an edge side include body part to fetch queued rendering results 2009-03-13 02:55:24 -07:00
Jeremy Kemper
7c1714cbd0 Body parts: future rendering, threaded future, queued future, open-uri example 2009-03-13 02:36:15 -07:00
Jeremy Kemper
3d260760f0 Introduce flush_output_buffer to append the buffer to the response body then start a new buffer. Useful for pushing custom parts to the response body without disrupting template rendering. 2009-03-13 00:25:05 -07:00
Eugene Pimenov
bdfa733d04 Ensure auto_link doesnt linkify URLs in the middle of a tag [#1523 state:resolved] 
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
 2009-03-10 16:52:21 +00:00
rpheath
1ab2ff58ed Fixed number_to_phone to work with 7 digit numbers [#2176 state:resolved] 
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
 2009-03-09 12:53:44 +00:00
Jeremy Kemper
1c36172c13 Ruby 1.9 compat: rename deprecated assert_raises to assert_raise. 
[#1617 state:resolved]
 2009-03-08 13:11:58 -07:00
Yury Kotlyarov
9b8cde41bc Remove duplicate test [#2136 state:resolved] 
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
 2009-03-08 15:50:38 +00:00
Joshua Peek
ea8488caef Fixed simplified render with nested models [#2042 state:resolved] 2009-03-07 14:05:18 -06:00
Lawrence Pit
77f7d98e38 submit_tag with confirmation and disable_with [#660 state:resolved] 
Signed-off-by: Joshua Peek <josh@joshpeek.com>
 2009-03-07 13:29:35 -06:00
Dan Barry
45494580d9 Ensure Active Record error related view helpers escape the message [#1280 state:resolved] [Inge Jørgensen, Dan Barry] 
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
 2009-03-07 18:55:19 +00:00
Mike Gunderloy
dcd9c7f58e Fix spelling in test name. 
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
 2009-02-28 15:35:03 +00:00
Eloy Duran
3d1d422b8b Pass a custom form builder on to nested fields_for calls. [#2023 status:committed] 
Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
 2009-02-27 13:56:27 +01:00
thedarkone
85df4841dd Template without a known template handler should only be reachable through its exact path. [#2027 state:resolved] 
Signed-off-by: Joshua Peek <josh@joshpeek.com>
 2009-02-24 10:41:45 -06:00
Joshua Peek
f8ea9f85d4 Fix templates reloading in development when using custom view path [#2012 state:resolved] 2009-02-19 20:55:56 -06:00
Tekin Suleyman
1525f3816e Enhanced form option helpers to add support for disabled option tags and use of anonymous functions for specifying selected and disabled values from collections. 
Signed-off-by: Michael Koziarski <michael@koziarski.com>
 2009-02-14 14:51:35 +13:00
Tekin Suleyman
d206b80a36 DRY up form option helper tests 
Signed-off-by: Michael Koziarski <michael@koziarski.com>
 2009-02-14 14:51:35 +13:00
Sam Oliver
f04346d8b9 Stops date select helpers from defaulting the selected date to today if :prompt option has been used 
Signed-off-by: Michael Koziarski <michael@koziarski.com>
[#561 state:resolved]
 2009-02-13 22:04:27 +13:00
Lance Ivy
5dbc9d40a4 Changed API of NestedAttributes to take an array, or hash with index keys, of hashes that have the id on the inside of the attributes hash and updated the FormBuilder to produce such hashes. Also fixed NestedAttributes with composite ids. 
Signed-off-by: Michael Koziarski <michael@koziarski.com>
Signed-off-by: Eloy Duran <eloy.de.enige@gmail.com>
[#1892 state:committed]
 2009-02-13 21:47:56 +13:00
thedarkone
3942cb406e Port fast reloadable templates from rails-dev-boost. 2009-02-12 13:04:12 -06:00
Joshua Peek
f400209084 Move checkbox hidden field before the actual checkbox so the actual value doesn't get clobbered [#1863 state:resolved] 2009-02-10 13:10:46 -06:00
Andrew White
199e750d46 Fix some edge cases when the same template is called with different local assigns 
Signed-off-by: Joshua Peek <josh@joshpeek.com>
 2009-02-10 12:09:49 -06:00
David Heinemeier Hansson
7527cdf79c Added partial scoping to TranslationHelper#translate, so if you call translate('.foo') from the people/index.html.erb template, you'll actually be calling I18n.translate(people.index.foo) [DHH] 2009-02-10 12:57:12 +01:00
Andrew White
893e9eb995 Improve view rendering performance in development mode and reinstate template recompiling in production [#1909 state:resolved] 
Signed-off-by: Joshua Peek <josh@joshpeek.com>
 2009-02-09 14:20:30 -06:00
José Valim
50f51ff950 Render implicit html template when xhr request now supports localization [#1886 state:resolved] 
Signed-off-by: Joshua Peek <josh@joshpeek.com>
 2009-02-07 11:37:02 -06:00
José Valim
24f2e676f7 Added support to dashed locales in templates localization [#1888 state:resolved] 
Signed-off-by: Joshua Peek <josh@joshpeek.com>
 2009-02-06 23:23:50 -06:00
Eugene Pimenov
b1c1e3deb7 Ruby 1.9 compat: change encoding of action_view/renderable to utf-8, so erb templates can use utf-8 properly 
[#1881 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
 2009-02-06 11:03:41 -08:00
Pascal Ehlert
d15d53cf81 Allowing an object to be passed explicitly to a fields_for with nested_attributes on one-to-one associations 
Signed-off-by: Michael Koziarski <michael@koziarski.com>
[#1849 state:committed]
 2009-02-06 13:26:58 +13:00
David Heinemeier Hansson
6db78e8c02 Added tests from Andrew Whites fix [#1385 state:committed] 2009-02-05 20:37:57 +01:00