From 66ff8a4076c635e9e4aa31ef4f856d635af48038 Mon Sep 17 00:00:00 2001 From: Dayle Rees Date: Wed, 28 Mar 2012 10:30:51 +0100 Subject: [PATCH 01/32] integrated a simple version of anbu into the laravel core Signed-off-by: Dayle Rees --- application/config/anbu.php | 59 +++++++++ application/start.php | 16 ++- application/views/home/index.php | 3 +- laravel/anbu/anbu.css | 207 +++++++++++++++++++++++++++++++ laravel/anbu/anbu.js | 174 ++++++++++++++++++++++++++ laravel/anbu/anbu.php | 97 +++++++++++++++ laravel/anbu/template.php | 63 ++++++++++ 7 files changed, 617 insertions(+), 2 deletions(-) create mode 100644 application/config/anbu.php mode change 100644 => 100755 application/start.php mode change 100644 => 100755 application/views/home/index.php create mode 100755 laravel/anbu/anbu.css create mode 100755 laravel/anbu/anbu.js create mode 100755 laravel/anbu/anbu.php create mode 100755 laravel/anbu/template.php diff --git a/application/config/anbu.php b/application/config/anbu.php new file mode 100644 index 00000000..9b6503ee --- /dev/null +++ b/application/config/anbu.php @@ -0,0 +1,59 @@ + true, + + /* + |-------------------------------------------------------------------------- + | Show the QUERIES tab. + |-------------------------------------------------------------------------- + | + | Display a tab showing all queries performed by the Database layer. + | + */ + + 'tab_queries' => true, + + /* + |-------------------------------------------------------------------------- + | Include jQuery? + |-------------------------------------------------------------------------- + | + | Anbu needs the jQuery JavaScript framework to function, if you are already + | using jQuery in your templates, set this value to false. + | + */ + + 'include_jquery' => true, + + /* + |-------------------------------------------------------------------------- + | Event Listeners + |-------------------------------------------------------------------------- + | + | These are the Laravel event listeners, feel free to modify them to use + | a different data source, or include more if necessary. + | + */ + + 'event_listeners' => function() + { + // pass laravel log entries to anbu + Event::listen('laravel.log', 'Anbu::log'); + + // pass executed SQL queries to anbu + Event::listen('laravel.query', 'Anbu::sql'); + }, + +); diff --git a/application/start.php b/application/start.php old mode 100644 new mode 100755 index 085dd090..a6fd4f70 --- a/application/start.php +++ b/application/start.php @@ -125,6 +125,20 @@ Blade::sharpen(); +/* +|-------------------------------------------------------------------------- +| Enable The Anbu Profiler +|-------------------------------------------------------------------------- +| +| The Anbu profiler is an easy way to view all of your Executed SQL +| queries, log entries and other useful data from the front-end of your +| web app, to enable output simply add Anbu::render(); after the +| tag of your main template, or page. +| +*/ + +Anbu::register(); + /* |-------------------------------------------------------------------------- | Set The Default Timezone @@ -154,4 +168,4 @@ if ( ! Request::cli() and Config::get('session.driver') !== '') { Session::load(); -} \ No newline at end of file +} diff --git a/application/views/home/index.php b/application/views/home/index.php old mode 100644 new mode 100755 index 156c36ab..980248f3 --- a/application/views/home/index.php +++ b/application/views/home/index.php @@ -88,6 +88,7 @@ +

Welcome To Laravel

@@ -126,4 +127,4 @@
- \ No newline at end of file + diff --git a/laravel/anbu/anbu.css b/laravel/anbu/anbu.css new file mode 100755 index 00000000..343b011c --- /dev/null +++ b/laravel/anbu/anbu.css @@ -0,0 +1,207 @@ +/* +Anbu Styles +Copyright 2012 Dayle Rees. +MIT License +Intended for inclusion with the Laravel PHP Framework. +*/ + +.anbu +{ + font-family:Helvetica, "Helvetica Neue", Arial, sans-serif !important; + font-size:14px !important; + background-color:#222 !important; + position:fixed !important; + bottom:0 !important; + right:0 !important; + width:100%; + z-index: 9999 !important; +} + +.anbu-tabs +{ + margin:0 !important; + padding:0 !important; + overflow:hidden !important; +} + +.anbu-tabs li +{ + display:inline; +} + +.anbu-tabs a, .anbu-tabs a:visited +{ + color:#aaa !important; + text-transform:uppercase !important; + font-weight:bold !important; + display:inline-block; + text-decoration:none !important; + font-size:0.8em !important; + padding: 0.8em 2em 0.7em 2em !important; + -webkit-transition-property:color, background-color; + -webkit-transition-duration: 0.7s, 0.2s; + -webkit-transition-timing-function: ease-in, ease-in; + -moz-transition-property:color, background-color; + -moz-transition-duration: 0.7s, 0.2s; + -moz-transition-timing-function: ease-in, ease-in; + -ms-transition-property:color, background-color; + -ms-transition-duration: 0.7s, 0.2s; + -ms-transition-timing-function: ease-in, ease-in; + -o-transition-property:color, background-color; + -o-transition-duration: 0.7s, 0.2s; + -o-transition-timing-function: ease-in, ease-in; + transition-property:color, background-color; + transition-duration: 0.7s, 0.2s; + transition-timing-function: ease-in, ease-in; +} + +#anbu-closed-tabs a, #anbu-closed-tabs a:visited +{ + padding: 0.85em 1.2em 0.85em 1.2em !important; +} + +.anbu-tabs a:hover +{ + background-color:#333 !important; + color:#fff !important; +} + +.anbu-tabs a.anbu-active-tab +{ + color:#fff !important; + background-color:#333 !important; +} + +.anbu a:focus +{ + outline:none !important; +} + +.anbu-tabs a:active +{ + background-color:#111 !important; +} + +.anbu-tabs li.anbu-tab-right +{ + float:right !important; +} + +.anbu-tabs li.anbu-tab-right a, .anbu-tabs li.anbu-tab-right a:visited +{ + padding: 0.86em 2em 0.7em 2em !important; +} + +#anbu-closed-tabs +{ + display:none; +} + + +.anbu-window +{ + display:none; +} + +.anbu-content-area +{ + background-color: #fff !important; + background-image: -webkit-gradient(linear, left top, left bottom, from(#eeeeee), to(#ffffff)); + background-image: -webkit-linear-gradient(top, #eeeeee, #ffffff); + background-image: -moz-linear-gradient(top, #eeeeee, #ffffff); + background-image: -ms-linear-gradient(top, #eeeeee, #ffffff); + background-image: -o-linear-gradient(top, #eeeeee, #ffffff); + background-image: linear-gradient(to bottom, #eeeeee, #ffffff); + height:14em; + margin-top:6px !important; + overflow-x:hidden !important; + overflow-y:auto !important; +} + +.anbu-table table +{ + margin:0 !important; + padding:0 !important; + font-size:0.9em !important; + border:0 !important; + border-collapse:collapse !important; + width:100% !important; + background-color:#fff !important; +} + +.anbu-table pre +{ + margin:0 !important; +} + +.anbu-table tr +{ + border-bottom:1px solid #ccc !important; +} + +.anbu-table tr:first-child +{ + border:0 !important; +} + +.anbu-table th +{ + background-color:#555 !important; + color:#fff !important; + text-transform:uppercase !important; +} + +.anbu-table th, .anbu-table td +{ + text-align:left !important; + padding:0.4em 1em !important; + margin:0 !important; +} + +.anbu-table td +{ + vertical-align:top !important; +} + +.anbu-table-first +{ + background-color:#eee !important; + border-right:1px solid #ccc !important; + width:10% !important; +} + +span.anbu-count +{ + margin-left:0.5em !important; + background-color:#555 !important; + display:inline-block !important; + padding:0.1em 0.5em 0.2em 0.5em !important; + color:#eee !important; + text-shadow:0 0 4px #000 !important; + -webkit-border-radius: 1px; + -moz-border-radius: 1px; + border-radius: 1px; + -moz-background-clip: padding; -webkit-background-clip: padding-box; background-clip: padding-box; + +} + +.anbu-empty +{ + display:block !important; + padding:1em !important; + text-align:center !important; + font-style:italic !important; + color:#ccc !important; + margin:1em !important; + text-shadow:0 1px 0px #fff !important; +} + +.anbu pre +{ + overflow-x: auto; + white-space: pre-wrap; + white-space: -moz-pre-wrap !important; + white-space: -pre-wrap; + white-space: -o-pre-wrap; + word-wrap: break-word; +} diff --git a/laravel/anbu/anbu.js b/laravel/anbu/anbu.js new file mode 100755 index 00000000..8f86fe35 --- /dev/null +++ b/laravel/anbu/anbu.js @@ -0,0 +1,174 @@ +/* +Anbu Profiler +Copyright 2012 Dayle Rees. +MIT License +Intended for inclusion with the Laravel PHP Framework. +*/ + +var anbu = { + + // BOUND ELEMENTS + // ------------------------------------------------------------- + // Binding these elements early, stops jQuery from "querying" + // the DOM every time they are used. + + el : { + main : $('.anbu'), + close : $('#anbu-close'), + zoom : $('#anbu-zoom'), + hide : $('#anbu-hide'), + show : $('#anbu-show'), + tab_pane : $('.anbu-tab-pane'), + hidden_tab_pane : $('.anbu-tab-pane:visible'), + tab : $('.anbu-tab'), + tabs : $('.anbu-tabs'), + tab_links : $('.anbu-tabs a'), + window : $('.anbu-window'), + closed_tabs : $('#anbu-closed-tabs'), + open_tabs : $('#anbu-open-tabs'), + content_area : $('.anbu-content-area') + }, + + // CLASS ATTRIBUTES + // ------------------------------------------------------------- + // Useful variable for Anbu. + + isZoomed : false, // is anbu in full screen mode + small_height : $('.anbu-content-area').height(), // initial height of content area + active_tab : 'anbu-active-tab', // the name of the active tab css + tab_data : 'data-anbu-tab', // the data attribute of the tab link + mini_button_width : '2.6em', // size of anbu when compact + window_open : false, // is the top window open? + active_pane : '', // current active pane + + // START() + // ------------------------------------------------------------- + // Sets up all the binds for Anbu! + + start : function () + { + // hide initial elements + + anbu.el.close.hide(); + anbu.el.zoom.hide(); + anbu.el.tab_pane.hide(); + + // bind all click events + anbu.el.close.click( function () { anbu.close_window(); }); + anbu.el.hide.click( function () { anbu.hide(); }); + anbu.el.show.click( function () { anbu.show(); }); + anbu.el.zoom.click( function () { anbu.zoom(); }); + anbu.el.tab.click( function () { anbu.clicked_tab($(this)); }); + }, + + // CLICKED_TAB() + // ------------------------------------------------------------- + // A tab has been clicked, decide what to do. + + clicked_tab : function (tab) + { + // if the tab is closed + if(anbu.window_open && anbu.active_pane == tab.attr(anbu.tab_data)) + { + anbu.close_window(); + } + else + { + anbu.open_window(tab); + } + }, + + // OPEN_WINDOW() + // ------------------------------------------------------------- + // Animate open the top window to the appropriate tab. + + open_window : function (tab) + { + // can't directly assign this line, but it works + $('.anbu-tab-pane:visible').fadeOut(200); + $('.' + tab.attr(anbu.tab_data)).delay(220).fadeIn(300); + anbu.el.tab_links.removeClass(anbu.active_tab); + tab.addClass(anbu.active_tab); + anbu.el.window.slideDown(300); + anbu.el.close.fadeIn(300); + anbu.el.zoom.fadeIn(300); + anbu.active_pane = tab.attr(anbu.tab_data); + anbu.window_open = true; + }, + + + // CLOSE_WINDOW() + // ------------------------------------------------------------- + // Animate closed the top window hiding all tabs. + + close_window : function() + { + anbu.el.tab_pane.fadeOut(100); + anbu.el.window.slideUp(300); + anbu.el.close.fadeOut(300); + anbu.el.zoom.fadeOut(300); + anbu.el.tab_links.removeClass(anbu.active_tab); + anbu.active_pane = ''; + anbu.window_open = false; + }, + + + // SHOW() + // ------------------------------------------------------------- + // Show the Anbu toolbar when it has been compacted. + + show : function () + { + anbu.el.closed_tabs.fadeOut(600, function () { + anbu.el.open_tabs.fadeIn(200); + }) + anbu.el.main.animate({width: '100%'}, 700); + }, + + // HIDE() + // ------------------------------------------------------------- + // Hide the anbu toolbar, show a tiny re-open button. + + hide : function () + { + anbu.close_window(); + anbu.el.window.slideUp(400, function () { + anbu.close_window(); + anbu.el.open_tabs.fadeOut(200, function () { + anbu.el.closed_tabs.fadeIn(200); + }) + anbu.el.main.animate({width: anbu.mini_button_width}, 700); + }); + + }, + + // TOGGLEZOOM() + // ------------------------------------------------------------- + // Toggle the zoomed mode of the top window. + + zoom : function () + { + if(anbu.isZoomed) + { + height = anbu.small_height; + anbu.isZoomed = false; + } + else + { + // the 6px is padding on the top of the window + height = ($(window).height() - anbu.el.tabs.height() - 6) + 'px'; + anbu.isZoomed = true; + } + + anbu.el.content_area.animate({height: height}, 700); + } + +} + + +jQuery(document).ready(function () { + // launch anbu + anbu.start(); +}); + + diff --git a/laravel/anbu/anbu.php b/laravel/anbu/anbu.php new file mode 100755 index 00000000..693d4b03 --- /dev/null +++ b/laravel/anbu/anbu.php @@ -0,0 +1,97 @@ + + * @copyright 2012 Dayle Rees + * @license MIT License + */ +class Anbu { + + /** + * An array of log entries recorded. + * + * @var array + */ + private static $logs = array(); + + /** + * Am array of SQL queries executed. + * + * @var array + */ + private static $queries = array(); + + + /** + * Render Anbu, assign view params and echo out the main view. + * + * @return void + */ + public static function render() + { + $data = array( + 'anbu_logs' => static::$logs, + 'anbu_queries' => static::$queries, + 'anbu_css' => File::get(path('sys').'anbu/anbu.css'), + 'anbu_js' => File::get(path('sys').'anbu/anbu.js'), + 'anbu_config' => Config::get('anbu') + ); + + echo View::make('path: '.path('sys').'anbu/template.php', $data)->render(); + } + + /** + * Add a log entry to the log entries array. + * + * @return void + */ + public static function log($type, $message) + { + static::$logs[] = array($type, $message); + } + + /** + * Add a performed SQL query to Anbu. + * + * @param string $sql + * @param array $bindings + * @param float $time + * @return void + */ + public static function sql($sql, $bindings, $time) + { + // I used this method to swap in the bindings, its very ugly + // will be replaced later, hopefully will find something in + // the core + foreach ($bindings as $b) + { + $count = 1; + $sql = str_replace('?', '`'.$b.'`', $sql,$count); + } + + static::$queries[] = array($sql, $time); + } + + /** + * Start Anbu's event listeners. + * + * @return void + */ + public static function register() + { + // load the event listeners from a closure in the + // anbu config file, this allows the user to easily + // modify them + $listener = Config::get('anbu.event_listeners'); + $listener(); + } + +} diff --git a/laravel/anbu/template.php b/laravel/anbu/template.php new file mode 100755 index 00000000..bb767e3e --- /dev/null +++ b/laravel/anbu/template.php @@ -0,0 +1,63 @@ + + +
+
+
+ +
+ + + + + + + + + + + + +
TypeMessage
+ + There are no log entries. + +
+ + +
+ + + + + + + + + + + + +
TimeQuery
ms
+ + There have been no SQL queries executed. + +
+ + +
+
+ + + +
+ + + From 8d16ce8d812d6150120fbdbf77434b26819f0a5d Mon Sep 17 00:00:00 2001 From: Dayle Rees Date: Wed, 28 Mar 2012 11:09:11 +0100 Subject: [PATCH 02/32] adding the anbu alias Signed-off-by: Dayle Rees --- application/config/application.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) mode change 100644 => 100755 application/config/application.php diff --git a/application/config/application.php b/application/config/application.php old mode 100644 new mode 100755 index c5f5a3ba..75af1c74 --- a/application/config/application.php +++ b/application/config/application.php @@ -116,6 +116,7 @@ */ 'aliases' => array( + 'Anbu' => 'Laravel\\Anbu\\Anbu', 'Auth' => 'Laravel\\Auth', 'Asset' => 'Laravel\\Asset', 'Autoloader' => 'Laravel\\Autoloader', @@ -157,4 +158,4 @@ 'View' => 'Laravel\\View', ), -); \ No newline at end of file +); From daea5fee2db3cf030796ec5463577688cadc3d8c Mon Sep 17 00:00:00 2001 From: Dayle Rees Date: Thu, 29 Mar 2012 21:18:06 +0100 Subject: [PATCH 03/32] changed anbu to load automatically at end of request- taylors idea --- application/config/anbu.php | 13 +++++++++++++ application/views/home/index.php | 1 - laravel/anbu/anbu.php | 9 +++++++++ 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/application/config/anbu.php b/application/config/anbu.php index 9b6503ee..148d2933 100644 --- a/application/config/anbu.php +++ b/application/config/anbu.php @@ -3,6 +3,19 @@ return array( + /* + |-------------------------------------------------------------------------- + | Enable Anbu + |-------------------------------------------------------------------------- + | + | This will cause anbu to be rendered on every request, if you would prefer + | to enable anbu in your templates manually, simply add Anbu::render(); + | after the tag. + | + */ + + 'enable' => true, + /* |-------------------------------------------------------------------------- | Show the LOG tab. diff --git a/application/views/home/index.php b/application/views/home/index.php index 980248f3..562a72bb 100755 --- a/application/views/home/index.php +++ b/application/views/home/index.php @@ -88,7 +88,6 @@ -

Welcome To Laravel

diff --git a/laravel/anbu/anbu.php b/laravel/anbu/anbu.php index 693d4b03..e2e7c4e7 100755 --- a/laravel/anbu/anbu.php +++ b/laravel/anbu/anbu.php @@ -3,6 +3,7 @@ use Laravel\View; use Laravel\File; use Laravel\Config; +use Laravel\Event; /** * Anbu, the light weight profiler for Laravel. @@ -92,6 +93,14 @@ public static function register() // modify them $listener = Config::get('anbu.event_listeners'); $listener(); + + // echo anbu on laravel.done if enabled + if(Config::get('anbu.enable')) + { + Event::listen('laravel.done', function() { + Anbu::render(); + }); + } } } From 63a3e2b5eeaac0a64820cb0f30b9c84ecc85f0b5 Mon Sep 17 00:00:00 2001 From: Dayle Rees Date: Tue, 3 Apr 2012 09:08:39 +0100 Subject: [PATCH 04/32] better line-height on code samples --- public/laravel/css/style.css | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/public/laravel/css/style.css b/public/laravel/css/style.css index b98816df..8460fea9 100755 --- a/public/laravel/css/style.css +++ b/public/laravel/css/style.css @@ -218,7 +218,12 @@ pre font-size:0.8em; background-color:#f5f5f5; text-shadow:1px 1px 0 #fff; - line-height:1.7em; + line-height:1.5em; +} + +.content pre li +{ + margin:0.2em 0; } code From 6f8e3259f02ec05cf7c34220939c12a5e6cd77e4 Mon Sep 17 00:00:00 2001 From: Dayle Rees Date: Tue, 3 Apr 2012 09:46:09 +0100 Subject: [PATCH 05/32] added welcome view with link to docs --- application/views/home/index.blade.php | 59 +++++++++++ application/views/home/index.php | 129 ------------------------- public/laravel/css/style.css | 23 +++++ 3 files changed, 82 insertions(+), 129 deletions(-) create mode 100644 application/views/home/index.blade.php delete mode 100644 application/views/home/index.php diff --git a/application/views/home/index.blade.php b/application/views/home/index.blade.php new file mode 100644 index 00000000..47782ff6 --- /dev/null +++ b/application/views/home/index.blade.php @@ -0,0 +1,59 @@ + + + + + + Laravel: A Framework For Web Artisans + + {{ HTML::style('laravel/css/style.css') }} + + +
+
+

Laravel

+

A Framework For Web Artisans

+ +

+ You have successfully installed the Laravel framework. Laravel is a simple framework + that helps web artisans create beautiful, creative applications using elegant, expressive + syntax. You'll love using it. +

+
+
+
+

Learn the terrain.

+ +

+ You've landed yourself on our default home page. The route that + is generating this page lives at: +

+ + 
{{ path('app') }}routes.php
+ +

And the view sitting before you can be found at:

+ + 
{{ path('app') }}views/home/index.php
+ +

Read the docs.

+ +

+ The docs are now included with the source package, you can {{ HTML::link('docs', 'read them offline here') }}. +

+ +

Create something beautiful.

+ +

+ Now that you're up and running, it's time to start creating! + Here are some links to help you get started: +

+ + +
+
+
+ + diff --git a/application/views/home/index.php b/application/views/home/index.php deleted file mode 100644 index 156c36ab..00000000 --- a/application/views/home/index.php +++ /dev/null @@ -1,129 +0,0 @@ - - - - - - Laravel - A Framework For Web Artisans - - - - -
-

Welcome To Laravel

- -

A Framework For Web Artisans

- -

- You have successfully installed the Laravel framework. Laravel is a simple framework - that helps web artisans create beautiful, creative applications using elegant, expressive - syntax. You'll love using it. -

- -

Learn the terrain.

- -

- You've landed yourself on our default home page. The route that - is generating this page lives at: -

- - 
APP_PATH/routes.php
- -

And the view sitting before you can be found at:

- - 
APP_PATH/views/home/index.php
- -

Create something beautiful.

- -

- Now that you're up and running, it's time to start creating! - Here are some links to help you get started: -

- - -
- - \ No newline at end of file diff --git a/public/laravel/css/style.css b/public/laravel/css/style.css index 8460fea9..f7b9a608 100755 --- a/public/laravel/css/style.css +++ b/public/laravel/css/style.css @@ -235,6 +235,29 @@ code text-shadow:1px 1px 0 #fff; } +.home +{ + font-size:1.1em; +} + +.out-links +{ + margin:0; + padding:0; +} + +.out-links li +{ + display:inline-block; +} + +.out-links li:not(:first-child):before +{ + content:"/"; + padding:0 1em; + color:#888; +} + /* Prettify Styles -------------- */ From 3d23303aeaaea7ae5ded441dbd01240b1c3f5eef Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Tue, 3 Apr 2012 19:57:01 +1000 Subject: [PATCH 06/32] Includes use render to prevent WSOD --- laravel/blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/laravel/blade.php b/laravel/blade.php index 7e6d33c9..e3111d09 100644 --- a/laravel/blade.php +++ b/laravel/blade.php @@ -264,7 +264,7 @@ protected static function compile_includes($value) { $pattern = static::matcher('include'); - return preg_replace($pattern, '$1with(get_defined_vars()); ?>', $value); + return preg_replace($pattern, '$1with(get_defined_vars())->render(); ?>', $value); } /** From edbac90ce3a21ba513022e9d6ab7e52d8f8bbbe5 Mon Sep 17 00:00:00 2001 From: Dayle Rees Date: Tue, 3 Apr 2012 11:30:00 +0100 Subject: [PATCH 07/32] added back to top widget --- bundles/docs/views/template.blade.php | 1 + public/laravel/css/style.css | 21 +++ public/laravel/js/scroll.js | 236 ++++++++++++++++++++++++++ 3 files changed, 258 insertions(+) create mode 100644 public/laravel/js/scroll.js diff --git a/bundles/docs/views/template.blade.php b/bundles/docs/views/template.blade.php index 44c6ff87..e49556d3 100644 --- a/bundles/docs/views/template.blade.php +++ b/bundles/docs/views/template.blade.php @@ -29,6 +29,7 @@
+ {{ HTML::script('http://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js') }} {{ Asset::container('footer')->scripts(); }} diff --git a/public/laravel/css/style.css b/public/laravel/css/style.css index f7b9a608..acb53a0f 100755 --- a/public/laravel/css/style.css +++ b/public/laravel/css/style.css @@ -258,6 +258,27 @@ .out-links li:not(:first-child):before color:#888; } +#toTop +{ + display:block; + padding:0.2em 1em 0.05em 1em; + position:fixed; + top:1.2em; + right:1.2em; + background-color:#777; + text-align:center; + color:#fff; + text-decoration:none; + text-transform:uppercase; + font-size:0.9em; + border-radius:3px; +} + +#toTop:hover +{ + background-color:#E3591E; +} + /* Prettify Styles -------------- */ diff --git a/public/laravel/js/scroll.js b/public/laravel/js/scroll.js new file mode 100644 index 00000000..1a4e9f05 --- /dev/null +++ b/public/laravel/js/scroll.js @@ -0,0 +1,236 @@ + +/* + * jQuery EasIng v1.1.2 - http://gsgd.co.uk/sandbox/jquery.easIng.php + * + * Uses the built In easIng capabilities added In jQuery 1.1 + * to offer multiple easIng options + * + * Copyright (c) 2007 George Smith + * Licensed under the MIT License: + * http://www.opensource.org/licenses/mit-license.php + */ + +// t: current time, b: begInnIng value, c: change In value, d: duration + +jQuery.extend( jQuery.easing, +{ + easeInQuad: function (x, t, b, c, d) { + return c*(t/=d)*t + b; + }, + easeOutQuad: function (x, t, b, c, d) { + return -c *(t/=d)*(t-2) + b; + }, + easeInOutQuad: function (x, t, b, c, d) { + if ((t/=d/2) < 1) return c/2*t*t + b; + return -c/2 * ((--t)*(t-2) - 1) + b; + }, + easeInCubic: function (x, t, b, c, d) { + return c*(t/=d)*t*t + b; + }, + easeOutCubic: function (x, t, b, c, d) { + return c*((t=t/d-1)*t*t + 1) + b; + }, + easeInOutCubic: function (x, t, b, c, d) { + if ((t/=d/2) < 1) return c/2*t*t*t + b; + return c/2*((t-=2)*t*t + 2) + b; + }, + easeInQuart: function (x, t, b, c, d) { + return c*(t/=d)*t*t*t + b; + }, + easeOutQuart: function (x, t, b, c, d) { + return -c * ((t=t/d-1)*t*t*t - 1) + b; + }, + easeInOutQuart: function (x, t, b, c, d) { + if ((t/=d/2) < 1) return c/2*t*t*t*t + b; + return -c/2 * ((t-=2)*t*t*t - 2) + b; + }, + easeInQuint: function (x, t, b, c, d) { + return c*(t/=d)*t*t*t*t + b; + }, + easeOutQuint: function (x, t, b, c, d) { + return c*((t=t/d-1)*t*t*t*t + 1) + b; + }, + easeInOutQuint: function (x, t, b, c, d) { + if ((t/=d/2) < 1) return c/2*t*t*t*t*t + b; + return c/2*((t-=2)*t*t*t*t + 2) + b; + }, + easeInSine: function (x, t, b, c, d) { + return -c * Math.cos(t/d * (Math.PI/2)) + c + b; + }, + easeOutSine: function (x, t, b, c, d) { + return c * Math.sin(t/d * (Math.PI/2)) + b; + }, + easeInOutSine: function (x, t, b, c, d) { + return -c/2 * (Math.cos(Math.PI*t/d) - 1) + b; + }, + easeInExpo: function (x, t, b, c, d) { + return (t==0) ? b : c * Math.pow(2, 10 * (t/d - 1)) + b; + }, + easeOutExpo: function (x, t, b, c, d) { + return (t==d) ? b+c : c * (-Math.pow(2, -10 * t/d) + 1) + b; + }, + easeInOutExpo: function (x, t, b, c, d) { + if (t==0) return b; + if (t==d) return b+c; + if ((t/=d/2) < 1) return c/2 * Math.pow(2, 10 * (t - 1)) + b; + return c/2 * (-Math.pow(2, -10 * --t) + 2) + b; + }, + easeInCirc: function (x, t, b, c, d) { + return -c * (Math.sqrt(1 - (t/=d)*t) - 1) + b; + }, + easeOutCirc: function (x, t, b, c, d) { + return c * Math.sqrt(1 - (t=t/d-1)*t) + b; + }, + easeInOutCirc: function (x, t, b, c, d) { + if ((t/=d/2) < 1) return -c/2 * (Math.sqrt(1 - t*t) - 1) + b; + return c/2 * (Math.sqrt(1 - (t-=2)*t) + 1) + b; + }, + easeInElastic: function (x, t, b, c, d) { + var s=1.70158;var p=0;var a=c; + if (t==0) return b; if ((t/=d)==1) return b+c; if (!p) p=d*.3; + if (a < Math.abs(c)) { a=c; var s=p/4; } + else var s = p/(2*Math.PI) * Math.asin (c/a); + return -(a*Math.pow(2,10*(t-=1)) * Math.sin( (t*d-s)*(2*Math.PI)/p )) + b; + }, + easeOutElastic: function (x, t, b, c, d) { + var s=1.70158;var p=0;var a=c; + if (t==0) return b; if ((t/=d)==1) return b+c; if (!p) p=d*.3; + if (a < Math.abs(c)) { a=c; var s=p/4; } + else var s = p/(2*Math.PI) * Math.asin (c/a); + return a*Math.pow(2,-10*t) * Math.sin( (t*d-s)*(2*Math.PI)/p ) + c + b; + }, + easeInOutElastic: function (x, t, b, c, d) { + var s=1.70158;var p=0;var a=c; + if (t==0) return b; if ((t/=d/2)==2) return b+c; if (!p) p=d*(.3*1.5); + if (a < Math.abs(c)) { a=c; var s=p/4; } + else var s = p/(2*Math.PI) * Math.asin (c/a); + if (t < 1) return -.5*(a*Math.pow(2,10*(t-=1)) * Math.sin( (t*d-s)*(2*Math.PI)/p )) + b; + return a*Math.pow(2,-10*(t-=1)) * Math.sin( (t*d-s)*(2*Math.PI)/p )*.5 + c + b; + }, + easeInBack: function (x, t, b, c, d, s) { + if (s == undefined) s = 1.70158; + return c*(t/=d)*t*((s+1)*t - s) + b; + }, + easeOutBack: function (x, t, b, c, d, s) { + if (s == undefined) s = 1.70158; + return c*((t=t/d-1)*t*((s+1)*t + s) + 1) + b; + }, + easeInOutBack: function (x, t, b, c, d, s) { + if (s == undefined) s = 1.70158; + if ((t/=d/2) < 1) return c/2*(t*t*(((s*=(1.525))+1)*t - s)) + b; + return c/2*((t-=2)*t*(((s*=(1.525))+1)*t + s) + 2) + b; + }, + easeInBounce: function (x, t, b, c, d) { + return c - jQuery.easing.easeOutBounce (x, d-t, 0, c, d) + b; + }, + easeOutBounce: function (x, t, b, c, d) { + if ((t/=d) < (1/2.75)) { + return c*(7.5625*t*t) + b; + } else if (t < (2/2.75)) { + return c*(7.5625*(t-=(1.5/2.75))*t + .75) + b; + } else if (t < (2.5/2.75)) { + return c*(7.5625*(t-=(2.25/2.75))*t + .9375) + b; + } else { + return c*(7.5625*(t-=(2.625/2.75))*t + .984375) + b; + } + }, + easeInOutBounce: function (x, t, b, c, d) { + if (t < d/2) return jQuery.easing.easeInBounce (x, t*2, 0, c, d) * .5 + b; + return jQuery.easing.easeOutBounce (x, t*2-d, 0, c, d) * .5 + c*.5 + b; + } +}); + +/* +|-------------------------------------------------------------------------- +| UItoTop jQuery Plugin 1.1 +| http://www.mattvarone.com/web-design/uitotop-jquery-plugin/ +|-------------------------------------------------------------------------- +*/ + +(function($){ + $.fn.UItoTop = function(options) { + + var defaults = { + text: 'To Top', + min: 200, + inDelay:600, + outDelay:400, + containerID: 'toTop', + containerHoverID: 'toTopHover', + scrollSpeed: 1200, + easingType: 'linear' + }; + + var settings = $.extend(defaults, options); + var containerIDhash = '#' + settings.containerID; + var containerHoverIDHash = '#'+settings.containerHoverID; + + $('body').append(''+settings.text+''); + $(containerIDhash).hide().click(function(){ + $('html, body').animate({scrollTop:0}, settings.scrollSpeed, settings.easingType); + $('#'+settings.containerHoverID, this).stop().animate({'opacity': 0 }, settings.inDelay, settings.easingType); + return false; + }) + .prepend('') + .hover(function() { + $(containerHoverIDHash, this).stop().animate({ + 'opacity': 1 + }, 600, 'linear'); + }, function() { + $(containerHoverIDHash, this).stop().animate({ + 'opacity': 0 + }, 700, 'linear'); + }); + + $(window).scroll(function() { + var sd = $(window).scrollTop(); + if(typeof document.body.style.maxHeight === "undefined") { + $(containerIDhash).css({ + 'position': 'absolute', + 'top': $(window).scrollTop() + $(window).height() - 50 + }); + } + if ( sd > settings.min ) + $(containerIDhash).fadeIn(settings.inDelay); + else + $(containerIDhash).fadeOut(settings.Outdelay); + }); + +}; +})(jQuery); + + +$(document).ready(function() { + $().UItoTop({ easingType: 'easeOutQuart' }); + if ($('#docs-sidebar').length ) { + $.get('/docs/sidebar', function(data) { + $('.sidebar ul.toc').before(data); + $('.sidebar ul.toc').hide(); + var url = document.location.href; + // console.log(url); + var parent_folder = url.substr(0, url.lastIndexOf('/')); + var active = url.substr(0, url.length-document.location.hash.length); + + $('.docs.sidebar ul ul').hide(); + $('.docs.sidebar ul ul').each(function() { + $(this).parent('li').addClass('nav-close'); + var anchor = $(this).prev('a').attr('href'); + if (anchor == active.replace('http://laravel.com', '')) { + $(this).prev('a').addClass('active'); + $(this).parent('li').addClass('nav-open').removeClass('nav-close'); + $(this).show(); + } else if (anchor == parent_folder.replace('http://laravel.com', '')) { + $(this).prev('a').addClass('active'); + $(this).parent('li').addClass('nav-open').removeClass('nav-close'); + $(this).show(); + } + //console.log(anchor+' == '+parent_folder); + $(this).prev('a').bind('click', function(e) { + $(this).parent('li').toggleClass('nav-open').toggleClass('nav-close'); + $(this).next('ul').animate({opacity: 'toggle', height: 'toggle'}, "slow"); + return false; + }); + }); + }); + } // end if +}); \ No newline at end of file From 9f1bd0ca3fec9dc5352a93322e4c6b04d6f5ef68 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Tue, 3 Apr 2012 08:22:18 -0500 Subject: [PATCH 08/32] chdir if the request is not from the web. --- paths.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/paths.php b/paths.php index 152a4f79..afc2bf58 100644 --- a/paths.php +++ b/paths.php @@ -13,6 +13,14 @@ // -------------------------------------------------------------- if ( ! isset($web)) $web = false; +// -------------------------------------------------------------- +// Change to the current directory if not from the web. +// -------------------------------------------------------------- +if ( ! $web) +{ + chdir(__DIR__); +} + // -------------------------------------------------------------- // Define the directory separator for the environment. // -------------------------------------------------------------- From 5d3cc6beb0bb1ebf46384afbd6ba98d81307a960 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Tue, 3 Apr 2012 09:17:18 -0500 Subject: [PATCH 09/32] template changes. --- application/views/home/index.blade.php | 22 ++++++--- bundles/docs/routes.php | 67 ++++++++++++++++++++------ bundles/docs/views/home.blade.php | 37 -------------- bundles/docs/views/menu.blade.php | 27 ----------- bundles/docs/views/template.blade.php | 12 ++--- public/laravel/css/style.css | 19 ++++++-- 6 files changed, 85 insertions(+), 99 deletions(-) delete mode 100644 bundles/docs/views/home.blade.php delete mode 100644 bundles/docs/views/menu.blade.php diff --git a/application/views/home/index.blade.php b/application/views/home/index.blade.php index 47782ff6..dd26ad93 100644 --- a/application/views/home/index.blade.php +++ b/application/views/home/index.blade.php @@ -13,15 +13,12 @@

Laravel

A Framework For Web Artisans

-

- You have successfully installed the Laravel framework. Laravel is a simple framework - that helps web artisans create beautiful, creative applications using elegant, expressive - syntax. You'll love using it. +

-

Learn the terrain.

+

Learn the terrain.

You've landed yourself on our default home page. The route that @@ -34,13 +31,22 @@ 

{{ path('app') }}views/home/index.php
-

Read the docs.

+

Grow in knowledge.

- The docs are now included with the source package, you can {{ HTML::link('docs', 'read them offline here') }}. + Leaning to use Laravel is amazingly simple thanks to + its {{ HTML::link('docs', 'wonderful documentation') }}. + Here are the basics:

-

Create something beautiful.

+
    +
  • {{ HTML::link('docs/routing#the-basics', 'Defining Routes') }}
    • +
  • {{ HTML::link('docs/controllers#the-basics', 'Building Controllers') }}
    • +
  • {{ HTML::link('docs/views#the-basics', 'Creating Views') }}
    • +
  • {{ HTML::link('docs/database/eloquent', 'Eloquent ORM') }}
    • +
+ +

Create something beautiful.

Now that you're up and running, it's time to start creating! diff --git a/bundles/docs/routes.php b/bundles/docs/routes.php index 43641286..184656cc 100644 --- a/bundles/docs/routes.php +++ b/bundles/docs/routes.php @@ -1,38 +1,75 @@ add('prettify', 'laravel/js/prettify.js'); - $view->with('sidebar', Markdown(file_get_contents(path('storage').'documentation/contents.md'))); + $view->with('sidebar', document('contents')); }); +/** + * Handle the documentation homepage. + * + * This page contains the "introduction" to Laravel. + */ Route::get('(:bundle)', function() { - return View::make('docs::home'); + return View::make('docs::page')->with('content', document('home')); }); -Route::get('docs/(:any)/(:any?)', function($section, $page = null) +/** + * Handle documentation routes for sections and pages. + * + * @param string $section + * @param string $page + * @return mixed + */ +Route::get('(:bundle)/(:any)/(:any?)', function($section, $page = null) { - $root = path('storage').'documentation/'; + $file = rtrim(implode('/', func_get_args()), '/'); - $file = rtrim(implode('/', array($section, $page)), '/').'.md'; - - if (file_exists($path = $root.$file)) + // If no page was specified, but a "home" page exists for the section, + // we'll set the file to the home page so that the proper page is + // display back out to the client for the requested doc page. + if (is_null($page) and document_exists($file.'/home')) { - $content = Markdown(file_get_contents($path)); + $file .= '/home'; } - elseif (file_exists($path = $root.$section.'/home.md')) + + if (document_exists($file)) { - $content = Markdown(file_get_contents($path)); + return View::make('docs::page')->with('content', document($file)); } else { return Response::error('404'); } - - return View::make('docs::page')->with('content', $content); }); \ No newline at end of file diff --git a/bundles/docs/views/home.blade.php b/bundles/docs/views/home.blade.php deleted file mode 100644 index 86670159..00000000 --- a/bundles/docs/views/home.blade.php +++ /dev/null @@ -1,37 +0,0 @@ -@layout('docs::template') - -@section('content') -

Learn the terrain.

- -

- You've landed yourself on our default home page. The route that - is generating this page lives in the main routes file. You can - find it here: -

- - 
APP_PATH/routes.php
- - -

And the view sitting before you can be found at:

- - 
APP_PATH/views/home/index.php
- -

Create something beautiful.

- -

- Now that you're up and running, it's time to start creating! - Here are some links to help you get started: -

- - -@endsection diff --git a/bundles/docs/views/menu.blade.php b/bundles/docs/views/menu.blade.php deleted file mode 100644 index 164556da..00000000 --- a/bundles/docs/views/menu.blade.php +++ /dev/null @@ -1,27 +0,0 @@ -

Documentation

- \ No newline at end of file diff --git a/bundles/docs/views/template.blade.php b/bundles/docs/views/template.blade.php index e49556d3..fd4a0a9d 100644 --- a/bundles/docs/views/template.blade.php +++ b/bundles/docs/views/template.blade.php @@ -5,8 +5,9 @@ Laravel: A Framework For Web Artisans - {{ Asset::styles(); }} - {{ Asset::scripts(); }} + + {{ HTML::style('laravel/css/style.css') }} + {{ HTML::style('laravel/js/modernizr-2.5.3.min.js') }}
@@ -14,10 +15,7 @@

Laravel

A Framework For Web Artisans

-

- You have successfully installed the Laravel framework. Laravel is a simple framework - that helps web artisans create beautiful, creative applications using elegant, expressive - syntax. You'll love using it. +

@@ -30,6 +28,6 @@
{{ HTML::script('http://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js') }} - {{ Asset::container('footer')->scripts(); }} + {{ HTML::script('laravel/js/prettify.js') }} diff --git a/public/laravel/css/style.css b/public/laravel/css/style.css index acb53a0f..1b598b9b 100755 --- a/public/laravel/css/style.css +++ b/public/laravel/css/style.css @@ -141,6 +141,14 @@ .content>h2 { margin-top:2.2em; } +div.home>h2:not(:first-child) { + margin-top:2.2em; +} + +div.home>h2 { + font-size: 14pt; +} + .content>h3 { font-size: 12pt; } @@ -159,6 +167,12 @@ .content li margin-bottom:1em; } +div.home li +{ + line-height:1.5em; + margin-bottom:1em; +} + a, a:visited { color:#2972A3; @@ -235,11 +249,6 @@ code text-shadow:1px 1px 0 #fff; } -.home -{ - font-size:1.1em; -} - .out-links { margin:0; From 6ee7c1c280625979bb84e15e36c972e05b70e298 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Tue, 3 Apr 2012 09:20:59 -0500 Subject: [PATCH 10/32] tweaking docs. --- bundles/docs/views/page.blade.php | 2 +- bundles/docs/views/template.blade.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bundles/docs/views/page.blade.php b/bundles/docs/views/page.blade.php index 9f6da707..1309e905 100644 --- a/bundles/docs/views/page.blade.php +++ b/bundles/docs/views/page.blade.php @@ -2,4 +2,4 @@ @section('content') {{ $content }} -@endsection +@endsection \ No newline at end of file diff --git a/bundles/docs/views/template.blade.php b/bundles/docs/views/template.blade.php index fd4a0a9d..2d108569 100644 --- a/bundles/docs/views/template.blade.php +++ b/bundles/docs/views/template.blade.php @@ -30,4 +30,4 @@ {{ HTML::script('http://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js') }} {{ HTML::script('laravel/js/prettify.js') }} - + \ No newline at end of file From 71531e5fe92da48af7e7562145d84701b44c78d4 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Tue, 3 Apr 2012 09:22:02 -0500 Subject: [PATCH 11/32] cleaning up code. --- application/bundles.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/application/bundles.php b/application/bundles.php index a408a244..e8b8f266 100644 --- a/application/bundles.php +++ b/application/bundles.php @@ -35,8 +35,6 @@ return array( - // route the official docs - 'docs' => array( - 'handles' => 'docs' - ), + 'docs' => array('handles' => 'docs'), + ); \ No newline at end of file From 7d30d179b765e67ebf1cfec889bc1a787a634a8f Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Tue, 3 Apr 2012 09:42:30 -0500 Subject: [PATCH 12/32] update documentation. --- bundles/docs/views/template.blade.php | 1 + public/laravel/css/style.css | 2 +- storage/documentation/database/eloquent.md | 28 +++++++++++++++++++++- 3 files changed, 29 insertions(+), 2 deletions(-) diff --git a/bundles/docs/views/template.blade.php b/bundles/docs/views/template.blade.php index 2d108569..02e24bd9 100644 --- a/bundles/docs/views/template.blade.php +++ b/bundles/docs/views/template.blade.php @@ -29,5 +29,6 @@
{{ HTML::script('http://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js') }} {{ HTML::script('laravel/js/prettify.js') }} + {{ HTML::script('laravel/js/scroll.js') }} \ No newline at end of file diff --git a/public/laravel/css/style.css b/public/laravel/css/style.css index 1b598b9b..fb5b11fc 100755 --- a/public/laravel/css/style.css +++ b/public/laravel/css/style.css @@ -269,7 +269,7 @@ .out-links li:not(:first-child):before #toTop { - display:block; + display:none; padding:0.2em 1em 0.05em 1em; position:fixed; top:1.2em; diff --git a/storage/documentation/database/eloquent.md b/storage/documentation/database/eloquent.md index 8624b8a7..3f7f66c6 100644 --- a/storage/documentation/database/eloquent.md +++ b/storage/documentation/database/eloquent.md @@ -14,6 +14,7 @@ ## Contents - [Constraining Eager Loads](#constraining-eager-loads) - [Setter & Getter Methods](#getter-and-setter-methods) - [Mass-Assignment](#mass-assignment) +- [Converting Models To Arrays](#to-array) ## The Basics @@ -303,6 +304,10 @@ ## Inserting Related Models $user->roles()->attach($role_id); +Alternatively, you can use the `sync` method, which accepts an array of IDs to "sync" with the intermediate table. After this operation is complete, only the IDs in the array will be on the intermediate table. + + $user->roles()->sync(array(1, 2, 3)); + ## Working With Intermediate Tables @@ -457,4 +462,25 @@ ## Mass-Assignment User::accessible(array('email', 'password', 'name')); -> **Note:** Utmost caution should be taken when mass-assigning using user-input. Technical oversights could cause serious security vulnerabilities. \ No newline at end of file +> **Note:** Utmost caution should be taken when mass-assigning using user-input. Technical oversights could cause serious security vulnerabilities. + + +## Converting Models To Arrays + +When building JSON APIs, you will often need to convert your models to array so they can be easily serialized. It's really simple. + +#### Convert a model to an array: + + return json_encode($user->to_array()); + +The `to_array` method will automatically grab all of the attributes on your model, as well as any loaded relationships. + +Sometimes you may wish to limit the attributes that are included in your model's array, such as passwords. To do this, add a `hidden` attribute definition to your model: + +#### Excluding attributes from the array: + + class User extends Eloquent { + + public static $hidden = array('password'); + + } \ No newline at end of file From c31df7379b23aed0945df48a52e16366dd22abf2 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Tue, 3 Apr 2012 09:48:44 -0500 Subject: [PATCH 13/32] put change log in docs. --- changes.md => storage/documentation/changes.md | 8 ++++---- storage/documentation/contents.md | 1 + storage/documentation/database/eloquent.md | 1 + 3 files changed, 6 insertions(+), 4 deletions(-) rename changes.md => storage/documentation/changes.md (94%) diff --git a/changes.md b/storage/documentation/changes.md similarity index 94% rename from changes.md rename to storage/documentation/changes.md index ae1d2cd2..2fedc32c 100644 --- a/changes.md +++ b/storage/documentation/changes.md @@ -1,4 +1,4 @@ -## Laravel Change Log +# Laravel Change Log ## Contents @@ -20,9 +20,9 @@ ## Laravel 3.2 - Fixed the passing of strings into the Input::except method. - Fixed replacement of optional parameters in URL::transpose method. -- Added "to_array" method to the base Eloquent model. -- Added "$hidden" static variable to the base Eloquent model. -- Added "sync" method to has_many_and_belongs_to Eloquent relationship. +- [Added `to_array` method to the base Eloquent model](/docs/database/eloquent#to-array). +- [Added `$hidden` static variable to the base Eloquent model](/docs/database/eloquent#to-array). +- [Added `sync` method to has\_many\_and\_belongs\_to Eloquent relationship](/docs/database/eloquent#sync-method). - Improved View performance by only loading contents from file once. - Fix handling of URLs beginning with has in URL::to. diff --git a/storage/documentation/contents.md b/storage/documentation/contents.md index 25d78c8a..ab0a9f1f 100644 --- a/storage/documentation/contents.md +++ b/storage/documentation/contents.md @@ -1,5 +1,6 @@ ### General - [Laravel Overview](/docs/home) +- [Change Log](/docs/changes) - [Installation & Setup](/docs/install) - [Requirements](/docs/install#requirements) - [Installation](/docs/install#installation) diff --git a/storage/documentation/database/eloquent.md b/storage/documentation/database/eloquent.md index 3f7f66c6..b0e499fb 100644 --- a/storage/documentation/database/eloquent.md +++ b/storage/documentation/database/eloquent.md @@ -304,6 +304,7 @@ ## Inserting Related Models $user->roles()->attach($role_id); + Alternatively, you can use the `sync` method, which accepts an array of IDs to "sync" with the intermediate table. After this operation is complete, only the IDs in the array will be on the intermediate table. $user->roles()->sync(array(1, 2, 3)); From fdb7b3a7f39a3baa2aa3006687e5932439a841aa Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Tue, 3 Apr 2012 09:49:24 -0500 Subject: [PATCH 14/32] put additions on top. --- storage/documentation/changes.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/storage/documentation/changes.md b/storage/documentation/changes.md index 2fedc32c..84e695d2 100644 --- a/storage/documentation/changes.md +++ b/storage/documentation/changes.md @@ -18,11 +18,11 @@ ## Contents ## Laravel 3.2 -- Fixed the passing of strings into the Input::except method. -- Fixed replacement of optional parameters in URL::transpose method. - [Added `to_array` method to the base Eloquent model](/docs/database/eloquent#to-array). - [Added `$hidden` static variable to the base Eloquent model](/docs/database/eloquent#to-array). - [Added `sync` method to has\_many\_and\_belongs\_to Eloquent relationship](/docs/database/eloquent#sync-method). +- Fixed the passing of strings into the Input::except method. +- Fixed replacement of optional parameters in URL::transpose method. - Improved View performance by only loading contents from file once. - Fix handling of URLs beginning with has in URL::to. From e66d8943d1e34a47a3c5192245837cd5b8219a2e Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Tue, 3 Apr 2012 09:51:56 -0500 Subject: [PATCH 15/32] move documentation into bundle. --- .../documentation => bundles/docs/pages}/artisan/commands.md | 0 .../documentation => bundles/docs/pages}/artisan/tasks.md | 0 {storage/documentation => bundles/docs/pages}/auth/config.md | 0 {storage/documentation => bundles/docs/pages}/auth/usage.md | 0 {storage/documentation => bundles/docs/pages}/bundles.md | 0 {storage/documentation => bundles/docs/pages}/cache/config.md | 0 {storage/documentation => bundles/docs/pages}/cache/usage.md | 0 {storage/documentation => bundles/docs/pages}/changes.md | 0 {storage/documentation => bundles/docs/pages}/config.md | 0 {storage/documentation => bundles/docs/pages}/contents.md | 0 {storage/documentation => bundles/docs/pages}/controllers.md | 0 .../documentation => bundles/docs/pages}/database/config.md | 0 .../documentation => bundles/docs/pages}/database/eloquent.md | 0 .../documentation => bundles/docs/pages}/database/fluent.md | 0 .../docs/pages}/database/migrations.md | 0 {storage/documentation => bundles/docs/pages}/database/raw.md | 0 .../documentation => bundles/docs/pages}/database/redis.md | 0 .../documentation => bundles/docs/pages}/database/schema.md | 0 {storage/documentation => bundles/docs/pages}/encryption.md | 0 {storage/documentation => bundles/docs/pages}/events.md | 0 {storage/documentation => bundles/docs/pages}/files.md | 0 {storage/documentation => bundles/docs/pages}/home.md | 0 {storage/documentation => bundles/docs/pages}/input.md | 0 {storage/documentation => bundles/docs/pages}/install.md | 0 {storage/documentation => bundles/docs/pages}/ioc.md | 0 {storage/documentation => bundles/docs/pages}/loading.md | 0 {storage/documentation => bundles/docs/pages}/localization.md | 0 {storage/documentation => bundles/docs/pages}/logging.md | 0 {storage/documentation => bundles/docs/pages}/models.md | 0 {storage/documentation => bundles/docs/pages}/requests.md | 0 {storage/documentation => bundles/docs/pages}/routing.md | 0 .../documentation => bundles/docs/pages}/session/config.md | 0 .../documentation => bundles/docs/pages}/session/usage.md | 0 {storage/documentation => bundles/docs/pages}/strings.md | 0 {storage/documentation => bundles/docs/pages}/testing.md | 0 {storage/documentation => bundles/docs/pages}/urls.md | 0 {storage/documentation => bundles/docs/pages}/validation.md | 0 {storage/documentation => bundles/docs/pages}/views/assets.md | 0 {storage/documentation => bundles/docs/pages}/views/forms.md | 0 {storage/documentation => bundles/docs/pages}/views/home.md | 0 {storage/documentation => bundles/docs/pages}/views/html.md | 0 .../documentation => bundles/docs/pages}/views/pagination.md | 0 .../documentation => bundles/docs/pages}/views/templating.md | 0 bundles/docs/routes.php | 4 ++-- 44 files changed, 2 insertions(+), 2 deletions(-) rename {storage/documentation => bundles/docs/pages}/artisan/commands.md (100%) rename {storage/documentation => bundles/docs/pages}/artisan/tasks.md (100%) rename {storage/documentation => bundles/docs/pages}/auth/config.md (100%) rename {storage/documentation => bundles/docs/pages}/auth/usage.md (100%) rename {storage/documentation => bundles/docs/pages}/bundles.md (100%) rename {storage/documentation => bundles/docs/pages}/cache/config.md (100%) rename {storage/documentation => bundles/docs/pages}/cache/usage.md (100%) rename {storage/documentation => bundles/docs/pages}/changes.md (100%) rename {storage/documentation => bundles/docs/pages}/config.md (100%) rename {storage/documentation => bundles/docs/pages}/contents.md (100%) rename {storage/documentation => bundles/docs/pages}/controllers.md (100%) rename {storage/documentation => bundles/docs/pages}/database/config.md (100%) rename {storage/documentation => bundles/docs/pages}/database/eloquent.md (100%) rename {storage/documentation => bundles/docs/pages}/database/fluent.md (100%) rename {storage/documentation => bundles/docs/pages}/database/migrations.md (100%) rename {storage/documentation => bundles/docs/pages}/database/raw.md (100%) rename {storage/documentation => bundles/docs/pages}/database/redis.md (100%) rename {storage/documentation => bundles/docs/pages}/database/schema.md (100%) rename {storage/documentation => bundles/docs/pages}/encryption.md (100%) rename {storage/documentation => bundles/docs/pages}/events.md (100%) rename {storage/documentation => bundles/docs/pages}/files.md (100%) rename {storage/documentation => bundles/docs/pages}/home.md (100%) rename {storage/documentation => bundles/docs/pages}/input.md (100%) rename {storage/documentation => bundles/docs/pages}/install.md (100%) rename {storage/documentation => bundles/docs/pages}/ioc.md (100%) rename {storage/documentation => bundles/docs/pages}/loading.md (100%) rename {storage/documentation => bundles/docs/pages}/localization.md (100%) rename {storage/documentation => bundles/docs/pages}/logging.md (100%) rename {storage/documentation => bundles/docs/pages}/models.md (100%) rename {storage/documentation => bundles/docs/pages}/requests.md (100%) rename {storage/documentation => bundles/docs/pages}/routing.md (100%) rename {storage/documentation => bundles/docs/pages}/session/config.md (100%) rename {storage/documentation => bundles/docs/pages}/session/usage.md (100%) rename {storage/documentation => bundles/docs/pages}/strings.md (100%) rename {storage/documentation => bundles/docs/pages}/testing.md (100%) rename {storage/documentation => bundles/docs/pages}/urls.md (100%) rename {storage/documentation => bundles/docs/pages}/validation.md (100%) rename {storage/documentation => bundles/docs/pages}/views/assets.md (100%) rename {storage/documentation => bundles/docs/pages}/views/forms.md (100%) rename {storage/documentation => bundles/docs/pages}/views/home.md (100%) rename {storage/documentation => bundles/docs/pages}/views/html.md (100%) rename {storage/documentation => bundles/docs/pages}/views/pagination.md (100%) rename {storage/documentation => bundles/docs/pages}/views/templating.md (100%) diff --git a/storage/documentation/artisan/commands.md b/bundles/docs/pages/artisan/commands.md similarity index 100% rename from storage/documentation/artisan/commands.md rename to bundles/docs/pages/artisan/commands.md diff --git a/storage/documentation/artisan/tasks.md b/bundles/docs/pages/artisan/tasks.md similarity index 100% rename from storage/documentation/artisan/tasks.md rename to bundles/docs/pages/artisan/tasks.md diff --git a/storage/documentation/auth/config.md b/bundles/docs/pages/auth/config.md similarity index 100% rename from storage/documentation/auth/config.md rename to bundles/docs/pages/auth/config.md diff --git a/storage/documentation/auth/usage.md b/bundles/docs/pages/auth/usage.md similarity index 100% rename from storage/documentation/auth/usage.md rename to bundles/docs/pages/auth/usage.md diff --git a/storage/documentation/bundles.md b/bundles/docs/pages/bundles.md similarity index 100% rename from storage/documentation/bundles.md rename to bundles/docs/pages/bundles.md diff --git a/storage/documentation/cache/config.md b/bundles/docs/pages/cache/config.md similarity index 100% rename from storage/documentation/cache/config.md rename to bundles/docs/pages/cache/config.md diff --git a/storage/documentation/cache/usage.md b/bundles/docs/pages/cache/usage.md similarity index 100% rename from storage/documentation/cache/usage.md rename to bundles/docs/pages/cache/usage.md diff --git a/storage/documentation/changes.md b/bundles/docs/pages/changes.md similarity index 100% rename from storage/documentation/changes.md rename to bundles/docs/pages/changes.md diff --git a/storage/documentation/config.md b/bundles/docs/pages/config.md similarity index 100% rename from storage/documentation/config.md rename to bundles/docs/pages/config.md diff --git a/storage/documentation/contents.md b/bundles/docs/pages/contents.md similarity index 100% rename from storage/documentation/contents.md rename to bundles/docs/pages/contents.md diff --git a/storage/documentation/controllers.md b/bundles/docs/pages/controllers.md similarity index 100% rename from storage/documentation/controllers.md rename to bundles/docs/pages/controllers.md diff --git a/storage/documentation/database/config.md b/bundles/docs/pages/database/config.md similarity index 100% rename from storage/documentation/database/config.md rename to bundles/docs/pages/database/config.md diff --git a/storage/documentation/database/eloquent.md b/bundles/docs/pages/database/eloquent.md similarity index 100% rename from storage/documentation/database/eloquent.md rename to bundles/docs/pages/database/eloquent.md diff --git a/storage/documentation/database/fluent.md b/bundles/docs/pages/database/fluent.md similarity index 100% rename from storage/documentation/database/fluent.md rename to bundles/docs/pages/database/fluent.md diff --git a/storage/documentation/database/migrations.md b/bundles/docs/pages/database/migrations.md similarity index 100% rename from storage/documentation/database/migrations.md rename to bundles/docs/pages/database/migrations.md diff --git a/storage/documentation/database/raw.md b/bundles/docs/pages/database/raw.md similarity index 100% rename from storage/documentation/database/raw.md rename to bundles/docs/pages/database/raw.md diff --git a/storage/documentation/database/redis.md b/bundles/docs/pages/database/redis.md similarity index 100% rename from storage/documentation/database/redis.md rename to bundles/docs/pages/database/redis.md diff --git a/storage/documentation/database/schema.md b/bundles/docs/pages/database/schema.md similarity index 100% rename from storage/documentation/database/schema.md rename to bundles/docs/pages/database/schema.md diff --git a/storage/documentation/encryption.md b/bundles/docs/pages/encryption.md similarity index 100% rename from storage/documentation/encryption.md rename to bundles/docs/pages/encryption.md diff --git a/storage/documentation/events.md b/bundles/docs/pages/events.md similarity index 100% rename from storage/documentation/events.md rename to bundles/docs/pages/events.md diff --git a/storage/documentation/files.md b/bundles/docs/pages/files.md similarity index 100% rename from storage/documentation/files.md rename to bundles/docs/pages/files.md diff --git a/storage/documentation/home.md b/bundles/docs/pages/home.md similarity index 100% rename from storage/documentation/home.md rename to bundles/docs/pages/home.md diff --git a/storage/documentation/input.md b/bundles/docs/pages/input.md similarity index 100% rename from storage/documentation/input.md rename to bundles/docs/pages/input.md diff --git a/storage/documentation/install.md b/bundles/docs/pages/install.md similarity index 100% rename from storage/documentation/install.md rename to bundles/docs/pages/install.md diff --git a/storage/documentation/ioc.md b/bundles/docs/pages/ioc.md similarity index 100% rename from storage/documentation/ioc.md rename to bundles/docs/pages/ioc.md diff --git a/storage/documentation/loading.md b/bundles/docs/pages/loading.md similarity index 100% rename from storage/documentation/loading.md rename to bundles/docs/pages/loading.md diff --git a/storage/documentation/localization.md b/bundles/docs/pages/localization.md similarity index 100% rename from storage/documentation/localization.md rename to bundles/docs/pages/localization.md diff --git a/storage/documentation/logging.md b/bundles/docs/pages/logging.md similarity index 100% rename from storage/documentation/logging.md rename to bundles/docs/pages/logging.md diff --git a/storage/documentation/models.md b/bundles/docs/pages/models.md similarity index 100% rename from storage/documentation/models.md rename to bundles/docs/pages/models.md diff --git a/storage/documentation/requests.md b/bundles/docs/pages/requests.md similarity index 100% rename from storage/documentation/requests.md rename to bundles/docs/pages/requests.md diff --git a/storage/documentation/routing.md b/bundles/docs/pages/routing.md similarity index 100% rename from storage/documentation/routing.md rename to bundles/docs/pages/routing.md diff --git a/storage/documentation/session/config.md b/bundles/docs/pages/session/config.md similarity index 100% rename from storage/documentation/session/config.md rename to bundles/docs/pages/session/config.md diff --git a/storage/documentation/session/usage.md b/bundles/docs/pages/session/usage.md similarity index 100% rename from storage/documentation/session/usage.md rename to bundles/docs/pages/session/usage.md diff --git a/storage/documentation/strings.md b/bundles/docs/pages/strings.md similarity index 100% rename from storage/documentation/strings.md rename to bundles/docs/pages/strings.md diff --git a/storage/documentation/testing.md b/bundles/docs/pages/testing.md similarity index 100% rename from storage/documentation/testing.md rename to bundles/docs/pages/testing.md diff --git a/storage/documentation/urls.md b/bundles/docs/pages/urls.md similarity index 100% rename from storage/documentation/urls.md rename to bundles/docs/pages/urls.md diff --git a/storage/documentation/validation.md b/bundles/docs/pages/validation.md similarity index 100% rename from storage/documentation/validation.md rename to bundles/docs/pages/validation.md diff --git a/storage/documentation/views/assets.md b/bundles/docs/pages/views/assets.md similarity index 100% rename from storage/documentation/views/assets.md rename to bundles/docs/pages/views/assets.md diff --git a/storage/documentation/views/forms.md b/bundles/docs/pages/views/forms.md similarity index 100% rename from storage/documentation/views/forms.md rename to bundles/docs/pages/views/forms.md diff --git a/storage/documentation/views/home.md b/bundles/docs/pages/views/home.md similarity index 100% rename from storage/documentation/views/home.md rename to bundles/docs/pages/views/home.md diff --git a/storage/documentation/views/html.md b/bundles/docs/pages/views/html.md similarity index 100% rename from storage/documentation/views/html.md rename to bundles/docs/pages/views/html.md diff --git a/storage/documentation/views/pagination.md b/bundles/docs/pages/views/pagination.md similarity index 100% rename from storage/documentation/views/pagination.md rename to bundles/docs/pages/views/pagination.md diff --git a/storage/documentation/views/templating.md b/bundles/docs/pages/views/templating.md similarity index 100% rename from storage/documentation/views/templating.md rename to bundles/docs/pages/views/templating.md diff --git a/bundles/docs/routes.php b/bundles/docs/routes.php index 184656cc..30812899 100644 --- a/bundles/docs/routes.php +++ b/bundles/docs/routes.php @@ -13,7 +13,7 @@ */ function document($page) { - return Markdown(file_get_contents(path('storage').'documentation/'.$page.'.md')); + return Markdown(file_get_contents(__DIR__.'/pages/'.$page.'.md')); } /** @@ -24,7 +24,7 @@ function document($page) */ function document_exists($page) { - return file_exists(path('storage').'documentation/'.$page.'.md'); + return file_exists(__DIR__.'/pages/'.$page.'.md'); } /** From 6735631cc1c5bed7a5fc319b6ecc7b961ef20e46 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Tue, 3 Apr 2012 09:53:33 -0500 Subject: [PATCH 16/32] tweaking style. --- application/views/home/index.blade.php | 2 +- public/laravel/css/style.css | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/application/views/home/index.blade.php b/application/views/home/index.blade.php index dd26ad93..0d3ec538 100644 --- a/application/views/home/index.blade.php +++ b/application/views/home/index.blade.php @@ -39,7 +39,7 @@ Here are the basics:

-
    +
    • {{ HTML::link('docs/routing#the-basics', 'Defining Routes') }}
    • {{ HTML::link('docs/controllers#the-basics', 'Building Controllers') }}
    • {{ HTML::link('docs/views#the-basics', 'Creating Views') }}
      • diff --git a/public/laravel/css/style.css b/public/laravel/css/style.css index fb5b11fc..4ed36baf 100755 --- a/public/laravel/css/style.css +++ b/public/laravel/css/style.css @@ -167,12 +167,6 @@ .content li margin-bottom:1em; } -div.home li -{ - line-height:1.5em; - margin-bottom:1em; -} - a, a:visited { color:#2972A3; From 3518f6863301bfc9f554b704750e9128b8b6ff52 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Tue, 3 Apr 2012 09:54:15 -0500 Subject: [PATCH 17/32] tweaking layout. --- application/views/home/index.blade.php | 8 -------- 1 file changed, 8 deletions(-) diff --git a/application/views/home/index.blade.php b/application/views/home/index.blade.php index 0d3ec538..0a4c8332 100644 --- a/application/views/home/index.blade.php +++ b/application/views/home/index.blade.php @@ -36,16 +36,8 @@

      Leaning to use Laravel is amazingly simple thanks to its {{ HTML::link('docs', 'wonderful documentation') }}. - Here are the basics:

      -
        -
      • {{ HTML::link('docs/routing#the-basics', 'Defining Routes') }}
        • -
      • {{ HTML::link('docs/controllers#the-basics', 'Building Controllers') }}
        • -
      • {{ HTML::link('docs/views#the-basics', 'Creating Views') }}
        • -
      • {{ HTML::link('docs/database/eloquent', 'Eloquent ORM') }}
        • -
      -

      Create something beautiful.

      From df70987679f3aa3660f3ef1118071a3208010da2 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Tue, 3 Apr 2012 10:48:01 -0500 Subject: [PATCH 18/32] added sync method to has_many relationship. --- .../eloquent/relationships/has_many.php | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/laravel/database/eloquent/relationships/has_many.php b/laravel/database/eloquent/relationships/has_many.php index b80d3844..d5622a41 100644 --- a/laravel/database/eloquent/relationships/has_many.php +++ b/laravel/database/eloquent/relationships/has_many.php @@ -12,6 +12,40 @@ public function results() return parent::get(); } + /** + * Sync the association table with an array of models. + * + * @param array $models + * @return bool + */ + public function sync(array $models) + { + $current = $this->table->lists($this->model->key()); + + // When syncing the has many relationship, we'll just spin the attributes and + // create a fresh model instances for each row. If the "id" is set on the + // array of attributes, we'll set the exists flag to true for update. + foreach ($models as $attributes) + { + $attributes[$this->foreign_key()] = $this->base->get_key(); + + $model = $this->fresh_model($attributes); + + $id = $model->get_key(); + + $model->exists = ( ! is_null($id) and in_array($id, $current)); + + // Before saving we'll force the entire model to be "dirty" so all of + // the attributes are saved. It shouldn't affect the updates as + // saving all the attributes shouldn't hurt anything. + $model->original = array(); + + $model->save(); + } + + return true; + } + /** * Initialize a relationship on an array of parent models. * From d0a701e8f7536793eaa20f135597c4f72be20f87 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Tue, 3 Apr 2012 10:55:04 -0500 Subject: [PATCH 19/32] Tweaking has_many "save" method. Signed-off-by: Taylor Otwell --- .../eloquent/relationships/has_many.php | 21 +++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/laravel/database/eloquent/relationships/has_many.php b/laravel/database/eloquent/relationships/has_many.php index d5622a41..df7f1451 100644 --- a/laravel/database/eloquent/relationships/has_many.php +++ b/laravel/database/eloquent/relationships/has_many.php @@ -15,21 +15,30 @@ public function results() /** * Sync the association table with an array of models. * - * @param array $models + * @param mixed $models * @return bool */ - public function sync(array $models) + public function save($models) { + if ( ! is_array($models)) $models = array($models); + $current = $this->table->lists($this->model->key()); - // When syncing the has many relationship, we'll just spin the attributes and - // create a fresh model instances for each row. If the "id" is set on the - // array of attributes, we'll set the exists flag to true for update. foreach ($models as $attributes) { $attributes[$this->foreign_key()] = $this->base->get_key(); - $model = $this->fresh_model($attributes); + // If the "attributes" are actually an array of the related model we'll + // just use the existing instance instead of creating a fresh model + // instance for the attributes. This allows for validation. + if ($attributes instanceof get_class($this->model)) + { + $model = $attributes; + } + else + { + $model = $this->fresh_model($attributes); + } $id = $model->get_key(); From 517da41a722f1a06891b9627706038ff100c89ef Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Tue, 3 Apr 2012 10:56:55 -0500 Subject: [PATCH 20/32] Tweaking has_many "save" method. Signed-off-by: Taylor Otwell --- laravel/database/eloquent/relationships/has_many.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/laravel/database/eloquent/relationships/has_many.php b/laravel/database/eloquent/relationships/has_many.php index df7f1451..ad152c07 100644 --- a/laravel/database/eloquent/relationships/has_many.php +++ b/laravel/database/eloquent/relationships/has_many.php @@ -20,6 +20,9 @@ public function results() */ public function save($models) { + // If the given "models" are not an array, we'll force them into an array so + // we can conveniently loop through them and insert all of them into the + // related database table assigned to the associated model instance. if ( ! is_array($models)) $models = array($models); $current = $this->table->lists($this->model->key()); From 6fdccd7496eaa906f4361d5595245ea2dbeee1de Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Tue, 3 Apr 2012 11:00:45 -0500 Subject: [PATCH 21/32] Fixing bug. Signed-off-by: Taylor Otwell --- laravel/database/eloquent/relationships/has_many.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/laravel/database/eloquent/relationships/has_many.php b/laravel/database/eloquent/relationships/has_many.php index ad152c07..cbf216e7 100644 --- a/laravel/database/eloquent/relationships/has_many.php +++ b/laravel/database/eloquent/relationships/has_many.php @@ -31,10 +31,12 @@ public function save($models) { $attributes[$this->foreign_key()] = $this->base->get_key(); + $class = get_class($this->model); + // If the "attributes" are actually an array of the related model we'll // just use the existing instance instead of creating a fresh model // instance for the attributes. This allows for validation. - if ($attributes instanceof get_class($this->model)) + if ($attributes instanceof $class) { $model = $attributes; } From 1f6e5f874106c28174ab2a63671393cb1f93d700 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Tue, 3 Apr 2012 11:11:03 -0500 Subject: [PATCH 22/32] updated change log and documentation. --- bundles/docs/pages/changes.md | 1 + bundles/docs/pages/database/eloquent.md | 14 ++++++++++++++ 2 files changed, 15 insertions(+) diff --git a/bundles/docs/pages/changes.md b/bundles/docs/pages/changes.md index 84e695d2..2cdaae61 100644 --- a/bundles/docs/pages/changes.md +++ b/bundles/docs/pages/changes.md @@ -21,6 +21,7 @@ ## Laravel 3.2 - [Added `to_array` method to the base Eloquent model](/docs/database/eloquent#to-array). - [Added `$hidden` static variable to the base Eloquent model](/docs/database/eloquent#to-array). - [Added `sync` method to has\_many\_and\_belongs\_to Eloquent relationship](/docs/database/eloquent#sync-method). +- [Added `save` method to has\_many Eloquent relationship](/docs/database/eloquent#has-many-save). - Fixed the passing of strings into the Input::except method. - Fixed replacement of optional parameters in URL::transpose method. - Improved View performance by only loading contents from file once. diff --git a/bundles/docs/pages/database/eloquent.md b/bundles/docs/pages/database/eloquent.md index b0e499fb..0706b7d9 100644 --- a/bundles/docs/pages/database/eloquent.md +++ b/bundles/docs/pages/database/eloquent.md @@ -290,6 +290,20 @@ ## Inserting Related Models When inserting related models through their parent model, the foreign key will automatically be set. So, in this case, the "post_id" was automatically set to "1" on the newly inserted comment. + +When working with `has_many` relationships, you may use the `save` method to insert / update related models: + + $comments = array( + array('message' => 'A new comment.'), + array('message' => 'A second comment.'), + ); + + $post = Post::find(1); + + $post->comments()->save($comments); + +### Inserting Related Models (Many-To-Many) + This is even more helpful when working with many-to-many relationships. For example, consider a **User** model that has many roles. Likewise, the **Role** model may have many users. So, the intermediate table for this relationship has "user_id" and "role_id" columns. Now, let's insert a new Role for a User: $role = new Role(array('title' => 'Admin')); From 43a3635722ae51b9ff5e9e10f2d5b22376c178a2 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Tue, 3 Apr 2012 11:20:20 -0500 Subject: [PATCH 23/32] move documentation markdown to system directory. --- bundles/docs/routes.php | 14 ++++++++++++-- .../documentation}/artisan/commands.md | 0 .../documentation}/artisan/tasks.md | 0 .../pages => laravel/documentation}/auth/config.md | 0 .../pages => laravel/documentation}/auth/usage.md | 0 .../pages => laravel/documentation}/bundles.md | 0 .../documentation}/cache/config.md | 0 .../pages => laravel/documentation}/cache/usage.md | 0 .../pages => laravel/documentation}/changes.md | 0 .../docs/pages => laravel/documentation}/config.md | 0 .../pages => laravel/documentation}/contents.md | 0 .../pages => laravel/documentation}/controllers.md | 0 .../documentation}/database/config.md | 0 .../documentation}/database/eloquent.md | 0 .../documentation}/database/fluent.md | 0 .../documentation}/database/migrations.md | 0 .../documentation}/database/raw.md | 0 .../documentation}/database/redis.md | 0 .../documentation}/database/schema.md | 0 .../pages => laravel/documentation}/encryption.md | 0 .../docs/pages => laravel/documentation}/events.md | 0 .../docs/pages => laravel/documentation}/files.md | 0 .../docs/pages => laravel/documentation}/home.md | 0 .../docs/pages => laravel/documentation}/input.md | 0 .../pages => laravel/documentation}/install.md | 0 .../docs/pages => laravel/documentation}/ioc.md | 0 .../pages => laravel/documentation}/loading.md | 0 .../documentation}/localization.md | 0 .../pages => laravel/documentation}/logging.md | 0 .../docs/pages => laravel/documentation}/models.md | 0 .../pages => laravel/documentation}/requests.md | 0 .../pages => laravel/documentation}/routing.md | 0 .../documentation}/session/config.md | 0 .../documentation}/session/usage.md | 0 .../pages => laravel/documentation}/strings.md | 0 .../pages => laravel/documentation}/testing.md | 0 .../docs/pages => laravel/documentation}/urls.md | 0 .../pages => laravel/documentation}/validation.md | 0 .../documentation}/views/assets.md | 0 .../pages => laravel/documentation}/views/forms.md | 0 .../pages => laravel/documentation}/views/home.md | 0 .../pages => laravel/documentation}/views/html.md | 0 .../documentation}/views/pagination.md | 0 .../documentation}/views/templating.md | 0 44 files changed, 12 insertions(+), 2 deletions(-) rename {bundles/docs/pages => laravel/documentation}/artisan/commands.md (100%) rename {bundles/docs/pages => laravel/documentation}/artisan/tasks.md (100%) rename {bundles/docs/pages => laravel/documentation}/auth/config.md (100%) rename {bundles/docs/pages => laravel/documentation}/auth/usage.md (100%) rename {bundles/docs/pages => laravel/documentation}/bundles.md (100%) rename {bundles/docs/pages => laravel/documentation}/cache/config.md (100%) rename {bundles/docs/pages => laravel/documentation}/cache/usage.md (100%) rename {bundles/docs/pages => laravel/documentation}/changes.md (100%) rename {bundles/docs/pages => laravel/documentation}/config.md (100%) rename {bundles/docs/pages => laravel/documentation}/contents.md (100%) rename {bundles/docs/pages => laravel/documentation}/controllers.md (100%) rename {bundles/docs/pages => laravel/documentation}/database/config.md (100%) rename {bundles/docs/pages => laravel/documentation}/database/eloquent.md (100%) rename {bundles/docs/pages => laravel/documentation}/database/fluent.md (100%) rename {bundles/docs/pages => laravel/documentation}/database/migrations.md (100%) rename {bundles/docs/pages => laravel/documentation}/database/raw.md (100%) rename {bundles/docs/pages => laravel/documentation}/database/redis.md (100%) rename {bundles/docs/pages => laravel/documentation}/database/schema.md (100%) rename {bundles/docs/pages => laravel/documentation}/encryption.md (100%) rename {bundles/docs/pages => laravel/documentation}/events.md (100%) rename {bundles/docs/pages => laravel/documentation}/files.md (100%) rename {bundles/docs/pages => laravel/documentation}/home.md (100%) rename {bundles/docs/pages => laravel/documentation}/input.md (100%) rename {bundles/docs/pages => laravel/documentation}/install.md (100%) rename {bundles/docs/pages => laravel/documentation}/ioc.md (100%) rename {bundles/docs/pages => laravel/documentation}/loading.md (100%) rename {bundles/docs/pages => laravel/documentation}/localization.md (100%) rename {bundles/docs/pages => laravel/documentation}/logging.md (100%) rename {bundles/docs/pages => laravel/documentation}/models.md (100%) rename {bundles/docs/pages => laravel/documentation}/requests.md (100%) rename {bundles/docs/pages => laravel/documentation}/routing.md (100%) rename {bundles/docs/pages => laravel/documentation}/session/config.md (100%) rename {bundles/docs/pages => laravel/documentation}/session/usage.md (100%) rename {bundles/docs/pages => laravel/documentation}/strings.md (100%) rename {bundles/docs/pages => laravel/documentation}/testing.md (100%) rename {bundles/docs/pages => laravel/documentation}/urls.md (100%) rename {bundles/docs/pages => laravel/documentation}/validation.md (100%) rename {bundles/docs/pages => laravel/documentation}/views/assets.md (100%) rename {bundles/docs/pages => laravel/documentation}/views/forms.md (100%) rename {bundles/docs/pages => laravel/documentation}/views/home.md (100%) rename {bundles/docs/pages => laravel/documentation}/views/html.md (100%) rename {bundles/docs/pages => laravel/documentation}/views/pagination.md (100%) rename {bundles/docs/pages => laravel/documentation}/views/templating.md (100%) diff --git a/bundles/docs/routes.php b/bundles/docs/routes.php index 30812899..334c652d 100644 --- a/bundles/docs/routes.php +++ b/bundles/docs/routes.php @@ -5,6 +5,16 @@ */ require_once __DIR__.'/libraries/markdown.php'; +/** + * Get the root path for the documentation Markdown. + * + * @return string + */ +function doc_root() +{ + return path('sys').'documentation/'; +} + /** * Get the parsed Markdown contents of a given page. * @@ -13,7 +23,7 @@ */ function document($page) { - return Markdown(file_get_contents(__DIR__.'/pages/'.$page.'.md')); + return Markdown(file_get_contents(doc_root().$page.'.md')); } /** @@ -24,7 +34,7 @@ function document($page) */ function document_exists($page) { - return file_exists(__DIR__.'/pages/'.$page.'.md'); + return file_exists(doc_root().$page.'.md'); } /** diff --git a/bundles/docs/pages/artisan/commands.md b/laravel/documentation/artisan/commands.md similarity index 100% rename from bundles/docs/pages/artisan/commands.md rename to laravel/documentation/artisan/commands.md diff --git a/bundles/docs/pages/artisan/tasks.md b/laravel/documentation/artisan/tasks.md similarity index 100% rename from bundles/docs/pages/artisan/tasks.md rename to laravel/documentation/artisan/tasks.md diff --git a/bundles/docs/pages/auth/config.md b/laravel/documentation/auth/config.md similarity index 100% rename from bundles/docs/pages/auth/config.md rename to laravel/documentation/auth/config.md diff --git a/bundles/docs/pages/auth/usage.md b/laravel/documentation/auth/usage.md similarity index 100% rename from bundles/docs/pages/auth/usage.md rename to laravel/documentation/auth/usage.md diff --git a/bundles/docs/pages/bundles.md b/laravel/documentation/bundles.md similarity index 100% rename from bundles/docs/pages/bundles.md rename to laravel/documentation/bundles.md diff --git a/bundles/docs/pages/cache/config.md b/laravel/documentation/cache/config.md similarity index 100% rename from bundles/docs/pages/cache/config.md rename to laravel/documentation/cache/config.md diff --git a/bundles/docs/pages/cache/usage.md b/laravel/documentation/cache/usage.md similarity index 100% rename from bundles/docs/pages/cache/usage.md rename to laravel/documentation/cache/usage.md diff --git a/bundles/docs/pages/changes.md b/laravel/documentation/changes.md similarity index 100% rename from bundles/docs/pages/changes.md rename to laravel/documentation/changes.md diff --git a/bundles/docs/pages/config.md b/laravel/documentation/config.md similarity index 100% rename from bundles/docs/pages/config.md rename to laravel/documentation/config.md diff --git a/bundles/docs/pages/contents.md b/laravel/documentation/contents.md similarity index 100% rename from bundles/docs/pages/contents.md rename to laravel/documentation/contents.md diff --git a/bundles/docs/pages/controllers.md b/laravel/documentation/controllers.md similarity index 100% rename from bundles/docs/pages/controllers.md rename to laravel/documentation/controllers.md diff --git a/bundles/docs/pages/database/config.md b/laravel/documentation/database/config.md similarity index 100% rename from bundles/docs/pages/database/config.md rename to laravel/documentation/database/config.md diff --git a/bundles/docs/pages/database/eloquent.md b/laravel/documentation/database/eloquent.md similarity index 100% rename from bundles/docs/pages/database/eloquent.md rename to laravel/documentation/database/eloquent.md diff --git a/bundles/docs/pages/database/fluent.md b/laravel/documentation/database/fluent.md similarity index 100% rename from bundles/docs/pages/database/fluent.md rename to laravel/documentation/database/fluent.md diff --git a/bundles/docs/pages/database/migrations.md b/laravel/documentation/database/migrations.md similarity index 100% rename from bundles/docs/pages/database/migrations.md rename to laravel/documentation/database/migrations.md diff --git a/bundles/docs/pages/database/raw.md b/laravel/documentation/database/raw.md similarity index 100% rename from bundles/docs/pages/database/raw.md rename to laravel/documentation/database/raw.md diff --git a/bundles/docs/pages/database/redis.md b/laravel/documentation/database/redis.md similarity index 100% rename from bundles/docs/pages/database/redis.md rename to laravel/documentation/database/redis.md diff --git a/bundles/docs/pages/database/schema.md b/laravel/documentation/database/schema.md similarity index 100% rename from bundles/docs/pages/database/schema.md rename to laravel/documentation/database/schema.md diff --git a/bundles/docs/pages/encryption.md b/laravel/documentation/encryption.md similarity index 100% rename from bundles/docs/pages/encryption.md rename to laravel/documentation/encryption.md diff --git a/bundles/docs/pages/events.md b/laravel/documentation/events.md similarity index 100% rename from bundles/docs/pages/events.md rename to laravel/documentation/events.md diff --git a/bundles/docs/pages/files.md b/laravel/documentation/files.md similarity index 100% rename from bundles/docs/pages/files.md rename to laravel/documentation/files.md diff --git a/bundles/docs/pages/home.md b/laravel/documentation/home.md similarity index 100% rename from bundles/docs/pages/home.md rename to laravel/documentation/home.md diff --git a/bundles/docs/pages/input.md b/laravel/documentation/input.md similarity index 100% rename from bundles/docs/pages/input.md rename to laravel/documentation/input.md diff --git a/bundles/docs/pages/install.md b/laravel/documentation/install.md similarity index 100% rename from bundles/docs/pages/install.md rename to laravel/documentation/install.md diff --git a/bundles/docs/pages/ioc.md b/laravel/documentation/ioc.md similarity index 100% rename from bundles/docs/pages/ioc.md rename to laravel/documentation/ioc.md diff --git a/bundles/docs/pages/loading.md b/laravel/documentation/loading.md similarity index 100% rename from bundles/docs/pages/loading.md rename to laravel/documentation/loading.md diff --git a/bundles/docs/pages/localization.md b/laravel/documentation/localization.md similarity index 100% rename from bundles/docs/pages/localization.md rename to laravel/documentation/localization.md diff --git a/bundles/docs/pages/logging.md b/laravel/documentation/logging.md similarity index 100% rename from bundles/docs/pages/logging.md rename to laravel/documentation/logging.md diff --git a/bundles/docs/pages/models.md b/laravel/documentation/models.md similarity index 100% rename from bundles/docs/pages/models.md rename to laravel/documentation/models.md diff --git a/bundles/docs/pages/requests.md b/laravel/documentation/requests.md similarity index 100% rename from bundles/docs/pages/requests.md rename to laravel/documentation/requests.md diff --git a/bundles/docs/pages/routing.md b/laravel/documentation/routing.md similarity index 100% rename from bundles/docs/pages/routing.md rename to laravel/documentation/routing.md diff --git a/bundles/docs/pages/session/config.md b/laravel/documentation/session/config.md similarity index 100% rename from bundles/docs/pages/session/config.md rename to laravel/documentation/session/config.md diff --git a/bundles/docs/pages/session/usage.md b/laravel/documentation/session/usage.md similarity index 100% rename from bundles/docs/pages/session/usage.md rename to laravel/documentation/session/usage.md diff --git a/bundles/docs/pages/strings.md b/laravel/documentation/strings.md similarity index 100% rename from bundles/docs/pages/strings.md rename to laravel/documentation/strings.md diff --git a/bundles/docs/pages/testing.md b/laravel/documentation/testing.md similarity index 100% rename from bundles/docs/pages/testing.md rename to laravel/documentation/testing.md diff --git a/bundles/docs/pages/urls.md b/laravel/documentation/urls.md similarity index 100% rename from bundles/docs/pages/urls.md rename to laravel/documentation/urls.md diff --git a/bundles/docs/pages/validation.md b/laravel/documentation/validation.md similarity index 100% rename from bundles/docs/pages/validation.md rename to laravel/documentation/validation.md diff --git a/bundles/docs/pages/views/assets.md b/laravel/documentation/views/assets.md similarity index 100% rename from bundles/docs/pages/views/assets.md rename to laravel/documentation/views/assets.md diff --git a/bundles/docs/pages/views/forms.md b/laravel/documentation/views/forms.md similarity index 100% rename from bundles/docs/pages/views/forms.md rename to laravel/documentation/views/forms.md diff --git a/bundles/docs/pages/views/home.md b/laravel/documentation/views/home.md similarity index 100% rename from bundles/docs/pages/views/home.md rename to laravel/documentation/views/home.md diff --git a/bundles/docs/pages/views/html.md b/laravel/documentation/views/html.md similarity index 100% rename from bundles/docs/pages/views/html.md rename to laravel/documentation/views/html.md diff --git a/bundles/docs/pages/views/pagination.md b/laravel/documentation/views/pagination.md similarity index 100% rename from bundles/docs/pages/views/pagination.md rename to laravel/documentation/views/pagination.md diff --git a/bundles/docs/pages/views/templating.md b/laravel/documentation/views/templating.md similarity index 100% rename from bundles/docs/pages/views/templating.md rename to laravel/documentation/views/templating.md From 27b0b321ac41ae85a5538bfe2c422a4fcdbf1f3a Mon Sep 17 00:00:00 2001 From: Dayle Rees Date: Tue, 3 Apr 2012 19:59:54 +0100 Subject: [PATCH 24/32] switched to markdown extra, with table styling --- bundles/docs/libraries/markdown.php | 1257 ++++++++++++++++++++++++++- public/laravel/css/style.css | 27 + 2 files changed, 1255 insertions(+), 29 deletions(-) diff --git a/bundles/docs/libraries/markdown.php b/bundles/docs/libraries/markdown.php index 95dfd221..b0a31a3f 100755 --- a/bundles/docs/libraries/markdown.php +++ b/bundles/docs/libraries/markdown.php @@ -1,8 +1,8 @@ # @@ -13,6 +13,7 @@ define( 'MARKDOWN_VERSION', "1.0.1o" ); # Sun 8 Jan 2012 +define( 'MARKDOWNEXTRA_VERSION', "1.2.5" ); # Sun 8 Jan 2012 # @@ -25,6 +26,14 @@ # Define the width of a tab for code blocks. @define( 'MARKDOWN_TAB_WIDTH', 4 ); +# Optional title attribute for footnote links and backlinks. +@define( 'MARKDOWN_FN_LINK_TITLE', "" ); +@define( 'MARKDOWN_FN_BACKLINK_TITLE', "" ); + +# Optional class attribute for footnote links and backlinks. +@define( 'MARKDOWN_FN_LINK_CLASS', "" ); +@define( 'MARKDOWN_FN_BACKLINK_CLASS', "" ); + # # WordPress settings: @@ -38,7 +47,7 @@ ### Standard Function Interface ### -@define( 'MARKDOWN_PARSER_CLASS', 'Markdown_Parser' ); +@define( 'MARKDOWN_PARSER_CLASS', 'MarkdownExtra_Parser' ); function Markdown($text) { # @@ -59,10 +68,10 @@ function Markdown($text) { ### WordPress Plugin Interface ### /* -Plugin Name: Markdown +Plugin Name: Markdown Extra Plugin URI: http://michelf.com/projects/php-markdown/ Description: Markdown syntax allows you to write using an easy-to-read, easy-to-write plain text format. Based on the original Perl version by John Gruber. More... -Version: 1.0.1o +Version: 1.2.5 Author: Michel Fortin Author URI: http://michelf.com/ */ @@ -79,9 +88,9 @@ function Markdown($text) { remove_filter('the_content', 'wpautop'); remove_filter('the_content_rss', 'wpautop'); remove_filter('the_excerpt', 'wpautop'); - add_filter('the_content', 'Markdown', 6); - add_filter('the_content_rss', 'Markdown', 6); - add_filter('get_the_excerpt', 'Markdown', 6); + add_filter('the_content', 'mdwp_MarkdownPost', 6); + add_filter('the_content_rss', 'mdwp_MarkdownPost', 6); + add_filter('get_the_excerpt', 'mdwp_MarkdownPost', 6); add_filter('get_the_excerpt', 'trim', 7); add_filter('the_excerpt', 'mdwp_add_p'); add_filter('the_excerpt_rss', 'mdwp_strip_p'); @@ -92,6 +101,21 @@ function Markdown($text) { add_filter('get_the_excerpt', 'balanceTags', 9); } + # Add a footnote id prefix to posts when inside a loop. + function mdwp_MarkdownPost($text) { + static $parser; + if (!$parser) { + $parser_class = MARKDOWN_PARSER_CLASS; + $parser = new $parser_class; + } + if (is_single() || is_page() || is_feed()) { + $parser->fn_id_prefix = ""; + } else { + $parser->fn_id_prefix = get_the_ID() . "."; + } + return $parser->transform($text); + } + # Comments # - Remove WordPress paragraph generator. # - Remove WordPress auto-link generator. @@ -140,15 +164,15 @@ function mdwp_show_tags($text) { function identify_modifier_markdown() { return array( - 'name' => 'markdown', - 'type' => 'modifier', - 'nicename' => 'Markdown', - 'description' => 'A text-to-HTML conversion tool for web writers', - 'authors' => 'Michel Fortin and John Gruber', - 'licence' => 'BSD-like', - 'version' => MARKDOWN_VERSION, - 'help' => 'Markdown syntax allows you to write using an easy-to-read, easy-to-write plain text format. Based on the original Perl version by John Gruber. More...' - ); + 'name' => 'markdown', + 'type' => 'modifier', + 'nicename' => 'PHP Markdown Extra', + 'description' => 'A text-to-HTML conversion tool for web writers', + 'authors' => 'Michel Fortin and John Gruber', + 'licence' => 'GPL', + 'version' => MARKDOWNEXTRA_VERSION, + 'help' => 'Markdown syntax allows you to write using an easy-to-read, easy-to-write plain text format. Based on the original Perl version by John Gruber. More...', + ); } @@ -731,9 +755,9 @@ function _doAnchors_reference_callback($matches) { if (isset($this->urls[$link_id])) { $url = $this->urls[$link_id]; - // dayle convert - $url = URL::to($url); + $url = URL::to($url); $url = $this->encodeAttribute($url); + $result = "titles[$link_id] ) ) { $title = $this->titles[$link_id]; @@ -755,8 +779,8 @@ function _doAnchors_inline_callback($matches) { $link_text = $this->runSpanGamut($matches[2]); $url = $matches[3] == '' ? $matches[4] : $matches[3]; $title =& $matches[7]; - // dayle convert - $url = URL::to($url); + + $url = URL::to($url); $url = $this->encodeAttribute($url); $result = "$codeblock\n"; + $codeblock = "

      $codeblock\n
      "; return "\n\n".$this->hashBlock($codeblock)."\n\n"; } @@ -1447,7 +1471,6 @@ function doAutoLinks($text) { } function _doAutoLinks_url_callback($matches) { $url = $this->encodeAttribute($matches[1]); - $url = Laravel\URL::to($url); $link = "$url"; return $this->hashPart($link); } @@ -1648,16 +1671,1192 @@ function _unhash_callback($matches) { } + +# +# Markdown Extra Parser Class +# + +class MarkdownExtra_Parser extends Markdown_Parser { + + # Prefix for footnote ids. + var $fn_id_prefix = ""; + + # Optional title attribute for footnote links and backlinks. + var $fn_link_title = MARKDOWN_FN_LINK_TITLE; + var $fn_backlink_title = MARKDOWN_FN_BACKLINK_TITLE; + + # Optional class attribute for footnote links and backlinks. + var $fn_link_class = MARKDOWN_FN_LINK_CLASS; + var $fn_backlink_class = MARKDOWN_FN_BACKLINK_CLASS; + + # Predefined abbreviations. + var $predef_abbr = array(); + + + function MarkdownExtra_Parser() { + # + # Constructor function. Initialize the parser object. + # + # Add extra escapable characters before parent constructor + # initialize the table. + $this->escape_chars .= ':|'; + + # Insert extra document, block, and span transformations. + # Parent constructor will do the sorting. + $this->document_gamut += array( + "doFencedCodeBlocks" => 5, + "stripFootnotes" => 15, + "stripAbbreviations" => 25, + "appendFootnotes" => 50, + ); + $this->block_gamut += array( + "doFencedCodeBlocks" => 5, + "doTables" => 15, + "doDefLists" => 45, + ); + $this->span_gamut += array( + "doFootnotes" => 5, + "doAbbreviations" => 70, + ); + + parent::Markdown_Parser(); + } + + + # Extra variables used during extra transformations. + var $footnotes = array(); + var $footnotes_ordered = array(); + var $abbr_desciptions = array(); + var $abbr_word_re = ''; + + # Give the current footnote number. + var $footnote_counter = 1; + + + function setup() { + # + # Setting up Extra-specific variables. + # + parent::setup(); + + $this->footnotes = array(); + $this->footnotes_ordered = array(); + $this->abbr_desciptions = array(); + $this->abbr_word_re = ''; + $this->footnote_counter = 1; + + foreach ($this->predef_abbr as $abbr_word => $abbr_desc) { + if ($this->abbr_word_re) + $this->abbr_word_re .= '|'; + $this->abbr_word_re .= preg_quote($abbr_word); + $this->abbr_desciptions[$abbr_word] = trim($abbr_desc); + } + } + + function teardown() { + # + # Clearing Extra-specific variables. + # + $this->footnotes = array(); + $this->footnotes_ordered = array(); + $this->abbr_desciptions = array(); + $this->abbr_word_re = ''; + + parent::teardown(); + } + + + ### HTML Block Parser ### + + # Tags that are always treated as block tags: + var $block_tags_re = 'p|div|h[1-6]|blockquote|pre|table|dl|ol|ul|address|form|fieldset|iframe|hr|legend'; + + # Tags treated as block tags only if the opening tag is alone on it's line: + var $context_block_tags_re = 'script|noscript|math|ins|del'; + + # Tags where markdown="1" default to span mode: + var $contain_span_tags_re = 'p|h[1-6]|li|dd|dt|td|th|legend|address'; + + # Tags which must not have their contents modified, no matter where + # they appear: + var $clean_tags_re = 'script|math'; + + # Tags that do not need to be closed. + var $auto_close_tags_re = 'hr|img'; + + + function hashHTMLBlocks($text) { + # + # Hashify HTML Blocks and "clean tags". + # + # We only want to do this for block-level HTML tags, such as headers, + # lists, and tables. That's because we still want to wrap

      s around + # "paragraphs" that are wrapped in non-block-level tags, such as anchors, + # phrase emphasis, and spans. The list of tags we're looking for is + # hard-coded. + # + # This works by calling _HashHTMLBlocks_InMarkdown, which then calls + # _HashHTMLBlocks_InHTML when it encounter block tags. When the markdown="1" + # attribute is found whitin a tag, _HashHTMLBlocks_InHTML calls back + # _HashHTMLBlocks_InMarkdown to handle the Markdown syntax within the tag. + # These two functions are calling each other. It's recursive! + # + # + # Call the HTML-in-Markdown hasher. + # + list($text, ) = $this->_hashHTMLBlocks_inMarkdown($text); + + return $text; + } + function _hashHTMLBlocks_inMarkdown($text, $indent = 0, + $enclosing_tag_re = '', $span = false) + { + # + # Parse markdown text, calling _HashHTMLBlocks_InHTML for block tags. + # + # * $indent is the number of space to be ignored when checking for code + # blocks. This is important because if we don't take the indent into + # account, something like this (which looks right) won't work as expected: + # + #

      + #
      + # Hello World. <-- Is this a Markdown code block or text? + #
      <-- Is this a Markdown code block or a real tag? + #
      + # + # If you don't like this, just don't indent the tag on which + # you apply the markdown="1" attribute. + # + # * If $enclosing_tag_re is not empty, stops at the first unmatched closing + # tag with that name. Nested tags supported. + # + # * If $span is true, text inside must treated as span. So any double + # newline will be replaced by a single newline so that it does not create + # paragraphs. + # + # Returns an array of that form: ( processed text , remaining text ) + # + if ($text === '') return array('', ''); + + # Regex to check for the presense of newlines around a block tag. + $newline_before_re = '/(?:^\n?|\n\n)*$/'; + $newline_after_re = + '{ + ^ # Start of text following the tag. + (?>[ ]*)? # Optional comment. + [ ]*\n # Must be followed by newline. + }xs'; + + # Regex to match any tag. + $block_tag_re = + '{ + ( # $2: Capture hole tag. + # Tag name. + '.$this->block_tags_re.' | + '.$this->context_block_tags_re.' | + '.$this->clean_tags_re.' | + (?!\s)'.$enclosing_tag_re.' + ) + (?: + (?=[\s"\'/a-zA-Z0-9]) # Allowed characters after tag name. + (?> + ".*?" | # Double quotes (can contain `>`) + \'.*?\' | # Single quotes (can contain `>`) + .+? # Anything but quotes and `>`. + )*? + )? + > # End of tag. + | + # HTML Comment + | + <\?.*?\?> | <%.*?%> # Processing instruction + | + # CData Block + | + # Code span marker + `+ + '. ( !$span ? ' # If not in span. + | + # Indented code block + (?: ^[ ]*\n | ^ | \n[ ]*\n ) + [ ]{'.($indent+4).'}[^\n]* \n + (?> + (?: [ ]{'.($indent+4).'}[^\n]* | [ ]* ) \n + )* + | + # Fenced code block marker + (?> ^ | \n ) + [ ]{0,'.($indent).'}~~~+[ ]*\n + ' : '' ). ' # End (if not is span). + ) + }xs'; + + + $depth = 0; # Current depth inside the tag tree. + $parsed = ""; # Parsed text that will be returned. + + # + # Loop through every tag until we find the closing tag of the parent + # or loop until reaching the end of text if no parent tag specified. + # + do { + # + # Split the text using the first $tag_match pattern found. + # Text before pattern will be first in the array, text after + # pattern will be at the end, and between will be any catches made + # by the pattern. + # + $parts = preg_split($block_tag_re, $text, 2, + PREG_SPLIT_DELIM_CAPTURE); + + # If in Markdown span mode, add a empty-string span-level hash + # after each newline to prevent triggering any block element. + if ($span) { + $void = $this->hashPart("", ':'); + $newline = "$void\n"; + $parts[0] = $void . str_replace("\n", $newline, $parts[0]) . $void; + } + + $parsed .= $parts[0]; # Text before current tag. + + # If end of $text has been reached. Stop loop. + if (count($parts) < 3) { + $text = ""; + break; + } + + $tag = $parts[1]; # Tag to handle. + $text = $parts[2]; # Remaining text after current tag. + $tag_re = preg_quote($tag); # For use in a regular expression. + + # + # Check for: Code span marker + # + if ($tag{0} == "`") { + # Find corresponding end marker. + $tag_re = preg_quote($tag); + if (preg_match('{^(?>.+?|\n(?!\n))*?(?.*\n)+?[ ]{0,'.($indent).'}'.$tag_re.'[ ]*\n}', $text, + $matches)) + { + # End marker found: pass text unchanged until marker. + $parsed .= $tag . $matches[0]; + $text = substr($text, strlen($matches[0])); + } + else { + # No end marker: just skip it. + $parsed .= $tag; + } + } + # + # Check for: Indented code block. + # + else if ($tag{0} == "\n" || $tag{0} == " ") { + # Indented code block: pass it unchanged, will be handled + # later. + $parsed .= $tag; + } + # + # Check for: Opening Block level tag or + # Opening Context Block tag (like ins and del) + # used as a block tag (tag is alone on it's line). + # + else if (preg_match('{^<(?:'.$this->block_tags_re.')\b}', $tag) || + ( preg_match('{^<(?:'.$this->context_block_tags_re.')\b}', $tag) && + preg_match($newline_before_re, $parsed) && + preg_match($newline_after_re, $text) ) + ) + { + # Need to parse tag and following text using the HTML parser. + list($block_text, $text) = + $this->_hashHTMLBlocks_inHTML($tag . $text, "hashBlock", true); + + # Make sure it stays outside of any paragraph by adding newlines. + $parsed .= "\n\n$block_text\n\n"; + } + # + # Check for: Clean tag (like script, math) + # HTML Comments, processing instructions. + # + else if (preg_match('{^<(?:'.$this->clean_tags_re.')\b}', $tag) || + $tag{1} == '!' || $tag{1} == '?') + { + # Need to parse tag and following text using the HTML parser. + # (don't check for markdown attribute) + list($block_text, $text) = + $this->_hashHTMLBlocks_inHTML($tag . $text, "hashClean", false); + + $parsed .= $block_text; + } + # + # Check for: Tag with same name as enclosing tag. + # + else if ($enclosing_tag_re !== '' && + # Same name as enclosing tag. + preg_match('{^= 0); + + return array($parsed, $text); + } + function _hashHTMLBlocks_inHTML($text, $hash_method, $md_attr) { + # + # Parse HTML, calling _HashHTMLBlocks_InMarkdown for block tags. + # + # * Calls $hash_method to convert any blocks. + # * Stops when the first opening tag closes. + # * $md_attr indicate if the use of the `markdown="1"` attribute is allowed. + # (it is not inside clean tags) + # + # Returns an array of that form: ( processed text , remaining text ) + # + if ($text === '') return array('', ''); + + # Regex to match `markdown` attribute inside of a tag. + $markdown_attr_re = ' + { + \s* # Eat whitespace before the `markdown` attribute + markdown + \s*=\s* + (?> + (["\']) # $1: quote delimiter + (.*?) # $2: attribute value + \1 # matching delimiter + | + ([^\s>]*) # $3: unquoted attribute value + ) + () # $4: make $3 always defined (avoid warnings) + }xs'; + + # Regex to match any tag. + $tag_re = '{ + ( # $2: Capture hole tag. + + ".*?" | # Double quotes (can contain `>`) + \'.*?\' | # Single quotes (can contain `>`) + .+? # Anything but quotes and `>`. + )*? + )? + > # End of tag. + | + # HTML Comment + | + <\?.*?\?> | <%.*?%> # Processing instruction + | + # CData Block + ) + }xs'; + + $original_text = $text; # Save original text in case of faliure. + + $depth = 0; # Current depth inside the tag tree. + $block_text = ""; # Temporary text holder for current text. + $parsed = ""; # Parsed text that will be returned. + + # + # Get the name of the starting tag. + # (This pattern makes $base_tag_name_re safe without quoting.) + # + if (preg_match('/^<([\w:$]*)\b/', $text, $matches)) + $base_tag_name_re = $matches[1]; + + # + # Loop through every tag until we find the corresponding closing tag. + # + do { + # + # Split the text using the first $tag_match pattern found. + # Text before pattern will be first in the array, text after + # pattern will be at the end, and between will be any catches made + # by the pattern. + # + $parts = preg_split($tag_re, $text, 2, PREG_SPLIT_DELIM_CAPTURE); + + if (count($parts) < 3) { + # + # End of $text reached with unbalenced tag(s). + # In that case, we return original text unchanged and pass the + # first character as filtered to prevent an infinite loop in the + # parent function. + # + return array($original_text{0}, substr($original_text, 1)); + } + + $block_text .= $parts[0]; # Text before current tag. + $tag = $parts[1]; # Tag to handle. + $text = $parts[2]; # Remaining text after current tag. + + # + # Check for: Auto-close tag (like
      ) + # Comments and Processing Instructions. + # + if (preg_match('{^auto_close_tags_re.')\b}', $tag) || + $tag{1} == '!' || $tag{1} == '?') + { + # Just add the tag to the block as if it was text. + $block_text .= $tag; + } + else { + # + # Increase/decrease nested tag count. Only do so if + # the tag's name match base tag's. + # + if (preg_match('{^mode = $attr_m[2] . $attr_m[3]; + $span_mode = $this->mode == 'span' || $this->mode != 'block' && + preg_match('{^<(?:'.$this->contain_span_tags_re.')\b}', $tag); + + # Calculate indent before tag. + if (preg_match('/(?:^|\n)( *?)(?! ).*?$/', $block_text, $matches)) { + $strlen = $this->utf8_strlen; + $indent = $strlen($matches[1], 'UTF-8'); + } else { + $indent = 0; + } + + # End preceding block with this tag. + $block_text .= $tag; + $parsed .= $this->$hash_method($block_text); + + # Get enclosing tag name for the ParseMarkdown function. + # (This pattern makes $tag_name_re safe without quoting.) + preg_match('/^<([\w:$]*)\b/', $tag, $matches); + $tag_name_re = $matches[1]; + + # Parse the content using the HTML-in-Markdown parser. + list ($block_text, $text) + = $this->_hashHTMLBlocks_inMarkdown($text, $indent, + $tag_name_re, $span_mode); + + # Outdent markdown text. + if ($indent > 0) { + $block_text = preg_replace("/^[ ]{1,$indent}/m", "", + $block_text); + } + + # Append tag content to parsed text. + if (!$span_mode) $parsed .= "\n\n$block_text\n\n"; + else $parsed .= "$block_text"; + + # Start over a new block. + $block_text = ""; + } + else $block_text .= $tag; + } + + } while ($depth > 0); + + # + # Hash last block text that wasn't processed inside the loop. + # + $parsed .= $this->$hash_method($block_text); + + return array($parsed, $text); + } + + + function hashClean($text) { + # + # Called whenever a tag must be hashed when a function insert a "clean" tag + # in $text, it pass through this function and is automaticaly escaped, + # blocking invalid nested overlap. + # + return $this->hashPart($text, 'C'); + } + + + function doHeaders($text) { + # + # Redefined to add id attribute support. + # + # Setext-style headers: + # Header 1 {#header1} + # ======== + # + # Header 2 {#header2} + # -------- + # + $text = preg_replace_callback( + '{ + (^.+?) # $1: Header text + (?:[ ]+\{\#([-_:a-zA-Z0-9]+)\})? # $2: Id attribute + [ ]*\n(=+|-+)[ ]*\n+ # $3: Header footer + }mx', + array(&$this, '_doHeaders_callback_setext'), $text); + + # atx-style headers: + # # Header 1 {#header1} + # ## Header 2 {#header2} + # ## Header 2 with closing hashes ## {#header3} + # ... + # ###### Header 6 {#header2} + # + $text = preg_replace_callback('{ + ^(\#{1,6}) # $1 = string of #\'s + [ ]* + (.+?) # $2 = Header text + [ ]* + \#* # optional closing #\'s (not counted) + (?:[ ]+\{\#([-_:a-zA-Z0-9]+)\})? # id attribute + [ ]* + \n+ + }xm', + array(&$this, '_doHeaders_callback_atx'), $text); + + return $text; + } + function _doHeaders_attr($attr) { + if (empty($attr)) return ""; + return " id=\"$attr\""; + } + function _doHeaders_callback_setext($matches) { + if ($matches[3] == '-' && preg_match('{^- }', $matches[1])) + return $matches[0]; + $level = $matches[3]{0} == '=' ? 1 : 2; + $attr = $this->_doHeaders_attr($id =& $matches[2]); + $block = "".$this->runSpanGamut($matches[1]).""; + return "\n" . $this->hashBlock($block) . "\n\n"; + } + function _doHeaders_callback_atx($matches) { + $level = strlen($matches[1]); + $attr = $this->_doHeaders_attr($id =& $matches[3]); + $block = "".$this->runSpanGamut($matches[2]).""; + return "\n" . $this->hashBlock($block) . "\n\n"; + } + + + function doTables($text) { + # + # Form HTML tables. + # + $less_than_tab = $this->tab_width - 1; + # + # Find tables with leading pipe. + # + # | Header 1 | Header 2 + # | -------- | -------- + # | Cell 1 | Cell 2 + # | Cell 3 | Cell 4 + # + $text = preg_replace_callback(' + { + ^ # Start of a line + [ ]{0,'.$less_than_tab.'} # Allowed whitespace. + [|] # Optional leading pipe (present) + (.+) \n # $1: Header row (at least one pipe) + + [ ]{0,'.$less_than_tab.'} # Allowed whitespace. + [|] ([ ]*[-:]+[-| :]*) \n # $2: Header underline + + ( # $3: Cells + (?> + [ ]* # Allowed whitespace. + [|] .* \n # Row content. + )* + ) + (?=\n|\Z) # Stop at final double newline. + }xm', + array(&$this, '_doTable_leadingPipe_callback'), $text); + + # + # Find tables without leading pipe. + # + # Header 1 | Header 2 + # -------- | -------- + # Cell 1 | Cell 2 + # Cell 3 | Cell 4 + # + $text = preg_replace_callback(' + { + ^ # Start of a line + [ ]{0,'.$less_than_tab.'} # Allowed whitespace. + (\S.*[|].*) \n # $1: Header row (at least one pipe) + + [ ]{0,'.$less_than_tab.'} # Allowed whitespace. + ([-:]+[ ]*[|][-| :]*) \n # $2: Header underline + + ( # $3: Cells + (?> + .* [|] .* \n # Row content + )* + ) + (?=\n|\Z) # Stop at final double newline. + }xm', + array(&$this, '_DoTable_callback'), $text); + + return $text; + } + function _doTable_leadingPipe_callback($matches) { + $head = $matches[1]; + $underline = $matches[2]; + $content = $matches[3]; + + # Remove leading pipe for each row. + $content = preg_replace('/^ *[|]/m', '', $content); + + return $this->_doTable_callback(array($matches[0], $head, $underline, $content)); + } + function _doTable_callback($matches) { + $head = $matches[1]; + $underline = $matches[2]; + $content = $matches[3]; + + # Remove any tailing pipes for each line. + $head = preg_replace('/[|] *$/m', '', $head); + $underline = preg_replace('/[|] *$/m', '', $underline); + $content = preg_replace('/[|] *$/m', '', $content); + + # Reading alignement from header underline. + $separators = preg_split('/ *[|] */', $underline); + foreach ($separators as $n => $s) { + if (preg_match('/^ *-+: *$/', $s)) $attr[$n] = ' align="right"'; + else if (preg_match('/^ *:-+: *$/', $s))$attr[$n] = ' align="center"'; + else if (preg_match('/^ *:-+ *$/', $s)) $attr[$n] = ' align="left"'; + else $attr[$n] = ''; + } + + # Parsing span elements, including code spans, character escapes, + # and inline HTML tags, so that pipes inside those gets ignored. + $head = $this->parseSpan($head); + $headers = preg_split('/ *[|] */', $head); + $col_count = count($headers); + + # Write column headers. + $text = "\n"; + $text .= "\n"; + $text .= "\n"; + foreach ($headers as $n => $header) + $text .= " ".$this->runSpanGamut(trim($header))."\n"; + $text .= "\n"; + $text .= "\n"; + + # Split content by row. + $rows = explode("\n", trim($content, "\n")); + + $text .= "\n"; + foreach ($rows as $row) { + # Parsing span elements, including code spans, character escapes, + # and inline HTML tags, so that pipes inside those gets ignored. + $row = $this->parseSpan($row); + + # Split row by cell. + $row_cells = preg_split('/ *[|] */', $row, $col_count); + $row_cells = array_pad($row_cells, $col_count, ''); + + $text .= "\n"; + foreach ($row_cells as $n => $cell) + $text .= " ".$this->runSpanGamut(trim($cell))."\n"; + $text .= "\n"; + } + $text .= "\n"; + $text .= "
      "; + + return $this->hashBlock($text) . "\n"; + } + + + function doDefLists($text) { + # + # Form HTML definition lists. + # + $less_than_tab = $this->tab_width - 1; + + # Re-usable pattern to match any entire dl list: + $whole_list_re = '(?> + ( # $1 = whole list + ( # $2 + [ ]{0,'.$less_than_tab.'} + ((?>.*\S.*\n)+) # $3 = defined term + \n? + [ ]{0,'.$less_than_tab.'}:[ ]+ # colon starting definition + ) + (?s:.+?) + ( # $4 + \z + | + \n{2,} + (?=\S) + (?! # Negative lookahead for another term + [ ]{0,'.$less_than_tab.'} + (?: \S.*\n )+? # defined term + \n? + [ ]{0,'.$less_than_tab.'}:[ ]+ # colon starting definition + ) + (?! # Negative lookahead for another definition + [ ]{0,'.$less_than_tab.'}:[ ]+ # colon starting definition + ) + ) + ) + )'; // mx + + $text = preg_replace_callback('{ + (?>\A\n?|(?<=\n\n)) + '.$whole_list_re.' + }mx', + array(&$this, '_doDefLists_callback'), $text); + + return $text; + } + function _doDefLists_callback($matches) { + # Re-usable patterns to match list item bullets and number markers: + $list = $matches[1]; + + # Turn double returns into triple returns, so that we can make a + # paragraph for the last item in a list, if necessary: + $result = trim($this->processDefListItems($list)); + $result = "
      \n" . $result . "\n
      "; + return $this->hashBlock($result) . "\n\n"; + } + + + function processDefListItems($list_str) { + # + # Process the contents of a single definition list, splitting it + # into individual term and definition list items. + # + $less_than_tab = $this->tab_width - 1; + + # trim trailing blank lines: + $list_str = preg_replace("/\n{2,}\\z/", "\n", $list_str); + + # Process definition terms. + $list_str = preg_replace_callback('{ + (?>\A\n?|\n\n+) # leading line + ( # definition terms = $1 + [ ]{0,'.$less_than_tab.'} # leading whitespace + (?![:][ ]|[ ]) # negative lookahead for a definition + # mark (colon) or more whitespace. + (?> \S.* \n)+? # actual term (not whitespace). + ) + (?=\n?[ ]{0,3}:[ ]) # lookahead for following line feed + # with a definition mark. + }xm', + array(&$this, '_processDefListItems_callback_dt'), $list_str); + + # Process actual definitions. + $list_str = preg_replace_callback('{ + \n(\n+)? # leading line = $1 + ( # marker space = $2 + [ ]{0,'.$less_than_tab.'} # whitespace before colon + [:][ ]+ # definition mark (colon) + ) + ((?s:.+?)) # definition text = $3 + (?= \n+ # stop at next definition mark, + (?: # next term or end of text + [ ]{0,'.$less_than_tab.'} [:][ ] | +
      | \z + ) + ) + }xm', + array(&$this, '_processDefListItems_callback_dd'), $list_str); + + return $list_str; + } + function _processDefListItems_callback_dt($matches) { + $terms = explode("\n", trim($matches[1])); + $text = ''; + foreach ($terms as $term) { + $term = $this->runSpanGamut(trim($term)); + $text .= "\n
      " . $term . "
      "; + } + return $text . "\n"; + } + function _processDefListItems_callback_dd($matches) { + $leading_line = $matches[1]; + $marker_space = $matches[2]; + $def = $matches[3]; + + if ($leading_line || preg_match('/\n{2,}/', $def)) { + # Replace marker with the appropriate whitespace indentation + $def = str_repeat(' ', strlen($marker_space)) . $def; + $def = $this->runBlockGamut($this->outdent($def . "\n\n")); + $def = "\n". $def ."\n"; + } + else { + $def = rtrim($def); + $def = $this->runSpanGamut($this->outdent($def)); + } + + return "\n
      " . $def . "
      \n"; + } + + + function doFencedCodeBlocks($text) { + # + # Adding the fenced code block syntax to regular Markdown: + # + # ~~~ + # Code block + # ~~~ + # + $less_than_tab = $this->tab_width; + + $text = preg_replace_callback('{ + (?:\n|\A) + # 1: Opening marker + ( + ~{3,} # Marker: three tilde or more. + ) + [ ]* \n # Whitespace and newline following marker. + + # 2: Content + ( + (?> + (?!\1 [ ]* \n) # Not a closing marker. + .*\n+ + )+ + ) + + # Closing marker. + \1 [ ]* \n + }xm', + array(&$this, '_doFencedCodeBlocks_callback'), $text); + + return $text; + } + function _doFencedCodeBlocks_callback($matches) { + $codeblock = $matches[2]; + $codeblock = htmlspecialchars($codeblock, ENT_NOQUOTES); + $codeblock = preg_replace_callback('/^\n+/', + array(&$this, '_doFencedCodeBlocks_newlines'), $codeblock); + $codeblock = "
      $codeblock
      "; + return "\n\n".$this->hashBlock($codeblock)."\n\n"; + } + function _doFencedCodeBlocks_newlines($matches) { + return str_repeat("empty_element_suffix", + strlen($matches[0])); + } + + + # + # Redefining emphasis markers so that emphasis by underscore does not + # work in the middle of a word. + # + var $em_relist = array( + '' => '(?:(? '(?<=\S|^)(? '(?<=\S|^)(? '(?:(? '(?<=\S|^)(? '(?<=\S|^)(? '(?:(? '(?<=\S|^)(? '(?<=\S|^)(? tags + # + # Strip leading and trailing lines: + $text = preg_replace('/\A\n+|\n+\z/', '', $text); + + $grafs = preg_split('/\n{2,}/', $text, -1, PREG_SPLIT_NO_EMPTY); + + # + # Wrap

      tags and unhashify HTML blocks + # + foreach ($grafs as $key => $value) { + $value = trim($this->runSpanGamut($value)); + + # Check if this should be enclosed in a paragraph. + # Clean tag hashes & block tag hashes are left alone. + $is_p = !preg_match('/^B\x1A[0-9]+B|^C\x1A[0-9]+C$/', $value); + + if ($is_p) { + $value = "

      $value

      "; + } + $grafs[$key] = $value; + } + + # Join grafs in one text, then unhash HTML tags. + $text = implode("\n\n", $grafs); + + # Finish by removing any tag hashes still present in $text. + $text = $this->unhash($text); + + return $text; + } + + + ### Footnotes + + function stripFootnotes($text) { + # + # Strips link definitions from text, stores the URLs and titles in + # hash references. + # + $less_than_tab = $this->tab_width - 1; + + # Link defs are in the form: [^id]: url "optional title" + $text = preg_replace_callback('{ + ^[ ]{0,'.$less_than_tab.'}\[\^(.+?)\][ ]?: # note_id = $1 + [ ]* + \n? # maybe *one* newline + ( # text = $2 (no blank lines allowed) + (?: + .+ # actual text + | + \n # newlines but + (?!\[\^.+?\]:\s)# negative lookahead for footnote marker. + (?!\n+[ ]{0,3}\S)# ensure line is not blank and followed + # by non-indented content + )* + ) + }xm', + array(&$this, '_stripFootnotes_callback'), + $text); + return $text; + } + function _stripFootnotes_callback($matches) { + $note_id = $this->fn_id_prefix . $matches[1]; + $this->footnotes[$note_id] = $this->outdent($matches[2]); + return ''; # String that will replace the block + } + + + function doFootnotes($text) { + # + # Replace footnote references in $text [^id] with a special text-token + # which will be replaced by the actual footnote marker in appendFootnotes. + # + if (!$this->in_anchor) { + $text = preg_replace('{\[\^(.+?)\]}', "F\x1Afn:\\1\x1A:", $text); + } + return $text; + } + + + function appendFootnotes($text) { + # + # Append footnote list to text. + # + $text = preg_replace_callback('{F\x1Afn:(.*?)\x1A:}', + array(&$this, '_appendFootnotes_callback'), $text); + + if (!empty($this->footnotes_ordered)) { + $text .= "\n\n"; + $text .= "
      \n"; + $text .= "empty_element_suffix ."\n"; + $text .= "
        \n\n"; + + $attr = " rev=\"footnote\""; + if ($this->fn_backlink_class != "") { + $class = $this->fn_backlink_class; + $class = $this->encodeAttribute($class); + $attr .= " class=\"$class\""; + } + if ($this->fn_backlink_title != "") { + $title = $this->fn_backlink_title; + $title = $this->encodeAttribute($title); + $attr .= " title=\"$title\""; + } + $num = 0; + + while (!empty($this->footnotes_ordered)) { + $footnote = reset($this->footnotes_ordered); + $note_id = key($this->footnotes_ordered); + unset($this->footnotes_ordered[$note_id]); + + $footnote .= "\n"; # Need to append newline before parsing. + $footnote = $this->runBlockGamut("$footnote\n"); + $footnote = preg_replace_callback('{F\x1Afn:(.*?)\x1A:}', + array(&$this, '_appendFootnotes_callback'), $footnote); + + $attr = str_replace("%%", ++$num, $attr); + $note_id = $this->encodeAttribute($note_id); + + # Add backlink to last paragraph; create new paragraph if needed. + $backlink = "↩"; + if (preg_match('{

        $}', $footnote)) { + $footnote = substr($footnote, 0, -4) . " $backlink

        "; + } else { + $footnote .= "\n\n

        $backlink

        "; + } + + $text .= "
      1. \n"; + $text .= $footnote . "\n"; + $text .= "
        2. \n\n"; + } + + $text .= "
      \n"; + $text .= "
      "; + } + return $text; + } + function _appendFootnotes_callback($matches) { + $node_id = $this->fn_id_prefix . $matches[1]; + + # Create footnote marker only if it has a corresponding footnote *and* + # the footnote hasn't been used by another marker. + if (isset($this->footnotes[$node_id])) { + # Transfert footnote content to the ordered list. + $this->footnotes_ordered[$node_id] = $this->footnotes[$node_id]; + unset($this->footnotes[$node_id]); + + $num = $this->footnote_counter++; + $attr = " rel=\"footnote\""; + if ($this->fn_link_class != "") { + $class = $this->fn_link_class; + $class = $this->encodeAttribute($class); + $attr .= " class=\"$class\""; + } + if ($this->fn_link_title != "") { + $title = $this->fn_link_title; + $title = $this->encodeAttribute($title); + $attr .= " title=\"$title\""; + } + + $attr = str_replace("%%", $num, $attr); + $node_id = $this->encodeAttribute($node_id); + + return + "". + "$num". + ""; + } + + return "[^".$matches[1]."]"; + } + + + ### Abbreviations ### + + function stripAbbreviations($text) { + # + # Strips abbreviations from text, stores titles in hash references. + # + $less_than_tab = $this->tab_width - 1; + + # Link defs are in the form: [id]*: url "optional title" + $text = preg_replace_callback('{ + ^[ ]{0,'.$less_than_tab.'}\*\[(.+?)\][ ]?: # abbr_id = $1 + (.*) # text = $2 (no blank lines allowed) + }xm', + array(&$this, '_stripAbbreviations_callback'), + $text); + return $text; + } + function _stripAbbreviations_callback($matches) { + $abbr_word = $matches[1]; + $abbr_desc = $matches[2]; + if ($this->abbr_word_re) + $this->abbr_word_re .= '|'; + $this->abbr_word_re .= preg_quote($abbr_word); + $this->abbr_desciptions[$abbr_word] = trim($abbr_desc); + return ''; # String that will replace the block + } + + + function doAbbreviations($text) { + # + # Find defined abbreviations in text and wrap them in elements. + # + if ($this->abbr_word_re) { + // cannot use the /x modifier because abbr_word_re may + // contain significant spaces: + $text = preg_replace_callback('{'. + '(?abbr_word_re.')'. + '(?![\w\x1A])'. + '}', + array(&$this, '_doAbbreviations_callback'), $text); + } + return $text; + } + function _doAbbreviations_callback($matches) { + $abbr = $matches[0]; + if (isset($this->abbr_desciptions[$abbr])) { + $desc = $this->abbr_desciptions[$abbr]; + if (empty($desc)) { + return $this->hashPart("$abbr"); + } else { + $desc = $this->encodeAttribute($desc); + return $this->hashPart("$abbr"); + } + } else { + return $matches[0]; + } + } + +} + + /* -PHP Markdown -============ +PHP Markdown Extra +================== Description ----------- -This is a PHP translation of the original Markdown formatter written in -Perl by John Gruber. +This is a PHP port of the original Markdown formatter written in Perl +by John Gruber. This special "Extra" version of PHP Markdown features +further enhancements to the syntax for making additional constructs +such as tables and definition list. Markdown is a text-to-HTML filter; it translates an easy-to-read / easy-to-write structured text format into HTML. Markdown's text format @@ -1694,12 +2893,12 @@ function _unhash_callback($matches) { Copyright and License --------------------- -PHP Markdown +PHP Markdown & Extra Copyright (c) 2004-2009 Michel Fortin All rights reserved. -Based on Markdown +Based on Markdown Copyright (c) 2003-2006 John Gruber All rights reserved. diff --git a/public/laravel/css/style.css b/public/laravel/css/style.css index 4ed36baf..5d10cc70 100755 --- a/public/laravel/css/style.css +++ b/public/laravel/css/style.css @@ -161,6 +161,33 @@ .content>h1:not(:first-child) { margin-top: 30px; } +.content table +{ + border-collapse:collapse + border:1px solid #eee; + width:100%; + line-height:1.5em; +} + +.content table code +{ + background-color:transparent; + font-size:0.9em; +} + +.content table td, .content table th +{ + border:1px solid #eee; + padding:0.5em 0.7em; + vertical-align:middle; + text-align:left; +} + +.content table th +{ + background-color:#f5f5f5; +} + .content li { line-height:1.5em; From 1ca7d799afda3033cdf2587f9be56cf2832e2d0a Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Tue, 3 Apr 2012 16:53:15 -0500 Subject: [PATCH 25/32] changes --- application/config/anbu.php | 72 ------------ application/config/application.php | 20 +++- application/routes.php | 6 + application/start.php | 14 --- laravel/anbu/anbu.php | 106 ------------------ laravel/anbu/template.php | 63 ----------- laravel/laravel.php | 16 +++ .../{anbu/anbu.css => profiling/profiler.css} | 7 -- .../{anbu/anbu.js => profiling/profiler.js} | 11 +- laravel/profiling/profiler.php | 84 ++++++++++++++ laravel/profiling/template.blade.php | 69 ++++++++++++ 11 files changed, 191 insertions(+), 277 deletions(-) delete mode 100644 application/config/anbu.php delete mode 100755 laravel/anbu/anbu.php delete mode 100755 laravel/anbu/template.php rename laravel/{anbu/anbu.css => profiling/profiler.css} (96%) rename laravel/{anbu/anbu.js => profiling/profiler.js} (96%) create mode 100644 laravel/profiling/profiler.php create mode 100755 laravel/profiling/template.blade.php diff --git a/application/config/anbu.php b/application/config/anbu.php deleted file mode 100644 index 148d2933..00000000 --- a/application/config/anbu.php +++ /dev/null @@ -1,72 +0,0 @@ - tag. - | - */ - - 'enable' => true, - - /* - |-------------------------------------------------------------------------- - | Show the LOG tab. - |-------------------------------------------------------------------------- - | - | Display a tog showing all entries made using the Laravel Log class. - | - */ - - 'tab_logs' => true, - - /* - |-------------------------------------------------------------------------- - | Show the QUERIES tab. - |-------------------------------------------------------------------------- - | - | Display a tab showing all queries performed by the Database layer. - | - */ - - 'tab_queries' => true, - - /* - |-------------------------------------------------------------------------- - | Include jQuery? - |-------------------------------------------------------------------------- - | - | Anbu needs the jQuery JavaScript framework to function, if you are already - | using jQuery in your templates, set this value to false. - | - */ - - 'include_jquery' => true, - - /* - |-------------------------------------------------------------------------- - | Event Listeners - |-------------------------------------------------------------------------- - | - | These are the Laravel event listeners, feel free to modify them to use - | a different data source, or include more if necessary. - | - */ - - 'event_listeners' => function() - { - // pass laravel log entries to anbu - Event::listen('laravel.log', 'Anbu::log'); - - // pass executed SQL queries to anbu - Event::listen('laravel.query', 'Anbu::sql'); - }, - -); diff --git a/application/config/application.php b/application/config/application.php index 75af1c74..8cbf104a 100755 --- a/application/config/application.php +++ b/application/config/application.php @@ -38,14 +38,24 @@ | remain secret and should not be shared with anyone. Make it about 32 | characters of random gibberish. | - | The "auto_key" option tells Laravel to automatically set this key value - | if one has not already been set. This is generally done on the first - | request to the Laravel splash screen. - | */ 'key' => 'YourSecretKeyGoesHere!', + /* + |-------------------------------------------------------------------------- + | Profiler Toolbar + |-------------------------------------------------------------------------- + | + | Laravel includes a beautiful profiler toolbar that gives you a heads + | up display of the queries and logs performed by your application. + | This is wonderful for development, but, of course, you should + | disable the toolbar for production applications.. + | + */ + + 'profiler' => true, + /* |-------------------------------------------------------------------------- | Application Character Encoding @@ -116,7 +126,6 @@ */ 'aliases' => array( - 'Anbu' => 'Laravel\\Anbu\\Anbu', 'Auth' => 'Laravel\\Auth', 'Asset' => 'Laravel\\Asset', 'Autoloader' => 'Laravel\\Autoloader', @@ -141,6 +150,7 @@ 'Log' => 'Laravel\\Log', 'Memcached' => 'Laravel\\Memcached', 'Paginator' => 'Laravel\\Paginator', + 'Profiler' => 'Laravel\\Profiling\\Profiler', 'URL' => 'Laravel\\URL', 'Redirect' => 'Laravel\\Redirect', 'Redis' => 'Laravel\\Redis', diff --git a/application/routes.php b/application/routes.php index 91d17aa9..2b09d557 100644 --- a/application/routes.php +++ b/application/routes.php @@ -35,6 +35,12 @@ Route::get('/', function() { + Config::set('database.connections.mysql.password', 'password'); + Config::set('database.connections.mysql.database', 'bundler'); + DB::table('users')->get(); + DB::table('users')->where_id(1)->first(); + DB::table('users')->where_in('id', array(1, 2, 3))->get(); + Log::error('Something went wrong!'); return View::make('home.index'); }); diff --git a/application/start.php b/application/start.php index a6fd4f70..8d2db780 100755 --- a/application/start.php +++ b/application/start.php @@ -125,20 +125,6 @@ Blade::sharpen(); -/* -|-------------------------------------------------------------------------- -| Enable The Anbu Profiler -|-------------------------------------------------------------------------- -| -| The Anbu profiler is an easy way to view all of your Executed SQL -| queries, log entries and other useful data from the front-end of your -| web app, to enable output simply add Anbu::render(); after the -| tag of your main template, or page. -| -*/ - -Anbu::register(); - /* |-------------------------------------------------------------------------- | Set The Default Timezone diff --git a/laravel/anbu/anbu.php b/laravel/anbu/anbu.php deleted file mode 100755 index e2e7c4e7..00000000 --- a/laravel/anbu/anbu.php +++ /dev/null @@ -1,106 +0,0 @@ - - * @copyright 2012 Dayle Rees - * @license MIT License - */ -class Anbu { - - /** - * An array of log entries recorded. - * - * @var array - */ - private static $logs = array(); - - /** - * Am array of SQL queries executed. - * - * @var array - */ - private static $queries = array(); - - - /** - * Render Anbu, assign view params and echo out the main view. - * - * @return void - */ - public static function render() - { - $data = array( - 'anbu_logs' => static::$logs, - 'anbu_queries' => static::$queries, - 'anbu_css' => File::get(path('sys').'anbu/anbu.css'), - 'anbu_js' => File::get(path('sys').'anbu/anbu.js'), - 'anbu_config' => Config::get('anbu') - ); - - echo View::make('path: '.path('sys').'anbu/template.php', $data)->render(); - } - - /** - * Add a log entry to the log entries array. - * - * @return void - */ - public static function log($type, $message) - { - static::$logs[] = array($type, $message); - } - - /** - * Add a performed SQL query to Anbu. - * - * @param string $sql - * @param array $bindings - * @param float $time - * @return void - */ - public static function sql($sql, $bindings, $time) - { - // I used this method to swap in the bindings, its very ugly - // will be replaced later, hopefully will find something in - // the core - foreach ($bindings as $b) - { - $count = 1; - $sql = str_replace('?', '`'.$b.'`', $sql,$count); - } - - static::$queries[] = array($sql, $time); - } - - /** - * Start Anbu's event listeners. - * - * @return void - */ - public static function register() - { - // load the event listeners from a closure in the - // anbu config file, this allows the user to easily - // modify them - $listener = Config::get('anbu.event_listeners'); - $listener(); - - // echo anbu on laravel.done if enabled - if(Config::get('anbu.enable')) - { - Event::listen('laravel.done', function() { - Anbu::render(); - }); - } - } - -} diff --git a/laravel/anbu/template.php b/laravel/anbu/template.php deleted file mode 100755 index bb767e3e..00000000 --- a/laravel/anbu/template.php +++ /dev/null @@ -1,63 +0,0 @@ - - -
      -
      -
      - -
      - - - - - - - - - - - - -
      TypeMessage
      - - There are no log entries. - -
      - - -
      - - - - - - - - - - - - -
      TimeQuery
      ms
      - - There have been no SQL queries executed. - -
      - - -
      -
      - - - -
      - - - diff --git a/laravel/laravel.php b/laravel/laravel.php index 3a90fe0d..0f81b6f3 100644 --- a/laravel/laravel.php +++ b/laravel/laravel.php @@ -143,6 +143,22 @@ Bundle::start(DEFAULT_BUNDLE); +/* +|-------------------------------------------------------------------------- +| Attach The Laravel Profiler +|-------------------------------------------------------------------------- +| +| If the profiler is enabled, we will attach it to the Laravel events +| for both queries and logs. This allows the profiler to intercept +| any of the queries or logs performed by the application. +| +*/ + +if (Config::get('application.profiler')) +{ + Profiling\Profiler::attach(); +} + /* |-------------------------------------------------------------------------- | Auto-Start Other Bundles diff --git a/laravel/anbu/anbu.css b/laravel/profiling/profiler.css similarity index 96% rename from laravel/anbu/anbu.css rename to laravel/profiling/profiler.css index 343b011c..1fb4e52f 100755 --- a/laravel/anbu/anbu.css +++ b/laravel/profiling/profiler.css @@ -1,10 +1,3 @@ -/* -Anbu Styles -Copyright 2012 Dayle Rees. -MIT License -Intended for inclusion with the Laravel PHP Framework. -*/ - .anbu { font-family:Helvetica, "Helvetica Neue", Arial, sans-serif !important; diff --git a/laravel/anbu/anbu.js b/laravel/profiling/profiler.js similarity index 96% rename from laravel/anbu/anbu.js rename to laravel/profiling/profiler.js index 8f86fe35..f91ad18f 100755 --- a/laravel/anbu/anbu.js +++ b/laravel/profiling/profiler.js @@ -1,10 +1,3 @@ -/* -Anbu Profiler -Copyright 2012 Dayle Rees. -MIT License -Intended for inclusion with the Laravel PHP Framework. -*/ - var anbu = { // BOUND ELEMENTS @@ -169,6 +162,4 @@ var anbu = { jQuery(document).ready(function () { // launch anbu anbu.start(); -}); - - +}); \ No newline at end of file diff --git a/laravel/profiling/profiler.php b/laravel/profiling/profiler.php new file mode 100644 index 00000000..5acb3f6d --- /dev/null +++ b/laravel/profiling/profiler.php @@ -0,0 +1,84 @@ + array(), 'logs' => array()); + + /** + * Get the rendered contents of the Profiler. + * + * @return string + */ + public static function render() + { + return render('path: '.__DIR__.'/template'.BLADE_EXT, static::$data); + } + + /** + * Add a log entry to the log entries array. + * + * @return void + */ + public static function log($type, $message) + { + static::$data['logs'][] = array($type, $message); + } + + /** + * Add a performed SQL query to the Profiler. + * + * @param string $sql + * @param array $bindings + * @param float $time + * @return void + */ + public static function query($sql, $bindings, $time) + { + foreach ($bindings as $binding) + { + $sql = preg_replace('/\?/', $binding, $sql, 1); + } + + static::$data['queries'][] = array($sql, $time); + } + + /** + * Attach the Profiler's event listeners. + * + * @return void + */ + public static function attach() + { + // First we'll attach to the query and log events. These allow us to catch + // all of the SQL queries and log messages that come through Laravel, + // and we will pass them onto the Profiler for simple storage. + Event::listen('laravel.log', function($type, $message) + { + Profiler::log($type, $message); + }); + + Event::listen('laravel.query', function($sql, $bindings, $time) + { + Profiler::query($sql, $bindings, $time); + }); + + // We'll attach the profiler to the "done" event so that we can easily + // attach the profiler output to the end of the output sent to the + // browser. This will display the profiler's nice toolbar. + Event::listen('laravel.done', function() + { + echo Profiler::render(); + }); + } + +} diff --git a/laravel/profiling/template.blade.php b/laravel/profiling/template.blade.php new file mode 100755 index 00000000..f434b8af --- /dev/null +++ b/laravel/profiling/template.blade.php @@ -0,0 +1,69 @@ + + +
      +
      +
      +
      + @if (count($logs) > 0) + + + + + + @foreach ($logs as $log) + + + + @endforeach + +
      TypeMessage
      + {{ $log[0] }} + + {{ print_r($log[1]) }} +
      + @else + There are no log entries. + @endif +
      + +
      + @if (count($queries) > 0) + + + + + + @foreach ($queries as $query) + + + + + @endforeach +
      TimeQuery
      + {{ $query[1] }}ms + + 
      {{ print_r($query[0]) }}
      +
      + @else + There have been no SQL queries executed. + @endif +
      +
      +
      + + + + +
      + + + + \ No newline at end of file From e0e0b51b9b437b218d3d0629a60558c55f84a530 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Tue, 3 Apr 2012 16:57:55 -0500 Subject: [PATCH 26/32] tweaking profiler. --- application/start.php | 16 ++++++++++++++++ laravel/laravel.php | 16 ---------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/application/start.php b/application/start.php index 8d2db780..06649bf6 100755 --- a/application/start.php +++ b/application/start.php @@ -112,6 +112,22 @@ return Lang::file($bundle, $language, $file); }); +/* +|-------------------------------------------------------------------------- +| Attach The Laravel Profiler +|-------------------------------------------------------------------------- +| +| If the profiler is enabled, we will attach it to the Laravel events +| for both queries and logs. This allows the profiler to intercept +| any of the queries or logs performed by the application. +| +*/ + +if (Config::get('application.profiler')) +{ + Profiler::attach(); +} + /* |-------------------------------------------------------------------------- | Enable The Blade View Engine diff --git a/laravel/laravel.php b/laravel/laravel.php index 0f81b6f3..3a90fe0d 100644 --- a/laravel/laravel.php +++ b/laravel/laravel.php @@ -143,22 +143,6 @@ Bundle::start(DEFAULT_BUNDLE); -/* -|-------------------------------------------------------------------------- -| Attach The Laravel Profiler -|-------------------------------------------------------------------------- -| -| If the profiler is enabled, we will attach it to the Laravel events -| for both queries and logs. This allows the profiler to intercept -| any of the queries or logs performed by the application. -| -*/ - -if (Config::get('application.profiler')) -{ - Profiling\Profiler::attach(); -} - /* |-------------------------------------------------------------------------- | Auto-Start Other Bundles From b58c6370ee273c015c955352b19553e05e930539 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Tue, 3 Apr 2012 17:07:37 -0500 Subject: [PATCH 27/32] fixing template. --- laravel/profiling/template.blade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/laravel/profiling/template.blade.php b/laravel/profiling/template.blade.php index f434b8af..9c6e4d24 100755 --- a/laravel/profiling/template.blade.php +++ b/laravel/profiling/template.blade.php @@ -16,7 +16,7 @@ {{ $log[0] }} - {{ print_r($log[1]) }} + {{ $log[1] }} @endforeach @@ -39,7 +39,7 @@ {{ $query[1] }}ms - 
      {{ print_r($query[0]) }}
      + 
      {{ $query[0] }}
      @endforeach From 02db9866274456d371f5b6a436e7662598898ac0 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Tue, 3 Apr 2012 17:07:56 -0500 Subject: [PATCH 28/32] fixing route. --- application/routes.php | 6 ------ 1 file changed, 6 deletions(-) diff --git a/application/routes.php b/application/routes.php index 2b09d557..91d17aa9 100644 --- a/application/routes.php +++ b/application/routes.php @@ -35,12 +35,6 @@ Route::get('/', function() { - Config::set('database.connections.mysql.password', 'password'); - Config::set('database.connections.mysql.database', 'bundler'); - DB::table('users')->get(); - DB::table('users')->where_id(1)->first(); - DB::table('users')->where_in('id', array(1, 2, 3))->get(); - Log::error('Something went wrong!'); return View::make('home.index'); }); From 507bba60caf3a5fe1ec31604943bfa38b12e79d9 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Tue, 3 Apr 2012 20:22:01 -0500 Subject: [PATCH 29/32] dont show profiler bar on ajax request. --- laravel/profiling/profiler.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/laravel/profiling/profiler.php b/laravel/profiling/profiler.php index 5acb3f6d..ef8ae252 100644 --- a/laravel/profiling/profiler.php +++ b/laravel/profiling/profiler.php @@ -4,6 +4,7 @@ use Laravel\File; use Laravel\Event; use Laravel\Config; +use Laravel\Request; class Profiler { @@ -21,7 +22,10 @@ class Profiler { */ public static function render() { - return render('path: '.__DIR__.'/template'.BLADE_EXT, static::$data); + if ( ! Request::ajax()) + { + return render('path: '.__DIR__.'/template'.BLADE_EXT, static::$data); + } } /** From 17bd505ff6d331530232a5da8e3c0a28220f1e64 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Wed, 4 Apr 2012 08:36:43 -0500 Subject: [PATCH 30/32] pass response in laravel done event. --- laravel/laravel.php | 2 +- laravel/profiling/profiler.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/laravel/laravel.php b/laravel/laravel.php index 3a90fe0d..b54ca570 100644 --- a/laravel/laravel.php +++ b/laravel/laravel.php @@ -246,4 +246,4 @@ | */ -Event::fire('laravel.done'); \ No newline at end of file +Event::fire('laravel.done', array($response)); \ No newline at end of file diff --git a/laravel/profiling/profiler.php b/laravel/profiling/profiler.php index ef8ae252..4bd5d863 100644 --- a/laravel/profiling/profiler.php +++ b/laravel/profiling/profiler.php @@ -79,7 +79,7 @@ public static function attach() // We'll attach the profiler to the "done" event so that we can easily // attach the profiler output to the end of the output sent to the // browser. This will display the profiler's nice toolbar. - Event::listen('laravel.done', function() + Event::listen('laravel.done', function($response) { echo Profiler::render(); }); From 8f24d832333001247aa5692fcb8a58376b145f44 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Wed, 4 Apr 2012 08:59:44 -0500 Subject: [PATCH 31/32] fixing profiler. --- laravel/profiling/profiler.php | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/laravel/profiling/profiler.php b/laravel/profiling/profiler.php index 4bd5d863..bb1ed496 100644 --- a/laravel/profiling/profiler.php +++ b/laravel/profiling/profiler.php @@ -18,10 +18,14 @@ class Profiler { /** * Get the rendered contents of the Profiler. * + * @param Response $response * @return string */ - public static function render() + public static function render($response) { + // We only want to send the profiler toolbar if the request is not an AJAX + // request, as sending it on AJAX requests could mess up JSON driven API + // type applications, so we will not send anything in those scenarios. if ( ! Request::ajax()) { return render('path: '.__DIR__.'/template'.BLADE_EXT, static::$data); @@ -56,6 +60,19 @@ public static function query($sql, $bindings, $time) static::$data['queries'][] = array($sql, $time); } + /** + * Determine if the given response includes jQuery. + * + * @param Response $response + * @return bool + */ + protected static function has_jquery($response) + { + $pattern = '/\(.*)\\<\/script\>(.*)\<\/head\>/'; + + return preg_match($pattern, $response->content); + } + /** * Attach the Profiler's event listeners. * @@ -81,7 +98,7 @@ public static function attach() // browser. This will display the profiler's nice toolbar. Event::listen('laravel.done', function($response) { - echo Profiler::render(); + echo Profiler::render($response); }); } From 3e00ce2efb954e2eb00f87093405ce2612583671 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Wed, 4 Apr 2012 09:50:01 -0500 Subject: [PATCH 32/32] fix bug regarding SSL cookies. --- artisan | 2 +- changes.md | 12 ++++++++++++ laravel/cookie.php | 8 ++++++++ paths.php | 2 +- public/index.php | 2 +- 5 files changed, 23 insertions(+), 3 deletions(-) diff --git a/artisan b/artisan index 66a0cc09..8f7bfe4e 100644 --- a/artisan +++ b/artisan @@ -3,7 +3,7 @@ * Laravel - A PHP Framework For Web Artisans * * @package Laravel - * @version 3.1.4 + * @version 3.1.5 * @author Taylor Otwell * @link http://laravel.com */ diff --git a/changes.md b/changes.md index 89d246ef..80d9b775 100644 --- a/changes.md +++ b/changes.md @@ -2,6 +2,8 @@ ## Laravel Change Log ## Contents +- [Laravel 3.1.5](#3.1.5) +- [Upgrading From 3.1.4](#upgrade-3.1.5) - [Laravel 3.1.4](#3.1.4) - [Upgrading From 3.1.3](#upgrade-3.1.4) - [Laravel 3.1.3](#3.1.3) @@ -13,6 +15,16 @@ ## Contents - [Laravel 3.1](#3.1) - [Upgrading From 3.0](#upgrade-3.1) + +## Laravel 3.1.5 + +- Fixes bug that could allow secure cookies to be sent over HTTP. + + +## Upgrading From 3.1.4 + +- Replace the **laravel** folder. + ## Laravel 3.1.4 diff --git a/laravel/cookie.php b/laravel/cookie.php index fc48212e..0f92818f 100644 --- a/laravel/cookie.php +++ b/laravel/cookie.php @@ -63,6 +63,14 @@ protected static function set($cookie) } else { + // We don't want to send secure cookies over HTTP unless the developer has + // turned off the "SSL" application configuration option, which is used + // while developing the application but should be true in production. + if ($secure and ! Request::secure() and Config::get('application.ssl')) + { + return; + } + setcookie($name, $value, $time, $path, $domain, $secure); } } diff --git a/paths.php b/paths.php index 152a4f79..f0136e1a 100644 --- a/paths.php +++ b/paths.php @@ -3,7 +3,7 @@ * Laravel - A PHP Framework For Web Artisans * * @package Laravel - * @version 3.1.4 + * @version 3.1.5 * @author Taylor Otwell * @link http://laravel.com */ diff --git a/public/index.php b/public/index.php index 561d13a3..56896d97 100644 --- a/public/index.php +++ b/public/index.php @@ -3,7 +3,7 @@ * Laravel - A PHP Framework For Web Artisans * * @package Laravel - * @version 3.1.4 + * @version 3.1.5 * @author Taylor Otwell * @link http://laravel.com */