Fixing issue where javascript requirements are included multiple time…

…s. Added functionality to allow seperate rendering of javascript requirements.

README.md

@@ -92,6 +92,7 @@ This will give you access to
 - [Rectangle](#rectangle)
 - [Circle](#circle)
 - [Render](#render)
+- [RenderJavascript](#renderJavascript)
 
 ### Map
 
@@ -249,6 +250,12 @@ The `render` method allows all maps to be rendered to the page, this method can
 	Mapper::render();
 	Mapper::render(0);
 
+### RenderJavascript
+
+The `renderJavascript` method allows all required javascript to be rendered to the page, this method can be included in Views or added as controller passed parameter.
+
+    Mapper::renderJavascript();
+
 ### License
 
 Googlmapper is open-sourced software licensed under the [MIT license](http://opensource.org/licenses/MIT)

spec/Cornford/Googlmapper/MapperSpec.php

@@ -270,4 +270,9 @@ public function it_can_create_a_streetview_map()
 		$this->render()->shouldReturn(self::STRING);
 	}
 
+	public function it_can_create_javascript_inclusions()
+	{
+		$this->map(self::INTEGER, self::INTEGER)->shouldReturn($this);
+		$this->renderJavascript()->shouldReturn(self::STRING);
+	}
 }

src/Cornford/Googlmapper/Contracts/MappingInterface.php

@@ -18,6 +18,13 @@ interface MappingInterface {
      */
     public function render($item = -1);
 
+    /**
+     * Renders and returns Google Map javascript code.
+     *
+     * @return string
+     */
+    public function renderJavascript();
+
     /**
      * Locate a location and return a Location instance.
      *

src/Cornford/Googlmapper/Mapper.php

@@ -33,6 +33,39 @@ public function render($item = -1)
 			return;
 		}
 
+		return $this->view->make('googlmapper::mapper')
+			->withView($this->view)
+			->withOptions($this->generateRenderOptions($item))
+			->withItems($item > -1 ? [$item => $this->getItem($item)] : $this->getItems())
+			->render();
+	}
+
+	/**
+	 * Renders and returns Google Map javascript code.
+	 *
+	 * @return string
+	 */
+	public function renderJavascript()
+	{
+		if (!$this->isEnabled()) {
+			return;
+		}
+
+		return $this->view->make('googlmapper::javascript')
+			->withView($this->view)
+			->withOptions($this->generateRenderOptions())
+			->render();
+	}
+
+	/**
+	 * Generates the render options for Google Map.
+	 *
+	 * @param integer $item
+	 *
+	 * @return string
+	 */
+	protected function generateRenderOptions($item = -1)
+	{
 		$options = $this->getOptions();
 
 		foreach (($item > -1 ? [$this->getItem($item)] : $this->getItems()) as $model) {
@@ -43,10 +76,7 @@ public function render($item = -1)
 			}
 		}
 
-		return $this->view->make('googlmapper::mapper')
-			->withView($this->view)
-			->withOptions($options)
-			->withItems($item > -1 ? [$item => $this->getItem($item)] : $this->getItems())->render();
+		return $options;
 	}
 
 	/**

src/views/javascript.blade.php

@@ -0,0 +1,13 @@
+@if (!$view->shared('javascript', false))
+
+    @if ($view->share('javascript', true)) @endif
+
+    <script type="text/javascript" src="//maps.googleapis.com/maps/api/js?v={!! $options['version'] !!}&region={!! $options['region'] !!}&language={!! $options['language'] !!}&key={!! $options['key'] !!}&signed_in={!! $options['user'] ? 'true' : 'false' !!}&libraries=places"></script>
+
+    @if ($options['cluster'])
+
+        <script type="text/javascript" src="//googlemaps.github.io/js-marker-clusterer/src/markerclusterer.js"></script>
+
+    @endif
+
+@endif

src/views/mapper.blade.php

@@ -1,10 +1,4 @@
-<script type="text/javascript" src="//maps.googleapis.com/maps/api/js?v={!! $options['version'] !!}&region={!! $options['region'] !!}&language={!! $options['language'] !!}&key={!! $options['key'] !!}&signed_in={!! $options['user'] ? 'true' : 'false' !!}&libraries=places"></script>
-
-@if ($options['cluster'])
-
-	<script type="text/javascript" src="//googlemaps.github.io/js-marker-clusterer/src/markerclusterer.js"></script>
-
-@endif
+@include('javascript')
 
 @foreach ($items as $id => $item)