Merge pull request #31 from UseMuffin/fallback-webservice-class

Fix generating fallback webservice class for plugin without vendor namespace.

Author: ADmad

src/AbstractDriver.php

@@ -44,9 +44,9 @@ abstract class AbstractDriver implements LoggerAwareInterface
     public function __construct($config = [])
     {
         if (!empty($config)) {
-            $this->config($config);            
+            $this->config($config);
         }
-        
+
         $this->initialize();
     }
 
@@ -200,16 +200,19 @@ public function __debugInfo()
      */
     protected function _createWebservice($className, array $options = [])
     {
-        $namespaceParts = explode('\\', get_class($this));
-
-        $pluginName = implode('/', array_reverse(array_slice(array_reverse($namespaceParts), -2)));
-
         $webservice = App::className($className, 'Webservice', 'Webservice');
         if ($webservice) {
             return new $webservice($options);
         }
 
-        $fallbackWebserviceClass = $pluginName . '.' . end($namespaceParts);
+        $namespaceParts = explode('\\', get_class($this));
+        $fallbackWebserviceClass = end($namespaceParts);
+
+        list($pluginName) = pluginSplit($className);
+        if ($pluginName) {
+            $fallbackWebserviceClass = $pluginName . '.' . $fallbackWebserviceClass;
+        }
+
         $fallbackWebservice = App::className($fallbackWebserviceClass, 'Webservice', 'Webservice');
         if ($fallbackWebservice) {
             return new $fallbackWebservice($options);

src/Model/Endpoint.php

@@ -849,9 +849,7 @@ public function save(EntityInterface $resource, $options = [])
         if ($resource->isNew()) {
             $query = $this->query()->create();
         } else {
-            $query = $this->query()->update()->where([
-                $resource->extract((array)$this->primaryKey())
-            ]);
+            $query = $this->query()->update()->where($resource->extract($primaryColumns));
         }
         $query->set($data);
 

tests/TestCase/AbstractDriverTest.php

@@ -0,0 +1,31 @@
+<?php
+namespace Muffin\Webservice\Test\TestCase\Model;
+
+use Cake\TestSuite\TestCase;
+use SomeVendor\SomePlugin\Webservice\Driver\SomePlugin;
+use TestPlugin\Webservice\Driver\TestPlugin;
+
+class AbstractDriverTest extends TestCase
+{
+    public function testWebserviceWithoutVendor()
+    {
+        $driver = new TestPlugin;
+
+        $webservice = $driver->webservice('test_plugin');
+        $this->assertInstanceOf('TestPlugin\Webservice\TestPluginWebservice', $webservice);
+
+        $webservice = $driver->webservice('foo');
+        $this->assertInstanceOf('TestPlugin\Webservice\TestPluginWebservice', $webservice);
+    }
+
+    public function testWebserviceWithVendor()
+    {
+        $driver = new SomePlugin;
+
+        $webservice = $driver->webservice('some_plugin');
+        $this->assertInstanceOf('SomeVendor\SomePlugin\Webservice\SomePluginWebservice', $webservice);
+
+        $webservice = $driver->webservice('foo');
+        $this->assertInstanceOf('SomeVendor\SomePlugin\Webservice\SomePluginWebservice', $webservice);
+    }
+}

tests/bootstrap.php

@@ -39,6 +39,7 @@
 
 $loader->addNamespace('TestApp', APP);
 $loader->addNamespace('SomeVendor\SomePlugin', APP . 'plugins' . DS . 'SomeVendor' . DS . 'SomePlugin' . DS . 'src');
+$loader->addNamespace('TestPlugin', APP . 'plugins' . DS . 'TestPlugin' . DS . 'src');
 
 require_once CORE_PATH . 'config/bootstrap.php';
 

tests/test_app/plugins/SomeVendor/SomePlugin/src/Webservice/Driver/SomePlugin.php

@@ -0,0 +1,17 @@
+<?php
+namespace SomeVendor\SomePlugin\Webservice\Driver;
+
+use Muffin\Webservice\AbstractDriver;
+
+class SomePlugin extends AbstractDriver
+{
+
+    /**
+     * Initialize is used to easily extend the constructor.
+     *
+     * @return void
+     */
+    public function initialize()
+    {
+    }
+}

tests/test_app/plugins/SomeVendor/SomePlugin/src/Webservice/SomePluginWebservice.php

@@ -0,0 +1,19 @@
+<?php
+namespace SomeVendor\SomePlugin\Webservice;
+
+use Muffin\Webservice\Model\Endpoint;
+use Muffin\Webservice\Webservice\Webservice;
+
+class SomePluginWebservice extends Webservice
+{
+
+    public function createResource($resourceClass, array $properties = [])
+    {
+        return $this->_createResource($resourceClass, $properties);
+    }
+
+    public function transformResults(Endpoint $endpoint, array $results)
+    {
+        return $this->_transformResults($endpoint, $results);
+    }
+}

tests/test_app/plugins/TestPlugin/src/Webservice/Driver/TestPlugin.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace TestPlugin\Webservice\Driver;
+
+use Muffin\Webservice\AbstractDriver;
+
+class TestPlugin extends AbstractDriver
+{
+
+    /**
+     * Initialize is used to easily extend the constructor.
+     *
+     * @return void
+     */
+    public function initialize()
+    {
+    }
+}

tests/test_app/plugins/TestPlugin/src/Webservice/TestPluginWebservice.php

@@ -0,0 +1,19 @@
+<?php
+namespace TestPlugin\Webservice;
+
+use Muffin\Webservice\Model\Endpoint;
+use Muffin\Webservice\Webservice\Webservice;
+
+class TestPluginWebservice extends Webservice
+{
+
+    public function createResource($resourceClass, array $properties = [])
+    {
+        return $this->_createResource($resourceClass, $properties);
+    }
+
+    public function transformResults(Endpoint $endpoint, array $results)
+    {
+        return $this->_transformResults($endpoint, $results);
+    }
+}