aboutsummaryrefslogtreecommitdiffstats
path: root/actionview
Commit message (Collapse)AuthorAgeFilesLines
* Deal with regex match groups in excerptGareth Rees2014-06-242-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original implementation has bugs if the regex contains a match group. Example: excerpt('This is a beautiful? morning', /\b(beau\w*)\b/i, :radius => 5) Expected: "...is a beautiful? mor..." Actual: "...is a beautifulbeaut..." The original phrase was being converted to a regex and returning the text either side of the phrase as expected: 'This is a beautiful? morning'.split(/beautiful/i, 2) # => ["This is a ", "? morning"] When we have a match with groups the match is returned in the array. Quoting the ruby docs: "If pattern is a Regexp, str is divided where the pattern matches. [...] If pattern contains groups, the respective matches will be returned in the array as well." 'This is a beautiful? morning'.split(/\b(beau\w*)\b/iu, 2) # => ["This is a ", "beautiful", "? morning"] If we assume we want to split on the first match – this fix makes that assumption – we can pass the already assigned `phrase` variable as the place to split (because we already know that a match exists from line 168). Originally spotted by Louise Crow (@crowbot) at https://github.com/mysociety/alaveteli/pull/1557
* Merge pull request #15732 from kuldeepaggarwal/correct-assets-ouputRafael Mendonça França2014-06-232-15/+15
|\ | | | | [ci skip] correct output for asset_helper methods
| * [ci skip] correct output for asset_helper methodsKuldeep Aggarwal2014-06-162-15/+15
| | | | | | | | see cc255d3
* | Merge pull request #15450 from aditya-kapoor/remove-nbsp-debugRafael Mendonça França2014-06-192-7/+7
|\ \ | | | | | | remove unnecessary gsub for space in ActionView::Helpers#debug
| * | remove unnecessary substitution for space in ActionView::Helpers#debugAditya Kapoor2014-06-142-7/+7
| | |
* | | 'TextHelper#highlight' now accepts a block to highlight the matched words.Lucas Mazza2014-06-193-3/+30
| | | | | | | | | | | | | | | | | | | | | | | | The helper will yield each matched word, and you can use this instead of the ':highlighter' option for more complex replacing logic: highlight('My email is me@work.com', EMAIL_REGEXP) { |m| mail_to(m) } # => 'My email is <a href="mailto:me@work.com">me@work.com</a>'
* | | highlight() now accepts regular expressions as well.Jan Szumiec2014-06-192-5/+15
| | |
* | | excerpt() now accepts regular expression instances as phrases.Jan Szumiec2014-06-192-3/+9
| | |
* | | Merge pull request #15709 from zuhao/refactor_actionview_compiled_templates_testYves Senn2014-06-181-8/+1
|\ \ \ | | | | | | | | Move cleanup into teardown, delete obsolete code.
| * | | Move cleanup into teardown, delete obsolete code.Zuhao Wan2014-06-141-8/+1
| | | |
* | | | [ci skip] /javascript/ ~> JavaScriptAditya Kapoor2014-06-171-1/+1
| | | |
* | | | reload I18n as we are defining `:ts` localeKuldeep Aggarwal2014-06-151-0/+2
| |_|/ |/| | | | | | | | fix build- see https://travis-ci.org/rails/rails/jobs/27578159#L2913.
* | | Merge pull request #15715 from ↵Yves Senn2014-06-143-4/+11
|\ \ \ | |_|/ |/| | | | | | | | | | | zuhao/refactor_actionview_cleanup_I18n_translations Clean up I18n stored translations after test.
| * | Clean up I18n stored translations after test.Zuhao Wan2014-06-143-4/+12
| | |
* | | Merge pull request #15712 from zuhao/refactor_actionview_javascript_helper_testYves Senn2014-06-141-3/+3
|\ \ \ | |/ / |/| | Avoid hard-coded value in test setup and teardown.
| * | Avoid hard-coded value in test setup and teardown.Zuhao Wan2014-06-141-3/+3
| |/
* / Make sure restoration always happen.Zuhao Wan2014-06-141-0/+1
|/
* Merge pull request #15693 from pdg137/enforce_utf8Matthew Draper2014-06-143-7/+7
|\ | | | | | | In actionview, eliminate calls to tag that use html_safe parameter values.
| * In actionview, eliminate calls to tag that use html_safe parameter values. ↵Paul Grayson2014-06-133-8/+7
|/ | | | This is generally unnecessary, since tag handles string quoting, except in one case (utf8_enforcer_tag) where we want to specify the encoding ourselves.
* Builder source code is still available on github [ci skip]Zachary Scott2014-06-131-0/+3
| | | | This was also removed from #15542
* Merge pull request #15654 from pdg137/masterMatthew Draper2014-06-135-7/+51
|\ | | | | | | In tag helper, honor html_safe on arrays; also make safe_join more similar to Array.join
| * In tag helper, honor html_safe on array parameters; also make safe_join more ↵Paul Grayson2014-06-124-8/+51
| | | | | | | | similar to Array.join by first calling flatten.
* | Merge pull request #15590 from ↵Yves Senn2014-06-125-14/+62
|\ \ | |/ |/| | | | | | | | | | | | | zuhao/refactor_actionview_register_template_handler Add unregister_template_handler to prevent leaks. Conflicts: actionview/CHANGELOG.md
| * Add unregister_template_handler to prevent leaks.Zuhao Wan2014-06-126-14/+62
| |
* | [ci skip] Fix doc for javascript_helperAditya Kapoor2014-06-111-1/+7
| |
* | [ci skip] Add Docs for strip_insignificant_zeros option in number helpersAkshay Vishnoi2014-06-101-10/+8
| |
* | [ci skip] Correct output and use valid options of number helpersAkshay Vishnoi2014-06-101-2/+2
| |
* | Fix cache_digest rake tasksJiri Pospisil2014-06-102-6/+14
|/ | | | | Bring cache_digests:* rake tasks up-to-date with the API changes introduced in 637bb726cac60aaa1f7e482836458aa73e17fbb7
* Merge pull request #15542 from Gaurav2728/gaurav-remove_shutdown_linkArthur Nogueira Neves2014-06-061-2/+0
|\ | | | | remove rubyforge.org that was shut down [ci skip]
| * remove rubyforge.org that was shut down [ci skip]Gaurav Sharma2014-06-061-2/+0
| |
* | Unwrap another html_escapeMatthew Draper2014-06-071-2/+2
| | | | | | | | /cc @tenderlove
* | eliminate more wasteful allocationsAaron Patterson2014-06-061-2/+2
|/
* Merge pull request #15513 from zenspider/remove_flush_output_bufferAaron Patterson2014-06-053-91/+0
|\ | | | | Removed CaptureHelper#flush_output_buffer as it is only used in tests.
| * Removed CaptureHelper#flush_output_buffer as it is only used in tests.Ryan Davis2014-06-043-91/+0
| | | | | | | | reviewed: @tenderlove
* | document include_blank's usage with a string [ci skip]Greg Molnar2014-06-051-1/+4
| |
* | Revert "Correct Documentation for asset_tag_helpers"Rafael Mendonça França2014-06-041-17/+16
|/ | | | | | | | | | This reverts commit c22a253d1a72602331db1eba3e91bc945eff2346. Reason: Our documentation assumes the assets are in the proper place and we are using the default Rails stack. With the default Rails stack and the assets being in the correct place the assets helpers uses the `/assets` prefix.
* call `capture` fewer times from `form_for`Aaron Patterson2014-06-022-4/+4
|
* drastically reduce object allocationsAaron Patterson2014-06-021-2/+2
| | | | | | | | | | before this change, we were allocating AS::SafeBuffer objects that were being interpolated in to a string, so the safe buffer object was being thrown away. This change only allocates a string (vs a string *and* a safebuffer) and interpolates the string. On my test application, this reduced the AS::SafeBuffer objects from 1527k per request to about 500 per request.
* Merge pull request #15379 from xuanxu/rational_precisionRafael Mendonça França2014-06-021-0/+1
|\ | | | | Fix AS::NumberHelper results with rationals
| * Fix AS::NumberHelper results with rationalsJuanjo Bazán2014-05-311-0/+1
| | | | | | | | | | | | | | | | | | | | :precision was incorrectly being applied to Rationals before: ActiveSupport::NumberHelper.number_to_rounded Rational(10, 3), precision: 2 => "3.3" after: ActiveSupport::NumberHelper.number_to_rounded Rational(10, 3), precision: 2 => "3.33"
* | Feature requests should be made on the mailing list, not submitted toZachary Scott2014-06-011-1/+6
| | | | | | | | the issue tracker. See also #15455 [ci skip]
* | [ci skip] correct doc for ActionView::Helpers::DebugHelperAditya Kapoor2014-05-311-5/+1
|/
* Update documentation for setting asset_host to a Proc, mention that the ↵Manuel Meurer2014-05-311-1/+4
| | | | request parameter might not be supplied [ci skip]
* Update url to rake docs [ci skip]Zachary Scott2014-05-291-1/+1
|
* Merge pull request #15061 from tgxworld/remove_unnecessary_includeMatthew Draper2014-05-291-1/+0
|\ | | | | Remove unnecessary include for integration tests.
| * Remove unnecessary include for integration tests.Guo Xiang Tan2014-05-111-1/+0
| |
* | Fix documentation簡煒航 (Jian Weihang)2014-05-291-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To prevent `ArgumentError`, `config.action_view.sanitized_allowed_attributes` should be assigned by an array instead of a list. ``` /Users/tonytonyjan/.rvm/rubies/ruby-2.1.2/lib/ruby/2.1.0/set.rb:98:in `do_with_enum': value must be enumerable (ArgumentError) from /Users/tonytonyjan/.rvm/rubies/ruby-2.1.2/lib/ruby/2.1.0/set.rb:355:in `merge' from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/actionview-4.1.1/lib/action_view/helpers/sanitize_helper.rb:211:in `sanitized_allowed_attributes=' from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/actionview-4.1.1/lib/action_view/railtie.rb:26:in `block (3 levels) in <class:Railtie>' from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/actionview-4.1.1/lib/action_view/railtie.rb:25:in `each' from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/actionview-4.1.1/lib/action_view/railtie.rb:25:in `block (2 levels) in <class:Railtie>' from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/activesupport-4.1.1/lib/active_support/lazy_load_hooks.rb:38:in `instance_eval' from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/activesupport-4.1.1/lib/active_support/lazy_load_hooks.rb:38:in `execute_hook' from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/activesupport-4.1.1/lib/active_support/lazy_load_hooks.rb:28:in `block in on_load' from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/activesupport-4.1.1/lib/active_support/lazy_load_hooks.rb:27:in `each' from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/activesupport-4.1.1/lib/active_support/lazy_load_hooks.rb:27:in `on_load' from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/actionview-4.1.1/lib/action_view/railtie.rb:24:in `block in <class:Railtie>' from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/railties-4.1.1/lib/rails/initializable.rb:30:in `instance_exec' from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/railties-4.1.1/lib/rails/initializable.rb:30:in `run' from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/railties-4.1.1/lib/rails/initializable.rb:55:in `block in run_initializers' from /Users/tonytonyjan/.rvm/rubies/ruby-2.1.2/lib/ruby/2.1.0/tsort.rb:226:in `block in tsort_each' from /Users/tonytonyjan/.rvm/rubies/ruby-2.1.2/lib/ruby/2.1.0/tsort.rb:348:in `block (2 levels) in each_strongly_connected_component' from /Users/tonytonyjan/.rvm/rubies/ruby-2.1.2/lib/ruby/2.1.0/tsort.rb:427:in `each_strongly_connected_component_from' from /Users/tonytonyjan/.rvm/rubies/ruby-2.1.2/lib/ruby/2.1.0/tsort.rb:347:in `block in each_strongly_connected_component' from /Users/tonytonyjan/.rvm/rubies/ruby-2.1.2/lib/ruby/2.1.0/tsort.rb:345:in `each' from /Users/tonytonyjan/.rvm/rubies/ruby-2.1.2/lib/ruby/2.1.0/tsort.rb:345:in `call' from /Users/tonytonyjan/.rvm/rubies/ruby-2.1.2/lib/ruby/2.1.0/tsort.rb:345:in `each_strongly_connected_component' from /Users/tonytonyjan/.rvm/rubies/ruby-2.1.2/lib/ruby/2.1.0/tsort.rb:224:in `tsort_each' from /Users/tonytonyjan/.rvm/rubies/ruby-2.1.2/lib/ruby/2.1.0/tsort.rb:205:in `tsort_each' from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/railties-4.1.1/lib/rails/initializable.rb:54:in `run_initializers' from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/railties-4.1.1/lib/rails/application.rb:288:in `initialize!' from /Users/tonytonyjan/Dropbox/home/codes/penta_ruby/config/environment.rb:5:in `<top (required)>' from /Users/tonytonyjan/Dropbox/home/codes/penta_ruby/config.ru:3:in `require' from /Users/tonytonyjan/Dropbox/home/codes/penta_ruby/config.ru:3:in `block in <main>' from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/rack-1.5.2/lib/rack/builder.rb:55:in `instance_eval' from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/rack-1.5.2/lib/rack/builder.rb:55:in `initialize' from /Users/tonytonyjan/Dropbox/home/codes/penta_ruby/config.ru:in `new' from /Users/tonytonyjan/Dropbox/home/codes/penta_ruby/config.ru:in `<main>' from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/rack-1.5.2/lib/rack/builder.rb:49:in `eval' from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/rack-1.5.2/lib/rack/builder.rb:49:in `new_from_string' from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/rack-1.5.2/lib/rack/builder.rb:40:in `parse_file' from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/rack-1.5.2/lib/rack/server.rb:277:in `build_app_and_options_from_config' from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/rack-1.5.2/lib/rack/server.rb:199:in `app' from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/railties-4.1.1/lib/rails/commands/server.rb:50:in `app' from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/rack-1.5.2/lib/rack/server.rb:314:in `wrapped_app' from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/railties-4.1.1/lib/rails/commands/server.rb:130:in `log_to_stdout' from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/railties-4.1.1/lib/rails/commands/server.rb:67:in `start' from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/railties-4.1.1/lib/rails/commands/commands_tasks.rb:81:in `block in server' from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/railties-4.1.1/lib/rails/commands/commands_tasks.rb:76:in `tap' from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/railties-4.1.1/lib/rails/commands/commands_tasks.rb:76:in `server' from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/railties-4.1.1/lib/rails/commands/commands_tasks.rb:40:in `run_command!' from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/railties-4.1.1/lib/rails/commands.rb:17:in `<top (required)>' from /Users/tonytonyjan/Dropbox/home/codes/penta_ruby/bin/rails:8:in `require' from /Users/tonytonyjan/Dropbox/home/codes/penta_ruby/bin/rails:8:in `<top (required)>' from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/spring-1.1.3/lib/spring/client/rails.rb:27:in `load' from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/spring-1.1.3/lib/spring/client/rails.rb:27:in `call' from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/spring-1.1.3/lib/spring/client/command.rb:7:in `call' from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/spring-1.1.3/lib/spring/client.rb:26:in `run' from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/spring-1.1.3/bin/spring:48:in `<top (required)>' from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/spring-1.1.3/lib/spring/binstub.rb:11:in `load' from /Users/tonytonyjan/.rvm/gems/ruby-2.1.2/gems/spring-1.1.3/lib/spring/binstub.rb:11:in `<top (required)>' from /Users/tonytonyjan/Dropbox/home/codes/penta_ruby/bin/spring:16:in `require' from /Users/tonytonyjan/Dropbox/home/codes/penta_ruby/bin/spring:16:in `<top (required)>' from bin/rails:3:in `load' from bin/rails:3:in `<main>' ```
* | correct docs for (asset|image)_path [ci skip]Aditya Kapoor2014-05-271-14/+14
| |
* | correct doc for (audio|video)_tag [ci skip]Aditya Kapoor2014-05-271-10/+10
| |
* | Correct Documentation for asset_tag_helpersAditya Kapoor2014-05-261-15/+16
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-07 09:44:56 +0000