9238c0a2d1cce49beafb165bab8ad6513821b83e 8ceb03e11d386feadfa9dd47b57d72c99e36ee6a Michael D. Ivey ivey@gweezlebur.com http://github.com/wycats/merb-core/commit/6155eae38811b4a8676530786fdedf48ba46cdea 6155eae38811b4a8676530786fdedf48ba46cdea

2008-06-20T12:51:37-07:00

Merge branch 'master' of git@github.com:wycats/merb-core * 'master' of git@github.com:wycats/merb-core: (50 commits) add Merb::Rack::Profiler middleware. to use add the following to your config/rack.rb file: update license Missing require require 'stringio' Add support for non-standard template reloading. Plugin authors need to override load_template_io to handle special reloading logic. Add support for IO templates instead of just paths. See PLUGIN_API_CHANGELOG for details. add swiftiplied mongrel rack adapter. Swapped the order of helper and controller in the default_framework Why should capture be private? Merb::Config[:framework] now needs absolute paths to work (breaks BC) Merb::Config[:framework] paths now pickup files using glob **/*.rb unless specified otherwise Don't automatically use Facebook signature Fixes failing spec. make the default rake task 'specs' so running rake in merb-core just runs the specs Rename @status to @_status Avoid adding nil values in place of missing keys for Hash#only Fix issue with null segments Fixed session cookie expires value [#366 state:resolved] Made HTTP method override proc-based and pluggable. [#364] siiiiiigh. ... cce28fdf0484ff88c3acf36df2e9e9f552dd8637 Michael D. Ivey ivey@gweezlebur.com 8cc7fdd0925f72a317156e110fbc27ba52707827 Ezra Zygmuntowicz ez@engineyard.com http://github.com/wycats/merb-core/commit/8ceb03e11d386feadfa9dd47b57d72c99e36ee6a 8ceb03e11d386feadfa9dd47b57d72c99e36ee6a

2008-06-19T18:53:16-07:00

add Merb::Rack::Profiler middleware. to use add the following to your config/rack.rb file: use Merb::Rack::Middleware or use Merb::Rack::Middleware, 5, 10 which means only show results that took 5% or more of the time and run the action 10 times to get average results f0c2ed09a01f0010dcfa172eeb7bab9bf41f2f28 Ezra Zygmuntowicz ez@engineyard.com ea2bbe5109bec44582fdce672c64e41118c22473 Ezra Zygmuntowicz ez@engineyard.com http://github.com/wycats/merb-core/commit/8cc7fdd0925f72a317156e110fbc27ba52707827 8cc7fdd0925f72a317156e110fbc27ba52707827

2008-06-19T16:47:25-07:00

update license bd84fa7afac355126d7c299bf24717d80d9130f2 Ezra Zygmuntowicz ez@engineyard.com 07bb4caddee0c7080c7e431c80116380d41b1ab3 f3aba3d20379015aa810ecc95f019e212264aed2 Ezra Zygmuntowicz ez@engineyard.com http://github.com/wycats/merb-core/commit/ea2bbe5109bec44582fdce672c64e41118c22473 ea2bbe5109bec44582fdce672c64e41118c22473

2008-06-18T21:18:10-07:00

Merge branch 'master' of git@github.com:wycats/merb-core Conflicts: lib/merb-core/core_ext/virtual_file.rb 16cdf3ede72779cb2e02257311d0f022f11befcc Ezra Zygmuntowicz ez@engineyard.com ce9182e196832a2e1fc293f2f3c1f3357d74e3c6 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/f3aba3d20379015aa810ecc95f019e212264aed2 f3aba3d20379015aa810ecc95f019e212264aed2

2008-06-18T20:16:54-07:00

Missing require 16cdf3ede72779cb2e02257311d0f022f11befcc Yehuda Katz wycats@gmail.com ce9182e196832a2e1fc293f2f3c1f3357d74e3c6 Ezra Zygmuntowicz ez@engineyard.com http://github.com/wycats/merb-core/commit/07bb4caddee0c7080c7e431c80116380d41b1ab3 07bb4caddee0c7080c7e431c80116380d41b1ab3

2008-06-18T19:32:34-07:00

require 'stringio' 87bd2e1ced92b8ac222886a40892885e9b329b0c Ezra Zygmuntowicz ez@engineyard.com 10020f168802d9a613501d650f1db1b94c2abb27 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/ce9182e196832a2e1fc293f2f3c1f3357d74e3c6 ce9182e196832a2e1fc293f2f3c1f3357d74e3c6

2008-06-18T16:43:29-07:00

Add support for non-standard template reloading. Plugin authors need to override load_template_io to handle special reloading logic. 015fb08cf6a43ba76631f4b830f717fd3a550ebe Yehuda Katz wycats@gmail.com 191f5c8a8ea334dd465968d796d7a598fecc5545 a086274a205592a935ddd11bb845e799d7f3fe9d Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/10020f168802d9a613501d650f1db1b94c2abb27 10020f168802d9a613501d650f1db1b94c2abb27

2008-06-18T16:19:38-07:00

Merge branch 'master' of git@github.com:wycats/merb-core * 'master' of git@github.com:wycats/merb-core: add swiftiplied mongrel rack adapter. Swapped the order of helper and controller in the default_framework d43f577e30760b1e12d09ea87c886717fede251e Yehuda Katz wycats@gmail.com 282a83a7e48467f27558222f44bfa4ec94db2399 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/191f5c8a8ea334dd465968d796d7a598fecc5545 191f5c8a8ea334dd465968d796d7a598fecc5545

2008-06-18T16:19:26-07:00

Add support for IO templates instead of just paths. See PLUGIN_API_CHANGELOG for details. 3abba2285bc766a461d271ded533d3b3e14d9bdc Yehuda Katz wycats@gmail.com c3cfb207d435e396c2adf712d57bdefa84de9043 Ezra Zygmuntowicz ez@engineyard.com http://github.com/wycats/merb-core/commit/a086274a205592a935ddd11bb845e799d7f3fe9d a086274a205592a935ddd11bb845e799d7f3fe9d

2008-06-18T14:55:28-07:00

add swiftiplied mongrel rack adapter. 1fac3115abef1d104a9ed162069f808fca4b310b Ezra Zygmuntowicz ez@engineyard.com 282a83a7e48467f27558222f44bfa4ec94db2399 Carl Lerche carl@splendificent.com http://github.com/wycats/merb-core/commit/c3cfb207d435e396c2adf712d57bdefa84de9043 c3cfb207d435e396c2adf712d57bdefa84de9043

2008-06-17T17:12:48-07:00

2008-06-15T14:06:10-07:00

Swapped the order of helper and controller in the default_framework Signed-off-by: Ezra Zygmuntowicz <ez@engineyard.com> 7e8d92d4a0a1743f2109ec286e97ecee089a6a59 Ezra Zygmuntowicz ez@engineyard.com 4ca65094c117f7f759950aa9dbf3d5d5419e29e5 b707f3ddc93b7ce74dde794e1248936fde9f2546 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/282a83a7e48467f27558222f44bfa4ec94db2399 282a83a7e48467f27558222f44bfa4ec94db2399

2008-06-17T12:31:15-07:00

Merge branch 'master' of git@github.com:wycats/merb-core * 'master' of git@github.com:wycats/merb-core: Merb::Config[:framework] now needs absolute paths to work (breaks BC) Merb::Config[:framework] paths now pickup files using glob **/*.rb unless specified otherwise 378603fa06ca1874d624f179e6f62f05da22237f Yehuda Katz wycats@gmail.com 490c31829c27abbc50aef0bf7153297df18a7475 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/4ca65094c117f7f759950aa9dbf3d5d5419e29e5 4ca65094c117f7f759950aa9dbf3d5d5419e29e5

