Merge branch 'release/v0.9.7'

README.md

@@ -1,4 +1,4 @@
-# Minimee for Craft - v0.9.6
+# Minimee for Craft - v0.9.7
 
 A [Craft CMS](http://buildwithcraft.com) port of the popular [Minimee](https://github.com/johndwells/Minimee) add-on for ExpressionEngine.
 

minimee/MinimeePlugin.php

@@ -34,7 +34,7 @@ public function getName()
 	 */
 	public function getVersion()
 	{
-		return '0.9.6';
+		return '0.9.7';
 	}
 
 	/**
@@ -118,7 +118,7 @@ public function init()
 	 */
 	public static function log($msg, $level = LogLevel::Info, $force = false)
 	{
-		if(version_compare('2.0', craft()->getVersion(), '>'))
+		if (version_compare('2.0', craft()->getVersion(), '>'))
 		{
 			Craft::log($msg, $level, $force);
 		}
@@ -153,7 +153,7 @@ public function getSettingsHtml()
 
 		return craft()->templates->render('minimee/settings', array(
 			'settings' => $this->getSettings(),
-			'filesystemConfigExists' => (bool) IOHelper::fileExists($filesystemConfigPath)
+			'filesystemConfigExists' => (bool)IOHelper::fileExists($filesystemConfigPath)
 
 		));
 	}
@@ -189,16 +189,16 @@ public function getResourcePath($path)
 	{
 		if (strncmp($path, 'minimee/', 8) === 0)
 		{
-			return craft()->path->getStoragePath().'minimee/'.substr($path, 8);
+			return craft()->path->getStoragePath() . 'minimee/' . substr($path, 8);
 		}
 	}
 
 	/**
 	 * Register our cache path that can then be deleted from CP
 	 */
-	function registerCachePaths()
+	public function registerCachePaths()
 	{
-		if(minimee()->service->settings->useResourceCache())
+		if (minimee()->service->settings->useResourceCache())
 		{
 			return array(
 				minimee()->service->makePathToStorageFolder() => Craft::t('Minimee caches')
@@ -219,7 +219,7 @@ function registerCachePaths()
 	 */
 	protected function _bindEvents()
 	{
-		craft()->on('minimee.createCache', function(Event $event) {
+		craft()->on('minimee.createCache', function() {
 			if(craft()->config->get('devMode'))
 			{
 				minimee()->service->deleteExpiredCache();
@@ -236,7 +236,13 @@ protected function _autoload()
 	{
 		require_once craft()->path->getPluginsPath() . 'minimee/library/vendor/autoload.php';
 
+		Craft::import('plugins.minimee.components.Minimee_Exception');
+		Craft::import('plugins.minimee.components.Minimee_InfoException');
+		Craft::import('plugins.minimee.components.Minimee_WarningException');
+		Craft::import('plugins.minimee.components.Minimee_ErrorException');
+
 		Craft::import('plugins.minimee.enums.MinimeeType');
+
 		Craft::import('plugins.minimee.models.Minimee_ISettingsModel');
 		Craft::import('plugins.minimee.models.Minimee_SettingsModel');
 	}
@@ -263,7 +269,7 @@ protected function _registerMinimeeDI()
 			return new Minimee_RemoteAssetModel($attributes);
 		});
 
-		minimee()->extend('makeClient', function(Zit $zit) {
+		minimee()->extend('makeClient', function() {
 			return new Client;
 		});
 	}

minimee/components/Minimee_ErrorException.php

@@ -0,0 +1,17 @@
+<?php namespace Craft;
+
+/**
+ * Minimee by John D Wells
+ *
+ * @author     	John D Wells <http://johndwells.com>
+ * @package    	Minimee
+ * @since		Craft 1.3
+ * @copyright 	Copyright (c) 2014, John D Wells
+ * @license 	http://opensource.org/licenses/mit-license.php MIT License
+ * @link       	http://github.com/johndwells/Minimee-Craft
+ */
+
+/**
+ *
+ */
+class Minimee_ErrorException extends Minimee_Exception {}

minimee/components/Minimee_Exception.php

@@ -0,0 +1,17 @@
+<?php namespace Craft;
+
+/**
+ * Minimee by John D Wells
+ *
+ * @author     	John D Wells <http://johndwells.com>
+ * @package    	Minimee
+ * @since		Craft 1.3
+ * @copyright 	Copyright (c) 2014, John D Wells
+ * @license 	http://opensource.org/licenses/mit-license.php MIT License
+ * @link       	http://github.com/johndwells/Minimee-Craft
+ */
+
+/**
+ *
+ */
+class Minimee_Exception extends Exception {}

minimee/components/Minimee_InfoException.php

@@ -0,0 +1,17 @@
+<?php namespace Craft;
+
+/**
+ * Minimee by John D Wells
+ *
+ * @author     	John D Wells <http://johndwells.com>
+ * @package    	Minimee
+ * @since		Craft 1.3
+ * @copyright 	Copyright (c) 2014, John D Wells
+ * @license 	http://opensource.org/licenses/mit-license.php MIT License
+ * @link       	http://github.com/johndwells/Minimee-Craft
+ */
+
+/**
+ *
+ */
+class Minimee_InfoException extends Minimee_Exception {}

minimee/components/Minimee_WarningException.php

@@ -0,0 +1,17 @@
+<?php namespace Craft;
+
+/**
+ * Minimee by John D Wells
+ *
+ * @author     	John D Wells <http://johndwells.com>
+ * @package    	Minimee
+ * @since		Craft 1.3
+ * @copyright 	Copyright (c) 2014, John D Wells
+ * @license 	http://opensource.org/licenses/mit-license.php MIT License
+ * @link       	http://github.com/johndwells/Minimee-Craft
+ */
+
+/**
+ *
+ */
+class Minimee_WarningException extends Minimee_Exception {}

minimee/enums/MinimeeType.php

@@ -3,6 +3,6 @@
 
 class MinimeeType
 {
-	const Css	= 'css';
-	const Js	= 'js';
+	const Css = 'css';
+	const Js = 'js';
 }

minimee/library/composer.json

@@ -5,7 +5,8 @@
 		}
 	},
 	"require": {
-		"selvinortiz/zit": "dev-master",
-		"mrclay/minify" : "dev-master"
+		"mrclay/jsmin-php": "^2.3",
+		"mrclay/minify": "^2.3",
+		"selvinortiz/zit": "^0.5.2"
 	}
-}
+}