aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* has_secure_password should not raise a 'digest missing' error if the calling ↵Robby Grossman2012-07-313-2/+21
| | | | class has specified for validations to be skipped.
* Merge pull request #7212 from accessd/small-typo-fixRafael Mendonça França2012-07-311-1/+1
|\ | | | | small fix typo in collection proxy
| * fix typo in collection proxyAccessd2012-07-311-1/+1
|/
* Update activesupport/CHANGELOG.mdJosé Valim2012-07-311-0/+2
|
* Merge pull request #7197 from davidcelis/i18n_inflectorJosé Valim2012-07-316-25/+84
|\ | | | | Make ActiveSupport::Inflector locale aware and multilingual
| * Make ActiveSupport::Inflector locale aware and multilingualDavid Celis2012-07-306-25/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Inflector is currently not very supportive of internationalized websites. If a user wants to singularize and/or pluralize words based on any locale other than English, they must define each case in locale files. Rather than create large locale files with mappings between singular and plural words, why not allow the Inflector to accept a locale? This patch makes ActiveSupport::Inflector locale aware and uses `:en`` unless otherwise specified. Users will still be provided a list of English (:en) inflections, but they may additionally define inflection rules for other locales. Each list is kept separately and permanently. There is no reason to limit users to one list of inflections: ActiveSupport::Inflector.inflections(:es) do |inflect| inflect.plural(/$/, 's') inflect.plural(/([^aeéiou])$/i, '\1es') inflect.plural(/([aeiou]s)$/i, '\1') inflect.plural(/z$/i, 'ces') inflect.plural(/á([sn])$/i, 'a\1es') inflect.plural(/é([sn])$/i, 'e\1es') inflect.plural(/í([sn])$/i, 'i\1es') inflect.plural(/ó([sn])$/i, 'o\1es') inflect.plural(/ú([sn])$/i, 'u\1es') inflect.singular(/s$/, '') inflect.singular(/es$/, '') inflect.irregular('el', 'los') end 'ley'.pluralize(:es) # => "leyes" 'ley'.pluralize(:en) # => "leys" 'avión'.pluralize(:es) # => "aviones" 'avión'.pluralize(:en) # => "avións" A multilingual Inflector should be of use to anybody that is tasked with internationalizing their Rails application. Signed-off-by: David Celis <david@davidcelis.com>
* | Merge pull request #7176 from bogdan/reverse_orderRafael Mendonça França2012-07-319-17/+35
|\ \ | | | | | | AR::Relation#order: make new order prepend old one.
| * | AR::Relation#order: make new order prepend old oneBogdan Gusiev2012-07-319-17/+35
|/ / | | | | | | | | | | | | User.order("name asc").order("created_at desc") # SELECT * FROM users ORDER BY created_at desc, name asc This also affects order defined in `default_scope` or any kind of associations.
* | Merge pull request #7205 from frodsan/fix_nodoc_liveCarlos Antonio da Silva2012-07-301-4/+4
|\ \ | | | | | | Fix nodoc in metal/live [ci skip]
| * | fix nodoc in metal/liveFrancesco Rodriguez2012-07-301-4/+4
|/ /
* | Merge pull request #7203 from frodsan/typo_liveRafael Mendonça França2012-07-301-6/+6
|\ \ | | | | | | fix typo in metal/live [ci skip]
| * | fix typo in metal/live [ci skip]Francesco Rodriguez2012-07-301-6/+6
|/ /
* | Remove the deprecation of update_column.Rafael Mendonça França2012-07-303-48/+18
| | | | | | | | | | | | update_column was suggested as replacement of update_attribute at the last release of 3-2-stable, so deprecating it now will confuse the users.
* | Revert "DRY class_attribute code"José Valim2012-07-301-3/+6
| | | | | | | | | | | | | | class_attribute is a building block and using define_method can be much slower for such basic method definitions. This reverts commit d59208d7032e2be855a89ad8d4685cc08dd7cdb3.
* | Merge pull request #7198 from cfcosta/refactor-cache_control_headersRafael Mendonça França2012-07-291-11/+19
|\ \ | | | | | | Refactor ActionDispatch::Http::Cache::Response#cache_control_headers
| * | Refactor ActionDispatch::Http::Cache::Response#cache_control_headers.Cainã Costa2012-07-301-11/+19
| | |
* | | updated changelogAaron Patterson2012-07-291-0/+16
| | |
* | | close the response when the response body is set so that normal render calls ↵Aaron Patterson2012-07-292-0/+14
| | | | | | | | | | | | will work
* | | header hash is duped before being sent up the rack stackAaron Patterson2012-07-293-12/+33
| | |
* | | freeze the header objectAaron Patterson2012-07-292-0/+7
| | |
* | | make sure set_response! sets the correct response objectAaron Patterson2012-07-292-0/+15
| | |
* | | adding a more docs on closing response streamsAaron Patterson2012-07-291-1/+4
| | |
* | | pushing Buffer up to LiveAaron Patterson2012-07-291-22/+22
| | |
* | | adding some docsAaron Patterson2012-07-291-1/+26
| | |
* | | Controller actions are processed in a separate thread for liveAaron Patterson2012-07-293-7/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | responses. Processing controller actions in a separate thread allows us to work around the rack api - we can allow the user to set status and headers, then block until the first bytes are written. As soon as the first bytes are written, the main thread can return the status, headers, and (essentially) a queue for the body.
* | | raise exceptions on header set after response committedAaron Patterson2012-07-293-0/+43
| | |
* | | make sure appropriate headers are set and deletedAaron Patterson2012-07-291-0/+11
| | |
* | | added live responses which can be written and read in separate threadsAaron Patterson2012-07-295-0/+130
| |/ |/|
* | ActionController::DataStreaming::FileBody doesn't respond to #close.Rafael Mendonça França2012-07-291-1/+1
| |
* | flushing output should write to the stream rather than mutating the response ↵Aaron Patterson2012-07-293-12/+16
|/ | | | object
* remove dead testAaron Patterson2012-07-291-4/+0
|
* adding a buffered stream to the response objectAaron Patterson2012-07-294-3/+93
|
* initialize ivars, refactor recycle! to call initializeAaron Patterson2012-07-292-9/+3
|
* Remove warning renaming the test classes to use the test conventionRafael Mendonça França2012-07-292-2/+2
|
* Remove deprecation warning, since scoped waas deprecatedRafael Mendonça França2012-07-291-1/+1
|
* Merge pull request #7196 from ↵Aaron Patterson2012-07-291-1/+5
|\ | | | | | | | | rimidl/fix-incorrect-require-mysql-in-mysql_rake_test Fix incorrect usage `require mysql` in the activerecord/.../mysql_rake_test
| * fix incorrect usage `require mysql` in the ↵Vladimir Strakhov2012-07-291-1/+5
| | | | | | | | activerecord/test/.../mysql_rake_test.rb
* | Merge pull request #7188 from rodrigoflores/masterCarlos Antonio da Silva2012-07-291-1/+2
|\ \ | | | | | | Documentation Fix: Pointing the case when no dependent option is given to a association method
| * | Explaining a bit better about the default behaviour of dependentRodrigo Flores2012-07-281-1/+2
| | |
* | | Merge pull request #7192 from bogdan/sqlite_tests_fixCarlos Antonio da Silva2012-07-291-4/+4
|\ \ \ | | | | | | | | More polite cleanup for sqlite tests
| * | | More polite cleanup for sqlite testsBogdan Gusiev2012-07-291-4/+4
| | |/ | |/|
* | | Merge pull request #7194 from alexandrz/masterCarlos Antonio da Silva2012-07-291-6/+3
|\ \ \ | |/ / |/| | DRY class_attribute
| * | DRY class_attribute codeAleksandr Zykov2012-07-291-6/+3
|/ /
* | issue a warning when we cannot construct a controllerAaron Patterson2012-07-281-2/+10
| |
* | this test is not a controller test, so switch to AS::TCAaron Patterson2012-07-281-1/+1
|/
* removes the AR session store from eager loaded code [fixes #7160]Xavier Noria2012-07-291-1/+10
| | | | | See the comment in the file activerecord/lib/active_record.rb added by this patch for the rationale.
* Merge pull request #7186 from rimidl/fix-failure-test-in-actionpackRafael Mendonça França2012-07-281-2/+2
|\ | | | | Fix test_can_wait_until_commit(ResponseTest) in /actionpack/test/dispatch/response_test.rb
| * fix failure test 'test_can_wait_until_commit(ResponseTest)' in actionpackVladimir Strakhov2012-07-281-2/+2
| |
* | Merge pull request #7185 from route/reset_table_name_refactoringRafael Mendonça França2012-07-281-8/+4
|\ \ | |/ |/| Refactor to reset_table_name
| * Refactor to reset_table_nameDmitry Vorotilin2012-07-281-8/+4
| |