@@ -4,10 +4,11 @@ class Interactive extends InteractiveAppModel {
var $objectCache = true;
var $objectPath = null;
var $raw = false;
-
+ var $type = null;
+
function process($cmds) {
$cmds = explode(";", $cmds);
-
+
$results = array();
foreach($cmds as $cmd) {
$this->raw = false;
@@ -23,10 +24,10 @@ class Interactive extends InteractiveAppModel {
$func = sprintf('__%sCall', $type);
$output = $this-> {$func}($cmd);
$results[] = array('cmd' => $cmd,
- 'raw' => $this->raw,
- 'output' => $output);
+ 'raw' => $this->raw,
+ 'output' => $output);
}
-
+
return $results;
}
@@ -64,9 +65,15 @@ class Interactive extends InteractiveAppModel {
}
function __getClass($className) {
- $className = $this->__fixClassName($className);
- $types = array('model', 'controller', 'helper', 'component');
+ $this->type = null;
$classType = false;
+ $className = $this->__fixClassName($className);
+
+ if ($this->type) {
+ $types = array($this->type);
+ } else {
+ $types = array('model', 'helper');
+ }
foreach($types as $type) {
$objects = Configure::listObjects($type, $this->objectPath, $this->objectCache);
@@ -108,6 +115,14 @@ class Interactive extends InteractiveAppModel {
}
function __fixClassName($className) {
+ if (stripos($className, 'component') !== false) {
+ $this->type = 'component';
+ }
+
+ if (stripos($className, 'controller') !== false) {
+ $this->type = 'controller';
+ }
+
return ucfirst(preg_replace('/(\$|controller|component)/i', '', $className));
}
models/interactive.php
@@ -122,7 +122,7 @@ class InteractiveTestCase extends CakeTestCase {
function testClassCallComponent() {
Configure::write('debug', 0);
Configure::write('Security.salt', 'fc4a7a2d16ed61344ff95c87674620c4ece9cea1');
- $result = $this->Interactive->__classCall('Auth::password("test")');
+ $result = $this->Interactive->__classCall('AuthComponent::password("test")');
$this->assertEqual('cfc21a50c1f69eabdb6687d7f2b33891865f69bb', $result);
Configure::write('debug', 2);
}
tests/cases/models/interactive.test.php
de04f4ae0cdd04113a2761082e15e77c0833989c
Matt Curry
matt@pseudocoder.com
http://github.com/mcurry/interactive/commit/88b85116318c4942664becadff68693fbc017743
88b85116318c4942664becadff68693fbc017743
2009-06-08T20:53:10-07:00
2009-06-08T20:53:10-07:00
better handling for name conflicts
207856fcab884eff987f7fd4f29b2e81414b8d2a
Matt Curry
matt@pseudocoder.com