aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Rename secret_token_key to secret_key_baseSantiago Pastorino2012-11-031-1/+1
| | |
| * | Move ensure_secret_secure to DummyKeyGeneratorSantiago Pastorino2012-11-031-0/+24
| | |
| * | Cache generated keys per KeyGenerator instance using salt + key_sizeSantiago Pastorino2012-11-031-0/+14
| | |
| * | Add cookie.encrypted which returns an EncryptedCookieJarSantiago Pastorino2012-11-032-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | How to use it? cookies.encrypted[:discount] = 45 => Set-Cookie: discount=ZS9ZZ1R4cG1pcUJ1bm80anhQang3dz09LS1mbDZDSU5scGdOT3ltQ2dTdlhSdWpRPT0%3D--ab54663c9f4e3bc340c790d6d2b71e92f5b60315; path=/ cookies.encrypted[:discount] => 45
| * | Sign cookies using key deriverSantiago Pastorino2012-11-031-0/+10
| |/
* | Merge pull request #8219 from nikitug/threadsafe_xmlmini_with_backendRafael Mendonça França2012-11-153-9/+104
|\ \ | | | | | | | | | | | | | | | | | | Make XmlMini.with_backend usable with threads Conflicts: activesupport/CHANGELOG.md
| * | Make XmlMini.with_backend usable with threadsNikita Afanasenko2012-11-153-9/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `XmlMini.with_backend` now may be safely used with threads: Thread.new do XmlMini.with_backend("REXML") { rexml_power } end Thread.new do XmlMini.with_backend("LibXML") { libxml_power } end Each thread will use it's own backend.
* | | let remove_constant still delete Kernel#autoload constants [rounds #8213]Xavier Noria2012-11-153-13/+25
|/ / | | | | | | | | The method #remove_const does not load the file, so we can still remove the constant.
* | dependencies no longer trigger Kernel#autoload in remove_const [fixes #8213]Xavier Noria2012-11-154-13/+44
| |
* | backporting Struct#to_h from ruby 2.0Aaron Patterson2012-11-132-0/+16
| |
* | Use new mocha version and add changelog entry for #8180Carlos Antonio da Silva2012-11-131-0/+2
| |
* | Merge pull request #8180 from freerange/mocha-fixes-supporting-only-0.13-onwardsCarlos Antonio da Silva2012-11-132-25/+5
|\ \ | | | | | | Simplify code by taking advantage of latest mocha (v0.13.0).
| * | Simplify code by taking advantage of latest mocha (v0.13.0).James Mead2012-11-122-25/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This only works with mocha v0.13.0 or later. Note that this also fixes a few subtle bugs present in the current implementation :- * Mocha was raising a `MiniTest::Assertion` instead of a `Mocha::ExpectationError` as intended. The latter is not recognized by MiniTest as an assertion failure and so it is recorded as a test *error*, not a test *failure* as it ought to. This leads to potentially confusing output in the test results. * Mocha verification should happen as part of the test. The verification of expectations is equivalent to a set of assertions. These assertions should happen as *part of* the test so that they have a chance to cause the test to fail, and not just as part of the teardown. Also if an assertion fails during the test, then there is no need to verify expectations, because only the first assertion failure is normally reported and all subsequent bets are off. * Expectation verification should be counted as an assertion. Mocha cannot record each expectation verification as an assertion, because we weren't passing in an assertion counter to `#mocha_verify`.
* | | `#as_json` isolates options when encoding a hash. Closes #8182Yves Senn2012-11-123-1/+24
|/ / | | | | | | | | | | Setting options in a custom `#as_json` method had side effects. Modifications of the `options` hash leaked outside and influenced the conversion of other objects contained in the hash.
* | Merge pull request #8173 from nikitug/match_classes_without_to_sCarlos Antonio da Silva2012-11-111-10/+10
|\ \ | | | | | | Match classes without to_s conversions.
| * | Match classes without to_s conversions.Nikita Afanasenko2012-11-111-10/+10
| | | | | | | | | | | | There is no need in `value_under_case.class.to_s` conversion since case already matches classes with `Class === value_under_case`.
* | | Test Hash#diff deprecation, also prevent deprecation message in AS testsNikita Afanasenko2012-11-111-1/+3
|/ /
* | Deprecate Hash#diff.Steve Klabnik2012-11-092-0/+4
| | | | | | | | | | | | It's no longer used in Rails any more. See https://github.com/rails/rails/pull/8142\#issuecomment-10227297 for more
* | Merge pull request #7763 from route/full-captureCarlos Antonio da Silva2012-11-083-11/+29
|\ \ | | | | | | Kernel#capture replaced by version which can catch output from subprocesses
| * | Kernel#capture replaced by version which can catch output from subprocessesDmitry Vorotilin2012-11-013-11/+29
| | |
* | | Clean up gemspecsVinny Diehl2012-11-081-9/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Organized the gemspec files a bit. * Made quotes more consistent (single quotes dominated, so I used that). * Moved license line down a line, separating it logically, and removed the extra whitespace before its = operator. * Minor whitespace fixes.
* | | cleaning up constantize testsAaron Patterson2012-11-071-44/+44
| | |
* | | fix warnings in Ruby 2.0Aaron Patterson2012-11-072-0/+4
| | |
* | | mocha_standalone is now deprecated. Switch to mocha/api.Jeremy Kemper2012-11-051-1/+1
| | |
* | | Make the tests pass with minitest 4.2Rafael Mendonça França2012-11-051-0/+3
| | |
* | | Remove AS::Concern extension from Testing::TaggedLoggingCarlos Antonio da Silva2012-11-051-4/+0
| | |
* | | Refactor Inflector#ordinal to avoid converting the number twiceCarlos Antonio da Silva2012-11-041-2/+4
| | |
* | | Fix typo in test nameCarlos Antonio da Silva2012-11-042-3/+2
| | |
* | | Use `tag!` instead of `method_missing` in `to_xml` conversions.Nikita Afanasenko2012-11-043-5/+9
| |/ |/| | | | | Since version `3.0.x` `Builder` caches method passed to `method_missing` each time. This commit replaces `method_missing` call with `tag!` call to prevent method redefinition on each `to_xml` call with the same builder.
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-11-034-9/+9
|\ \ | | | | | | | | | | | | | | | | | | Conflicts: actionpack/lib/action_controller/metal/mime_responds.rb activerecord/lib/active_record/attribute_methods.rb guides/source/working_with_javascript_in_rails.md
| * | Adding a missing parenthesis in the doc of String#parameterize.Geoffrey Roguelon2012-10-241-2/+2
| | |
| * | fix output messages - docs [ci skip]Francesco Rodriguez2012-10-224-6/+6
| | |
| * | More changes around 1.9 hash syntaxAvnerCohen2012-10-212-4/+4
| | | | | | | | | | | | Added missing space in previous hash related commit
* | | Fixed timezone mapping of Solomon Islands.Steve Klabnik2012-11-012-1/+3
| |/ |/| | | | | | | | | | | | | Fixes #8095. For reference, here is the discussion about the mapping being incorrect: http://rubyforge.org/pipermail/tzinfo-users/2012-November/000114.html
* | Make caller attribute in deprecation methods optionalAlexey Gaziev2012-10-3013-15/+23
| |
* | Provide a call stack for deprecation warnings where needed.Nikita Afanasenko2012-10-294-6/+12
| | | | | | | | It's sometimes hard to quickly find where deprecated call was performed, especially in case of migrating between Rails versions. So this is an attempt to improve the call stack part of the warning message by providing caller explicitly.
* | atomicc.rb: Don't assume we may chown/chmod a file.Daniele Sluijters2012-10-292-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously this code just assumed it is capable of changing the file ownership, both user and group. This will fail in a lot of scenario's unless: * The process is run as a superuser (root); * The owning user and group are already set to the user and group we're trying to chown to; * The user chown'ing only changes the group to another group it is a member of. If either of those conditions are not met the filesystem will simply deny the operation throwing an error. It is also not always possible to do a chmod, there might be a SELinux policy or another limitation preventing the user to change the file mode. To this end the chmod call has also been added to the rescue block. I've also added a little comment above the chmod command that doing a chmod on a file which has an ACL set will cause the ACL to be recalculated / modified.
* | Merge pull request #8046 from pmahoney/exceptions_as_flow_controlRafael Mendonça França2012-10-281-2/+2
|\ \ | | | | | | Replace flow-control exception with explicit test.
| * | Replace flow-control exception with explicit test.Patrick Mahoney2012-10-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was noticed while profiling 'assets:precompile' in JRuby that exception creation was consuming a large portion of time, and some of that was due to File.atomic_write. Testing first with File.exists? eliminates the need for an exception which should be a perfomrance improvement on both JRuby and MRI. In this case, the stat() isn't even extra overhead, since it is always called.
* | | Fix some assert_raise calls containing messages in Active SupportCarlos Antonio da Silva2012-10-282-7/+15
|/ /
* | Fix queueing tests that should be consuming the queue rather than draining itJeremy Kemper2012-10-262-4/+10
| |
* | Job consumer logs to Rails.logger by defaultJeremy Kemper2012-10-261-2/+5
| |
* | Job worker thread logs failed jobs tooJeremy Kemper2012-10-262-2/+2
| |
* | Job worker thread logs to stderr if no logger is providedJeremy Kemper2012-10-262-2/+13
| |
* | Implement replace method so key? works correctly.David Graham2012-10-263-0/+22
| |
* | Remove ActiveRecord::Model consant from AS::TestCaseCarlos Antonio da Silva2012-10-261-1/+1
| | | | | | | | Fixing the build.
* | make the cache test more @tenderlove(ing) and not depend on internal ↵Noah Hendrix2012-10-231-2/+7
| | | | | | | | implentation
* | pass the key to the block in cache.fetch on missesNoah Hendrix2012-10-232-7/+12
|/
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-10-215-8/+8
|\ | | | | | | | | | | Conflicts: activesupport/lib/active_support/core_ext/hash/slice.rb guides/source/active_support_core_extensions.md
| * Hash Syntax changes to 1.9 formatAvnerCohen2012-10-205-9/+9
| |