d6ae9e5d2c4a402b1ece791bdeb730416000227c ea8c442bc0958a1848a506e73285aceb6e670cd5 Nathan Weizenbaum nex342@gmail.com http://github.com/nex3/haml/commit/f808d6cc009f43140f4d7560bfb18b3438803fed f808d6cc009f43140f4d7560bfb18b3438803fed 2009-11-09T14:12:07-08:00 2009-11-09T14:12:07-08:00 Merge branch 'stable' Conflicts: VERSION doc-src/HAML_CHANGELOG.md doc-src/SASS_CHANGELOG.md 5dbd0332d3772fbcf91f74e9190f52bd102d1c1e Nathan Weizenbaum nex342@gmail.com 0c44bbc7554bb7212cfc650c9bc48bfb794ba55f Nathan Weizenbaum nex342@gmail.com http://github.com/nex3/haml/commit/ea8c442bc0958a1848a506e73285aceb6e670cd5 ea8c442bc0958a1848a506e73285aceb6e670cd5 2009-11-09T14:11:33-08:00 2009-11-09T14:11:33-08:00 Bump VERSION to 2.2.13. 0a389cbccad6555795b824a25233a00468695d69 Nathan Weizenbaum nex342@gmail.com 2ebda4eba8927239823b9b1b1b01cca71912dacb 0c44bbc7554bb7212cfc650c9bc48bfb794ba55f Nathan Weizenbaum nex342@gmail.com http://github.com/nex3/haml/commit/d6ae9e5d2c4a402b1ece791bdeb730416000227c d6ae9e5d2c4a402b1ece791bdeb730416000227c 2009-11-08T16:41:54-08:00 2009-11-08T16:41:54-08:00 Merge branch 'stable' Conflicts: lib/haml/html.rb 4487d5cc7e50822ed8d7cd290010d56fdfc885d7 Nathan Weizenbaum nex342@gmail.com 76bd406875920079bb26445ddeb0d3842e825f01 Nathan Weizenbaum nex342@gmail.com http://github.com/nex3/haml/commit/0c44bbc7554bb7212cfc650c9bc48bfb794ba55f 0c44bbc7554bb7212cfc650c9bc48bfb794ba55f 2009-11-08T16:40:37-08:00 2009-11-08T16:40:37-08:00 [Haml] [html2haml] Fix an incompatibility with Hpricot 0.8.2. 97f16bc821f17ee0f908444fbd650306041b660b Nathan Weizenbaum nex342@gmail.com 2ce9601720400f8937711c8f50deaff0f9f5306f Nathan Weizenbaum nex342@gmail.com http://github.com/nex3/haml/commit/2ebda4eba8927239823b9b1b1b01cca71912dacb 2ebda4eba8927239823b9b1b1b01cca71912dacb 2009-11-08T16:21:59-08:00 2009-11-08T16:21:59-08:00 [Sass] Fix a few Ruby 1.9 test failures. 3e7af93a64114351837b88df52341beb8c9fd99c Nathan Weizenbaum nex342@gmail.com 45062c18fe107ed16428324568f6fdc0fcba86af 76bd406875920079bb26445ddeb0d3842e825f01 Nathan Weizenbaum nex342@gmail.com http://github.com/nex3/haml/commit/2ce9601720400f8937711c8f50deaff0f9f5306f 2ce9601720400f8937711c8f50deaff0f9f5306f 2009-11-08T16:17:38-08:00 2009-11-08T16:17:38-08:00 Merge branch 'stable' Conflicts: doc-src/HAML_CHANGELOG.md 050849278a7fdb13f6d1d9c9ca6cd9970e388d9b Nathan Weizenbaum nex342@gmail.com 44c86ec89e89b55afca064018c3684247eebeb3a Nathan Weizenbaum nex342@gmail.com http://github.com/nex3/haml/commit/76bd406875920079bb26445ddeb0d3842e825f01 76bd406875920079bb26445ddeb0d3842e825f01 2009-11-08T15:59:52-08:00 2009-11-08T15:59:52-08:00 [Haml] Add support for a workaround for fake ASCII input strings. Closes gh-3 This is a complicated issue, but I'll do my best to explain it here. By default, Haml encodes its templates as Encoding.default_internal, which is usually UTF-8. This means that strings printed to the template should be either UTF-8 or UTF-8-compatible ASCII. So far, all well and good. Now, it's possible to have strings that are marked as ASCII-8bit, but which aren't UTF-8 compatible. This includes valid UTF-8 strings that are forced into an ASCII-8bit encoding. If one of these strings is concatenated to a UTF-8 string, Ruby says "I don't know what to do with these non-ASCII characters!" and throws an encoding error. I call this sort of string "fake ASCII." This is what was happening in the referenced GitHub issue (or at least in the sample app Adam Salter created at http://github.com/adamsalter/test-project/tree/haml_utf8). The template was UTF-8 encoded, and it was being passed a fake ASCII string, marked as ASCII-8bit but with UTF-8 byte sequences in it, and it was choking. The issue now becomes: where is this fake ASCII string coming from? From the database. The database drivers used by Rails aren't Ruby 1.9 compatible. Despite storing UTF-8 strings in the database, the drivers return fake ASCII strings. The best solution to this is clearly to fix the database drivers, but that will probably take some time. One stop-gap would be to call `force_encoding("utf-8")` on all the database values somewhere, which is still a little annoying. Finally, the solution provided in this commit is to set `:encoding => "ascii-8bit"` for Haml. This makes the Haml template itself fake ASCII, which is wrong but will help prevent encoding errors. 969b0989a02f60cde4bac15e7f0d2e6e40867fdb Nathan Weizenbaum nex342@gmail.com b13bebcea60ff8e3b8aacc68258718f6570bc556 Nathan Weizenbaum nex342@gmail.com http://github.com/nex3/haml/commit/44c86ec89e89b55afca064018c3684247eebeb3a 44c86ec89e89b55afca064018c3684247eebeb3a 2009-11-08T15:56:42-08:00 2009-11-08T15:56:42-08:00 [Haml] Fix some Ruby 1.9 test failures. b0205b208eb6513439da44c9b49f75cb736c6b23 Nathan Weizenbaum nex342@gmail.com 7f8bfc8bd0ba556894a70ea16ef96363d1dc8555 b13bebcea60ff8e3b8aacc68258718f6570bc556 Nathan Weizenbaum nex342@gmail.com http://github.com/nex3/haml/commit/45062c18fe107ed16428324568f6fdc0fcba86af 45062c18fe107ed16428324568f6fdc0fcba86af 2009-11-05T22:58:02-08:00 2009-11-05T22:58:02-08:00 Merge branch 'stable' Conflicts: VERSION doc-src/HAML_CHANGELOG.md doc-src/SASS_CHANGELOG.md 800d30b0c38d38033dac136906584961f002811f Nathan Weizenbaum nex342@gmail.com 6bff8f528de3eb83d180ce45bfbc24016d0980da Nathan Weizenbaum nex342@gmail.com http://github.com/nex3/haml/commit/b13bebcea60ff8e3b8aacc68258718f6570bc556 b13bebcea60ff8e3b8aacc68258718f6570bc556 2009-11-05T22:57:24-08:00 2009-11-05T22:57:24-08:00 Bump VERSION to 2.2.12. 4a37b9e83bcfe0d9046c2798a7847984ee3d7823 Nathan Weizenbaum nex342@gmail.com 7417b49ba3b14fabb3c390ca70134407ed6de4cf Nathan Weizenbaum nex342@gmail.com http://github.com/nex3/haml/commit/6bff8f528de3eb83d180ce45bfbc24016d0980da 6bff8f528de3eb83d180ce45bfbc24016d0980da 2009-11-05T22:56:48-08:00 2009-11-05T22:55:46-08:00 [Sass] Fix a stupid bug and make the Rails plugin work. How embarassing. Closes gh-56 28b2bcfbabf5fb930bc5368bb493993227a8ffa8 Nathan Weizenbaum nex342@gmail.com 949bf1c098808cc87f7d9a8c076604d4577a1443 7417b49ba3b14fabb3c390ca70134407ed6de4cf Nathan Weizenbaum nex342@gmail.com http://github.com/nex3/haml/commit/7f8bfc8bd0ba556894a70ea16ef96363d1dc8555 7f8bfc8bd0ba556894a70ea16ef96363d1dc8555 2009-11-05T20:58:53-08:00 2009-11-05T20:58:53-08:00 Merge branch 'stable' Conflicts: VERSION doc-src/HAML_CHANGELOG.md doc-src/SASS_CHANGELOG.md 51a4f12a311fa57d7ff86d8505342afae064513b Nathan Weizenbaum nex342@gmail.com 79890dc9e5d14e0cefd749a81e88b48a0f0d51ea Nathan Weizenbaum nex342@gmail.com http://github.com/nex3/haml/commit/7417b49ba3b14fabb3c390ca70134407ed6de4cf 7417b49ba3b14fabb3c390ca70134407ed6de4cf 2009-11-05T20:55:24-08:00 2009-11-05T20:55:24-08:00 Bump VERSION to 2.2.11. c83de1bd2e2beb54bc0003c4ca281f46cafa9ca0 Nathan Weizenbaum nex342@gmail.com 02035ed9f9a4f247a88004889c9e7897fddf6d38 79890dc9e5d14e0cefd749a81e88b48a0f0d51ea Nathan Weizenbaum nex342@gmail.com http://github.com/nex3/haml/commit/949bf1c098808cc87f7d9a8c076604d4577a1443 949bf1c098808cc87f7d9a8c076604d4577a1443 2009-11-05T20:52:52-08:00 2009-11-05T20:52:52-08:00 Merge branch 'stable' 97714eb7a3a35f09b38fb2cb89bfbfcac2ecac89 Nathan Weizenbaum nex342@gmail.com 87649adf639cbdbb812fa9ec7d36b7873803e754 Nathan Weizenbaum nex342@gmail.com http://github.com/nex3/haml/commit/79890dc9e5d14e0cefd749a81e88b48a0f0d51ea 79890dc9e5d14e0cefd749a81e88b48a0f0d51ea 2009-11-05T20:52:46-08:00 2009-11-05T20:52:46-08:00 [Sass] Use proper callback mechanisms to register Sass on Rails 3.0, rather than monkeypatching. 3c8b32962c27062097df42e4d1cf8ae3e0d3bb22 Nathan Weizenbaum nex342@gmail.com 2924984f04330bdf4f919d1b0f47c77328b9fc7b Nathan Weizenbaum nex342@gmail.com http://github.com/nex3/haml/commit/87649adf639cbdbb812fa9ec7d36b7873803e754 87649adf639cbdbb812fa9ec7d36b7873803e754 2009-11-05T20:46:46-08:00 2009-11-05T20:46:46-08:00 [Haml] Make sure Haml::Util.rails_root is always a string. d702b299280b4e66d7939c35725520955ca9d199 Nathan Weizenbaum nex342@gmail.com 5d25ebbae7456478ac511bddcefbe29d751620e6 2924984f04330bdf4f919d1b0f47c77328b9fc7b Nathan Weizenbaum nex342@gmail.com http://github.com/nex3/haml/commit/02035ed9f9a4f247a88004889c9e7897fddf6d38 02035ed9f9a4f247a88004889c9e7897fddf6d38 2009-11-05T20:14:34-08:00 2009-11-05T20:14:34-08:00 Merge branch 'stable' f7d874df4dbc2b72c7ecfc65e67c73339b225705 Nathan Weizenbaum nex342@gmail.com 24cbbfd5d83efb19a424dbbcbdca8db3a26813ad Nathan Weizenbaum nex342@gmail.com http://github.com/nex3/haml/commit/2924984f04330bdf4f919d1b0f47c77328b9fc7b 2924984f04330bdf4f919d1b0f47c77328b9fc7b 2009-11-05T20:14:28-08:00 2009-11-05T20:14:28-08:00 Get rid of the 'Edge Rails Compatibility' changelog sections, since there's only one such change now. 9ff8fc1a2695f3ae439bbbc0282d5d0258cba43c Nathan Weizenbaum nex342@gmail.com bc4c26e6cbedea87128922cb51736e631da74bf4 24cbbfd5d83efb19a424dbbcbdca8db3a26813ad Nathan Weizenbaum nex342@gmail.com http://github.com/nex3/haml/commit/5d25ebbae7456478ac511bddcefbe29d751620e6 5d25ebbae7456478ac511bddcefbe29d751620e6 2009-11-05T18:48:49-08:00 2009-11-05T18:48:49-08:00 Merge branch 'stable' Conflicts: lib/haml/util.rb 0a0de5763c78b585c0699100daffe8499c519b4d Nathan Weizenbaum nex342@gmail.com 285bf70701b129b4c4fbc492a164786fdd1aa51d 5c838a9ef570d20e19d7394b2198eec69ee11ce8 Nathan Weizenbaum nex342@gmail.com http://github.com/nex3/haml/commit/24cbbfd5d83efb19a424dbbcbdca8db3a26813ad 24cbbfd5d83efb19a424dbbcbdca8db3a26813ad 2009-11-05T18:48:13-08:00 2009-11-05T18:48:13-08:00 Merge commit 'origin/stable' into stable Conflicts: doc-src/SASS_CHANGELOG.md 35055fedae4ce3d92d3339505bad9523c9cb37d0 Nathan Weizenbaum nex342@gmail.com 0a11a29a4f8287426aa9facc1500ceeb7115a83d Nathan Weizenbaum nex342@gmail.com http://github.com/nex3/haml/commit/285bf70701b129b4c4fbc492a164786fdd1aa51d 285bf70701b129b4c4fbc492a164786fdd1aa51d 2009-11-05T18:46:55-08:00 2009-11-04T19:01:39-08:00 [Haml] Abstract away RAILS_ROOT. Closes gh-48 57966b9feda4fc270c05d93ab8e0fb28aa0b8a35 Nathan Weizenbaum nex342@gmail.com da5bb969450c1a21cd2158410eb2b8819c56862d 5c838a9ef570d20e19d7394b2198eec69ee11ce8 Nathan Weizenbaum nex342@gmail.com http://github.com/nex3/haml/commit/bc4c26e6cbedea87128922cb51736e631da74bf4 bc4c26e6cbedea87128922cb51736e631da74bf4 2009-11-05T18:38:32-08:00 2009-11-05T18:38:32-08:00 Merge branch 'stable' a3f9bbceab6f0acbcd0f05262655402132996776 Nathan Weizenbaum nex342@gmail.com add68bb64181163dd587efe37b3008ec15df3812 Nathan Weizenbaum nex342@gmail.com http://github.com/nex3/haml/commit/5c838a9ef570d20e19d7394b2198eec69ee11ce8 5c838a9ef570d20e19d7394b2198eec69ee11ce8 2009-11-05T18:38:27-08:00 2009-11-05T18:38:27-08:00 Revert "[Haml] Support concatenating multiple CSS-syntax ids using _." This reverts commit 5aa2cd6992a8101686c2401cc5f8010058be3856. Conflicts: doc-src/HAML_CHANGELOG.md 8789dd83ccd100217eaa3e7a56df99c4fde91d96 Nathan Weizenbaum nex342@gmail.com edc209e51435c020310396376285c90e87dc32f8 add68bb64181163dd587efe37b3008ec15df3812 Nathan Weizenbaum nex342@gmail.com http://github.com/nex3/haml/commit/da5bb969450c1a21cd2158410eb2b8819c56862d da5bb969450c1a21cd2158410eb2b8819c56862d 2009-11-05T18:19:51-08:00 2009-11-05T18:19:51-08:00 Merge branch 'stable' c14695ffde550df9208e9e20576aee6504aad55c Nathan Weizenbaum nex342@gmail.com 18db0f63383bd7cde136eb9e58efbe2c32832cbb Nathan Weizenbaum nex342@gmail.com http://github.com/nex3/haml/commit/add68bb64181163dd587efe37b3008ec15df3812 add68bb64181163dd587efe37b3008ec15df3812 2009-11-05T18:19:18-08:00 2009-11-05T18:19:18-08:00 [Haml] Don't kill rake gems:install if only the plugin skeleton is installed. Closes gh-55 6b3876f0b1aecfa27337ad7f5e2a5cb8a637af24 Nathan Weizenbaum nex342@gmail.com ff56d46d544e0ea8ca21ff617be5aeebd138223d Nathan Weizenbaum nex342@gmail.com http://github.com/nex3/haml/commit/0a11a29a4f8287426aa9facc1500ceeb7115a83d 0a11a29a4f8287426aa9facc1500ceeb7115a83d 2009-11-04T17:54:30-08:00 2009-11-04T17:54:30-08:00 [Haml] Disable the content_for test for Rails 3.*. d0e7b4bea35fad9d9963e860a575603c079b63d7 Nathan Weizenbaum nex342@gmail.com 18db0f63383bd7cde136eb9e58efbe2c32832cbb Nathan Weizenbaum nex342@gmail.com http://github.com/nex3/haml/commit/ff56d46d544e0ea8ca21ff617be5aeebd138223d ff56d46d544e0ea8ca21ff617be5aeebd138223d 2009-11-04T17:50:16-08:00 2009-11-04T17:50:16-08:00 [Haml] Don't use the non-standard String#ord in template_test. 8eed6bcc82dafde2c8d0fb70cb8363a14ce8423b Nathan Weizenbaum nex342@gmail.com 802ffa27d493378750dbcf2ba9ccf8a553096eeb Nathan Weizenbaum nex342@gmail.com http://github.com/nex3/haml/commit/18db0f63383bd7cde136eb9e58efbe2c32832cbb 18db0f63383bd7cde136eb9e58efbe2c32832cbb 2009-11-04T15:17:34-08:00 2009-11-04T15:17:34-08:00 Always require 'rubygems' in test/linked_rails so we can load Rack. d98f5f959ec0a8f8c8e2c9328fd42cc90cf3fab7 Nathan Weizenbaum nex342@gmail.com 050d263fd2d9ac7b8347406c449f967ab3efd5ce Nathan Weizenbaum nex342@gmail.com http://github.com/nex3/haml/commit/edc209e51435c020310396376285c90e87dc32f8 edc209e51435c020310396376285c90e87dc32f8 2009-11-04T15:15:04-08:00 2009-11-04T15:15:04-08:00 [Haml] Fix the problem added in 408da5f, re-enable the disabled optimizations. 6077635abfe6da1193b8a3bc1819dfd6f33d43d4 Nathan Weizenbaum nex342@gmail.com 761d2c259818dabf0c3c591f34c3d65f7a2dc082 Nathan Weizenbaum nex342@gmail.com http://github.com/nex3/haml/commit/050d263fd2d9ac7b8347406c449f967ab3efd5ce 050d263fd2d9ac7b8347406c449f967ab3efd5ce 2009-11-04T15:09:19-08:00 2009-11-04T15:09:19-08:00 [Haml] Make flush_merged_text a little more imperative and cleaner. b2ae120fbd9faf15b607dc0a20d0aee98a4cf55a Nathan Weizenbaum nex342@gmail.com