bump semver to 0.1.0; update docs

Author: robocoder

.travis.yml

@@ -7,5 +7,4 @@ php:
 #  - hhvm
 
 script:
-  - composer install --dev
   - phpunit tests

LICENSE.md

@@ -38,7 +38,7 @@ GPL VERSION 3
 
 
 
-					GNU GENERAL PUBLIC LICENSE
+                    GNU GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
  Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>

README.md

@@ -1,4 +1,4 @@
-# scssphp v0.0.15
+# scssphp v0.1.0
 ### <http://leafo.net/scssphp>
 
 [![Build Status](https://secure.travis-ci.org/leafo/scssphp.png)](http://travis-ci.org/leafo/scssphp)

bin/pscss

@@ -3,7 +3,7 @@
 
 error_reporting(E_ALL);
 
-require __DIR__ . '/../vendor/autoload.php';
+include 'scss.inc.php';
 
 use Leafo\ScssPhp\Compiler;
 use Leafo\ScssPhp\Parser;

composer.json

@@ -2,6 +2,7 @@
     "name": "leafo/scssphp",
     "type": "library",
     "description": "scssphp is a compiler for SCSS written in PHP.",
+    "keywords": ["css", "stylesheet", "scss", "sass", "less"],
     "homepage": "http://leafo.net/scssphp/",
     "license": [
         "MIT",

phpunit.xml.dist

@@ -12,7 +12,7 @@
     processIsolation            = "false"
     stopOnFailure               = "false"
     syntaxCheck                 = "false"
-    bootstrap                   = "vendor/autoload.php">
+    bootstrap                   = "scss.inc.php">
 
     <testsuites>
         <testsuite name="Project Test Suite">
@@ -22,7 +22,7 @@
 
     <filter>
         <whitelist>
-            <directory>.</directory>
+            <directory>src</directory>
         </whitelist>
     </filter>
 

scss.inc.php

@@ -0,0 +1,10 @@
+<?php
+include __DIR__ . '/src/Colors.php';
+include __DIR__ . '/src/Compiler.php';
+include __DIR__ . '/src/Formatter.php';
+include __DIR__ . '/src/Formatter/Compressed.php';
+include __DIR__ . '/src/Formatter/Crunched.php';
+include __DIR__ . '/src/Formatter/Expanded.php';
+include __DIR__ . '/src/Formatter/Nested.php';
+include __DIR__ . '/src/Parser.php';
+include __DIR__ . '/src/Server.php';

site/docs/index.md

@@ -9,8 +9,10 @@
 
 ### Including
 
-The entire project comes in a single file. Just include it somewhere to start
-using it:
+The project can be loaded through a `composer` generated auto-loader.
+
+Alternatively, the entire project can be loaded through a utility file.
+Just include it somewhere to start using it:
 
     ```php
     <?php
@@ -20,13 +22,16 @@ using it:
 ### Compiling
 
 In order to manually compile code from PHP you must create an instance of the
-`scssc` class. The typical flow is to create the instance, set any compile time
+`Compiler` class. The typical flow is to create the instance, set any compile time
 options, then run the compiler with the `compile` method.
 
     ```php
     <?php
     require "scssphp/scss.inc.php";
-    $scss = new scssc();
+
+    use Leafo\ScssPhp\Compiler;
+
+    $scss = new Compiler();
 
     echo $scss->compile('
       $color: #abc;
@@ -59,7 +64,10 @@ The default import path is `array("")`, which means the current directory.
     ```php
     <?php
     require "scssphp/scss.inc.php";
-    $scss = new scssc();
+
+    use Leafo\ScssPhp\Compiler;
+
+    $scss = new Compiler();
     $scss->setImportPaths("assets/stylesheets/");
 
     // will search for `assets/stylesheets/mixins.scss'
@@ -73,7 +81,10 @@ files that SCSS would otherwise not process (such as vanilla CSS imports).
     ```php
     <?php
     require "scssphp/scss.inc.php";
-    $scss = new scssc();
+
+    use Leafo\ScssPhp\Compiler;
+
+    $scss = new Compiler();
     $scss->addImportPath(function($path) {
         if (!file_exists('stylesheets/'.$path)) return null;
         return 'stylesheets/'.$path;
@@ -90,15 +101,15 @@ default formatter.
 
 Three formatters are included:
 
-* `scss_formatter`
-* `scss_formatter_nested` *(default)*
-* `scss_formatter_compressed`
+* `Leafo\ScssPhp\Formatter\Expanded`
+* `Leafo\ScssPhp\Formatter\Nested` *(default)*
+* `Leafo\ScssPhp\Formatter\Compressed`
 
 We can change the formatting using the `setFormatter` method.
 
 * <p>`setFormatter($formatterName)` sets the current formatter to `$formatterName`,
   the name of a class as a string that implements the formatting interface. See
-  the source for `scss_formatter` for an example.
+  the source for `Leafo\ScssPhp\Formatter\Expanded` for an example.
   </p>
 
 Given the following SCSS:
@@ -123,7 +134,7 @@ Given the following SCSS:
 
 The formatters will output,
 
-`scss_formatter`:
+`Leafo\ScssPhp\Formatter\Expanded`:
 
     ```css
     .navigation ul {
@@ -138,7 +149,7 @@ The formatters will output,
     }
     ```
 
-`scss_formatter_nested`:
+`Leafo\ScssPhp\Formatter\Nested`:
 
     ```css
     .navigation ul {
@@ -151,7 +162,7 @@ The formatters will output,
       color: silver; }
     ```
 
-`scss_formatter_compressed`:
+`Leafo\ScssPhp\Formatter\Compressed`:
 
     ```css
     .navigation ul{line-height:20px;color:blue;}.navigation ul a{color:red;}.footer .copyright{color:silver;}
@@ -198,7 +209,9 @@ together. PHP's anonymous function syntax is used to define the function.
 
     ```php
     <?php
-    $scss = new scssc();
+    use Leafo\ScssPhp\Compiler;
+
+    $scss = new Compiler();
 
     $scss->registerFunction("add-two", function($args) {
       list($a, $b) = $args;
@@ -223,7 +236,7 @@ files if they've been modified (or one of the imports has been modified).
 
 ### Using `serveFrom`
 
-`scss_server::serveFrom` is a simple to use function that should handle most cases.
+`Server::serveFrom` is a simple to use function that should handle most cases.
 
 For example, create a file `style.php`:
 
@@ -232,13 +245,16 @@ For example, create a file `style.php`:
     $directory = "stylesheets";
 
     require "scssphp/scss.inc.php";
-    scss_server::serveFrom($directory);
+
+    use Leafo\ScssPhp\Server;
+
+    Server::serveFrom($directory);
     ```
 
 Going to the URL `example.com/style.php/style.scss` will attempt to compile
 `style.scss` from the `stylesheets` directory, and serve it as CSS.
 
-* <p>`scss_server::serveFrom($directory)` will serve SCSS files out of
+* <p>`Server::serveFrom($directory)` will serve SCSS files out of
   `$directory`. It will attempt to get the path to the file out of
   `$_SERVER["PATH_INFO"]`. (It also looks at the GET parameter `p`)
   </p>
@@ -262,14 +278,14 @@ directory. It writes its cache in a special directory called `scss_cache`.
 Also, because SCSS server writes headers, make sure no output is written before
 it runs.
 
-### Using `scss_server`
+### Using `Leafo\ScssPhp\Server`
 
-Creating an instance of `scss_server` is just another way of accomplishing what
-`serveFrom` does. It let's us customize the cache directory and the instance
-of the `scssc` that is used to compile
+Creating an instance of `Server` is just another way of accomplishing what
+`serveFrom` does. It lets us customize the cache directory and the instance
+of the `Compiler` that is used to compile
 
 
-* <p>`new scss_server($sourceDir, $cacheDir, $scss)` creates a new server that
+* <p>`new Server($sourceDir, $cacheDir, $scss)` creates a new server that
   serves files from `$sourceDir`. The cache dir is where the cached compiled
   files are placed. When `null`, `$sourceDir . "/scss_cache"` is used. `$scss`
   is the instance of `scss` that is used to compile.
@@ -283,10 +299,13 @@ Here's an example of creating a SCSS server that outputs compressed CSS:
     <?php
     require "scssphp/scss.inc.php";
 
-    $scss = new scssc();
+    use Leafo\ScssPhp\Compiler;
+    use Leafo\ScssPhp\Server;
+
+    $scss = new Compiler();
     $scss->setFormatter("scss_formatter_compressed");
 
-    $server = new scss_server("stylesheets", null, $scss);
+    $server = new Server("stylesheets", null, $scss);
     $server->serve();
     ```
 
@@ -301,6 +320,6 @@ If passed the flag `-v`, input is ignored and the current version if returned.
 The flag `-f` can be used to set the [formatter](#Output_formatting):
 
     ```bash
-    $ ./pscss -f scss_formatter_compressed < styles.scss
+    $ bin/pscss -f scss_formatter_compressed < styles.scss
     ```
 

site/index.md

@@ -20,10 +20,10 @@ Follow the author on twitter: [@moonscript](http://twitter.com/moonscript).
 <a name="installing"></a>
 ## Installing
 
-You can always download the latest version here:  
+You can always download the latest version here:
 <a href="$root/src/scssphp-$current_version.tar.gz" id="download-link">scssphp-$current_version.tar.gz</a>
 
-You can also find the latest source online:  
+You can also find the latest source online:
 <https://github.com/leafo/scssphp/>
 
 If you use [Packagist][2] for installing packages, then you can update your `composer.json` like so:
@@ -54,7 +54,10 @@ Create a file, like `style.php`:
     $directory = "stylesheets";
 
     require "scssphp/scss.inc.php";
-    scss_server::serveFrom($directory);
+
+    use Leafo\ScssPhp\Server;
+
+    Server::serveFrom($directory);
 
     ```
 
@@ -74,13 +77,17 @@ must have permission to write in `scss_cache`.
 
 ### Compiler Interface
 
-If you're interested in directly using the compiler, then all you need to do is
-require `scss.inc.php` and invoke the `scss` class:
+If you're interested in directly using the compiler, then all you need to either
+require `scss.inc.php` or use your `composer` generated auto-laoder, and then
+invoke the `Compiler` class:
 
     ```php
     <?php
     require "scssphp/scss.inc.php";
-    $scss = new scssc();
+
+    use Leafo\ScssPhp\Compiler;
+
+    $scss = new Compiler();
 
     echo $scss->compile('
       $color: #abc;
@@ -104,6 +111,9 @@ Find any issues? I'd love to fix them for you, post about them on [the issues tr
 <div id="changelog"></div>
 ## Changelog
 
+* **0.1.0** -- Aug 9, 2014
+  * raise PHP requirement (5.3+)
+  * reformat/reorganize source files to be PSR-2 compliant
 * **0.0.15** -- Aug 6, 2014
   * fix regression with default values in functions (torkiljohnsen)
 * **0.0.14** -- Aug 5, 2014
@@ -148,7 +158,7 @@ Find any issues? I'd love to fix them for you, post about them on [the issues tr
   * Add == and != ops for colors.
   * @if and @while directives should treat null like false.
   * Add pscss as bin in composer.json (Christian Lück).
-  * Fix !default bug (James Shannon, Alberto Aldegheri). 
+  * Fix !default bug (James Shannon, Alberto Aldegheri).
   * Fix mixin content includes (James Shannon, Christian Brandt).
   * Fix passing of varargs to another mixin.
   * Fix interpolation bug in expToString() (Matti Jarvinen).

site/site.moon

@@ -3,10 +3,10 @@ require "sitegen"
 tools = require "sitegen.tools"
 
 sitegen.create_site =>
-  @current_version = "0.0.15"
+  @current_version = "0.1.0"
   @title = "SCSS Compiler in PHP"
 
-  scssphp = tools.system_command "pscss < %s > %s", "css"
+  scssphp = tools.system_command "bin/pscss < %s > %s", "css"
   build scssphp, "style.scss", "style/style.css"
 
   deploy_to "leaf@leafo.net", "www/scssphp/"