Merge pull request #48 from ralucarietkerk/inflection

Allow customizing endpoint inflection type.

Author: ADmad

src/Model/Endpoint.php

@@ -108,6 +108,13 @@ class Endpoint implements RepositoryInterface, EventListenerInterface, EventDisp
      */
     protected $_alias;
 
+    /**
+     * The inflect method to use for endpoint routes
+     *
+     * @var string
+     */
+    protected $_inflectionMethod = 'underscore';
+
     /**
      * Initializes a new instance
      *
@@ -153,6 +160,9 @@ public function __construct(array $config = [])
         if (!empty($config['resourceClass'])) {
             $this->resourceClass($config['resourceClass']);
         }
+        if (!empty($config['inflect'])) {
+            $this->inflectionMethod($config['inflect']);
+        }
 
         $this->_eventManager = $eventManager ?: new EventManager();
 
@@ -217,7 +227,8 @@ public function endpoint($endpoint = null)
             if (empty($endpoint)) {
                 $endpoint = $this->alias();
             }
-            $this->_endpoint = Inflector::underscore($endpoint);
+            $inflectMethod = $this->inflectionMethod();
+            $this->_endpoint = Inflector::$inflectMethod($endpoint);
         }
 
         return $this->_endpoint;
@@ -452,6 +463,22 @@ public function resourceClass($name = null)
         return $this->_resourceClass;
     }
 
+    /**
+     * Returns the inflect method or sets a new one
+     *
+     * @param null|string $method The inflection method to use
+     *
+     * @return null|string
+     */
+    public function inflectionMethod($method = null)
+    {
+        if ($method === null) {
+            return $this->_inflectionMethod;
+        }
+
+        return $this->_inflectionMethod = $method;
+    }
+
     /**
      * Returns an instance of the Webservice used
      *
@@ -808,9 +835,9 @@ public function exists($conditions)
     public function save(EntityInterface $resource, $options = [])
     {
         $options = new ArrayObject($options + [
-            'checkRules' => true,
-            'checkExisting' => false,
-        ]);
+                'checkRules' => true,
+                'checkExisting' => false,
+            ]);
 
         if ($resource->errors()) {
             return false;

tests/TestCase/Model/EndpointTest.php

@@ -40,6 +40,15 @@ public function setUp()
         ]);
     }
 
+    public function testEndpoint()
+    {
+        $endpoint = new Endpoint(['alias' => 'UserGroups']);
+        $this->assertSame('user_groups', $endpoint->endpoint());
+
+        $endpoint = new Endpoint(['alias' => 'UserGroups', 'inflect' => 'dasherize']);
+        $this->assertSame('user-groups', $endpoint->endpoint());
+    }
+
     public function testFind()
     {
         $query = $this->endpoint->find();
@@ -172,7 +181,7 @@ public function testNewEntity()
             'title' => 'New entity',
             'body' => 'New entity body'
         ]), $this->endpoint->newEntity([
-           'title' => 'New entity',
+            'title' => 'New entity',
             'body' => 'New entity body'
         ]));
     }
@@ -230,6 +239,19 @@ public function testConnection()
         $this->assertSame($this->connection, $endpoint->connection());
     }
 
+    /**
+     * Tests inflectionMethod method
+     *
+     * @return void
+     */
+    public function testInflectionMethod()
+    {
+        $endpoint = new Endpoint(['endpoint' => 'users']);
+        $this->assertSame('underscore', $endpoint->inflectionMethod());
+        $endpoint->inflectionMethod('dasherize');
+        $this->assertSame('dasherize', $endpoint->inflectionMethod());
+    }
+
     /**
      * Tests primaryKey method
      *