aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Set the default options value for as_json in the encoder object.José Valim2011-09-302-3/+3
| | |
* | | Fixing `as_json` method for ActiveRecord models.Nicolás Hock Isaza2011-09-291-1/+1
|/ / | | | | | | | | | | | | | | | | | | | | | | | | When you've got an AR Model and you override the `as_json` method, you should be able to add default options to the renderer, like this: class User < ActiveRecord::Base def as_json(options = {}) super(options.merge(:except => [:password_digest])) end end This was not possible before this commit. See the added test case.
* | remove superfluous to_s in ERB::Util.html_escapeAlexey Vakhov2011-09-241-1/+1
| |
* | Minor doc fix to String#constantizeRyan Oblak2011-09-231-3/+3
| |
* | Update CHANGELOG for safe_constantize.José Valim2011-09-232-1/+6
| |
* | Use safe_constantize where possible.José Valim2011-09-231-3/+1
| |
* | Ensure that constantize just rescues NameError that applies to the constant ↵José Valim2011-09-232-4/+26
| | | | | | | | being currently loaded.
* | Added ActiveSupport::Inflector.safe_constantize and String#safe_constantize; ↵Ryan Oblak2011-09-235-21/+106
| | | | | | | | refactored common constantize tests into ConstantizeTestCases
* | No need to create a range objectSantiago Pastorino2011-09-221-3/+3
| |
* | Merge pull request #3096 from phuibonhoa/masterSantiago Pastorino2011-09-222-10/+18
|\ \ | | | | | | FileStore key_file_path does not properly limit filenames to 255 characters
| * | Updated existing test that fails with this fix ↵Philippe Huibonhoa2011-09-211-1/+1
| | | | | | | | | | | | | | | (8d63678d1406c5518d437709af0fde717c0248d7). Before the fix the test was giving a false positive, because file_store.key_file_path would return an empty filename (i.e. test/tmp_cache/4D0/F4D rather than test/tmp_cache/4D0/F4D/xxxx…). Even though the fix referenced above divides the filename into directories to prevent it from being too long, it seems that 1000 characters will always raise an error, so reducing the key size to 900).
| * | Fixed issue in file store where it could create a filename that was too long ↵Philippe Huibonhoa2011-09-212-9/+17
| | | | | | | | | | | | for the file system. (https://github.com/rails/rails/issues/3072)
* | | fix incorrect commentVijay Dev2011-09-221-1/+1
| | |
* | | Fix test to reflect use of to_param for keysbrainopia2011-09-181-8/+8
|/ /
* | Merge pull request #3049 from brainopia/fix_to_query_edge_caseSantiago Pastorino2011-09-172-1/+10
|\ \ | | | | | | Fix Hash#to_query edge case with html_safe string on 1.8 ruby
| * | Fix Hash#to_query edge case with html_safe string on 1.8 rubybrainopia2011-09-162-1/+10
| | |
* | | Proper lines numbers for stack trace infoSantiago Pastorino2011-09-161-1/+1
|/ /
* | Fix typo in deprecation noticeClaudio Poli2011-09-161-1/+1
| |
* | Fix typo in deprecation warning.Peter Suschlik2011-09-161-1/+1
| |
* | Test deprecation warning when not using an options hash as second parameter.Willem van Bergen2011-09-152-2/+14
| |
* | Use an options hash to specify digest/cipher algorithm and a serializer for ↵Willem van Bergen2011-09-154-20/+26
| | | | | | | | MessageVerifier and MessageEncryptor.
* | Add some documentation for the new serializer property of MessageVerifier ↵Willem van Bergen2011-09-151-0/+5
| | | | | | | | and MessageEncryptor.
* | Implement API suggestions of pull request.Willem van Bergen2011-09-154-18/+34
| |
* | Fixed tests so that they will also run properly in other timezones.Willem van Bergen2011-09-152-4/+4
| |
* | Custom serializers and deserializers in MessageVerifier and MessageEncryptor.Willem van Bergen2011-09-154-5/+30
| | | | | | | | | | By default, these classes use Marshal for serializing and deserializing messages. Unfortunately, the Marshal format is closely associated with Ruby internals and even changes between different interpreters. This makes the resulting message very hard to impossible to unserialize messages generated by these classes in other environments like node.js. This patch solves this by allowing you to set your own custom serializer and deserializer lambda functions. By default, it still uses Marshal to be backwards compatible.
* | update 3.1 release date in changelogsVijay Dev2011-09-141-1/+1
| |
* | Fix a typo in dateSemyon Perepelitsa2011-09-121-1/+1
| |
* | revert the changes from c60995f3 - related to marking sub,gsub as ↵Vijay Dev2011-09-091-20/+1
| | | | | | | | unavailable to use with safe strings
* | delete the CHANGELOG entry re SafeBuffer and sub/gsub, since it has been ↵Xavier Noria2011-09-081-2/+0
| | | | | | | | reverted
* | Revert removing gsub and sub from safe buffer.José Valim2011-09-085-63/+45
| |
* | mention the issue number for future referenceXavier Noria2011-09-081-1/+1
| |
* | registers removal of sub and friends for safe strings in the CHANGELOGXavier Noria2011-09-081-0/+2
| |
* | this should have gone with the previous commitXavier Noria2011-09-082-6/+6
| |
* | copy-edits a couple of exception messagesXavier Noria2011-09-081-4/+4
| | | | | | | | | | | | | | "Safe Buffer" should either be the constant with the class name, or go in lower case. I've chosen to follow the same terminology that is used in the AS core extensiong guide, "safe string", though "safe buffer" is also used elsewhere, we should pick one.
* | better method documentation on disable safe string methodsDamien Mathieu2011-09-081-6/+12
| |
* | remove support of symbols on classify and camelizeDamien Mathieu2011-09-084-34/+52
| |
* | make gsub and sub unavailable in SafeBuffers - Closes #1555Damien Mathieu2011-09-082-11/+24
| |
* | Make sure require_tzinfo only calls Kernel#require if TZInfo isn't already ↵Tim Lucas2011-09-071-1/+1
| | | | | | | | | | | | | | | | present. This wasn't a problem when require_tzinfo was only called from TimeZone#initialize, but now it's being called for every lookup to TimeZone.[] (via lazy_zones_map) TimeZone lookup can occur when unmarshalling TimeWithZone objects, which is where I first saw the big slowdown (500ms for each Rails action that loaded from Rails.cache)
* | We can't simply check the first line of the backtrace, Arun Agrawal2011-09-041-4/+6
| | | | | | because JRuby reports the call to __send__ in the backtrace.
* | Modified content in guides and commentsArun Agrawal2011-09-041-2/+2
| | | | | | | | | | | | for "assert /" warnings. Removed because if somebody will use this code they will get warnings!
* | Merge pull request #2827 from sikachu/extractable_ordered_hashJosé Valim2011-09-033-0/+12
|\ \ | | | | | | Make `ActiveSupport::OrderedHash` extractable when using `Array#extract_options!
| * | Make `ActiveSupport::OrderedHash` extractable when using ↵Prem Sichanugrist2011-09-033-0/+12
| |/ | | | | | | | | `Array#extract_options!` `ActiveSupport::OrderedHash` is actually a subclass of the hash, so it does make sense that it should be extractable from the array list.
* / docs formatting changesVijay Dev2011-09-013-4/+4
|/
* Revert "Ruby 1.8.7+ provides to_date/to_datetime, AS just makes them ↵Chris Griego2011-08-311-0/+22
| | | | | | | | public." to support date implementations without private to_date/to_datetime on Time (home_run). This reverts commit 080345baca1076a9788dff4803153600aec31f86. Signed-off-by: José Valim <jose.valim@gmail.com>
* Merge pull request #2723 from guilleiguaran/3-1-0-changelogsSantiago Pastorino2011-08-281-0/+12
| | | | Update changelogs for Rails 3.1.0
* Revert all the stuff to do with disallowing non-public methods for ↵Jon Leighton2011-08-256-170/+3
| | | | Module#delegate
* stop circular require warningsAaron Patterson2011-08-242-2/+0
|
* only backport the to_d method if it does not existAaron Patterson2011-08-241-2/+5
|
* dealing with some -w warnings on startupAaron Patterson2011-08-241-0/+2
|
* Fix autoload_once_paths when using Pathnames & ruby 1.9Jonathan del Strother2011-08-242-1/+20
| | | | | | | Under ruby 1.9.2 - "/var/log".starts_with?(Pathname.new("/var")) # => false so setting config.autoload_once_paths with Pathnames would not work