Merge branch 'feature/raw-on-development-or-production'

src/Basset/Asset.php

@@ -31,6 +31,13 @@ class Asset extends Filterable {
      */
     protected $log;
 
+    /**
+     * Application environment.
+     * 
+     * @var string
+     */
+    protected $appEnvironment;
+
     /**
      * Absolute path to the asset.
      *
@@ -89,15 +96,17 @@ class Asset extends Filterable {
      * @param  \Illuminate\Filesystem\Filesystem  $files
      * @param  \Basset\Factory\FilterFactory  $filterFactory
      * @param  \Illuminate\Log\Writer  $log
+     * @param  string  $appEnvironment
      * @param  string  $absolutePath
      * @param  string  $relativePath
      * @return void
      */
-    public function __construct(Filesystem $files, FilterFactory $filterFactory, Writer $log, $absolutePath, $relativePath)
+    public function __construct(Filesystem $files, FilterFactory $filterFactory, Writer $log, $appEnvironment, $absolutePath, $relativePath)
     {
         $this->files = $files;
         $this->filterFactory = $filterFactory;
         $this->log = $log;
+        $this->appEnvironment = $appEnvironment;
         $this->absolutePath = $absolutePath;
         $this->relativePath = $relativePath;
         $this->filters = new \Illuminate\Support\Collection;
@@ -344,12 +353,30 @@ public function raw()
         return $this;
     }
 
+    /**
+     * Sets the asset to be served raw when the application is running in a given environment.
+     * 
+     * @param  string|array  $environment
+     * @return \Basset\Asset
+     */
+    public function rawOnEnvironment()
+    {
+        $environments = array_flatten(func_get_args());
+
+        if (in_array($this->appEnvironment, $environments))
+        {
+            return $this->raw();
+        }
+
+        return $this;
+    }
+
     /**
      * Determines if the asset is to be served raw.
      * 
      * @return bool
      */
-    public function serveRaw()
+    public function isRaw()
     {
         return $this->raw;
     }

src/Basset/BassetServiceProvider.php

@@ -180,7 +180,7 @@ protected function registerFactories()
     {
         $this->app['basset.factory.asset'] = $this->app->share(function($app)
         {
-            return new AssetFactory($app['files'], $app['basset.factory.filter'], $app['basset.log'], $app['path.public']);
+            return new AssetFactory($app['files'], $app['basset.factory.filter'], $app['basset.log'], $app['env'], $app['path.public']);
         });
 
         $this->app['basset.factory.filter'] = $this->app->share(function($app)

src/Basset/Collection.php

@@ -63,7 +63,7 @@ public function getAssetsOnlyRaw($group = null)
         // as being raw.
         $assets = $this->getAssets($group, true)->filter(function($asset)
         {
-            return $asset->serveRaw();
+            return $asset->isRaw();
         });
 
         return $assets;
@@ -84,7 +84,7 @@ public function getAssets($group = null, $raw = true)
 
         foreach ($assets as $key => $asset)
         {
-            if ( ! $raw and $asset->serveRaw() or ! is_null($group) and ! $asset->{'is'.ucfirst(str_singular($group))}())
+            if ( ! $raw and $asset->isRaw() or ! is_null($group) and ! $asset->{'is'.ucfirst(str_singular($group))}())
             {
                 $assets->forget($key);
             }

src/Basset/Directory.php

@@ -368,6 +368,18 @@ public function raw()
         return $this;
     }
 
+    /**
+     * All assets within directory will be served raw on a given environment.
+     * 
+     * @return \Basset\Directory
+     */
+    public function rawOnEnvironment($environment)
+    {
+        $this->assets->each(function($asset) use ($environment) { $asset->rawOnEnvironment($environment); });
+
+        return $this;
+    }
+
     /**
      * Get the path to the directory.
      *

src/Basset/Factory/AssetFactory.php

@@ -27,6 +27,13 @@ class AssetFactory implements FactoryInterface {
      */
     protected $log;
 
+    /**
+     * Application environment.
+     * 
+     * @var string
+     */
+    protected $appEnvironment;
+
     /**
      * Path to the public directory.
      *
@@ -47,14 +54,16 @@ class AssetFactory implements FactoryInterface {
      * @param  \Illuminate\Filesystem\Filesystem  $files
      * @param  \Basset\Factory\FilterFactory  $filter
      * @param  \Illuminate\Log\Writer  $log
+     * @param  string  $appEnvironment
      * @param  string  $publicPath
      * @return void
      */
-    public function __construct(Filesystem $files, FilterFactory $filter, Writer $log, $publicPath)
+    public function __construct(Filesystem $files, FilterFactory $filter, Writer $log, $appEnvironment, $publicPath)
     {
         $this->files = $files;
         $this->filter = $filter;
         $this->log = $log;
+        $this->appEnvironment = $appEnvironment;
         $this->publicPath = $publicPath;
     }
 
@@ -70,7 +79,7 @@ public function make($path)
 
         $relativePath = $this->buildRelativePath($absolutePath);
 
-        $asset = new Asset($this->files, $this->filter, $this->log, $absolutePath, $relativePath);
+        $asset = new Asset($this->files, $this->filter, $this->log, $this->appEnvironment, $absolutePath, $relativePath);
 
         return $asset->setOrder($this->nextAssetOrder());
     }

src/Basset/Server.php

@@ -138,13 +138,13 @@ protected function serveDevelopmentCollection(Collection $collection, $group, $f
 
         foreach ($collection->getAssetsWithRaw($group) as $asset)
         {
-            if ($asset->serveRaw() or ! $path = $entry->getDevelopmentAsset($asset))
+            if ( ! $asset->isRaw() and $path = $entry->getDevelopmentAsset($asset))
             {
-                $path = $asset->getRelativePath();
+                $path = $this->prefixBuildPath($identifier.'/'.$path);
             }
             else
             {
-                $path = $this->prefixBuildPath($identifier.'/'.$path);
+                $path = $asset->getRelativePath();
             }
 
             $responses[] = $this->{'create'.studly_case($group).'Element'}($path, $format);

tests/Basset/AssetTest.php

@@ -22,7 +22,7 @@ public function setUp()
 
         $this->log = m::mock('Illuminate\Log\Writer');
 
-        $this->asset = new Asset($this->files, $this->filter, $this->log, 'path/to/public/foo/bar.sass', 'foo/bar.sass');
+        $this->asset = new Asset($this->files, $this->filter, $this->log, 'testing', 'path/to/public/foo/bar.sass', 'foo/bar.sass');
         $this->asset->setOrder(1);
         $this->asset->setGroup('stylesheets');
     }
@@ -43,7 +43,7 @@ public function testGetAssetProperties()
     public function testAssetsCanBeServedRaw()
     {
         $this->asset->raw();
-        $this->assertTrue($this->asset->serveRaw());
+        $this->assertTrue($this->asset->isRaw());
     }
 
 
@@ -63,15 +63,15 @@ public function testCheckingOfAssetGroupWhenNoGroupSupplied()
 
     public function testAssetCanBeRemotelyHosted()
     {
-        $asset = new Asset($this->files, $this->filter, $this->log, 'http://foo.com/bar.css', 'http://foo.com/bar.css');
+        $asset = new Asset($this->files, $this->filter, $this->log, 'testing', 'http://foo.com/bar.css', 'http://foo.com/bar.css');
 
         $this->assertTrue($asset->isRemote());
     }
 
 
     public function testAssetCanBeRemotelyHostedWithRelativeProtocol()
     {
-        $asset = new Asset($this->files, $this->filter, $this->log, '//foo.com/bar.css', '//foo.com/bar.css');
+        $asset = new Asset($this->files, $this->filter, $this->log, 'testing', '//foo.com/bar.css', '//foo.com/bar.css');
 
         $this->assertTrue($asset->isRemote());
     }

tests/Basset/CollectionTest.php

@@ -94,7 +94,7 @@ public function testGettingCollectionRawAssets()
 
     public function newAsset($relative, $absolute, $group, $order)
     {
-        $asset = new Asset(m::mock('Illuminate\Filesystem\Filesystem'), m::mock('Basset\Factory\FilterFactory'), m::mock('Illuminate\Log\Writer'), $absolute, $relative);
+        $asset = new Asset(m::mock('Illuminate\Filesystem\Filesystem'), m::mock('Basset\Factory\FilterFactory'), m::mock('Illuminate\Log\Writer'), 'testing', $absolute, $relative);
 
         return $asset->setOrder($order)->setGroup($group);
     }

tests/Basset/DirectoryTest.php

@@ -20,15 +20,15 @@ public function setUp()
         $this->files = m::mock('Illuminate\Filesystem\Filesystem');
         $this->finder = m::mock('Basset\AssetFinder');
         $this->filter = m::mock('Basset\Factory\FilterFactory');
-        $this->asset = m::mock('Basset\Factory\AssetFactory', array($this->files, $this->filter, $this->log, 'path/to/public'))->shouldDeferMissing();
+        $this->asset = m::mock('Basset\Factory\AssetFactory', array($this->files, $this->filter, $this->log, 'testing', 'path/to/public'))->shouldDeferMissing();
 
         $this->directory = new Directory($this->log, $this->asset, $this->filter, $this->finder, 'foo');
     }
 
 
     public function testAddingBasicAssetFromPublicDirectory()
     {
-        $asset = new Asset($this->files, $this->filter, $this->log, null, null);
+        $asset = new Asset($this->files, $this->filter, $this->log, 'testing', null, null);
 
         $this->finder->shouldReceive('find')->once()->with('foo.css')->andReturn('path/to/foo.css');
         $this->asset->shouldReceive('make')->once()->with('path/to/foo.css')->andReturn($asset);
@@ -40,7 +40,7 @@ public function testAddingBasicAssetFromPublicDirectory()
 
     public function testAddingInvalidAssetReturnsBlankAssetInstance()
     {
-        $asset = new Asset($this->files, $this->filter, $this->log, null, null);
+        $asset = new Asset($this->files, $this->filter, $this->log, 'testing', null, null);
 
         $this->finder->shouldReceive('find')->once()->with('foo.css')->andThrow('Basset\Exceptions\AssetNotFoundException');
         $this->asset->shouldReceive('make')->once()->with(null)->andReturn($asset);
@@ -54,7 +54,7 @@ public function testAddingInvalidAssetReturnsBlankAssetInstance()
 
     public function testAddingAssetFiresCallback()
     {
-        $asset = new Asset($this->files, $this->filter, $this->log, null, null);
+        $asset = new Asset($this->files, $this->filter, $this->log, 'testing', null, null);
 
         $this->finder->shouldReceive('find')->once()->with('foo.js')->andReturn('path/to/foo.js');
         $this->asset->shouldReceive('make')->once()->with('path/to/foo.js')->andReturn($asset);
@@ -118,7 +118,7 @@ public function testRequireCurrentWorkingDirectory()
         $files[0]->shouldReceive('getPathname')->andReturn('foo/bar.css');
         $files[1]->shouldReceive('isFile')->andReturn(false);
 
-        $asset = new Asset($this->files, $this->filter, $this->log, null, null);
+        $asset = new Asset($this->files, $this->filter, $this->log, 'testing', null, null);
         $this->finder->shouldReceive('find')->once()->with('foo/bar.css')->andReturn('foo/bar.css');
         $this->asset->shouldReceive('make')->once()->with('foo/bar.css')->andReturn($asset);
 
@@ -144,7 +144,7 @@ public function testRequireDirectoryChangesDirectoryAndRequiresNewWorkingDirecto
         $file->shouldReceive('isFile')->andReturn(true);
         $file->shouldReceive('getPathname')->andReturn('foo/bar/baz.css');
 
-        $asset = new Asset($this->files, $this->filter, $this->log, null, null);
+        $asset = new Asset($this->files, $this->filter, $this->log, 'testing', null, null);
         $this->finder->shouldReceive('find')->once()->with('foo/bar/baz.css')->andReturn('foo/bar/baz.css');
         $this->asset->shouldReceive('make')->once()->with('foo/bar/baz.css')->andReturn($asset);
 
@@ -210,9 +210,9 @@ public function testGettingOfDirectoryPath()
 
     public function testExcludingOfAssetsFromDirectory()
     {
-        $fooAsset = new Asset($this->files, $this->filter, $this->log, 'path/to/foo.css', 'foo.css');
+        $fooAsset = new Asset($this->files, $this->filter, $this->log, 'testing', 'path/to/foo.css', 'foo.css');
         $fooAsset->setOrder(1);
-        $barAsset = new Asset($this->files, $this->filter, $this->log, 'path/to/bar.css', 'bar.css');
+        $barAsset = new Asset($this->files, $this->filter, $this->log, 'testing', 'path/to/bar.css', 'bar.css');
         $barAsset->setOrder(1);
 
         $this->finder->shouldReceive('find')->once()->with('foo.css')->andReturn('path/to/foo.css');
@@ -232,9 +232,9 @@ public function testExcludingOfAssetsFromDirectory()
 
     public function testIncludingOfAssetsFromDirectory()
     {
-        $fooAsset = new Asset($this->files, $this->filter, $this->log, 'path/to/foo.css', 'foo.css');
+        $fooAsset = new Asset($this->files, $this->filter, $this->log, 'testing', 'path/to/foo.css', 'foo.css');
         $fooAsset->setOrder(1);
-        $barAsset = new Asset($this->files, $this->filter, $this->log, 'path/to/bar.css', 'bar.css');
+        $barAsset = new Asset($this->files, $this->filter, $this->log, 'testing', 'path/to/bar.css', 'bar.css');
         $barAsset->setOrder(1);
 
         $this->finder->shouldReceive('find')->once()->with('foo.css')->andReturn('path/to/foo.css');

tests/Basset/Factory/AssetFactoryTest.php

@@ -16,7 +16,7 @@ public function setUp()
         $this->files = m::mock('Illuminate\Filesystem\Filesystem');
         $this->filter = m::mock('Basset\Factory\FilterFactory');
         $this->log = m::mock('Illuminate\Log\Writer');
-        $this->factory = new Basset\Factory\AssetFactory($this->files, $this->filter, $this->log, __DIR__, 'testing');
+        $this->factory = new Basset\Factory\AssetFactory($this->files, $this->filter, $this->log, 'testing', __DIR__);
     }
 
 

tests/Basset/Manifest/EntryTest.php

@@ -48,7 +48,7 @@ public function testAddingDevelopmentAssetToEntry()
 
     public function testAddingDevelopmentAssetToEntryFromAssetInstance()
     {
-        $asset = new Basset\Asset($files = m::mock('Illuminate\Filesystem\Filesystem'), m::mock('Basset\Factory\FilterFactory'), m::mock('Illuminate\Log\Writer'), 'foo/bar.sass', 'foo/bar.sass');
+        $asset = new Basset\Asset($files = m::mock('Illuminate\Filesystem\Filesystem'), m::mock('Basset\Factory\FilterFactory'), m::mock('Illuminate\Log\Writer'), 'testing', 'foo/bar.sass', 'foo/bar.sass');
         $files->shouldReceive('lastModified')->once()->with('foo/bar.sass')->andReturn(time());
         $this->entry->addDevelopmentAsset($asset);
         $this->data['development']['stylesheets']['foo/bar.sass'] = 'foo/bar-'.md5('[]'.time()).'.css';

tests/Basset/ServerTest.php

@@ -86,12 +86,12 @@ public function testServingDevelopmentCollectionReturnsExpectedHtml()
             m::mock('Basset\Asset')
         ));
 
-        $assets[0]->shouldReceive('serveRaw')->once()->andReturn(false);
+        $assets[0]->shouldReceive('isRaw')->once()->andReturn(false);
         $assets[0]->shouldReceive('getGroup')->once()->andReturn('stylesheets');
         $assets[0]->shouldReceive('getRelativePath')->once()->andReturn('bar.less');
-        $assets[1]->shouldReceive('serveRaw')->once()->andReturn(true);
+        $assets[1]->shouldReceive('isRaw')->once()->andReturn(true);
         $assets[1]->shouldReceive('getRelativePath')->once()->andReturn('qux.css');
-        $assets[2]->shouldReceive('serveRaw')->once()->andReturn(false);
+        $assets[2]->shouldReceive('isRaw')->once()->andReturn(false);
         $assets[2]->shouldReceive('getGroup')->once()->andReturn('stylesheets');
         $assets[2]->shouldReceive('getRelativePath')->once()->andReturn('baz.sass');
 
@@ -149,4 +149,35 @@ public function testServingCollectionsWithCustomFormat()
     }
 
 
+    public function testServingRawAssetsOnGivenEnvironment()
+    {
+        $this->app['basset']->shouldReceive(array('offsetExists' => true, 'offsetGet' => $collection = m::mock('Basset\Collection')))->with('foo');
+        $this->app['config']->shouldReceive('get')->once()->with('basset::production')->andReturn('production');
+
+        $this->app['basset.builder']->shouldReceive('buildAsDevelopment')->once()->with($collection, 'stylesheets');
+        $this->app['basset.builder.cleaner']->shouldReceive('clean')->once()->with('foo');
+
+        $collection->shouldReceive('getIdentifier')->andReturn('foo');
+        $collection->shouldReceive('getAssetsWithRaw')->once()->with('stylesheets')->andReturn($assets = array(
+            m::mock('Basset\Asset', array(new Filesystem, m::mock('Basset\Factory\FilterFactory'), m::mock('Illuminate\Log\Writer'), 'testing', null, null))->shouldDeferMissing(),
+            m::mock('Basset\Asset')->shouldDeferMissing()
+        ));
+
+        $assets[0]->rawOnEnvironment('testing');
+        $assets[0]->shouldReceive('getRelativePath')->once()->andReturn('bar.css');
+        $assets[1]->shouldReceive('isRaw')->once()->andReturn(false);
+        $assets[1]->shouldReceive('getGroup')->once()->andReturn('stylesheets');
+        $assets[1]->shouldReceive('getRelativePath')->once()->andReturn('baz.sass');
+
+        $entry = $this->app['basset.manifest']->make($collection);
+        $entry->addDevelopmentAsset('baz.sass', 'baz.css', 'stylesheets');
+
+        $this->app['config']->shouldReceive('get')->with('basset::build_path')->andReturn('assets');
+
+        $expected = '<link rel="stylesheet" type="text/css" href="http://localhost/bar.css" />'.PHP_EOL.
+                    '<link rel="stylesheet" type="text/css" href="http://localhost/assets/foo/baz.css" />';
+        $this->assertEquals($expected, $this->server->serve('foo', 'stylesheets'));
+    }
+
+
 }