José Valim
c07746cbdf
Merge branch 'master' of git://github.com/rails/rails
2009-07-08 12:53:13 +02:00
Lawrence Pit
579250ea46
Use the i18n gem if present instead of vendor code. [ #2871 state:resolved]
...
Signed-off-by: Yehuda Katz <wycats@gmail.com >
2009-07-07 18:36:42 -07:00
Lawrence Pit
da635394c1
Ruby 1.9 style String interpolation support for lower ruby versions. Thanks to code from Masao Mutoh's GetText gem. [ #2870 state:resolved]
...
Signed-off-by: Yehuda Katz <wycats@yehuda-katzs-macbookpro41.local >
2009-07-07 16:21:57 -07:00
Yehuda Katz + Carl Lerche
61604feec0
Get Initializer tests running without requiring parts of Rails being loaded first
2009-07-06 12:25:34 -07:00
José Valim
dd7ee082be
Use active_support/mini since we just need inflections.
2009-07-06 18:38:27 +02:00
José Valim
3bf45890b3
Merge branch 'master' of git://github.com/rails/rails
2009-07-03 14:56:19 +02:00
Yehuda Katz + Carl Lerche
1d280e21a1
Adds support for def self.setup in isolation tests for setup that should be run only once in the parent
2009-07-02 16:03:41 -07:00
Brian Abreu
d036899717
Fixed ActiveSupport::OrderedHash::[] work identically to ::Hash::[] in ruby 1.8.7 [ #2832 state:resolved]
...
Signed-off-by: Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com >
2009-07-02 12:01:05 -07:00
Aaron Patterson
49bdbebca6
wycats forgot a +1, so I added it [ #2749 state:resolved]
...
Signed-off-by: Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com >
2009-07-02 11:39:06 -07:00
Levin Alexander
ab2d6abb55
make #inspect if zero length duration return '0 seconds' instead of empty string [ #2838 state:resolved]
...
Signed-off-by: Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com >
2009-07-02 11:22:25 -07:00
José Valim
1c265da1db
Merge branch 'master' of git://github.com/rails/rails
2009-07-02 10:25:18 +02:00
Yehuda Katz + Carl Lerche
ee7d4c47e7
Fixes bug where Memcached connections get corrupted when an invalid expire is passed in [ #2854 state:resolved]
2009-07-01 16:56:43 -07:00
Jeremy Kemper
49824e8ad6
JSON.escape returns UTF-8 strings
...
[#2849 state:resolved]
2009-07-01 16:22:19 -07:00
Jeremy Kemper
f37a2ea84c
uses Hash#except/slice
2009-07-01 16:01:20 -07:00
Yehuda Katz + Carl Lerche
8e3e362aed
Forgot to commit the new file. This is slightly embarrassing.
2009-07-01 15:26:14 -07:00
Yehuda Katz + Carl Lerche
1a6f4d424a
Apparently stdlib isn't std enough
2009-07-01 15:20:02 -07:00
Yehuda Katz + Carl Lerche
3990c128ef
Modify isolation test to require a file not in use anywhere in Rails
2009-07-01 15:06:11 -07:00
Jeremy Kemper
e7312105c7
Merge branch 'master' of git@github.com:rails/rails
2009-07-01 12:55:19 -07:00
Yehuda Katz + Carl Lerche
1026d7706f
Original cache objects should not be immutable [ #2860 state:resolved]
...
Signed-off-by: Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com >
2009-07-01 12:16:55 -07:00
Yehuda Katz + Carl Lerche
882dd4e605
ensure Inflector.camelize works with symbols [ #2856 state:resolved]
...
Signed-off-by: Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com >
2009-07-01 12:14:34 -07:00
Yehuda Katz + Carl Lerche
7583a24ee0
Move mocha down below initial T::U require and bump version to 0.9.7 [ #2858 state:resolved]
2009-07-01 11:53:17 -07:00
Yehuda Katz + Carl Lerche
eea7b5db1d
Crazy hacks to get the Isolation testing module to work on non forking environments
2009-06-30 17:39:32 -07:00
Carl Lerche
db3de78a83
Bump up the version to 3.0.pre
2009-06-30 14:37:12 -07:00
Yehuda Katz + Carl Lerche
575b95ea0b
Created AS::Testing::Isolation which runs each test case in a separate process.
...
This allows for testing rails bootup (files are required, correct constants are
set, etc...). Currently, this is implemented via forking only, but we will add
support for jruby and windows shortly.
2009-06-30 12:00:50 -07:00
Carl Lerche
4954379283
Remove stray checks for Rspec in the testing setup.
2009-06-30 08:41:17 -07:00
José Valim
915f108d6a
Merge branch 'master' of git://github.com/rails/rails
2009-06-26 11:58:02 +02:00
Yehuda Katz + Carl Lerche
8ee60660ce
Try speeding up rails booting
2009-06-25 14:32:15 -07:00
José Valim
0744900861
Merge branch 'master' of git://github.com/rails/rails
2009-06-23 16:52:39 +02:00
Pratik Naik
66eb05821b
Use stubbing instead of sleep() in File store cache tests
2009-06-21 15:25:28 +01:00
Pratik Naik
b5775c2b3e
Add expiry support File cache store [ #1693 state:resolved] [Roman Shterenzon, Pratik Naik]
2009-06-21 15:25:28 +01:00
José Valim
8037fee9ff
Merge branch 'master' of git://github.com/rails/rails
2009-06-19 16:10:24 +02:00
Jeremy Kemper
63cc6b7242
Friendlier runtime exception if delegatee is nil
2009-06-18 20:00:35 -04:00
Jeremy Kemper
50fe928c15
Delegated methods report the expected file/line in backtraces
2009-06-18 18:07:55 -04:00
Joshua Peek
fbdf706fff
Add basic JSON serializer to AMo
2009-06-17 21:27:54 -05:00
Joshua Peek
1c4d28ba31
Move model naming into ActiveModel
2009-06-17 10:37:39 -05:00
José Valim
908b5305d4
Convert line breaks.
2009-06-17 11:26:32 +02:00
Yehuda Katz + Carl Lerche
614374b3e5
Require missing file in AS
2009-06-15 11:31:52 -07:00
Yehuda Katz + Carl Lerche
64ae5b56ff
Fix failing tests in new callbacks
2009-06-15 11:26:47 -07:00
Xavier Noria
b56169c262
moves reopening of core classes to add generic stuff from Action Pack to AS/core_ext and adds tests
...
[#2798 state:committed]
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net >
2009-06-13 15:01:14 -07:00
Luca Guidi
9eeb5fed2f
Bytes calculation speed up
...
[#2800 state:committed]
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net >
2009-06-13 14:03:45 -07:00
Xavier Noria
d32965399c
uses Object#metaclass and Object#class_eval in a few spots
...
[#2797 state:committed]
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net >
2009-06-12 16:14:06 -07:00
Yehuda Katz + Carl Lerche
4fc0778123
Simplify helper use of ActiveSupport::Dependencies, and use super better for in #helpers
2009-06-10 12:15:30 -07:00
Brian Lopez
69bc2043f9
enable *real* IO parsing for the libxml, nokogiri and rexml backends [ #2659 state:resolved]
...
Signed-off-by: Joshua Peek <josh@joshpeek.com >
2009-06-09 09:01:50 -05:00
Yehuda Katz
114e25e735
Further cleanup of callbacks
2009-06-09 19:47:53 +12:00
Yehuda Katz
8cae3cd0cf
More pruning of NewCallbacks
2009-06-09 19:47:53 +12:00
Jeremy Kemper
e1f679a020
Simplify json decoder backend lazy load
2009-06-08 19:37:51 -07:00
Jeremy Kemper
99cf77be27
Add #element and #collection to ModelName
2009-06-08 19:37:50 -07:00
Jeremy Kemper
30a3b6b4fc
Ruby 1.9: fix json encoding
2009-06-08 15:16:47 -07:00
Jeremy Kemper
00ee990443
JSON: split encoding and coercion
2009-06-08 13:21:30 -07:00
Jeremy Kemper
5e1b46d4c2
Don't rely on Rails.logger
2009-06-08 01:40:14 -07:00
