d4e533e96774982ff117c82bc209e1245be64a49 Daniel Neighman has.sox@gmail.com http://github.com/wycats/merb-core/commit/2368f8f95e17f236ce50abdf77b83d7db587abd4 2368f8f95e17f236ce50abdf77b83d7db587abd4 2008-03-06T05:03:45-08:00 2008-03-06T05:03:45-08:00 Adds specs and changes for compatibility with ActiveSupport. There is one caveat. It will not change YAML generated Hash keys to strings if they are defined as symbols as is currently the behaviour of ActiveSupport. Closes #134 Squashed commit of the following: commit 03b56a347cc331fdd3d5566bec1904732481e743 Author: Daniel Neighman <has.sox@gmail.com> Date: Thu Mar 6 23:52:43 2008 +1100 Adds *.pid to the .gitignore file commit 213c0792398b3c57965b766547e6d2882154185c Author: Daniel Neighman <has.sox@gmail.com> Date: Thu Mar 6 23:51:25 2008 +1100 Added all specs from ActiveSupport Hash#from_xml to Merb core_ext Hash#from_xml commit f5e566a445f44be446ad63ab9e1d995dc46c0ae1 Author: Daniel Neighman <has.sox@gmail.com> Date: Thu Mar 6 23:38:31 2008 +1100 Adds more active resource compatible specs commit abc4c1fd3c97720091f8205f30c7929d8dd9db48 Author: Daniel Neighman <has.sox@gmail.com> Date: Thu Mar 6 22:35:51 2008 +1100 Adds support for nil="true" attribute commit c3485f018979674d3ef326fb06da9e2d911c0792 Author: Daniel Neighman <has.sox@gmail.com> Date: Thu Mar 6 22:12:11 2008 +1100 Adds some specs from ActiveSupport for from_xml commit da7afbf04c4ff3c1ad3fbabcae1c49980eed06c3 Author: Daniel Neighman <has.sox@gmail.com> Date: Thu Mar 6 20:54:41 2008 +1100 Fixes nil values 424ab87f320a0374bf0ae141c112056992cb7bf3 Daniel Neighman has.sox@gmail.com a90df4f413db9c6377f776b32da67e3b83131880 Ezra Zygmuntowicz ez@engineyard.com http://github.com/wycats/merb-core/commit/d4e533e96774982ff117c82bc209e1245be64a49 d4e533e96774982ff117c82bc209e1245be64a49 2008-03-06T00:04:49-08:00 2008-03-06T00:04:49-08:00 update the logger. no longer accept an optional block to call. added bang! versions of all the debug,info,warn log levels that flushes the log buffer immediately. adapt the code base to use the bnag! version for bootloader log messages default log level in production mode is now :warn 5891218bee97d71d9e81f40d0cc30ad02281350a Ezra Zygmuntowicz ez@engineyard.com dd1894e76d4253bbe4faa2fb1201c6bed2498f05 Ezra Zygmuntowicz ez@engineyard.com http://github.com/wycats/merb-core/commit/a90df4f413db9c6377f776b32da67e3b83131880 a90df4f413db9c6377f776b32da67e3b83131880 2008-03-05T15:52:01-08:00 2008-03-05T15:52:01-08:00 remove some vestigal config defaults 397f45b31660474fb54a004388ec9d825daab84d Ezra Zygmuntowicz ez@engineyard.com 989cafc63e337fcb5fae2441d8c14cfaa8a46a0e Ezra Zygmuntowicz ez@engineyard.com http://github.com/wycats/merb-core/commit/dd1894e76d4253bbe4faa2fb1201c6bed2498f05 dd1894e76d4253bbe4faa2fb1201c6bed2498f05 2008-03-05T15:51:48-08:00 2008-03-05T15:51:48-08:00 Add rack adapter for Ebb, damn it's fast! 4791bdffe69b08a28dc8756e7966a8392548e2f4 Ezra Zygmuntowicz ez@engineyard.com 2c48aa531e472c47834290970ea83349b8f233bc Ezra Zygmuntowicz ez@engineyard.com http://github.com/wycats/merb-core/commit/989cafc63e337fcb5fae2441d8c14cfaa8a46a0e 989cafc63e337fcb5fae2441d8c14cfaa8a46a0e 2008-03-05T14:45:51-08:00 2008-03-05T14:45:51-08:00 coerce the port to an integer when starting mongrel (jruby compat) 17fa13c37d5c6c934f17c223dfe66d406eb5a69f Ezra Zygmuntowicz ez@engineyard.com 89b6937ccc43070ee5c050474361c63453aa9d46 Ezra Zygmuntowicz ez@engineyard.com http://github.com/wycats/merb-core/commit/2c48aa531e472c47834290970ea83349b8f233bc 2c48aa531e472c47834290970ea83349b8f233bc 2008-03-05T12:59:55-08:00 2008-03-05T12:59:55-08:00 remove specs for dependency as they were broittle and not testing the right thing. fd2dce3cfc9e2b41a1b41995a5e346975b2c9dd2 Ezra Zygmuntowicz ez@engineyard.com 58bd96a49004025e7afa23d2caa9fedf3ad58f39 Janne Asmala janne@mindvalley.com http://github.com/wycats/merb-core/commit/89b6937ccc43070ee5c050474361c63453aa9d46 89b6937ccc43070ee5c050474361c63453aa9d46 2008-03-05T12:55:22-08:00 2008-03-04T21:30:23-08:00 Missing documentation Added documentation for a few stray methods and all methods in BootLoader. Signed-off-by: Yehuda Katz <wycats@gmail.com> 6a604c2af09eb1f7cc33da85839210eab4ff2dc1 Yehuda Katz wycats@gmail.com 1631105b30808f449cf486bf71cbfff6536148a3 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/58bd96a49004025e7afa23d2caa9fedf3ad58f39 58bd96a49004025e7afa23d2caa9fedf3ad58f39 2008-03-05T12:52:55-08:00 2008-03-05T12:52:55-08:00 Fixes #155 (_perform_content_negotiation doesn't find */* if it comes last in the accept header order, and nothing else matches) 9df88f251cbe17caff9239ab7d181419ac2c171c Yehuda Katz wycats@gmail.com d06148fec38a07aa50ac09e7ec12f71ca0f7f2e8 Daniel Neighman has.sox@gmail.com http://github.com/wycats/merb-core/commit/1631105b30808f449cf486bf71cbfff6536148a3 1631105b30808f449cf486bf71cbfff6536148a3 2008-03-05T02:03:14-08:00 2008-03-05T02:03:14-08:00 Changes use_test to wrap only the call to dependencies in the check for Merb.environment == "test" This was causing an issue with the generators never being set to test_unit a646538e03239542d78bcc496ccba3f8ec152a3a Daniel Neighman has.sox@gmail.com 384685cc991b912aa369c95f0345294c3c1ac510 Ezra Zygmuntowicz ez@engineyard.com http://github.com/wycats/merb-core/commit/d06148fec38a07aa50ac09e7ec12f71ca0f7f2e8 d06148fec38a07aa50ac09e7ec12f71ca0f7f2e8 2008-03-04T22:25:17-08:00 2008-03-04T22:25:17-08:00 update changelog 47796f22f4e4f125a0b5683b46092472b45a4388 Ezra Zygmuntowicz ez@engineyard.com 0fc1a185a418061c06597f032f9a5e551719c1a4 Michael D. Ivey ivey@gweezlebur.com http://github.com/wycats/merb-core/commit/384685cc991b912aa369c95f0345294c3c1ac510 384685cc991b912aa369c95f0345294c3c1ac510 2008-03-04T21:46:12-08:00 2008-03-04T21:46:12-08:00 change dependency() to use gem() instead of Gem.activate 857864f3df22c4a1c9086067563ef42d205fed51 Michael D. Ivey ivey@gweezlebur.com e442ea7787b119a127633ad9c28d57ee2a32505f f891d8dbec205bc81eb1bf733f9079025b03a362 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/0fc1a185a418061c06597f032f9a5e551719c1a4 0fc1a185a418061c06597f032f9a5e551719c1a4 2008-03-04T18:27:53-08:00 2008-03-04T18:27:53-08:00 Merge branch 'master' of git@github.com:wycats/merb-core 74e85ec6a354d0d5a091b6b86be81f3649b12440 Yehuda Katz wycats@gmail.com 826d11734cd188ed0c4ff32507a5c4a79a259689 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/e442ea7787b119a127633ad9c28d57ee2a32505f e442ea7787b119a127633ad9c28d57ee2a32505f 2008-03-04T17:13:57-08:00 2008-03-04T17:13:57-08:00 As a last resort, look for */* in the formats before throwing NotAcceptable (TODO: Clean this up) 4e8255ebaebb9bd16fac737426dc7703e68430ea Yehuda Katz wycats@gmail.com 8c27e9c3d588ffb19f571539711fcc375db99c43 Ezra Zygmuntowicz ez@engineyard.com http://github.com/wycats/merb-core/commit/f891d8dbec205bc81eb1bf733f9079025b03a362 f891d8dbec205bc81eb1bf733f9079025b03a362 2008-03-04T16:53:04-08:00 2008-03-04T16:53:04-08:00 really remove hooks 8095810afd665f7400e00c29c5595de6bf2f86d2 Ezra Zygmuntowicz ez@engineyard.com 826d11734cd188ed0c4ff32507a5c4a79a259689 Ezra Zygmuntowicz ez@engineyard.com http://github.com/wycats/merb-core/commit/8c27e9c3d588ffb19f571539711fcc375db99c43 8c27e9c3d588ffb19f571539711fcc375db99c43 2008-03-04T16:50:13-08:00 2008-03-04T16:50:13-08:00 don't require hook.rb 88d24cf869c608a24799afc1863a35ccc309e462 Ezra Zygmuntowicz ez@engineyard.com 315e3c81828d33694d3ef279060dbac09a56aadc 0b4fb97bf89c9241b2d6a7f26decee2e7a7fc081 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/826d11734cd188ed0c4ff32507a5c4a79a259689 826d11734cd188ed0c4ff32507a5c4a79a259689 2008-03-04T15:53:56-08:00 2008-03-04T15:53:56-08:00 Merge branch 'master' of git@github.com:wycats/merb-core bd484a14f9cb51c1c5272c3e1d4729954ec9dfbe Yehuda Katz wycats@gmail.com 4faa93bc6561fa9366dcb97e89775a08d29c086d Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/315e3c81828d33694d3ef279060dbac09a56aadc 315e3c81828d33694d3ef279060dbac09a56aadc 2008-03-04T15:53:03-08:00 2008-03-04T15:53:03-08:00 Fix perform_content_negotiation to correctly handle :format in params. Fix render_* to correctly return the correct content_type. 7926e9b8928d9d66aba5a5c685ff3663d418e677 Yehuda Katz wycats@gmail.com fad650f492effd0393d8c6ed393e834ce9160bd7 Ezra Zygmuntowicz ez@engineyard.com http://github.com/wycats/merb-core/commit/0b4fb97bf89c9241b2d6a7f26decee2e7a7fc081 0b4fb97bf89c9241b2d6a7f26decee2e7a7fc081 2008-03-04T15:04:24-08:00 2008-03-04T15:04:24-08:00 remove hooks.rb, they were premature and only used in one place session sotres now need to use setup_session and finalize_session rather then hooks b22fa46ec7cd1d376ca8cec74dd3b11e9fece27b Ezra Zygmuntowicz ez@engineyard.com 17fa804630498330f69f46765c4ef6a4f4eb405a 4faa93bc6561fa9366dcb97e89775a08d29c086d Ezra Zygmuntowicz ez@engineyard.com http://github.com/wycats/merb-core/commit/fad650f492effd0393d8c6ed393e834ce9160bd7 fad650f492effd0393d8c6ed393e834ce9160bd7 2008-03-04T13:34:12-08:00 2008-03-04T13:34:12-08:00 Merge branch 'master' of git@github.com:wycats/merb-core 66830f510645a66d18adebbcfd69ec92274425af Ezra Zygmuntowicz ez@engineyard.com bf38f7948cdcb9a05a1177604d80b87558777987 Ezra Zygmuntowicz ez@engineyard.com http://github.com/wycats/merb-core/commit/17fa804630498330f69f46765c4ef6a4f4eb405a 17fa804630498330f69f46765c4ef6a4f4eb405a 2008-03-04T13:33:51-08:00 2008-03-04T13:33:51-08:00 fix evented mongrel to not go crazy 61e05b8f14e95b14bd2866b4df35e9268960ae24 Ezra Zygmuntowicz ez@engineyard.com 7a1c3e23354621f680554ee0bd3e873dff4b22c7 bf38f7948cdcb9a05a1177604d80b87558777987 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/4faa93bc6561fa9366dcb97e89775a08d29c086d 4faa93bc6561fa9366dcb97e89775a08d29c086d 2008-03-04T13:30:04-08:00 2008-03-04T13:30:04-08:00 Merge branch 'master' of git@github.com:wycats/merb-core 4827bfa468245954d5ac2d9c8b1c5480c3fc5600 Yehuda Katz wycats@gmail.com 539dd037b1845e13c11203ce10986898c52b4fd3 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/7a1c3e23354621f680554ee0bd3e873dff4b22c7 7a1c3e23354621f680554ee0bd3e873dff4b22c7 2008-03-04T13:28:50-08:00 2008-03-04T13:28:50-08:00 Calling /foo.pdf should throw a 406 if :pdf is not a registered mime. f75b8540acc02b6bc86dce9f6549c258e056b368 Yehuda Katz wycats@gmail.com 66e0e524e72106234051371b859912befff7f670 Ezra Zygmuntowicz ez@engineyard.com http://github.com/wycats/merb-core/commit/bf38f7948cdcb9a05a1177604d80b87558777987 bf38f7948cdcb9a05a1177604d80b87558777987 2008-03-04T13:14:47-08:00 2008-03-04T13:14:47-08:00 touch up dispatcher a bit, remove some un-needed code from the hot path ef98abc73a26ebb068bbb8074e1869224cd49d5a Ezra Zygmuntowicz ez@engineyard.com 31634b395abd6d690ebbb98a113e7e70aaf64ffd Ezra Zygmuntowicz ez@engineyard.com http://github.com/wycats/merb-core/commit/66e0e524e72106234051371b859912befff7f670 66e0e524e72106234051371b859912befff7f670 2008-03-04T13:01:38-08:00 2008-03-04T13:01:38-08:00 fix dispatcher to not parse the params twice, still supports request_params 812b41a7e76a0bf160de576d04c38d4e70af2414 Ezra Zygmuntowicz ez@engineyard.com 44774a2a892e23ef9aeaed2f9860bdc3b5bdf5a3 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/539dd037b1845e13c11203ce10986898c52b4fd3 539dd037b1845e13c11203ce10986898c52b4fd3 2008-03-04T12:47:54-08:00 2008-03-04T12:47:54-08:00 Should resolve #180 (Exception in exception.html.erb) b784a8d1696ec23519390eaeff8c362ff90613af Yehuda Katz wycats@gmail.com adc9ccd6d1636562a15a9662ae49fd97f4524a81 Ezra Zygmuntowicz ez@engineyard.com http://github.com/wycats/merb-core/commit/31634b395abd6d690ebbb98a113e7e70aaf64ffd 31634b395abd6d690ebbb98a113e7e70aaf64ffd 2008-03-04T12:36:35-08:00 2008-03-04T12:36:35-08:00 fix some specs to not rebuild the router every iteration 7d61be6bff743026cc56f7da0988c0637ccfe885 Ezra Zygmuntowicz ez@engineyard.com 44774a2a892e23ef9aeaed2f9860bdc3b5bdf5a3 Janne Asmala janne@mindvalley.com http://github.com/wycats/merb-core/commit/adc9ccd6d1636562a15a9662ae49fd97f4524a81 adc9ccd6d1636562a15a9662ae49fd97f4524a81 2008-03-04T12:31:09-08:00 2008-03-01T20:36:15-08:00 Test documentation Documentation for all methods in Merb::Test. Signed-off-by: Ezra Zygmuntowicz <ez@engineyard.com> 132ce836b4f5834389ef17f0d0f5787c0866d9a5 Ezra Zygmuntowicz ez@engineyard.com 6793ef9897e5ee6c11f0d29b743dbc9989fa722c Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/44774a2a892e23ef9aeaed2f9860bdc3b5bdf5a3 44774a2a892e23ef9aeaed2f9860bdc3b5bdf5a3 2008-03-04T12:29:56-08:00 2008-03-04T12:29:56-08:00 Resolves #181 (Special chars in static filenames) 326bc4957c200e0bc8dca401d833990860e4d7be Yehuda Katz wycats@gmail.com f23889f34b791e7e2c0c1ec14be47f7577999d20 Loren Segal lsegal@soen.ca http://github.com/wycats/merb-core/commit/6793ef9897e5ee6c11f0d29b743dbc9989fa722c 6793ef9897e5ee6c11f0d29b743dbc9989fa722c 2008-03-03T20:00:18-08:00 2008-03-03T20:00:18-08:00 Install gem with --local so it won't poll remote servers for updates during install 5db13f555e13fdff3c7d0da6b613261f3b6a6b93 Loren Segal lsegal@soen.ca 6a54e6c391aa01a9223d2b85772c539fa078214b Ben Burkert ben@benburkert.com http://github.com/wycats/merb-core/commit/f23889f34b791e7e2c0c1ec14be47f7577999d20 f23889f34b791e7e2c0c1ec14be47f7577999d20 2008-03-03T16:10:37-08:00 2008-03-03T16:10:37-08:00 cleaned up a confusing if statement a6dee5e37980106cfec2706fc1ab40d762b1a0d3 Ben Burkert ben@benburkert.com