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
10,490 Commits 34 Branches 105 Tags
0fbeaa98e4e60ca0949be298dae8545807407e1d
Commit Graph

10490 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bas Van Klinkenberg
0fbeaa98e4 Fixed a bug in JSON decoding with Yaml backend, where a combination of dates, escaped or unicode encoded data and arrays would make the parser fail with a ParseError exception. [#2831 state:resolved] 
Signed-off-by: Yehuda Katz <wycats@gmail.com>
 2009-08-08 12:44:41 -03:00
Yehuda Katz
d0301e13f4 First pass at making partial rendering an Object. More cleanup to come. 2009-08-08 12:44:26 -03:00
Steve St. Martin
a8645593a4 remove duplicate call to stringify_keys [#2587 status:resolved] 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2009-08-08 13:56:41 +02:00
Wolfram Arnold
73f2d37505 Add test to verify that the new :inverse_of association option will indeed fix the validation problem for a belongs_to relationship that validates_presence_of the parent, when both the parent and the child are new (in-memory) records. Also check that this works when the parents adds child via nested_attributes_for. 
Lastly, add a require 'models/pet' to association_validation_test.rb, so that test can be run independently (was failing due to that missing dependency). [#2815 status:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
 2009-08-08 13:07:49 +02:00
Eric Davis
fbe6c3c195 Adds a :file delivery_method to save email to a file on disk 
Signed-off-by: Michael Koziarski <michael@koziarski.com>
[#2438 state:committed]
 2009-08-08 16:32:17 +12:00
Josh Sharpe
54e7f5ba43 Tidy up the AR tests, removing duplicates and making tests clearer / more focussed. 
Signed-off-by: Michael Koziarski <michael@koziarski.com>

[#2774 state:committed]
 2009-08-08 14:53:35 +12:00
Mike Breen
e8dc151396 Add option to routes task to target a specific controller with CONTROLLER=x. 
Signed-off-by: Michael Koziarski <michael@koziarski.com>
[#2928 state:committed]
 2009-08-08 14:38:33 +12:00
Matt Duncan
5fdc33c1a3 Default sent_on time to now in ActionMailer 
Signed-off-by: Michael Koziarski <michael@koziarski.com>
[#2607 state:committed]
 2009-08-08 14:11:32 +12:00
wmoxam
98450fd168 Fix number_to_precision rounding error [#2071 state:resolved] 
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
 2009-08-08 02:05:10 +01:00
Jeremy Kemper
43b406bdb0 Ruby 1.9 compat: fix route recognition encoding test 2009-08-07 17:16:34 -07:00
Jeremy Kemper
12c271d1d2 Ruby 1.9.2: implicit argument passing of super from method defined by define_method() is not supported 2009-08-07 17:04:56 -07:00
Jeremy Kemper
019ed5a7c0 Don't rely on T::U::TestCase#name 2009-08-07 17:04:19 -07:00
Jeremy Kemper
482a6f716f Ruby 1.9.2: Object#id is gone now 2009-08-07 16:41:04 -07:00
Brendan Schwartz
201387496e Ruby 1.9 compat: fix for SSL in Active Resource 
[#1272 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
 2009-08-07 12:24:02 -07:00
Jeremy Kemper
06afa48c8c Merge branch 'oracle_enhanced' 2009-08-07 11:58:45 -07:00
Yehuda Katz
010a0c92eb Rename find_by_parts and find_by_parts? to find and exists? 2009-08-07 15:00:12 -03:00
José Valim
55575e2165 Allow rails templates relative to the current path to be given. 2009-08-07 17:17:51 +02:00
José Valim
aed135d3e2 Renamed presenter to renderer, added some documentation and defined its API. 2009-08-07 17:17:51 +02:00
José Valim
1fd65c80fc Encapsulate respond_with behavior in a presenter. 2009-08-07 17:16:16 +02:00
José Valim
7034272354 Add destroyed? to ActiveRecord, include tests for polymorphic urls for destroyed objects and refactor mime responds tests and documentation. 2009-08-07 17:16:16 +02:00
José Valim
f59984cc81 Add nagivational behavior to respond_with. 2009-08-07 17:16:15 +02:00
José Valim
c44f7e39f4 Updated vendored thor to 0.11.5 2009-08-07 17:16:15 +02:00
José Valim
e45e120af9 Merge branch 'master' of git://github.com/rails/rails into old 2009-08-07 17:13:44 +02:00
Yehuda Katz
bfe58ac05d Get all ActionController partial rendering to use ActionView's partial code. Consequences: 
* It is not possible to always pre-determine the layout before going to ActionView.
    This was *already* broken for render :partial => @object, :layout => true. This is
    now handled by overriding render_to_body in layouts.rb and manually injecting the
    partial's response. This needs to be done in ActionController since ActionController
    knows enough to get _layout_for_option. There is probably a better abstraction here.
  * As a result, all partial rendering can correctly restrict their layouts to the mime
    type of the rendered partial. This could have previously caused a bug in some edge cases.
  * If other layout-like options are added, they might need to add special code for the
    case of render :partial. We should try to think of an alternate solution, if possible,
    but this works for the cases we know of now.
 2009-08-07 11:33:54 -03:00
José Valim
dac8927b05 Merge branch 'master' of git://github.com/rails/rails into old 2009-08-07 16:10:17 +02:00
Yehuda Katz
606e950ccb Whitespace 2009-08-07 06:32:54 -03:00
Yehuda Katz
d94ba11295 Continue reworking the partial path. 
* TODO: Review ActionController calling render_template for certain partials.
    Might we be able to save logic by always delegating to AV's render_partial?
 2009-08-07 06:32:17 -03:00
Yehuda Katz
493d84ce2f Modify various partial methods to carry along the block that can be passed in with render 
* _render_single_template, which renders a template without layout
  * _render_partial_unknown_type, which renders a partial of unknown type
    (the entry method for most partial rendering; supports strings, objects, and collections)
  * _render_partial_object, which renders a partial for a single object.
  * extracted _render_partial_path so it can be used to render the spacer without going
    through the public render :partial
 2009-08-07 05:40:01 -03:00
Yehuda Katz
59e475e3a6 Some more AV work: 
* rename _render_partial to _render_partial_unknown_type to reflect that for this call, 
  	we don't know the type.
  * Merge _render_partial_with_block and _render_partial_with_layout to _render_partial
    * TODO: Check to see if any more logic can be shared
    * TODO: See about streamlining block path so we can get rid of @_proc_for_layout
  * Remove @exempt_from_layout as it is no longer needed
 2009-08-07 03:48:28 -03:00
Yehuda Katz
0612fd0f09 Replace _render_template_with_layout with _render_template since the layout is optional 2009-08-07 03:18:45 -03:00
Yehuda Katz
b3e199f698 Some more AV refactoring: 
* remove no longer used _array_like_objects
  * _render_content_with_layout renamed to _render_content since layout it optional
  * remove check for optional layout before _render_content
 2009-08-07 02:46:21 -03:00
Yehuda Katz
8534c5bf19 Start cleaning up partial path 2009-08-07 01:51:50 -03:00
Yehuda Katz
9b506484f1 This is handled by the resolver now 2009-08-07 01:51:32 -03:00
Yehuda Katz
70a440aa27 Clean up render @object a bit more. 2009-08-07 00:52:13 -03:00
Yehuda Katz
4ac9d391d3 Improve a path in _render_partial 2009-08-06 23:42:11 -03:00
Yehuda Katz
0435178ff8 Remove file that doesn't seem to be used anymore 2009-08-06 22:57:42 -03:00
Yehuda Katz
71638e6760 Move AbstractController to a top-level component 2009-08-06 22:51:24 -03:00
Yehuda Katz
16c01224cb ActionController::Metal#to_rack converted to #to_a to match normal rack convention 2009-08-06 20:05:14 -03:00
Yehuda Katz
70d779aaea Update _render_options to reflect the fact that they're public 2009-08-06 20:03:59 -03:00
Yehuda Katz
bd6b61be88 Rename /base to /metal and make base.rb and metal.rb top-level to reflect their module locations 2009-08-06 19:52:11 -03:00
Yehuda Katz
52798fd479 rename ActionController::Http to ActionController::Metal at Josh's suggestion 2009-08-06 19:50:22 -03:00
Yehuda Katz
af375a5eb3 Replace _action_view with view_context to reflect that it is public and that it does not need to be an ActionView instance 2009-08-06 19:45:40 -03:00
Yehuda Katz
f0945409d9 replace _render_*_from_controller with render_* as they are intended to be public 2009-08-06 19:43:28 -03:00
Raimonds Simanovskis
5f0c425e8d Some databases (e.g. Oracle) does not allow "AS" between table name and table alias name, for others it is optional 2009-08-06 23:41:00 +03:00
Raimonds Simanovskis
53be10c5e6 fixed test_foreign_key_violations_are_translated_to_specific_exception to work with Oracle 2009-08-06 23:41:00 +03:00
Raimonds Simanovskis
44a7ef85eb modifications to Oracle connection.rb setup 2009-08-06 23:41:00 +03:00
Raimonds Simanovskis
9b2309c4a8 fix schema_dumper_test for Oracle as it supports precision up to 38 2009-08-06 23:41:00 +03:00
Raimonds Simanovskis
94e761551b changed default connection to localhost orcl database 2009-08-06 23:41:00 +03:00
Raimonds Simanovskis
8afab34a76 always sort lists by id before comparison to avoid errors because of different sorting of same results (on Oracle database) 2009-08-06 23:41:00 +03:00
Raimonds Simanovskis
8f34c96614 support for assert_queries when using Oracle adapter 
initialize $KCODE to UTF8 when JRuby is used
 2009-08-06 23:41:00 +03:00