aboutsummaryrefslogtreecommitdiffstats
path: root/actionview
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'rm-remove-mocha'Rafael Mendonça França2014-07-191-0/+2
|\ | | | | | | | | Conflicts: actionpack/test/abstract_unit.rb
| * Stop requiring mocha automaticallyRafael Mendonça França2014-07-191-0/+2
| | | | | | | | | | | | | | | | | | | | | | We are planning to remove mocha from our test suite because of performance problems. To make this possible we should stop require mocha on ActionSupport::TestCase. This should not affect applications since users still need to add mocha to Gemfile and this already load mocha. Added FIXME notes to place that still need mocha removal
* | adding missing test for text area value before type castEugene Gilburg2014-07-191-0/+7
| |
* | adding missing test coverageEugene Gilburg2014-07-181-0/+12
| |
* | marking private methods which dont work if called on their own anywaysEugene Gilburg2014-07-182-1/+5
| |
* | small refactors to actionview renderersEugene Gilburg2014-07-183-16/+15
| |
* | Prefer to pass block when logging.Guo Xiang Tan2014-07-181-5/+5
| | | | | | | | | | | | | | | | The Logger by default includes a guard which checks for the logging level. By removing the custom logging guards, we can decouple the logging guard from the logging action to be done. This also follows the good practice listed on http://guides.rubyonrails.org/debugging_rails_applications.html#impact-of-logs-on-performance.
* | docs, `select` and friends with `multiple=true` include a blank string.Yves Senn2014-07-171-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | [Jonas Baumann & Yves Senn] The submitted params from a select with `multiple: true` look as follows: ``` {post: {category: [""]}} {post: {category: ["", "Category 1", "Category 2"]}} ``` This is a follow up to #1552.
* | Merge pull request #16201 from noinkling/masterGodfrey Chan2014-07-161-5/+5
|\ \ | | | | | | Fix broken list formatting in API docs [ci skip]
| * | Fix broken list formatting [ci skip]noinkling2014-07-171-5/+5
| | |
* | | subclass Rails::EngineAaron Patterson2014-07-161-1/+2
|/ /
* | Use &= instead of select with include?Rafael Mendonça França2014-07-161-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The performance is almost the same with both implementations but this is clear. Before this patch: Calculating ------------------------------------- small erb template 1452 i/100ms ------------------------------------------------- small erb template 17462.1 (±13.3%) i/s - 85668 in 5.031395s .Calculating ------------------------------------- small erb template with 1 partial 887 i/100ms ------------------------------------------------- small erb template with 1 partial 8899.6 (±18.8%) i/s - 42576 in 5.009453s .Calculating ------------------------------------- small erb template with 2 partials 666 i/100ms ------------------------------------------------- small erb template with 2 partials 6821.5 (±8.8%) i/s - 33966 in 5.020791s After the patch: Calculating ------------------------------------- small erb template 1479 i/100ms ------------------------------------------------- small erb template 15956.6 (±7.6%) i/s - 79866 in 5.036001s .Calculating ------------------------------------- small erb template with 1 partial 841 i/100ms ------------------------------------------------- small erb template with 1 partial 9242.2 (±6.9%) i/s - 46255 in 5.029497s .Calculating ------------------------------------- small erb template with 2 partials 615 i/100ms ------------------------------------------------- small erb template with 2 partials 6524.7 (±6.8%) i/s - 32595 in 5.020456s You can find the benchmark code at https://gist.github.com/rafaelfranca/dee31120cfdb1ddc3b56
* | Merge pull request #15917 from luke-gru/actionview_perfRafael Mendonça França2014-07-161-1/+1
|\ \ | | | | | | | | | remove Set.new from DetailsKey::get, impacts rendering overhead
| * | remove Set.new from DetailsKey::get, impacts rendering overhead performanceLuke Gruber2014-06-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Using ruby-prof, I noticed that Set#add had the largest 'self time' percentage (5% of the overall time spent rendering) when benchmarking the rendering of a small cached ERB template that was 3 lines long. It turns out it was from this line. I don't believe the Set is necessary, either. Removing this line increases the rendering ips using Benchmark::ips accordingly.
* | | Fix typo on the variable nameRafael Mendonça França2014-07-161-8/+8
| | |
* | | Add CHANGELOG entry for PartialIteration.Rafael Mendonça França2014-07-161-0/+10
| | | | | | | | | | | | Closes #7698.
* | | Document the PartialIteration objectRafael Mendonça França2014-07-161-3/+9
| | |
* | | Build only one PartialIteration object for loopRafael Mendonça França2014-07-162-16/+26
| | |
* | | No need to have a file to PartialIteration classRafael Mendonça França2014-07-162-4/+19
| | | | | | | | | | | | This class is only used on the PartialRenderer.
* | | Added PartialIteration class used when rendering collectionsJoel Junström2014-07-166-14/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The iteration object is available as the local variable "template_name_iteration" when rendering partials with collections. It gives access to the +size+ of the collection beeing iterated over, the current +index+ and two convinicence methods +first?+ and +last?+ "template_name_counter" variable is kept but is deprecated. [Joel Junström + Lucas Uyezu]
* | | Merge pull request #16175 from skorks/log_digestor_as_debugRafael Mendonça França2014-07-151-1/+1
|\ \ \ | | | | | | | | Log digest as :debug instead of :info
| * | | Log digest as :debug instead of :infoAlan Skorkin2014-07-151-1/+1
| | | |
* | | | Merge pull request #16161 from jpawlyn/masterAndrew White2014-07-153-1/+14
|\ \ \ \ | |/ / / |/| | | Fix empty host for an asset url when asset_host proc returns nil
| * | | Return an absolute instead of relative path from an asset url in the case of ↵Jolyon Pawlyn2014-07-153-1/+14
| | | | | | | | | | | | | | | | the `asset_host` proc returning nil
* | | | Fix typos like `a html` to `an html` and 'an mail' to 'an email'. [ci skip]Santosh Wadghule2014-07-141-1/+1
|/ / /
* | | Assert the nature of the original exceptionMatthew Draper2014-07-121-0/+1
| | | | | | | | | | | | | | | | | | Just so it's clearer what's going on in the following assertion. /cc #11993 @robin850
* | | Merge pull request #11993 from razielgn/actionview-use-name-to-inspect-errorGuillermo Iguaran2014-07-111-1/+1
|\ \ \ | | | | | | | | Use NameError#name to assert raised error.
| * | | Use NameError#name to assert raised error.Federico Ravasio2013-11-241-1/+1
| | | | | | | | | | | | | | | | | | | | This makes the test compatible with other Ruby implementations, which may implement error messages differently.
* | | | Synced 4.2 release notes with the latest commits.Godfrey Chan2014-07-111-1/+1
| | | | | | | | | | | | | | | | | | | | Also reordered some of the items to put newer ones on top (same order as CHANGELOGs), which makes it easier to diff while we are still working on it.
* | | | Fixed borken tests in AV caused by 013c74dGodfrey Chan2014-07-101-2/+2
| | | |
* | | | Include missing module in tag_helperCarlos Antonio da Silva2014-07-091-0/+1
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | Since 6857415187810f1289068a448268264d0cf0844f we are using #safe_join to join the content when an Array is given, so we must include the dependent module here to make sure it's available when this module is used alone. This was making Simple Form tests to fail with current master due to the missing dependency.
* | | Change back occurrences of SQLite(3) to sqlite3 when referring to theZachary Scott2014-07-061-1/+1
| | | | | | | | | | | | adapter, fixed from #16057 [ci skip]
* | | [ci skip] /sqlite/i --> SQLiteAkshay Vishnoi2014-07-062-3/+3
| | |
* | | [ci skip] /javascript/ -> JavaScript - cover whole appAkshay Vishnoi2014-07-041-2/+2
| | |
* | | Add CHANGELOG for c803b90Godfrey Chan2014-07-021-0/+4
| | |
* | | Fix escape_once double-escaping hex-encoded entitiesJohn F. Douthat2014-07-022-0/+2
| | | | | | | | | | | | (This is a manual merge of #9102)
* | | Add CHANGELOG entry for #15214Rafael Mendonça França2014-06-301-0/+4
| | | | | | | | | | | | Closes #15214
* | | Use if/elseRafael Mendonça França2014-06-301-2/+5
| | | | | | | | | | | | | | | Since we are using both branches of the code is preferable to use if/else over the early return.
* | | Add String support for min/max attributes on DatetimeFieldTodd Bealmear2014-06-303-2/+119
| | |
* | | Tiny documentation fixes [ci skip]Robin Dupret2014-06-291-1/+1
| | |
* | | Rename options param of #time_ago_in_words to match API changeMax Kramer2014-06-281-2/+2
| |/ |/| | | Rename `include_seconds_or_options` to `options` to match 6b9356a (which removed the deprecation introduced by #6077). This has no functional impact because the parameter is passed directly through, but makes it clearer that the parameter no longer supports a boolean as input.
* | 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.