Completed specs and tests for current generators

Author: impleri

readme.md

@@ -1,13 +1,14 @@
-Laravel REST API Library
+Laravel Resource Library
 ========================
 
-[![Build Status](https://travis-ci.org/impleri/laravel-resource.png?branch=master)](https://travis-ci.org/impleri/laravel-resource)
-[![Scrutinizer Quality Score](https://scrutinizer-ci.com/g/impleri/laravel-resource/badges/quality-score.png?s=a2f2da02db7ae7e8f2fe395d2e83d4659ccbbf76)](https://scrutinizer-ci.com/g/impleri/laravel-resource/)
-[![Code Coverage](https://scrutinizer-ci.com/g/impleri/laravel-resource/badges/coverage.png?s=2ccdf1fcdc1af0403df59f59a757fe052c504ac6)](https://scrutinizer-ci.com/g/impleri/laravel-resource/)
-[![Dependency Status](https://www.versioneye.com/user/projects/531a85fcec13755bfa000aeb/badge.png)](https://www.versioneye.com/user/projects/531a85fcec13755bfa000aeb)
+An Alternative RESTful resource implementation for Laravel 4. This package provides
+a more extensive REST API interface than the stock resource controller generator.
+Out of the box, the package provides a lot of boilerplate code for scaffolding routes, controllers, models, and views. Routes are RESTful and API-centric. It handles outputting to JSON, XML (via a view), HTML (via a view), CSV, and plain text.
 
 
-Alternative RESTful resource implementation for Laravel 4. This package provides
-a more extensive REST API interface than the stock resource controller generator.
-Out of the box, the package allows others to generate routes and controllers so
-that developers simply plug in a model and overload methods when needed.
+[![Latest Release](https://poser.pugx.org/impleri/laravel-resource/v/stable.png)](https://packagist.org/packages/impleri/laravel-resource) |
+[![Build Status](https://travis-ci.org/impleri/laravel-resource.png?branch=master)](https://travis-ci.org/impleri/laravel-resource) |
+[![Code Quality](https://scrutinizer-ci.com/g/impleri/laravel-resource/badges/quality-score.png?s=a2f2da02db7ae7e8f2fe395d2e83d4659ccbbf76)](https://scrutinizer-ci.com/g/impleri/laravel-resource/) |
+[![Code Coverage](https://scrutinizer-ci.com/g/impleri/laravel-resource/badges/coverage.png?s=2ccdf1fcdc1af0403df59f59a757fe052c504ac6)](https://scrutinizer-ci.com/g/impleri/laravel-resource/) |
+[![Dependency Status](https://www.versioneye.com/user/projects/531a85fcec13755bfa000aeb/badge.png)](https://www.versioneye.com/user/projects/531a85fcec13755bfa000aeb)
+

src/Generator.php

@@ -53,11 +53,11 @@ public function execute($options)
             $contents = View::make($view, $data)->render();
 
             // Remove the old backup
-            if (!$this->save($data['file'], $contents)) {
+            if ($this->save($data['file'], $contents)) {
+                $count++;
+            } else {
                 // Some kind of warning here
             }
-
-            $count++;
         }
 
         // Return count to the toolbox
@@ -89,9 +89,13 @@ protected function fillOptions($options)
         }
 
         // Flesh out the base path
+        $basePath = $this->trailingSeparator($options['basePath']);
+
+        // Add base namespace to base path
         $baseNamespace = $options['baseNamespace'];
-        $basePath = $options['basePath'];
-        $basePath .= (empty($baseNamespace)) ? '' : str_replace('\\', '/', $baseNamespace);
+        $basePath .= (empty($baseNamespace)) ? '' : $this->convertNamespace($baseNamespace);
+        $basePath = $this->trailingSeparator($basePath);
+
         $options['basePath'] = $basePath;
 
         return $options;
@@ -109,14 +113,19 @@ protected function fillOptions($options)
     protected function fillClass($name, $class, $options)
     {
         $namespace = $options['baseNamespace'];
-        $saveTo = $options['basePath'];
+        $saveTo = $this->trailingSeparator($options['basePath']);
 
         // Add to the save path and namespace
         if (isset($class['subNamespace'])) {
+            if (!empty($namespace)) {
+                $namespace = $this->trailingSeparator($namespace, '\\');
+            }
             $namespace .= $class['subNamespace'];
-            $saveTo .= str_replace('\\', '/', $class['subNamespace']);
+            $saveTo .= $this->convertNamespace($class['subNamespace']);
         }
 
+        $saveTo = $this->trailingSeparator($saveTo);
+
         // Override the class name with the array value
         if (isset($class['name'])) {
             $name = $class['name'];
@@ -172,4 +181,33 @@ protected function save($path, $contents)
 
         return $success;
     }
+
+    /**
+     * Trailing Separator
+     *
+     * Ensures there is a trailing separator on a string
+     * @param  string $string String to test
+     * @param  string $end    Separator to append
+     * @return string         Modified string
+     */
+    protected function trailingSeparator($string, $end = '/')
+    {
+        if (substr($string, -strlen($end)) !== $end) {
+            $string .= $end;
+        }
+
+        return $string;
+    }
+
+    /**
+     * Convert Namespace
+     *
+     * Convert backslash from namespace to forward slash for file path.
+     * @param  string $string Namespace to convert.
+     * @return string         Namespace converted to a path.
+     */
+    protected function convertNamespace($string)
+    {
+        return str_replace('\\', '/', $string);
+    }
 }

src/RouteGenerator.php

@@ -22,9 +22,10 @@ class RouteGenerator extends Generator
      *
      * Boilerplate method to inflate generator options using defaults.
      * @param  array  $options Variables to pass to the view
+     * @return array           Options
      * @throws BadFunctionCallException If missing element/collection from $options
      */
-    protected function fillOptions(&$options)
+    protected function fillOptions($options)
     {
         // Need at least a name to use
         if (!isset($options['collection']) && !isset($options['element'])) {
@@ -36,6 +37,8 @@ protected function fillOptions(&$options)
             $options['basePath'] = $this->path;
         }
 
+        $options['basePath'] = $this->trailingSeparator($options['basePath']);
+
         if (!isset($options['collection'])) {
             // Pluralize the element
             $options['collection'] = Str::plural($options['element']);
@@ -68,6 +71,8 @@ protected function fillOptions(&$options)
         if (!isset($options['allowDeleteAll'])) {
             $options['allowDeleteAll'] = false;
         }
+
+        return $options;
     }
 
     /**
@@ -79,7 +84,7 @@ protected function fillOptions(&$options)
      */
     public function execute($options)
     {
-        $this->fillOptions($options);
+        $options = $this->fillOptions($options);
 
         // Pass options to the view and return the rendered string
         return View::make($this->view, $options)->render();