Commit Graph

26154 Commits

Author SHA1 Message Date
José Valim
6f5fdf8179 Merge pull request #3747 from lest/middleware-logger
middlewares should have configurable logger
2011-11-25 05:33:26 -08:00
Piotr Sarnacki
8ff8fa5e5f I suck, forgot to also change rake's task description 2011-11-25 12:54:39 +01:00
Piotr Sarnacki
c9bb099318 Display mounted engines in rake routes by default 2011-11-25 12:45:58 +01:00
lest
cd9d28d6fd middlewares should use logger from env 2011-11-25 13:09:46 +03:00
José Valim
fcacc6986a Merge branch 'serializers'
This implements the ActiveModel::Serializer object. Includes code, tests, generators and guides.

From José and Yehuda with love.

Conflicts:
	railties/CHANGELOG.md
2011-11-25 09:59:35 +00:00
José Valim
4565c871a6 Merge pull request #3752 from ganeshkumar/gem_lending
Added tests for #3751
2011-11-25 01:51:56 -08:00
José Valim
696d01f7f4 Add docs to serializers. Update CHANGELOGs. 2011-11-25 09:49:54 +00:00
ganesh
c8d7291b6b Added tests for #3751 2011-11-25 14:55:28 +05:30
José Valim
6d9f9b3b05 Add a hook for serializers in the scaffold generator (off for now). 2011-11-25 09:17:32 +00:00
José Valim
ebb8ea22f3 Add generators for serializers. 2011-11-25 09:14:05 +00:00
Piotr Sarnacki
0cd3bf8406 Allow to display engine's routes when running rake routes ENGINES=true 2011-11-24 16:16:00 +01:00
Piotr Sarnacki
30cf3e16a0 Merge pull request #3746 from qoobaa/active-model-naming-with-anonymous-classes
make ActiveModel::Name fail gracefully with anonymous classes
2011-11-24 06:56:46 -08:00
Jakub Kuźma
dc39af0a9a make ActiveModel::Name fail gracefully with anonymous classes 2011-11-24 15:50:21 +01:00
Piotr Sarnacki
a478389b7d Forgot to add CHANGELOG entry for config.railties_order 2011-11-24 13:40:27 +01:00
José Valim
28bcda4098 Rename UserSerializer to DefaultUserSerializer in tests. 2011-11-23 23:53:20 +00:00
José Valim
7fcc8c0a1f Rely solely on active_model_serializer and remove the fancy constant lookup. 2011-11-23 23:45:27 +00:00
José Valim
6da52c617e Remove listings from the serialization guide that won't make 3.2. 2011-11-23 23:22:46 +00:00
José Valim
8896b4fdc8 Implement ArraySerializer and move old serialization API to a new namespace.
The following constants were renamed:

  ActiveModel::Serialization     => ActiveModel::Serializable
  ActiveModel::Serializers::JSON => ActiveModel::Serializable::JSON
  ActiveModel::Serializers::Xml  => ActiveModel::Serializable::XML

The main motivation for such a change is that `ActiveModel::Serializers::JSON`
was not actually a serializer, but a module that when included allows the target to be serializable to JSON.

