Commit Graph

1607 Commits

Author SHA1 Message Date
Douglas F Shearer
e1854e0b19 ActiveSupport::OrderedHash[1,2,3,4] creates an OrderedHash instead of a Hash.
[#2615 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
2009-05-11 11:45:57 -07:00
Jeremy Kemper
d45d0a1864 Merge branch 'master' of git@github.com:rails/rails 2009-05-11 11:43:30 -07:00
Alexander Dymo
2e7409f035 Change spelling of Kyev timezone to Kyiv [#2613 state:resolved] 2009-05-10 11:59:03 -05:00
Ken Collins
9e0cfdb7f9 ActiveSupport::OrderedHash#to_a method returns an ordered set of arrays. Matches ruby1.9's Hash#to_a.
Signed-off-by: Michael Koziarski <michael@koziarski.com>
[#2629 state:committed]
2009-05-10 13:04:46 +12:00
Jeremy Kemper
4817bf94d1 Check for date/time methods that moved upstream in 1.9 2009-05-07 18:39:03 -07:00
Joshua Peek
af40fa6d03 Prefer "included" language over "setup" 2009-05-07 10:38:57 -05:00
Joshua Peek
2854535b02 Make module dependency DSL opt in 2009-05-07 10:29:22 -05:00
Joshua Peek
783deae99a Add test coverage to module setup extensions 2009-05-07 10:03:39 -05:00
codebrulee
eb201e64c0 Fixed Hash#from_xml with keys that are all caps.
Signed-off-by: Michael Koziarski <michael@koziarski.com>
2009-05-04 10:01:01 -07:00
Jeremy Kemper
79420e71e0 Work around Float faux precision 2009-04-30 01:33:07 -07:00
Jeremy Kemper
091965c0fc Prefer behavior check to RUBY_VERSION to catch 1.8 backports 2009-04-29 23:12:34 -07: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
Jeremy Kemper
f58c322e7e Use __send__ for BasicObject friendliness 2009-04-26 20:05:17 -07:00
Jeremy Kemper
ee46ffedb8 Now that we have a separate internal rails_to_json, use a separate circular reference stack instead of sticking it in the options hash 2009-04-26 20:04:47 -07:00
Jeremy Kemper
8aaed3d456 Convert encoding before escaping 2009-04-26 16:21:57 -07:00
Stephen Bannasch
1d71a34afa add JRuby-JDOM backend for XmlMini
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
2009-04-26 16:13:55 -07:00
Jeremy Kemper
ea712364e2 Don't undefine object_id 2009-04-26 15:56:08 -07:00
Jeremy Kemper
3bd32754e2 Privatize rails_to_json 2009-04-26 15:54:28 -07:00
Jeremy Kemper
4a8d2ef0a5 Extract json string escaping 2009-04-26 15:53:59 -07:00
Jeremy Kemper
8d64085138 Only Object to_json alias is needed. Prefer nil options. 2009-04-26 15:18:33 -07:00
Jeremy Kemper
da3a80dd4f Track object ids so the objects needn't respond to == 2009-04-26 15:04:02 -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
Jeremy Kemper
f28bd9557c Fix dependencies revealed by testing in isolation 2009-04-22 18:54:13 -07:00
Jeremy Kemper
5c4ba6e3fc new_callbacks core extensions 2009-04-22 17:17:31 -07:00
Jeremy Kemper
b2d6fdae35 Fix tests on 1.9 2009-04-22 17:07:04 -07:00
Jeremy Kemper
7f6779c1d5 Merge branch 'master' into cherry
Conflicts:
	activesupport/lib/active_support.rb
2009-04-22 16:53:58 -07:00
Jeremy Kemper
6fee981fa4 Opt in to JSON 2009-04-22 16:48:58 -07:00
Jeremy Kemper
f5d720fb96 Opt in to Dependencies 2009-04-22 16:42:14 -07:00
Jeremy Kemper
ab321268f8 No more free lunch 2009-04-22 16:10:49 -07:00
Jeremy Kemper
42a06d2d62 stdlib autoloads were hanging on 1.9.1 2009-04-22 09:10:48 -07:00
Jeremy Kemper
a27192f49a Divert CoreExtensions mention in docs 2009-04-22 00:47:25 -07:00
Jeremy Kemper
b70239b0cf Convert string extension modules to class reopens 2009-04-22 00:45:39 -07:00
Jeremy Kemper
35afad620b ActiveSupport.core_ext bridge util no longer used 2009-04-22 00:34:24 -07:00
Jeremy Kemper
e6eb941d1b Switch last module core extension to class reopen 2009-04-22 00:33:00 -07:00
Jeremy Kemper
685a53a360 Merge branch 'master' into cherry
Conflicts:
	activesupport/CHANGELOG
	activesupport/lib/active_support/core_ext/class/delegating_attributes.rb
	activesupport/lib/active_support/core_ext/hash/conversions.rb
	activesupport/lib/active_support/core_ext/module/attribute_accessors.rb
	activesupport/lib/active_support/core_ext/string/multibyte.rb
	activesupport/lib/active_support/core_ext/time/calculations.rb
	activesupport/lib/active_support/deprecation.rb
2009-04-20 18:31:40 -07:00
Jeremy Kemper
db05c73fb6 Move AS::Duration autoload to core/time/autoload 2009-04-20 18:14:39 -07:00
Jeremy Kemper
164a94d0bc Clearer String#first and #last edge cases. Fix that 'foo'.first(0) == 'foo' instead of '' 2009-04-20 00:40:15 -07:00
Jeremy Kemper
5d84c732ee Treating strings as enumerable is deprecated 2009-04-20 00:32:14 -07:00
Jeremy Kemper
4f63e84843 Autoload I18n simple backend 2009-04-17 22:24:36 -07:00
Jeremy Kemper
f40eb52566 Autoload YAML and StringScanner for JSON decoding 2009-04-17 22:24:08 -07:00
Jeremy Kemper
2c5c2717cb Autoload StringScanner for pre-1.9 String#each_char 2009-04-17 21:58:18 -07:00
Jeremy Kemper
595e03336f Remove rarely-used DRb cache store 2009-04-17 21:53:17 -07:00
Jeremy Kemper
bd84b82018 Eliminate Pathname extensions 2009-04-17 21:49:57 -07:00
Jeremy Kemper
727e9dc18a Dice up ActiveSupport::Deprecation 2009-04-17 21:29:30 -07:00
Jeremy Kemper
3202671dc9 Fix core/all require of adjacent core features 2009-04-17 21:20:57 -07:00
Jeremy Kemper
151348824e Fix core/time require of DateTime core extensions 2009-04-17 21:17:55 -07:00
Jeremy Kemper
60896ca6f4 Clearer String#first and #last edge cases. Fix that foo.first(0) == instead of foo. 2009-04-17 13:44:59 -05:00
Carl Lerche & Yehuda Katz
647b83d50c Resurrecting 1.9 compatibility. 2009-04-13 16:56:04 -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:

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

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

893e9eb99504705419ad6edac14d00e71cef5f12
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:

      199e750d46c04970b5e7684998d09405648ecbd4
      3942cb406e1d5db0ac00e03153809cc8dc4cc4db
      f8ea9f85d4f1e3e6f3b5d895bef6b013aa4b0690
      e3b166aab37ddc2fbab030b146eb61713b91bf55
      ae9f258e03c9fd5088da12c1c6cd216cc89a01f7
      44423126c6f6133a1d9cf1d0832b527e8711d40f

0cb020b4d6d838025859bd60fb8151c8e21b8e84
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.

8c5cc66a831aadb159f3daaffa4208064c30af0e
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.

87e8b162463f13bd50d27398f020769460a770e3
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
Carl Lerche & Yehuda Katz
2036d3ba75 Revert rspec-runner change. TODO: Add back support for the rspec T::U runner. 2009-04-09 12:33:39 -07:00