aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* When a dynamic :controller segment is present in the path add a Regexp ↵Andrew White2010-07-073-21/+46
| | | | | | | | | | | constraint that allow matching on multiple path segments. Using a namespace block isn't compatible with dynamic routes so we raise an ArgumentError if we detect a :module present in the scope. [#5052 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* Refactor handling of :only and :except options. The rules are:Andrew White2010-07-062-73/+236
| | | | | | | | | | | 1. Don't inherit when specified as an option on a resource 2. Don't push into scope when specified as an option on a resource 2. Resources pull in :only or :except options from scope 3. Either :only or :except in nested scope overwrites parent scope [#5048 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* documents automatic management of join models in hmt associations, in ↵Xavier Noria2010-07-062-4/+21
| | | | particular the gotcha that deletion is direct
* Recognize should also work with route is wrapped in a constraint.José Valim2010-07-063-1/+8
|
* RouteSet should also handle anonymous classes.José Valim2010-07-051-2/+2
|
* Define a convention for descendants and subclasses.José Valim2010-07-0513-192/+100
| | | | | | The former should be symmetric with ancestors and include all children. However, it should not include self since ancestors + descendants should not have duplicated. The latter is symmetric to superclass in the sense it only includes direct children. By adopting a convention, we expect to have less conflict with other frameworks, as Datamapper. For this moment, to ensure ActiveModel::Validations can be used with Datamapper, we should always call ActiveSupport::DescendantsTracker.descendants(self) internally instead of self.descendants avoiding conflicts.
* Move Date#xmlschema to conversions and add a missing requireSantiago Pastorino2010-07-043-9/+12
|
* Avoids deprecation warning running testsSantiago Pastorino2010-07-041-5/+7
|
* Adds tests for content negotiation change introduced in dc5300adb6d46252c26ePatrik Stenmark2010-07-041-0/+20
| | | | Signed-off-by: wycats <wycats@gmail.com>
* ARGV.empty? is useless. If ARGV is empty, ARGV.first != "new" will always be ↵Madjo DIAPENA2010-07-041-1/+1
| | | | | | true Signed-off-by: José Valim <jose.valim@gmail.com>
* Fix syntax of routing tests so they actually runAndrew White2010-07-041-12/+18
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* Refactor resource options and scoping. Resource classes are now only ↵Andrew White2010-07-042-101/+145
| | | | | | responsible for controlling how they are named. All other options passed to resources are pushed out to the scope. Signed-off-by: José Valim <jose.valim@gmail.com>
* Fixes for "router" and "routes" terminologyWincent Colaiuta2010-07-037-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit f7ba614c2db improved the internal consistency of the different means of accessing routes, but it introduced some problems at the level of code comments and user-visible strings. This commit applies fixes on three levels: Firstly, we remove or replace grammatically invalid constructs such as "a routes" or "a particular routes". Secondly, we make sure that we always use "the router DSL" or "the router syntax", because this has always been the official terminology. Finally, we make sure that we only use "routes" when referring to the application-specific set of routes that are defined in the "config/routes.rb" file, we use "router" when referring on a more abstract level to "the code in Rails used to handle routing", and we use "routing" when we need an adjective to apply to nouns such as "url_helpers. Again this is consistent with historical practice and other places in the documentation. Note that this is not a sweep over the entire codebase to ensure consistent usage of language; it is just a revision of the changes introduced in commit f7ba614c2db. Signed-off-by: Wincent Colaiuta <win@wincent.com> Signed-off-by: José Valim <jose.valim@gmail.com>
* Merge remote branch 'spastorino/master'Jeremy Kemper2010-07-0311-30/+40
|\
| * Add a missing require to allow the usage of Array#to_xmlSantiago Pastorino2010-07-031-0/+1
| |
| * Removes the dependency that AMo has on tzinfoSantiago Pastorino2010-07-031-6/+6
| | | | | | | | [#4979 state:committed]
| * Refactor move some date, time and date_time methods to */zones and fixed ↵Santiago Pastorino2010-07-039-24/+33
| | | | | | | | some requires
* | Refactor recall parameter normalization [#5021 state:resolved]Andrew White2010-07-032-18/+33
|/ | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* Time#formatted_offset is defined in core_ext/time/conversionsSantiago Pastorino2010-07-021-0/+1
| | | | [#4979]
* Time#as_json: use Time#formatted_offset instead of strftime %z directive, ↵Geoff Buesing2010-07-021-1/+1
| | | | | | | | which is non-standard and inaccurate on some platforms (e.g., Mac OS X). [#4979] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Fix indentJeremy Kemper2010-07-021-1/+1
|
* Fix routes with :controller segment when namespaced [#5034 state:resolved]José Valim2010-07-024-30/+63
|
* reload_routes! was still referencing old Rails::Application.José Valim2010-07-021-6/+5
|
* bump erubis version to 2.6.6 and thor version to 0.13.7Santiago Pastorino2010-07-023-4/+4
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* Time has it own implementation of xmlschema, now AMo doesn't depend on TZInfoSantiago Pastorino2010-07-023-4/+7
| | | | | | [#4979 state:committed] Signed-off-by: José Valim <jose.valim@gmail.com>
* Unify routes naming by renaming router to routesPiotr Sarnacki2010-07-0215-37/+37
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* porting session.clear fix to master branch. [#5030 state:resolved]Aaron Patterson2010-07-012-0/+27
| | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* AS json refactor, move to_json implementation to core_ext and a cleanup a ↵Santiago Pastorino2010-07-016-36/+29
| | | | bit the code
* Bump bundler dependency to 1.0.0.beta.2 or laterJeremy Kemper2010-07-013-2/+3
|
* Avoid calls to Rails::Application since this is not the official API.José Valim2010-07-0117-80/+55
| | | | Your application should *always* reference your application const (as Blog::Application) and Rails.application should be used just internally.
* fix failure if behavior is not define and try use the defaultCyril Mougel2010-07-012-1/+8
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* Add the possibility to have several behaviors in AS::Deprecation.José Valim2010-07-014-3/+19
|
* Don't remove scheduled destroys when loading an association. [#4642 ↵James Le Cuirot2010-07-012-1/+12
| | | | | | state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* Make relation a private method.José Valim2010-07-012-6/+7
|
* Merge remote branch 'rails/master'Xavier Noria2010-06-30126-970/+5690
|\
| * Support any mysql-like adapterJeremy Kemper2010-06-301-7/+7
| |
| * add note of which configuration option to set in deprecation warning message ↵bodhi2010-06-301-3/+5
| | | | | | | | | | | | [#5012 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
| * Improve the idiom used in multibyte chars a bit.José Valim2010-06-301-3/+3
| |
| * Fix ActiveSupport::Multibyte::Chars#slice for empty strings when starting ↵Alex Muntean2010-06-302-1/+3
| | | | | | | | | | | | offset is negative [#4717 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
| * Update Unicode database to 5.2.0. [#5011 state:resolved]Norman Clarke2010-06-302-1/+1
| | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
| * Fix AS::MB::Chars#+ to not alter self [#4646 state:resolved]James MacAulay2010-06-302-8/+10
| | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
| * Add missing CHANGELOG items.José Valim2010-06-301-0/+2
| |
| * A couple enhancements to the router:José Valim2010-06-302-27/+75
| | | | | | | | | | | | | | | | * Allow to use the get :symbol shortcut outside resources scopes as well; * Fix a bug where :action was not being picked from given options; * Giving :as option inside a resource now changes just the relative name instead of the full name;
| * Clean up the logic to specify the name and path for action a bit.José Valim2010-06-301-87/+51
| |
| * We are trying to test that & escapes here not that &amp; is being escaped, ↵Santiago Pastorino2010-06-291-3/+2
| | | | | | | | | | | | also added a cosmetic change to test_link_tag_with_query_and_no_name Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * performance tests now working accurately on 1.9, using Ruby with the GCdata ↵Gonçalo Silva2010-06-291-36/+18
| | | | | | | | patch
| * AssociationCollection#create_by_*, find_or_create_by_* work properly now. ↵Aaron Patterson2010-06-292-0/+73
| | | | | | | | | | | | [#1108 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * migrations.rb requires active_support/core_ext/module/aliasing [#5008 ↵Tekin2010-06-301-0/+1
| | | | | | | | | | | | state:committed] Signed-off-by: Xavier Noria <fxn@hashref.com>
| * s/escape_once/html_escape/, since html safety is the contract that now says ↵Xavier Noria2010-06-306-20/+25
| | | | | | | | whether something has to be escaped
| * url_for no longer escapes HTML, the :escape option is also goneXavier Noria2010-06-305-33/+14
| | | | | | | | Rationale: url_for is just a path/URL generator, it is the responsability of the caller to escape conveniently HTML needs it, JavaScript needs different escaping, a text mail needs no escaping at all, etc.
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-07 10:50:47 +0000