2008-06-17T12:31:07-07:00

Why should capture be private? 1def6188ff8a175b8636645c92a9010d0a9795d4 Yehuda Katz wycats@gmail.com a57dd606907917ff6401d00b1d98bbd2b431c1f2 Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb-core/commit/b707f3ddc93b7ce74dde794e1248936fde9f2546 b707f3ddc93b7ce74dde794e1248936fde9f2546

2008-06-17T04:58:11-07:00

Merb::Config[:framework] now needs absolute paths to work (breaks BC) When specifying paths for custom app structures (which --flat and --very-flat use as well), you now need to construct full paths instead of Merb.root based paths. This gives this option its flexibility back. By default a glob pattern (**/*.rb) is assumed, just like Merb.push_path expects. For components like :config and :public, you'd want to specify nil to stop automatical loading of contained files. Before, the default was nil, preventing the loading of *.rb files - the opposite of push_path's default behaviour. [BC] you need to adjust your Merb::Config[:framework] settings accordingly. Example (before): Merb::Config[:framework] = { :application => "application.rb", :config => "config", :public => "public", :view => "views" } Example (after): Merb::Config[:framework] = { :application => Merb.root / "application.rb", :config => [Merb.root / "config", nil], :public => [Merb.root / "public", nil], :view => Merb.root / "views" } 15583ddb6c8399cadee8db179e4516732353781a Fabien Franzen info@atelierfabien.be 490c31829c27abbc50aef0bf7153297df18a7475 Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb-core/commit/a57dd606907917ff6401d00b1d98bbd2b431c1f2 a57dd606907917ff6401d00b1d98bbd2b431c1f2

2008-06-16T13:54:59-07:00

Merb::Config[:framework] paths now pickup files using glob **/*.rb unless specified otherwise 32a6f04145ed29870fb8766b568738c68e039da3 Fabien Franzen info@atelierfabien.be 1fd7a9ccc0d4ff11a961038d882d724a5725595b Michael D. Ivey ivey@gweezlebur.com http://github.com/wycats/merb-core/commit/490c31829c27abbc50aef0bf7153297df18a7475 490c31829c27abbc50aef0bf7153297df18a7475

2008-06-13T00:30:42-07:00

2008-06-13T00:29:38-07:00

Don't automatically use Facebook signature Accidentally put this in, from my benchmarks. This should go into merb_facebooker...which should get merged to facebooker eventually 0690f62a31c9073ae52ead2f65fd144d4942ecd9 Michael D. Ivey ivey@gweezlebur.com 2032f494b926e7d4d5bef47748ec8acac25e4da9 1bdc6eeb899fb1ecd98691207316e403eb17f370 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/1fd7a9ccc0d4ff11a961038d882d724a5725595b 1fd7a9ccc0d4ff11a961038d882d724a5725595b

2008-06-11T21:59:28-07:00

Merge branch 'master' of git@github.com:wycats/merb-core * 'master' of git@github.com:wycats/merb-core: make the default rake task 'specs' so running rake in merb-core just runs the specs Rename @status to @_status Avoid adding nil values in place of missing keys for Hash#only Fix issue with null segments Fixed session cookie expires value [#366 state:resolved] Made HTTP method override proc-based and pluggable. [#364] 335d3a41b2784e9bc2abd02f69d90a34722f31d7 Yehuda Katz wycats@gmail.com 75f71027c5f023eebb91023845f06262cb16a880 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/2032f494b926e7d4d5bef47748ec8acac25e4da9 2032f494b926e7d4d5bef47748ec8acac25e4da9

2008-06-11T21:59:18-07:00

Fixes failing spec. 5c5c9a8aa4e8c7280f5cfeb99428b18e3b081611 Yehuda Katz wycats@gmail.com 480f4b21f751922bf642fd373c657753ce7f7ffb Ezra Zygmuntowicz ez@engineyard.com http://github.com/wycats/merb-core/commit/1bdc6eeb899fb1ecd98691207316e403eb17f370 1bdc6eeb899fb1ecd98691207316e403eb17f370

2008-06-11T20:38:46-07:00

make the default rake task 'specs' so running rake in merb-core just runs the specs b44da00f366f292e952cf66c28e4ca5572fb39de Ezra Zygmuntowicz ez@engineyard.com 33a25d088ddf4f6931a509f8dee712d48bb045cd Michael D. Ivey ivey@gweezlebur.com http://github.com/wycats/merb-core/commit/480f4b21f751922bf642fd373c657753ce7f7ffb 480f4b21f751922bf642fd373c657753ce7f7ffb

2008-06-11T15:13:50-07:00

Rename @status to @_status We may want to do the same w/ @request and @headers [#232 state:resolved] 40599728fed53f44404363c495a9e601fed8e5b5 Michael D. Ivey ivey@gweezlebur.com ccb5a25af793b54b6173a3f443d96046684e48c1 Brian Mitchell binary42@gmail.com http://github.com/wycats/merb-core/commit/33a25d088ddf4f6931a509f8dee712d48bb045cd 33a25d088ddf4f6931a509f8dee712d48bb045cd

2008-06-11T14:37:58-07:00

2008-06-06T16:53:36-07:00

Avoid adding nil values in place of missing keys for Hash#only Signed-off-by: Michael D. Ivey <ivey@gweezlebur.com> 9d5189e6743c095c730f33ff4550b1d08a13c055 Michael D. Ivey ivey@gweezlebur.com 35d98ffd7971beec09d150af11dc5e6232dbcd62 Michael Latta mlatta@technomage.com http://github.com/wycats/merb-core/commit/ccb5a25af793b54b6173a3f443d96046684e48c1 ccb5a25af793b54b6173a3f443d96046684e48c1

2008-06-11T14:19:50-07:00

2008-06-08T09:59:59-07:00

Fix issue with null segments Signed-off-by: Michael D. Ivey <ivey@gweezlebur.com> [#365 state:resolved] I was going to change this to use explicit returns, but I think the more common case is for segments() to be non-nil so this is better. a64627f6f711b2b1edffa3da1d6fcdc9b134ecd1 Michael D. Ivey ivey@gweezlebur.com e7792452a120cdc582b7a1cd826e47eded459d3d mde mde@fleegix.org http://github.com/wycats/merb-core/commit/35d98ffd7971beec09d150af11dc5e6232dbcd62 35d98ffd7971beec09d150af11dc5e6232dbcd62

2008-06-11T14:09:29-07:00

2008-06-09T22:45:54-07:00

Fixed session cookie expires value [#366 state:resolved] Fixed a bug where setup_session sets the session-key cookie in each request, and with no expires value. This bug meant that sessions couldn't be set to expire on a certain date -- they could only be set to expire when the user closes the browser. Signed-off-by: Michael D. Ivey <ivey@gweezlebur.com> 360f260f803bf461126ef204d7bbc85d8cebc26e Michael D. Ivey ivey@gweezlebur.com 75f71027c5f023eebb91023845f06262cb16a880 mde mde@fleegix.org http://github.com/wycats/merb-core/commit/e7792452a120cdc582b7a1cd826e47eded459d3d e7792452a120cdc582b7a1cd826e47eded459d3d

2008-06-11T13:49:39-07:00

2008-06-08T19:11:10-07:00

Made HTTP method override proc-based and pluggable. [#364] Changed the check for specific params to procs that execute in the request scope, allowing checks for method overrides to be based on params, headers -- or pretty much anything in the request. Also changed the name of the array that stores these checks from browser_method_workarounds to the more accurate and descriptive http_method_overrides. Signed-off-by: Michael D. Ivey <ivey@gweezlebur.com> (I changed this to yield the controller to the block, instead of using instance_eval, as it seemed cleaner and was significantly faster. See benchmark attachment on ticket #364 --ivey) [#364 state:resolved] a9572674bfc2546ce843a719f184432258de91ee Michael D. Ivey ivey@gweezlebur.com 3e8a8934b62aaa5453a97b8150b0ab3877580e0c cd7bacb9c7eb105ecf84c01fb56bcc8af29b5c15 David James djwonk@collectiveinsight.net http://github.com/wycats/merb-core/commit/75f71027c5f023eebb91023845f06262cb16a880 75f71027c5f023eebb91023845f06262cb16a880

2008-06-11T10:52:54-07:00

Merge branch 'master' of git://github.com/wycats/merb-core * 'master' of git://github.com/wycats/merb-core: (192 commits) siiiiiigh. Revert partial counter and yielding. Remove some duplication For crying out loud. Refactor display. WARNING: This commit might not be stable. I need to add a bunch more specs for display before I feel confident. Make the TemplateNotFound error read better. Slight refactor of _get_layout. Fix _template_for so it's actually readable uhhhhhhhh... Added Merb::Router.reset! and Merb::Router.capture Speedup Route URL generation Start work on fixing contaminated cousins bug. Changed controller inheritance of _template_root Added the ability to use full/absolute template paths for render, display and partial views This cannot be tested this way. It needs to be tested as a public spec (testing it privately here was a cop-out and fails when I fixed up the way dependency works). Allows passage of query string via env["QUERY_STRING"] in tests. [#358 state:resolved] Handles use of dependency after BootLoading. [#360 state:resolved] properly set the session_id_key added 2 specs for multipart formdata: (1) for checking request with IO, (2) for testing GET with content_type not erroring on multipart/form-data absence; fixed error with multipart/form-data absence. Made Class a lot more sane. Fix README for merb-gen app foo ... cc4fa07242559e1e20f49ba4422e51a48626916f David James djwonk@collectiveinsight.net ce9a7f1e77fcb633db0f936467a77d2fdf687437 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/cd7bacb9c7eb105ecf84c01fb56bcc8af29b5c15 cd7bacb9c7eb105ecf84c01fb56bcc8af29b5c15

2008-06-10T22:10:21-07:00

siiiiiigh. 54b19a7e19801348f42fa9d863038d13222b21e6 Yehuda Katz wycats@gmail.com a09128eac56b9333324692a2ddf2be688c33de85 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/ce9a7f1e77fcb633db0f936467a77d2fdf687437 ce9a7f1e77fcb633db0f936467a77d2fdf687437

2008-06-10T21:58:45-07:00

Revert partial counter and yielding. f73adff0bffce1cdbe493a99ca4ecba9b685889e Yehuda Katz wycats@gmail.com 384287b21dc6fdac927b088c2aa6647e461532b9 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/a09128eac56b9333324692a2ddf2be688c33de85 a09128eac56b9333324692a2ddf2be688c33de85

2008-06-10T21:54:56-07:00

Remove some duplication 73ea997b0e8ac0a45b80ea2778fb255a830e8290 Yehuda Katz wycats@gmail.com 995f4f670e8a212af676bd9736f1a2c4b4cb2161 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/384287b21dc6fdac927b088c2aa6647e461532b9 384287b21dc6fdac927b088c2aa6647e461532b9

2008-06-10T21:39:58-07:00

For crying out loud. 052ad67ac570ff30bae7d353e73cf317912d8e15 Yehuda Katz wycats@gmail.com c1ce863d84641e1748a388a959fd409b7c244916 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/995f4f670e8a212af676bd9736f1a2c4b4cb2161 995f4f670e8a212af676bd9736f1a2c4b4cb2161

2008-06-10T20:28:48-07:00

Refactor display. WARNING: This commit might not be stable. I need to add a bunch more specs for display before I feel confident. 72e1a7b41f8b65628961169b663856a80b2cffc8 Yehuda Katz wycats@gmail.com