Merge pull request #3 from xelax90/master

Added package.json as config file

Author: Articus

src/BowerModule/Bower/Service.php

@@ -197,12 +197,20 @@ public function getModulePaths($module, $minified = false)
 
 	/**
 	 * Returns path to bower.json for specified module
+	 * If usePackageJson option is set to true and bower.json is not readable, returns path to package.json
 	 * @param string $module
 	 * @return string
 	 */
 	public function getModuleBowerConfigFilePath($module)
 	{
-		return $this->getPathBuilder()->getOsPath($this->getBowerFolder(), $module, 'bower.json');
+		$path = $this->getPathBuilder()->getOsPath($this->getBowerFolder(), $module, 'bower.json');
+		if(!is_readable($path) && $this->getConfig()->getUsePackageJson()){
+			$path = $this->getPathBuilder()->getOsPath($this->getBowerFolder(), $module, 'package.json');
+		}
+		if(!is_readable($path)){
+			throw new \RuntimeException('Failed to access configuration for "'.$module.'".');
+		}
+		return $path;
 	}
 
 	/**
@@ -214,10 +222,6 @@ public function getModuleBowerConfig($module)
 	{
 		//TODO add caching
 		$filePath = $this->getModuleBowerConfigFilePath($module);
-		if (!is_readable($filePath))
-		{
-			throw new \RuntimeException('Failed to access configuration for "'.$module.'".');
-		}
 		$config = file_get_contents($filePath);
 		if ($config === false)
 		{

src/BowerModule/Config/Module.php

@@ -38,7 +38,12 @@ class Module extends AbstractOptions
 	 * @var bool
 	 */
 	protected $debugMode;
-
+	/**
+	 * Set to true if you want to scan for package.json file in addition to bower.json
+	 * @var bool
+	 */
+	protected $usePackageJson = false;
+	
 	/**
 	 * @param array|Folder $bowerFolder
 	 */
@@ -154,4 +159,12 @@ public function getDebugMode()
 	{
 		return (bool) $this->debugMode;
 	}
+	
+	public function getUsePackageJson() {
+		return (bool) $this->usePackageJson;
+	}
+
+	public function setUsePackageJson($usePackageJson) {
+		$this->usePackageJson = $usePackageJson;
+	}
 }

src/BowerModule/View/Helper/Bower.php

@@ -76,6 +76,9 @@ public function __invoke(
 			{
 				$bower = $this->getBower();
 				$modules = $bower->findDependencies($pack->getModules());
+				if($place == self::PLACE_PREPEND){
+					$modules = array_reverse($modules);
+				}
 				foreach ($modules as $moduleName)
 				{
 					$insert($pathBuilder->getDebugWebPath($moduleName));