aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add automatic template digests to all CacheHelper#cache calls (originally ↵David Heinemeier Hansson2012-08-2914-14/+358
| | | | spiked in the cache_digests plugin) *DHH*
* Fix spacingDavid Heinemeier Hansson2012-08-291-8/+8
|
* Fix spacingDavid Heinemeier Hansson2012-08-291-5/+4
|
* Merge pull request #7230 from schneems/schneems/expose_required_keysAndrew White2012-08-296-30/+41
|\ | | | | Add Missing Keys from Journey on Failed URL Format
| * refactor route_set `generate_extras` functionalityschneems2012-08-281-17/+9
| | | | | | | | | | | | The result of Generator with or without the @extras instance variable set contains the desired information. Rather than preserving state when initializing the original object, we can simply extract the keys from the resultant parameters. ATP Actionpack, railties
| * Add Missing Keys from Journey on failed URL formatschneems2012-08-286-16/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Many named routes have keys that are required to successfully resolve. If a key is left off like this: <%= link_to 'user', user_path %> This will produce an error like this: No route matches {:action=>"show", :controller=>"users"} Since we know that the :id is missing, we can add extra debugging information to the error message. No route matches {:action=>"show", :controller=>"users"} missing required keys: [:id] This will help new and seasoned developers look closer at their parameters. I've also subclassed the routing error to be clear that this error is a result of attempting to generate a url and not because the user is trying to visit a bad url. While this may sound trivial this error message is misleading and confuses most developers. The important part isn't what's in the options its's what's missing. Adding this information to the error message will make debugging much more obvious. This is the sister pull request of https://github.com/rails/journey/pull/44 which will be required to get they missing keys into the correct error message. Example Development Error in Rails: http://cl.ly/image/3S0T0n1T3421
* | fixes a regexpXavier Noria2012-08-291-1/+1
| | | | | | | | | | | | | | | | We need to anchor to remove the extension. In addition to be the correct way to do that, files in ~/.rbenv get that .rb removed, so it is a real source of bugs, as reported in https://github.com/rails/rails/commit/b33700f5580b4cd85379a1dc60fa341ac4d8deb2#commitcomment-1781840
* | Merge pull request #7476 from ayrton/fixed_indentationXavier Noria2012-08-291-3/+3
|\ \ | | | | | | Fixed indendation
| * | Fixed indendationAyrton De Craene2012-08-291-3/+3
|/ /
* | Add a test to make sure preloading properly merges association and default ↵Pratik Naik2012-08-283-0/+23
| | | | | | | | scope conditions
* | CHANGELOGs are now per branchXavier Noria2012-08-286-17846/+6
| | | | | | | | | | | | | | | | | | | | Changes in old branches needed to be manually synched in CHANGELOGs of newer ones. This has proven to be brittle, sometimes one just forgets this manual step. With this commit we switch to CHANGELOGs per branch. When a new major version is cut from master, the CHANGELOGs in master start being blank. A link to the CHANGELOG of the previous branch allows anyone interested to follow the history.
* | detect circular constant autoloadingXavier Noria2012-08-284-4/+27
| | | | | | | | | | | | | | Nowadays circular autoloads do not work, but the user gets a NameError that says some constant is undefined. That's puzzling, because he is normally trying to autoload a constant he knows can be autoloaded. With this check we can give a better error message.
* | Merge pull request #7470 from kennyj/fix_method_redefined_warningRafael Mendonça França2012-08-282-0/+6
|\ \ | | | | | | Fix method redefined warnings.
| * | Fix method redefined warnings.kennyj2012-08-292-0/+6
|/ /
* | Merge pull request #7469 from kennyj/fix_many_warnings_in_amJosé Valim2012-08-281-1/+1
|\ \ | | | | | | Fixes warnings when executing rake test in ActionMailer.
| * | Fixes warnings when executing rake test in ActionMailer. Related to ↵kennyj2012-08-291-1/+1
|/ / | | | | | | 582a7f459990487659886b90e54c22e055c65870
* | Merge pull request #7468 from kennyj/tiny_fixingsJosé Valim2012-08-285-7/+4
|\ \ | |/ |/| Tiny fixes in railties/test/application.
| * Remove unused require.kennyj2012-08-292-3/+0
| |
| * Fixes wrong test class names.kennyj2012-08-294-4/+4
|/
* fixes a bug in dependencies.rbXavier Noria2012-08-281-1/+1
| | | | | | | loaded stores file names without the .rb extension, but search_for_file returns file names with the extension. The solution is hackish, but this file needs a revamp.
* Merge pull request #7466 from arunagw/warning_removed_apRafael Mendonça França2012-08-281-1/+1
|\ | | | | removed : warning: `*' interpreted as argument prefix
| * removed : warning: `*' interpreted as argument prefixArun Agrawal2012-08-281-1/+1
|/
* Add missing requireRafael Mendonça França2012-08-281-0/+1
|
* Merge pull request #7452 from arunagw/memcached_dalliRafael Mendonça França2012-08-282-7/+7
|\ | | | | Memcached to dalli for actionpack test.
| * More fixes for action pack tests with Dalli.Arun Agrawal2012-08-271-3/+3
| |
| * Let's run action pack tests with DalliArun Agrawal2012-08-271-4/+4
| | | | | | There is no memcache gem left in repo.
* | Merge pull request #7465 from wpp/generator_controller_pluralJosé Valim2012-08-281-6/+6
|\ \ | | | | | | Change generators controller help from singular to plural example.
| * | Change generators controller help from singular to plural example.Philipp Weissensteiner2012-08-281-6/+6
|/ / | | | | | | | | | | | | When running `rails generate controller --help` an example with creating a (singular) "CreditCard" controller is shown. The convention is to generate controllers with plural names though.
* | Merge pull request #7458 from frodsan/fix_orddep_basicsRafael Mendonça França2012-08-281-5/+5
|\ \ | | | | | | fix order dependent test in AR::BasicsTest
| * | fix order dependent test in AR::BasicsTestFrancesco Rodriguez2012-08-271-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | This test https://github.com/rails/rails/blob/master/activerecord/test/cases/base_test.rb#L381 is failing because is not setting `CreditCard.pluralize_table_name` to `false`. In this case, i prefer to change to another model that is not in the `GUESSED_CLASSES` array.
* | | Merge branch 'actionview-decoupling'Piotr Sarnacki2012-08-2849-232/+487
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | This branch contains set of changes that will allow to extract Action View out of Action Pack in the future. This work will be probably done after Rails 4.0 release, because of a few deprecations that were done to make decoupling possible.
| * | | Update AP's CHANGELOG with user facing changesPiotr Sarnacki2012-08-281-0/+14
| | | |
| * | | Deprecate AV::RecordIdentifier in controllersPiotr Sarnacki2012-08-283-4/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Methods provided by RecordIdentifier are not widely used in controllers nowadays as they're view specific (this is probably a legacy left after RJS rendering directly in controllers). However if people still need to use it, it's trivial to include ActionView::RecordIdentifier by themselves.
| * | | Fix ActionView::RecordIdentifier to work as a singletonPiotr Sarnacki2012-08-282-0/+10
| | | | | | | | | | | | | | | | | | | | We extend it with self, but the methods were not working properly were used directly on module.
| * | | No need to use included hook for includePiotr Sarnacki2012-08-281-3/+1
| | | | | | | | | | | | | | | | | | | | When module is extended ActiveSupport::Concern, include calls are lazily loaded, so there is no need to wrap it with included hook.
| * | | Deprecate Template#mime_typePiotr Sarnacki2012-08-282-0/+13
| | | |
| * | | Add deprecation horizon to html-scannerPiotr Sarnacki2012-08-281-1/+2
| | | |
| * | | Implement ActionView::Template::TypesPiotr Sarnacki2012-08-285-4/+65
| | | | | | | | | | | | | | | | | | | | | | | | AV::Template::Types is a small abstraction to allow to specify template types that can be used in ActionView. When Action Pack is loaded it's replaced with Mime::Type.
| * | | Don't require action_dispatch in ActionView::UrlHelpersPiotr Sarnacki2012-08-288-100/+134
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ActionDispatch::Routing::UrlFor was always required in UrlHelpers. This was changed by splitting previous implementation of UrlHelper into 2 modules: ActionView::Helpers::UrlHelper and ActionView::Routing::UrlHelper. The former one keeps only basic implementation of url_for. The latter adds features that allow to use routes and is only required when url_helpers or mounted_helpers are required.
| * | | Use ActionView::Base.logger instead of AC::Base.loggerPiotr Sarnacki2012-08-282-2/+2
| | | |
| * | | Add ActionView::Base.default_formatsPiotr Sarnacki2012-08-284-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | default_formats array is used by LookupContext in order to allow rendering templates when :formats option is not passed. Previously it was always set to Mime::SET, which created dependency on Action Pack. In order to remove this dependency, Mime::SET is used only if ActionController is loaded.
| * | | Remove Mime::Type translations from Action ViewPiotr Sarnacki2012-08-284-11/+10
| | | | | | | | | | | | | | | | | | | | Action View should not be responsible for translating mime types. Any translation that's needed should be handled at controller level.
| * | | Deprecate mime types lookup in auto_discovery_link_tagPiotr Sarnacki2012-08-282-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | Automatically handling mime types for things other than :rss and :atom is not functionality that justifies dependency on Mime::Type from actionpack.
| * | | Remove comment about getting rid of old AV::Base.new behaviorPiotr Sarnacki2012-08-281-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I've talked to José Valim, who added this comment, and there is no need to remove old API. It's good to have a simple way to instantiate ActionView::Base, by just passing view paths as a first argument, instead of constructing LookupContext and then the Renderer. [ci skip]
| * | | Remove stubs from LogSubscriber testsPiotr Sarnacki2012-08-281-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We can use another way to instantiate ActionView::Base, by passing renderer as a first option. Thanks to that we can just pass prefixes to LookupContext instead stubbing them on the controller. This is also good, because that kind of API is used in Rails code.
| * | | Move action_controller/vendor/html-scanner to action_viewPiotr Sarnacki2012-08-2816-27/+32
| | | | | | | | | | | | | | | | | | | | | | | | This is another step in moving Action View's dependencies in Action Pack to Action View itself. Also, HtmlScanner seems to be better suited for views rather than controllers.
| * | | Deprecate ActionController::RecordIdentifierPiotr Sarnacki2012-08-282-0/+12
| | | |
| * | | Add ActionView::ModelNamingPiotr Sarnacki2012-08-283-4/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | It's just a duplicate of ActionController::ModelNaming. These are just a simple helpers for decoupling Active Model, so it does not make sense to extract it to Active Support, but the point is to decouple also Action View and Action Pack
| * | | Move ActionController::RecordIdentifier to ActionViewPiotr Sarnacki2012-08-287-11/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Since it's more about DOM classes and ids it belongs to Action View better. What's more, it's more convenient to make it part of Action View to follow the rule that Action Pack can depend on Action View, but not the other way round.
| * | | Remove dependency on actionpack in ActionView::AssetPathsPiotr Sarnacki2012-08-284-6/+20
|/ / / | | | | | | | | | | | | | | | Since Action View should not depend on actionpack, it's best to delegate invalid_asset_host! to controller and just rely on such simple contract instead of raising ActionController::RoutingError directly.