With such changes, we were able to clean up the namespace to add true serializers as the ArraySerializer.
2011-11-23 23:18:15 +00:00
José Valim
0536ea8c78 Add safe_constantize to ActiveSupport::Dependencies. 2011-11-23 21:43:03 +00:00
José Valim
e6cfd85361 Merge pull request #3739 from lest/config-always-write-cookie
configuration option to always write cookie
2011-11-23 12:58:56 -08:00
lest
98a1717e7c configuration option to always write cookie 2011-11-23 23:50:04 +03:00
José Valim
e62de52aa3 Merge branch 'master' into serializers 2011-11-23 20:43:06 +00:00
Piotr Sarnacki
40b19e0635 Allow to change engine's loading priority with config.railties_order= 2011-11-23 21:36:33 +01:00
Yehuda Katz
8549f7a4f0 Merge pull request #3731 from HeeL/master
code stats calculation
2011-11-23 11:11:40 -08:00
Yehuda Katz
e9f63c55f8 Merge pull request #3733 from kennyj/fix_warnings_for_show_exceptions_test
Warnings removed. (ambiguous first argument)
2011-11-23 11:10:27 -08:00
José Valim
fd86a1b6b0 Rely on a public contract between railties instead of accessing railtie methods directly. 2011-11-23 19:06:45 +00:00
José Valim
3ee0116c94 Optimize cache expansion by skipping rails cache id in nested keys. 2011-11-23 18:22:09 +00:00
José Valim
2c568f1e45 Merge pull request #3738 from exviva/issues/3737_AS_cache_expand_cache_key
Issues/3737 AS::Cache.expand_cache_key
2011-11-23 10:17:34 -08:00
José Valim
f62f545f7c Merge pull request #3735 from kennyj/fix_3728
Fix #3728 Remove unreachable code, and add additional testcases.
2011-11-23 09:55:31 -08:00
Olek Janiszewski
a650dd05f8 Fix #3737 AS::expand_cache_key generates wrong key in certain situations (part 2)
`nil` and `false` both expand to `""` (empty string), while `true` expands to
`"true"`; `false` should expand to `"false"`
2011-11-23 18:11:38 +01:00
Olek Janiszewski
d8e6dc9cf1 Fix #3737 AS::expand_cache_key generates wrong key in certain situations
`cache_key` method is never called when the argument is a 1-element array
with something that responds to `cache_key`
2011-11-23 18:06:16 +01:00
kennyj
ea70e027b6 Remove unreachable code, and add additional testcases. 2011-11-24 00:25:34 +09:00
kennyj
453f5534b4 Warnings removed. (ambiguous first argument) 2011-11-24 00:10:34 +09:00
Sergey Parizhskiy
d78a7026fc improved code stats calculation, check on multiline comments and rewrite regexps according to a class naming convention 2011-11-23 14:10:30 +02:00
Yehuda Katz
a93ee92da2 Merge pull request #3725 from marcandre/twz_eql
Fix inconsistencies with Time{WithZone}#{hash,eql?}
2011-11-22 13:01:37 -08:00
Yehuda Katz
9b7be78820 Merge pull request #3724 from marcandre/media_default
stylesheet_tag default's media is "screen"
2011-11-22 12:38:05 -08:00
Marc-Andre Lafortune
a4912078c7 Fix inconsistencies with Time{WithZone}#{hash,eql?} 2011-11-22 15:37:16 -05:00
Marc-Andre Lafortune
05e02deb68 Make explicit the default media when calling stylesheet_tag and change the default generators. 2011-11-22 15:16:23 -05:00
José Valim
b13b49ccc1 Merge pull request #3718 from lest/fix-javascript-include-tag
javascript_include_tag should add '.js' to sources that contain '.'
2011-11-22 09:45:11 -08:00
José Valim
39ecbfdab9 Merge pull request #3717 from lest/show-exceptions-refactor
Show exceptions refactor: controller should be responsible for choice to show exceptions
2011-11-22 07:19:39 -08:00
lest
3a1d51959b deprecation warning, changelog entry 2011-11-22 17:36:58 +03:00
lest
aa491f6a9c javascript_include_tag should add '.js' to sources that contain '.' 2011-11-22 16:39:07 +03:00
Vijay Dev
8cae31c800 remove nodoc on OrderedHash 2011-11-22 17:12:37 +05:30
lest
5bcd119b8d move show_detailed_exceptions? to Rescue module 2011-11-22 13:34:13 +03:00
lest
c6d6b28bb4 refactor show exceptions tests 2011-11-22 11:38:55 +03:00
lest
a9e8cf78fd add ActionController::Metal#show_detailed_exceptions? 2011-11-22 11:38:24 +03:00
Xavier Noria
8f57bf207f tests predicates according to the boolean interpretation of their return value, not expecting specifically true or false
Respecting Genuine assert_equal false Edition
2011-11-21 14:22:16 -08:00
José Valim
401393b656 Deprecate InstanceMethods namespace handling in ActiveSupport::Concern.
This avoids the unnecessary "yo dawg, I heard you like include, so I put a module that includes your module when it is included" approach when building extensions.
2011-11-21 22:17:35 +00:00
Xavier Noria
f312e2142b Revert "tests predicates according to the boolean interpretation of their return value, not expecting specifically true or false"
Reason: there were some genuine tests for false when
reading values, going to revise those ones.

This reverts commit a539a5e3f3be68f027d3dfe43f88dc9f0642c743.
2011-11-21 14:14:11 -08:00
Xavier Noria
a539a5e3f3 tests predicates according to the boolean interpretation of their return value, not expecting specifically true or false 2011-11-21 14:11:40 -08:00