Skip to content
This repository has been archived by the owner on Jun 6, 2019. It is now read-only.

Commit

Permalink
Rewrote the filter system
Browse files Browse the repository at this point in the history
  • Loading branch information
afroald committed Oct 21, 2013
1 parent 077dcb5 commit 5bbf24e
Show file tree
Hide file tree
Showing 16 changed files with 266 additions and 305 deletions.
7 changes: 2 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,11 @@
}
],
"require": {
"leafo/scssphp": "dev-master",
"leafo/scssphp-compass": "dev-master",
"leafo/lessphp": "0.4.0",
"coffeescript/coffeescript": "dev-master",
"chh/shellwords": "0.1.0",
"symfony/finder": "2.3.*",
"symfony/filesystem": "2.3.*",
"symfony/http-foundation": "2.3.*"
"symfony/http-foundation": "2.3.*",
"symfony/process": "2.3.*"
},
"require-dev": {
"phpunit/phpunit": "3.7.*",
Expand Down
236 changes: 56 additions & 180 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 5 additions & 7 deletions src/Sprockets/Asset.php
Original file line number Diff line number Diff line change
Expand Up @@ -90,12 +90,12 @@ public function logicalPathname()

public function path()
{
return $this->source->getPath();
return $this->source->getPathInfo()->getRealPath();
}

public function pathname()
{
return $this->source->getPathname();
return $this->source->getRealPath();
}

/**
Expand Down Expand Up @@ -235,21 +235,17 @@ protected function process()
// We want to run all the processors on the file without the directives included.
$content = $this->directiveProcessor()->body();

// Run pre-processors

// Run engines
foreach ($this->extensions() as $extension)
{
$engine = $this->pipeline->engine($extension);
$engine = $this->pipeline->filters->engine($extension);

if ($engine)
{
$content = $engine->process($this, $content);
}
}

// Run post-processors

$this->processedContent = $content;
}

Expand Down Expand Up @@ -281,6 +277,8 @@ protected function bundle()
$content.= $this->body();
}

// Run compressors

$this->bundledContent = $content;
}
}
15 changes: 0 additions & 15 deletions src/Sprockets/Engine/CoffeeScriptEngine.php

This file was deleted.

14 changes: 0 additions & 14 deletions src/Sprockets/Engine/LessEngine.php

This file was deleted.

14 changes: 0 additions & 14 deletions src/Sprockets/Engine/ScssEngine.php

This file was deleted.

Loading

0 comments on commit 5bbf24e

Please sign in to comment.