Skip to content
This repository
  • 283 commits
  • 381 files changed
  • 32 comments
  • 110 contributors
This comparison is big! We're only showing the most recent 250 commits
Apr 30, 2009
John F. Douthat johndouthat Fix action-cached exception responses.
Methods raising ActiveRecord::RecordNotFound were returning 404 on first request and 200 OK with blank body on subsequent requests.

[#2533 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
d1d1894
Jeremy Kemper jeremy Missed commit for 7c4b325 a5ed7ee
May 01, 2009
Alexander Podgorbunsky shurikp Default scope :order should be overridden by named scopes.
[#2346 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
628b4ad
Ruy Asan rubyruy Fixed bug with polymorphic has_one :as pointing to an STI record
[#2594 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
93c5578
Ruy Asan rubyruy Added routing test for irregular ID requirements and custom member ac…
…tion.

[#2595 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
17e712d
May 04, 2009
codebrulee Remove stray underscore from the hash conversion methods which broke …
…backwards compatibility with Hash.from_xml

Also add an all-caps test to prevent future regressions
ebe8dd6
Tim Connor timocratic fix problems with requires in metal choking under development reloadi…
…ng [#2579 state:resolved]

Signed-off-by: Joshua Peek <josh@joshpeek.com>
49169f7
Greg Hurrell wincent Extract ActionController::Caching::Sweeper into separate file [#1977
…state:resolved]

Signed-off-by: Joshua Peek <josh@joshpeek.com>
5ac05f1
Joshua Peek josh Deprecate assert_redirect_to's partial hash matching. This will be fu…
…lly removed in 3.0.
7f1f16c
May 08, 2009
Joshua Peek josh Don't stream each line of the body, just send the whole thing e61cceb
May 09, 2009
Joshua Peek josh Fix syntax error from 5ac05f1 4051dd3
May 10, 2009
Ken Collins metaskills ActiveSupport::OrderedHash#to_a method returns an ordered set of arra…
…ys. Matches ruby1.9's Hash#to_a.

Signed-off-by: Michael Koziarski <michael@koziarski.com>
[#2629 state:committed]
6dec3c4
John Small JohnSmall Add configuration options for :dasherize and :camelize calls to Hash#…
…to_xml

People using ActiveResource & REST to integrate with other systems need to be able to control the default dasherize behavior of Hash.to_xml.
Currently there is no test for a default value, but existing code asssumes it's true. This patch adds tests for the default value and adds
mattr_accessor to ActiveSupport for :dasherize_xml and :camelize_xml. These module attributes set the defaults for :dasherize and :camelize in
rename_keys inside Hash#to_xml. The tests have been changed to separate out the testing of the parameter options for :camelize
and :dasherize so that we only test one thing at a time. We also test default values for :camelize_xml and :dasherize_xml.

The module attribute dasherize_xml is set to true in this patch to maintain existing code. But at some point in the future it should be set to
false because Hash#to_xml probably should not set underscores to dashes by default.

Changed documentation on ActiveResource#to_xml to correctly describe the behaviour of Hash#to_xml. The previous documentation said that
the default for :dasherize was false, in fact it was and still is true, but we now have a way to change the default. I've also added
documentation for the :camelize option.

Signed-off-by: Michael Koziarski <michael@koziarski.com>
7bf9bf3
Anthony Crumley anthonycrumley Fixed eager load error on find with include => [:table_name] and hash…
… conditions like {:table_name => {:column => 'value'}}

Signed-off-by: Michael Koziarski <michael@koziarski.com>
88d5e33
May 11, 2009
Douglas F Shearer dougal ActiveSupport::OrderedHash[1,2,3,4] creates an OrderedHash instead of…
… a Hash.

[#2615 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
2bcb244
Jeremy Kemper jeremy Revert "Fixed bug with polymorphic has_one :as pointing to an STI rec…
…ord"

[#2594 state:open]

This reverts commit 93c5578.
35e1785
May 14, 2009
Peter Marklund Changed ActiveRecord::Base#exists? to invoke find_initial so that it …
…is compatible with, and doesn't lose, :include scopes (references to eager loaded tables)

Signed-off-by: Michael Koziarski <michael@koziarski.com>
[#2543 state:committed]
0380e9c
Joshua Peek josh Sweeper does not belong in Sweeping module f7cb7fc
May 15, 2009
José Valim josevalim Allow strings to be sent as collection to select.
Signed-off-by: Michael Koziarski <michael@koziarski.com>
[#2391 state:committed]
66ead4f
May 16, 2009
Pratik lifo Include guides directory in the rails gem ba92e83
May 17, 2009
Daniel dguettler has_one :through should not create a new association when assigned nil [
#698 state:resolved]

Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
4cd4072
Jacob Kjeldahl Supply valid ruby-prof parameters [#1804 state:resolved]
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
d5f018e
Paulo Schneider phss Fix typo in the generated routes.rb [#2433 state:resolved]
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
14b7698
Mike Breen hardbap Allow assert_template to take a symbol [#2011 state:resolved]
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
f383a4a
Joshua Peek josh Fix reset_session with ActiveRecord store [#2200 state:resolved] e30016c
Joshua Peek josh Missed a file from the previous commit 43e537b
risk danger olson technoweenie Add pluggable JSON backends with support for the JSON gem.
    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
d052e9f
Jeremy Kemper jeremy Only Object to_json alias is needed. Prefer nil options. cc47d3f
Jeremy Kemper jeremy Extract json string escaping 5b80ead
risk danger olson technoweenie load the JSON Backend lazily. 2b5e4f3
May 18, 2009
Pratik lifo Ensure HTTP Digest auth uses appropriate HTTP method [#2490 state:res…
…olved] [Steve Madsen]
dbb0258
Pratik lifo Make sure default_scope#create checks for options[:conditions] [#2181
…state:resolved] [James Le Cuirot]
97b75c9
Luca Guidi Ensure HasManyThroughAssociation#destroy delete orphan records [#2251
…state:resolved]

Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
7a85927
Ken Collins metaskills Reimplement Fixtures.identify so that it consistently generates ident…
…ities across ruby versions.

[#2633 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
50608ec
Joe Van Dyk joevandyk Add ability to get multiple memcached keys at the same time (via MemC…
…acheStore#read_multi).

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
ad85771
Jeremy Kemper jeremy Fix imprecise float comparison 9fcadcb
May 19, 2009
Bryan Helmkamp brynary Allow MemCacheStore to be initialized with a MemCache object instead …
…of addresses and options
6339e5d
Jeremy Kemper jeremy Mark pending release in changelog instead of edge 2a65772
Bryan Helmkamp brynary Use duck typing to also allow MemCache-like object when initializing …
…a MemCacheStore

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
542d6a0
May 20, 2009
Eloy Durán alloy Ensure the parent record is always saved when the child is invalid. [#…
…2249 state:resolved]

Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
a70c781
May 25, 2009
Hongli Lai FooBarWidget activesupport/json/encoders fix that to_json should call rails_to_jso…
…n, not just be an alias to the rails_to_json method defined in Object. Fixes #2690

Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
9b2a665
May 27, 2009
Joshua Peek josh Ensure Memcache local cache returns duplicated values [#2302 state:re…
…solved]
b4c7b3e
David Calavera calavera ensure initialize_database_middleware doesn't use ActionController if…
… action_controller framework is not enabled [#2680 state:resolved]

Signed-off-by: Joshua Peek <josh@joshpeek.com>
4196616
Hongli Lai FooBarWidget Make the Failsafe middleware attempt to render 500.html during failsa…
…fe response rendering. Also make the default static failsafe response more friendly, in case 500.html rendering fails. [#2715 state:resolved]

Signed-off-by: Joshua Peek <josh@joshpeek.com>
34a1ed0
May 28, 2009
Johan Sørensen js The FlashHash and friends causes a lot of needless session storing, w…
…hen we know for a fact that there's no content in the flash. By not storing the empty hash in the session we save a lot of communication with the various session backends, while still keeping the same interface to the flash. [#2703 state:resolved]

Signed-off-by: Joshua Peek <josh@joshpeek.com>
dc94c09
Johan Sørensen js Only save the session if we're actually writing to it [#2703 state:re…
…solved]

Signed-off-by: Joshua Peek <josh@joshpeek.com>
14edaa1
May 30, 2009
Joshua Peek josh Revert "Only save the session if we're actually writing to it [#2703
…state:resolved]"

This reverts commit 14edaa1.
c73cf7d
Jun 01, 2009
Michael Koziarski NZKoz Revert "Ensure calculations respect scoped :select". Broke .count on …
…a has_many :through association.

This reverts commit 6543426.
34c3162
Ian Terrell ianterrell added a failing test case for counting has_many :through associations…
… with scopes

Signed-off-by: Michael Koziarski <michael@koziarski.com>
a92790a
Han Kessels han fix for IE incompatibility of :disable_with in submit_tag
Signed-off-by: Michael Koziarski <michael@koziarski.com>
4d7c597
Michael Koziarski NZKoz name is case sensitive, update tests to reflect that b600bf2
Jun 05, 2009
Tim Connor timocratic Work around a gem dependency edge case that prevents Rails from booti…
…ng..

If you have a frozen gem with unfrozen dependencies (for instance if the
dependency has native extensions so can't be frozen) you can have a
nightmare upgrade problem, where you cannot rake gems:install, because
rake is broken by a gem loading problem.

If you bump up your frozen gem to a newer version that requires a newer
dependency, everybody else on the team will have rake broken by that
dependency mismatch, since you will have had to specify the dependency
in your config.gems, otherwise nobody will have installed it, since the
parent is frozen. And now the config.gems loading code will kill rake.

[#2609 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
84a755b
Jun 08, 2009
Jeremy Kemper jeremy Don't rely on Rails.logger 4b4164e
Jeremy Kemper jeremy Revert rails_to_json -> to_json so we don't break compatibility
[#2753 state:resolved]
4a78dae
Jeremy Kemper jeremy JSON: split encoding and coercion a69ee11
Jeremy Kemper jeremy Use to_json instead of rails_to_json 01f820c
Jeremy Kemper jeremy Ruby 1.9: fix json encoding ec10f13
Jeremy Kemper jeremy Integration tests use Rack::Lint on 1.9 also aebd1ba
Jeremy Kemper jeremy Check for to_str instead of String 05abd7c
Jeremy Kemper jeremy Failsafe doesn't return bare String body 91fbdfd
Jeremy Kemper jeremy Ruby 1.9: sqlite escape encoding 91727ae
Jeremy Kemper jeremy Lazier Rakefile requires to avoid needing full rake gem on 1.9 cc5d313
Jeremy Kemper jeremy Add #element and #collection to ModelName f1e75e4
Jeremy Kemper jeremy Simplify json decoder backend lazy load 74f16a5
Jeremy Kemper jeremy Prefer JSON.encode(value) to value.to_json 756e82d
Jeremy Kemper jeremy Qualify constant references in BasicObjects f9b2227
Jeremy Kemper jeremy Fix AR json encoding 63d0c33
Jeremy Kemper jeremy Clearer String#first and #last edge cases. Fix that 'foo'.first(0) ==…
… 'foo' instead of ''
e70272e
Pratik lifo Vendor Rack edge ( commit : 815342a ) 5fb66a3
Jun 09, 2009
Nathan Kontny n8 A test to show that http_authentication needs to fail authentication …
…if the password procedure returns nil. Also includes a fix to validate_digest_response to fail validation if the password procedure returns nil.

Signed-off-by: Michael Koziarski <michael@koziarski.com>
056ddbd
Matt Jones al2o3cr Fix several issues with the 2.3.2 gem loader.
Incorporates the following:

- migrates back small change to gems:build:force from bfc1609 to finish closing #2266.

- unrolls to_proc calls in gems.rake, to match the change in master.

- fixes #2722 by passing the options hash to dependencies during build. (includes a test)

- fixes #2721 by loading the specification directly in from_directory_name. Adds an option to opt-out of specification loading when needed (in gems:refresh_specs, for instance). Includes tests.

- fixes #2679 by refreshing specs for all frozen gems rather than just gems loaded from the environment.

- fixes #2678 by passing the options hash to dependencies during unpack.

Signed-off-by: Michael Koziarski <michael@koziarski.com>
2c3d290
Michael Koziarski NZKoz Revert "Ensure HasManyThroughAssociation#destroy delete orphan records"
This reverts commit 7a85927.

There's still some debate about the intended behaviour in the ticket, leaving in master but removing prior to shipping 2.3.3
b1a044b
Tom Ward tomafro Change autoload declaration in ActionView::Helpers from JavascriptHel…
…per to JavascriptHelper, matching the actual helper name. Also removed require from UrlHelper which was inadvertently preventing the autoload typo from causing a failure.

Signed-off-by: Michael Koziarski <michael@koziarski.com>
d970733
Eugene Pimenov libc PostgreSQL adapter should call thread safe quote_string function
Signed-off-by: Michael Koziarski <michael@koziarski.com>
c5c022c
Steven Luscher steveluscher Fixes #2439. ActionController::Integration::Session no longer mangles…
… multiparameter attribute params when processing multipart requests.

Signed-off-by: Michael Koziarski <michael@koziarski.com>
d63fab3
Friedrich Göpel 1.9 compatibility - don't pass an array as the from address as this e…
…nds up generating invalid SMTP commands.
72d111a
David Stevenson dsboulder Made label target radio button tags with values. Radio button now res…
…pects inherited :index options when generating id.

Signed-off-by: Michael Koziarski <michael@koziarski.com>
898a880
Stephen Anderson Sanitized the id generated by text_area_tag helper method. text_area_…
…tag('item[description]') should return: <textarea id="item_description" name="item[description]"></textarea> instead of: <textarea id="item[description]" name="item[description]"></textarea> The old id was causing HTML validation failures.

Signed-off-by: Michael Koziarski <michael@koziarski.com>
cd14a4a
Jeremy Kemper jeremy Remove dead AbstractRequest autoload 7e1bcef
Jun 10, 2009
Matt Jones al2o3cr Fix incorrect specification path in GemDependency#from_directory_name
Signed-off-by: Michael Koziarski <michael@koziarski.com>
f43404d
Michael Koziarski NZKoz Whitelist the methods which are called by multiparameter attribute as…
…signment.

This prevents users from causing NoMethodErrors and the like by editing the parameter names, and closes a potential exploit of CVE-2009-1904.
19c38a9
Jun 11, 2009
Andrew Kaspick akaspick allow absolute paths for the asset caches
Signed-off-by: Michael Koziarski <michael@koziarski.com>
d3d4822
Joshua Peek josh Vendor rack 1.0.x stable 25fde77
Jeremy Kemper jeremy Update memcache-client to 1.7.4 for cheaper timeouts cb9429a
Jun 13, 2009
Luca Guidi Bytes calculation speed up
[#2800 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
447d60e
Jun 15, 2009
Joshua Peek josh Add :concat option to asset tag helpers to force concatenation.
This is useful for working around IE's stylesheet limit.

  stylesheet_link_tag :all, :concat => true
a491b19
Jun 18, 2009
Jeremy Kemper jeremy Delegated methods report the expected file/line in backtraces b75bc05
Jeremy Kemper jeremy Friendlier runtime exception if delegatee is nil 8b9b954
Jeremy Kemper jeremy Turn on autolist for debugging also 2255474
Jun 25, 2009
Joshua Peek josh send_data should set Content-Length as a string 6720b25
Jun 27, 2009
Michael Koziarski NZKoz Make filter_parameters work correctly with array parameters.
Conflicts:

	actionpack/lib/action_controller/base/filter_parameter_logging.rb
9407f6e
Chris Mear chrismear Make text_area_tag escape contents by default.
Signed-off-by: Michael Koziarski <michael@koziarski.com>
eb52dc3
Jul 01, 2009
Yehuda Katz + Carl Lerche Accept Symbol for contoller name [#2855 state:resolved]
Signed-off-by: Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>
e10305f
Yehuda Katz + Carl Lerche Move mocha down below initial T::U require and bump version to 0.9.7 [#…
…2858 state:resolved]
a8bd3c8
Jeremy Kemper jeremy Merge branch '2-3-stable' of git@github.com:rails/rails into 2-3-stable dfdf8e5
Yehuda Katz + Carl Lerche Updates CI to use latest mocha 97ad936
Jeremy Kemper jeremy JSON.escape returns UTF-8 strings
[#2849 state:resolved]
5217c16
Yehuda Katz + Carl Lerche Fixes bug where Memcached connections get corrupted when an invalid e…
…xpire is passed in [#2854 state:resolved]
4d8fd8d
Elliot Winkler mcmire Patch FormTagHelper so that when a form tag is created, the div which…
… holds the form authenticity token is set to display:inline [#2846 state:resolved]

Signed-off-by: Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>
0d3c5f0
Jul 02, 2009
J.D. Hollis jdhollis Only check for built extensions on gem dependencies that are in vendo…
…r/gems. [#2825 state:resolved]

Signed-off-by: Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>
f6f24b7
Yehuda Katz + Carl Lerche Fixes a number of tests that inexplicably didn't fail when we committ…
…ed the original patch
281c1a8
Levin Alexander levinalex make #inspect if zero length duration return '0 seconds' instead of e…
…mpty string [#2838 state:resolved]

Signed-off-by: Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>
d8fff7d
Jarl Friis My suggestion to fix ticket 2401 [#2401 state:resolved]
Signed-off-by: Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>
1c855ad
Brian Abreu Fixed ActiveSupport::OrderedHash::[] work identically to ::Hash::[] i…
…n ruby 1.8.7 [#2832 state:resolved]

Signed-off-by: Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>
944f4fc
Jesús García Sáez blaxter Allow symbols on routes declaration (:controller and :action values) [#…
…2828 state:resolved]

Signed-off-by: Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>
6673001
Jul 07, 2009
Hongli Lai FooBarWidget Mocha >= 0.9.7 is required, otherwise mocking doesn't work. [#2874 st…
…ate:resolved]

Signed-off-by: Yehuda Katz <wycats@yehuda-katzs-macbookpro41.local>
31254be
Hongli Lai FooBarWidget Add support for dumping non-standard primary keys when using the SQLi…
…te3 adapter. Fix unit tests so that this feature is tested for all adapters.

Signed-off-by: Yehuda Katz <wycats@yehuda-katzs-macbookpro41.local>
d8f8066
Lawrence Pit lawrencepit Use the i18n gem if present instead of vendor code. [#2871 state:reso…
…lved]

Signed-off-by: Yehuda Katz <wycats@gmail.com>
29c5985
Jul 08, 2009
Hongli Lai FooBarWidget Cleanup application after #close has been called on the Rack response…
… body, not when AC::Reload#call is done.

The Rack body might lazily evaluate its output, which is for example the case
if one calls 'render :text => lambda { ... }'. The code which lazily evaluates
the output might use other application classes. So we will want to defer
cleanup until the Rack request is completely finished.

Signed-off-by: Michael Koziarski <michael@koziarski.com>
bc2c4a4
Michael Koziarski NZKoz Match tests with new reloading behaviour 6a50d6c
Jul 12, 2009
Michael Koziarski NZKoz Prepare version numbers, changelogs and gem dependencies for 2.3.3. 18e68d9
Joshua Peek josh Go back to depending on Rack 1.0.x gem f36d9a6
Joshua Peek josh Correctly setup the rack gem dependency. ae85927
Jul 15, 2009
Szymon Nowak szimek Add primary_key option to belongs_to association
[#765 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
b3ec7b2
Jul 16, 2009
Michael Koziarski NZKoz Move from referencing the BlueCloth constant directly, to referencing…
… Markdown.

This supports alternative implementations of markdown such as rpeg-markdown or rdiscount, and later releases of bluecloth.  There are some performance issues with earlier releases of bluecloth, and you should probably upgrade.  In the event that you can't you can place the following code into an initializer:

  Markdown = BlueCloth
a147bec
Jul 19, 2009
Michael Koziarski NZKoz Forgot to bump the railties versions c7bcbb9
Jul 21, 2009
Akira Matsuda amatsuda Ruby 1.9.2 compat: Use File#expand_path for require path because "." …
…will not be included in LOAD_PATH since Ruby 1.9.2 [#2921 state:resolved]

Signed-off-by: Yehuda Katz <wycats@gmail.com>
7a427a8
Akira Matsuda amatsuda Ruby 1.9.2 compat: name method was renamed to __name__ since MiniTest…
… 1.4.x [#2922 state:resolved]

Signed-off-by: Yehuda Katz <wycats@gmail.com>
be4d743
Jul 22, 2009
Michael Koziarski NZKoz Memoize cookies so that updates to cookies are available in the curre…
…nt request. [#2733 state:resolved]

Signed-off-by: Joshua Peek <josh@joshpeek.com>

Conflicts:

	actionpack/test/controller/cookie_test.rb
143c55d
Jul 23, 2009
Sebastian Delmont sd Fix filter_parameter_logging of non-hash values within array params
Signed-off-by: Michael Koziarski <michael@koziarski.com>
[#2927 state:committed]
ead5d88
Jul 27, 2009
Luke Melia lukemelia Avoid loading the ActiveRecord::SessionStore class on initialization …
…if it is not in use [#2737 state:resolved]

Signed-off-by: Joshua Peek <josh@joshpeek.com>
60122e8
Ross Kaffenburger and Bryan Helmkamp Don't check authenticity tokens for any AJAX requests 523f3ba
Jul 29, 2009
Jeremy Kemper jeremy Revert "Methods invoked within named scope Procs should respect the s…
…cope stack. [#1267 state:resolved]"

This reverts commit 6a13376.

Conflicts:

	activerecord/test/cases/named_scope_test.rb
17f336e
Aug 01, 2009
Hongli Lai FooBarWidget Make the new code reloading behavior work with multithreaded environm…
…ents such as Mongrel.

[#2948 state:incomplete]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
d37ac79
Jeremy Kemper jeremy SQLite: deprecate the 'dbfile' option in favor of 'database.' 32cfd4c
Jeremy Kemper jeremy Fix errant require 2102945
Jeremy Kemper jeremy Extract String#bytesize shim 7244425
Sava Chankov kanmeiban Ruby 1.9: fix Content-Length for multibyte send_data streaming
[#2661 state:resolved]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
dc559f2
Jeremy Kemper jeremy Ruby 1.9: fix encoding for test_file_stream f09ceb5
Jeremy Kemper jeremy Ruby 1.9: fix reloader tests using lambdas with no env arg 6cbcfff
Sven Fuchs svenfuchs Stop messing with supposedly-deprecated interpolation placeholders wh…
…en no interpolation values have been passed.

[#2885 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
bf00de0
Aug 05, 2009
Michael Koziarski NZKoz Run the view tests too 95db8aa
Sven Fuchs svenfuchs Make app template git adapter sync back output immediately by using s…
…ystem() instead of backticks [#2047 state:resolved]

Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
5a0e295
risk danger olson technoweenie move the serialized AR record logic to #as_json. Leave ActiveRecord::…
…Base#to_json to use the same Object#to_json implementation, but keep it around for documentation purposes.
55501b9
Akira Matsuda amatsuda Ruby 1.9.2 compat: Array#* uses to_str instead of to_s to join values…
… since Ruby 1.9.2

[#2959 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
8dab61d
Jeremy Kemper jeremy Merge branch '2-3-stable' of git@github.com:rails/rails into 2-3-stable 4b33155
Aug 07, 2009
Brendan Schwartz bschwartz Ruby 1.9 compat: fix for SSL in Active Resource
[#1272 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
e1d27ee
Aug 08, 2009
Matt Duncan mrduncan Default sent_on time to now in ActionMailer
Signed-off-by: Michael Koziarski <michael@koziarski.com>
[#2607 state:committed]
f73d34c
Mike Breen hardbap Add option to routes task to target a specific controller with CONTRO…
…LLER=x.

Signed-off-by: Michael Koziarski <michael@koziarski.com>
[#2928 state:committed]
1c6c216
crankharder crankharder Tidy up the AR tests, removing duplicates and making tests clearer / …
…more focussed.

Signed-off-by: Michael Koziarski <michael@koziarski.com>

[#2774 state:committed]
9aaeb18
Emilio Tagua miloops Fix models load order to be able to run unit tests.
[#2550 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
6843fb9
Jeremy Kemper jeremy Fix caller in assert_redirected_to deprecation warning.
[#2932 state:committed]
ab6d295
Marshall Huss mwhuss HTTP proxy support
[#2133 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
791c388
Stephen St. Martin stevestmartin Update truncate documentation / examples to more clearly demonstrate …
…its actual behavior

[#3016 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
679a0bf
Nick Quaranto and Josh Nichols Adding a deprecation warning for output.flush when rendering a proc o…
…r lambda

[#2893 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
d39c456
Marc-André Lafortune marcandre Enumerable#sum now works will all enumerables, even if they don't res…
…pond to :size

[#2489 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
819c347
Hugo Peixoto hugopeixoto MySQL: fix diacritic uniqueness test by setting the default character…
… set and collation to utf8/utf8_unicode_ci

[#2883 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
ac9f9a9
Rob Anderton rob-at-thewebfellas Fix binary fixture test on Windows
[#2597 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
a25296a
Tristan Dunn tristandunn Don't define a default primary key in the schema dumper.
[#1908 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
9aa9bad
Aug 09, 2009
Michael Koziarski NZKoz Depend on rubygems 1.3.2
Also move the min_version definition up a line so it's present in the rescue block down below.
cd5e784
Jan Schwenzien Fix HTTP basic authentication for long credentials [#2572 state:resol…
…ved]

Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
389449d
Matt Duncan mrduncan Adding :from scoping to ActiveRecord calculations
Signed-off-by: Michael Koziarski <michael@koziarski.com>
407fbb5
Michael Koziarski NZKoz Don't call additional methods on builders passed to the atom_feed hel…
…per.

Additionally, actually test that the atom_feed helper works with :xml as an option.

[#1836 state:committed]
796b7c6
Rich Bradley Fix for nested :include with namespaced models.
[#260 state:committed]
0b95a2a
Yehuda Katz wycats Added benchmark to 2-3 7d40ba1
Yehuda Katz wycats Benchmarks 3cad1df
Yehuda Katz wycats Update bench harness in 2.3 to match master output ee8fe3a
Jeremy Kemper jeremy Setting connection timeout also affects Net::HTTP open_timeout.
[#2947 state:resolved]
83cc7de
Dmitry Ratnikov ratnikov Changed to use klass instead of constantizing in assign_ids generated…
… method

[#260 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
32c2355
José Valim josevalim Make http digest work with different server/browser combinations. [#3006
status:resolved]

Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
2d2216f
Michael Siebert siebertm Fix deprecating =-methods by using send [#2431 status:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
4c96030
Hugo Peixoto hugopeixoto added tests for namespaced models generation and fixed a bug related …
…to it. Also fixed a pluralization=false issue.

Signed-off-by: José Valim <jose.valim@gmail.com>
5f6623b
Hugo Peixoto hugopeixoto Fixed the end_of_* to work with Time.usec (and Time.nsec in ruby1.9) [#…
…1225 status:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
5e4b946
Mike Breen hardbap Serialized attributes should only be saved with partial_updates when …
…the serialized attribute is present [#2397 state:resolved]

Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
8056c57
Rizwan Reza rizwanreza Support passing Redcloth options via textilize helper [#2973 state:re…
…solved]

Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
d1202cf
Anup Narkhede railsbob Ensure hm:t#find does not assign nil to :include [#1845 state:resolved]
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
80d8608
Matt Conway wr0ngway Allow connect_timeout, read_timeout and write_timeout settings for My…
…SQL [#2544 state:resolved]

Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
d3a802c
Dan Croak croaky Deprecation warning for routes_for_controller_and_action. Use routes_…
…for instead. [#3023]

Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
8058a1d
Simon Jefford simonjefford Add test for routes_for_controller_and_action deprecation [#3023]
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
c41fb58
Jeremy Kemper jeremy Fix that RedCloth shouldn't be required to run tests d44b5c6
Hugo Peixoto hugopeixoto Added a uniqueness validation test that uses diacritics.
[#2883 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
a8286af
Elise Huard validate uniqueness with limit in utf8
[#2653 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
f6f04f1
rnicholson rnicholson Add ability to set SSL options on ARes connections.
[#2370 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
de0b073
Hugo Peixoto With multiparameter date attributes, the behaviour when empty fields …
…are present is now coherent with the one described in the date_select documentation.

[#1715 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
2c4f4a8
David Burger Fix that Hash#to_xml and Array#to_xml shouldn't modify their options …
…hashes [#672 state:resolved] [David Burger, Dana Jones]

Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
c9d4bcf
Josh Nichols technicalpickles Added back support for destroying an association's object by id. [#2306
… status:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
29a5549
Jatinder Singh rubymerchant Make ActiveResource#exists? work [#3020 state:resolved]
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
323f58f
Bence Nagy nagybence path_names could be used to customize collection actions too
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
250e718
Hugo Peixoto Added both the documentation and a test case for the collection path …
…name customization feature.

[#1218 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
39de15f
Tristan Dunn tristandunn No longer require database name for MySQL to allow cross database sel…
…ects.

[#1122 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
7908cfa
stiff stiff Make sure association conditions work with :include and :joins [#358
…state:resolved]

Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
93f5d9d
Jordan Brough Active Resource recognizes 410 as Resource Gone now [#2316 state:reso…
…lved] [Jordan Brough, Jatinder Singh]

Signed-off-by: Pratik Naik <pratiknaik@gmail.com>

Conflicts:

	activeresource/lib/active_resource/exceptions.rb

Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
be017fd
GrzesF GrzesF Ensure ActiveResource#load works with numeric arrays [Grzegorz Forysi…
…nski, Elad Meidar]

[#2305 state:resolved]

Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
59c3b0d
Matt Duncan mrduncan Fixed to_label_tag to accept id attribute without changing for attrib…
…ute [#2660 status:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
ba96125
Arthur Zapparoli arthurgeek Model#human_attribute_name now accept symbols [#3025 status:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
18b4ac6
jeem jeem make private_and_public_methods unmemoizable [#2372 state:resolved]
Signed-off-by: Joshua Peek <josh@joshpeek.com>
cc3183d
Dan Croak croaky has_many :through create should not raise validation errors
[#2934 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
33c054d
Josh Nichols technicalpickles Backported XML serialization behavior from master for dealing with ro…
…ot nodes that have modules.

ie,
- the root node is dasherized, such that MyApplication::Business::Project becomes <my-application-project-business-project>
- association children nodes have type attributes, such that MyApplication::Business::Developer becomes <developer type="MyApplication::Project::Developer">

[#2723 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
15fd67e
Josh Nichols technicalpickles Only load db/schema.rb if it exists; otherwise, display a message to …
…run db:migrate or remove active_record in environment.rb.

[#3012 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
ebb6606
Joshua Peek josh Deprecate router generation "best match" sorting ff643ce
Jatinder Singh rubymerchant AR should respect default values for MySQL BINARY and VARBINARY columns.
[#1273 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
8a49af3
Gabe da Silveira gtd Fix that counter_cache breaks with has_many :dependent => :nullify.
[#1196 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
9bc80f4
Jeremy Kemper jeremy Fix test dependency on taggings 011baa0
Morgan Schweers Fix that creating a table whose primary key prefix type is :table_nam…
…e generates an incorrectly pluralized primary key.

[#872 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
d0bdff0
José Valim josevalim Allow radio buttons to work with booleans.
[#2937 state:committed]

Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
e972acc
Jaime Bellmyer bellmyer raises exception (ActiveRecord::ConfigurationError with message) on h…
…abtm association creation if join table contains a primary key

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
9a3a798
Jaime Bellmyer bellmyer raises an exception on habtm join table inserts if join table contain…
…s a primary key. Caches this check to save time on subsequent inserts.

[#2086 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
9d51f62
Leonardo Borges leonardoborges PostgreSQL: XML datatype support
[#1874 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
5c74cff
Daniel Sheppard Fix that JSON parser fails to read escaped backslashes.
[#973 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
9341655
Fabien Jakimowicz jakimowicz Add support for errors in JSON format.
[#1956 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
c3da22c
Tim Peters Use table prefix and suffix for schema_migrations index.
[#1543 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
9e96f37
Cristi Balan cristibalan Add tests for scoping schema_migrations index by global table prefix …
…and suffix

[#1543 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
25fe43b
Erik Ostrom eostrom Correctly handle offsets in Multibyte::Chars#index and #rindex.
The offset in codepoints was being passed directly to the wrapped string's index/rindex method. Now we translate the offset into bytes first.

[#3028 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
4e01437
Aug 10, 2009
Arthur Zapparoli arthurgeek Removed duplicated tests [#3026 state:resolved]
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
9bcacf4
Gabe da Silveira gtd Enable has_many :through for going through a has_one association on t…
…he join model [#2719 state:resolved]

Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
b763858
Tristan Dunn tristandunn Prevent overwriting of table name in merging SQL conditions [#2949 st…
…ate:resolved]
491f1b5
Visnu Pitiyanuvath visnup Allow ho:through#build when the owner is a new record [#1749 state:re…
…solved]

Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
ecc9b70
Max Lapshin maxlapshin Make sure link_to generates the form with the specified :href if any [#…
…2254 state:resolved]

Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
9e29c08
codeape Introduce grouped_collection_select helper.
[#1249 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
9a42096
Kamal Fariz Mahyuddin kamal find_cmd should return the full path of the db command
[#1488 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
9284bcc
Hongli Lai FooBarWidget Correctly unlock the reloader lock if the underlying app raises an ex…
…ception.

[#2873 state:incomplete]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
a919698
Bryan Helmkamp brynary Allow delegating to nil, because the method might actually exist on it e82b435
Aug 11, 2009
Jeremy Kemper jeremy 'would of' => 'will be' 6f5d1f3
Aug 15, 2009
Jay Pignata Fix test_has_many_through_polymorphic_has_one on sqlite2 [#3054 state…
…:resolved]

Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
dad0f62
Jay Pignata Fix calculation tests on sqlite2 [#3053 state:resolved]
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
a249cad
Jatinder Singh rubymerchant Fix ActiveResource load test for 64bit machines [#3051 state:resolved]
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
dbc62ad
Jeremy Kemper jeremy Refine the deprecated route check to explicitly check whether the fut…
…ure route pick comes before the deprecated route that was found.
061b0ba
Jeremy Kemper jeremy Normalize route generation order: associations, yield block, then own…
… routes.
75a483e
Jay Pignata Adding a call to logger from params_parser to give detailed debug inf…
…ormation when invalid xml or json is posted

[#2481 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
1cf32ad
Hongli Lai FooBarWidget Fix reloading of metal pieces.
- Do not hold references to old metal objects after metal classes have been reloaded.
- Obtain the reloader lock before building the middleware stack, so that reloading of metal pieces works in the face of multithreading.

[#2873 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
14b6ab0
Jeremy Kemper jeremy Bump pg gem requirement to 0.8.0. Build psql db with UTF8 encoding. 1cb433c
Jeremy Kemper jeremy 2-3-stable CI notifies rails core list d8ae3d5
Aug 17, 2009
Pratik lifo Deprecate SQLite2Adapter and DeprecatedSQLiteAdapter b9f668e
Aug 18, 2009
David Heinemeier Hansson dhh Added db/seeds.rb as a default file for storing seed data for the dat…
…abase. Can be loaded with rake db:seed (or created alongside the db with db:setup). (This is also known as the "Stop Putting Gawd Damn Seed Data In Your Migrations" feature) [DHH]

Conflicts:

	railties/CHANGELOG
f3c7bbe
Aug 20, 2009
Mike Gunderloy ffmike Fix trivial typo in template runner example [#3082 state:resolved]
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
9127c5b
Aug 23, 2009
Jeremy Kemper jeremy Add active_support/all for forward compatibility. d6a944f
Aug 25, 2009
Jeremy Kemper jeremy Benchmark script via miloops' arel fork via DataMapper's AR compariso…
…n script
f1355e6
Emilio Tagua miloops timestamps gives a created_at field not created_on.
[#3093 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
38d6e65
Jeremy Kemper jeremy Fix typo e213f0c
Aug 26, 2009
Akira Matsuda amatsuda I18n: use I18n for select helpers' prompt text
[#2252 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
d725ad3
Sven Fuchs svenfuchs allow ActiveRecord#RecordInvalid exception message to be localized
[#2754 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
a4838ee
Jeremy Kemper jeremy Revert "I18n: use I18n for select helpers' prompt text"
Broke CI.

[#2252 state:open]

This reverts commit d725ad3.
3cd245b
Akira Matsuda amatsuda I18n: use I18n for select helpers' prompt text
[#2252 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
e46e67c
Jeffrey Hardy packagethief UrlRewriter#rewrite_url should call #to_param on the value given in :…
…anchor option, just as #url_for does

[#2746 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
4240890
Jeffrey Hardy packagethief Don't use AR::Base.connection for fixture column quoting. Use the con…
…nection given to Fixtures.new

[#3104 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
8a49183
Aug 27, 2009
Jeffrey Hardy packagethief When running multiple test tasks, don't abort early if one produces f…
…ailures

[#3107 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
058459d
Jeremy Kemper jeremy Prefer utf8_unicode_ci (better) over utf8_general_ci (faster) 05d7409
Aug 29, 2009
Sven Fuchs + Mateo Murphy Fix ActiveRecord Error message I18n:
* allow messages and full_messages to be lazily translated at any time
* allow locales to be swapped and still obtain correctly localized messages
* allow localized global and error-type specific full_message formats
* extract an Error class

[#1687 state:open]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
13fb26b
Aug 30, 2009
Chad Woolley thewoolleyman CI config updates: do not send CI emails unless explicitly enabled, u…
…se 'gem update --system', and send emails from an address which can post to the core list

[#3116 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
70ed47f
Jay Pignata Ensuring that a singular model name is set for use in controllers whe…
…n scaffold is passed a plural model name

[#3062 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
ff8cb50
Antonio Tapiador atd I18n support for plugins
Rails will now automatically add locale files found in any engine's locale
directory to the I18n.load_path (i.e. files that match the glob pattern
"config/locales/**/*.{rb,yml}" relative to engine directories).

[#2325 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
49342d1
Aug 31, 2009
Jay Pignata Duplicating the options hash in Date#advance to prevent modification …
…of the original [#1133 state:resolved]

Signed-off-by: Joshua Peek <josh@joshpeek.com>
49c4a79
Joshua Peek josh Deprecated "best fit" detection is to difficult. Just provide a switc…
…h to toggle the new behavor on.

  # new_rails_defaults.rb
  ActionController::Routing.generate_best_match = false
6fdfe4c
Sep 01, 2009
Geoff Buesing gbuesing Rails::Info doesn't require version for unwanted frameworks
[#3124 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
6bf1777
José Valim josevalim Assert primary key does not exist in habtm when the association is de…
…fined, instead of doing that everytime a record is inserted.

[#3128 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
594a281
Sep 02, 2009
Jeremy Kemper jeremy Revert "Assert primary key does not exist in habtm when the associati…
…on is defined, instead of doing that everytime a record is inserted."

Test failures on PostgreSQL.

[#3128]

This reverts commit 594a281.
2b82708
Sep 04, 2009
Coda Hale codahale Fix timing attack vulnerability in ActiveSupport::MessageVerifier.
Use a constant-time comparison algorithm to compare the candidate HMAC with the calculated HMAC to prevent leaking information about the calculated HMAC.

Signed-off-by: Michael Koziarski <michael@koziarski.com>
1f07a89
Manfred Stienstra Manfred Add verify and clean methods to ActiveSupport::Multibyte.
When accepting character input from outside of your application you can't
blindly trust that all strings are properly encoded. With these methods
you can check incoming strings and clean them up if necessary.

Signed-off-by: Michael Koziarski <michael@koziarski.com>
07c6938
Michael Koziarski NZKoz Clean tag attributes before passing through the escape_once logic.
Addresses CVE-2009-3009
9a68c72
Michael Koziarski NZKoz Prepare for 2.3.4 release a43ef24