lib/arr.php lib/delegator.php lib/marshal.php lib/module.php lib/proc.php @@ -12,14 +12,12 @@ rubyisms in php ## Features -INCOMPLETE - -* mixins - methods and properties can be added to an existing class OR instance of an object -* alias\_method and alias\_method\_chain (also works at the class OR instance level) -* Object class (all classes should inherit from this) -* Enumerable, A (array), and H (hash) classes -* blocks (as strings) -* structs +* A base `Object` class (all classes should inherit from this) +* Mixins - `Post::extend('Validations');` +* alias\_method - `Post::alias_method('save_with_validation', 'save');` +* alias\_method\_chain - `Post::alias_method_chain('save', 'validation');` +* Procs - `$proc = new Proc('name', 'echo "hello $name";'); $proc->call('Sean');` +* Various classes and modules from the standard ruby library like `Enumerable`, `Arr`, `Hash`, `Struct`, etc ## Usage README.markdown @@ -1,3 +1,13 @@ +2009-06-11 - Sean Huber (shuber@huberry.com) + * Huge refactor + * Add Object::new_instance_array method + * Add autoloading and marshal class + * Add Object::cloned and Object#dup + * Add Object#__clone + * Add Object#superclass + * build_function_call supports calling instance methods + * Add Delegator (incomplete) + 2009-03-16 - Sean Huber (shuber@huberry.com) * Add Struct class * Add some methods to Struct doc/CHANGELOG @@ -5,7 +5,4 @@ * look into stream filters * observers * Object#call should build an instance method call to eval so that protected and private methods can be called -* Mod#ancestors -* Mod#append_features -* fix static property inheritance issues -* classes should copy extended methods/properties from the mixin's extended methods/properties \ No newline at end of file +* Mod#append_features \ No newline at end of file doc/TODO @@ -1,6 +1,6 @@ <?php -class Enumerator extends Object implements ArrayAccess, Countable, IteratorAggregate { +class Enumerator extends Object implements Iterator, ArrayAccess, Countable { public $array; public $default; @@ -14,11 +14,19 @@ class Enumerator extends Object implements ArrayAccess, Countable, IteratorAggre function count() { return count($this->array); } - + + function current() { + return current($this->array); + } + function getIterator() { - return new ArrayIterator($this->array); + return $this; } - + + function key() { + return key($this->array); + } + function offsetExists($offset) { return isset($this->array[$offset]); } @@ -35,9 +43,23 @@ class Enumerator extends Object implements ArrayAccess, Countable, IteratorAggre function offsetUnset($offset) { unset($this->array[$offset]); } + + function next() { + $this->valid = (next($this->array) !== false); + } + + function rewind() { + $this->valid = (reset($this->array) !== false); + } + + function valid() { + return $this->valid; + } } +abstract class Enumerable extends Enumerator { } + abstract class EnumerableMethods { function all($block) { @@ -56,7 +78,7 @@ abstract class EnumerableMethods { } function collect($block) { - $result = new A; + $result = new Arr; foreach ($this as $key => $value) $result[] = evaluate_block($block, get_defined_vars()); return $result; } @@ -67,7 +89,7 @@ abstract class EnumerableMethods { } function filter($callback = null) { - return $this->new_instance(array_filter($this->array, $callback)); + return call_class_method($this->class, 'new_instance', array(array_filter($this->array, $callback))); } function has_key($key) { @@ -98,8 +120,8 @@ abstract class EnumerableMethods { } function partition($block) { - $passed = $this->new_instance(); - $failed = $this->new_instance(); + $passed = call_class_method($this->class, 'new_instance'); + $failed = call_class_method($this->class, 'new_instance'); foreach ($this as $key => $value) { if (evaluate_block($block, get_defined_vars())) { $passed[$key] = $value; @@ -107,11 +129,11 @@ abstract class EnumerableMethods { $failed[$key] = $value; } } - return new A(array($passed, $failed)); + return new Arr(array($passed, $failed)); } function reject($block) { - $result = $this->new_instance(); + $result = call_class_method($this->class, 'new_instance'); foreach ($this as $key => $value) if (!evaluate_block($block, get_defined_vars())) $result[$key] = $value; return $result; } @@ -129,7 +151,7 @@ abstract class EnumerableMethods { } function select($block) { - $result = $this->new_instance(); + $result = call_class_method($this->class, 'new_instance'); foreach ($this as $key => $value) if (evaluate_block($block, get_defined_vars())) $result[$key] = $value; return $result; } @@ -142,16 +164,12 @@ abstract class EnumerableMethods { if (is_null($sort_flags)) $sort_flags = SORT_REGULAR; $array = $this->array; asort($array, $sort_flags); - return $this->new_instance($array); + return call_class_method($this->class, 'new_instance', array($array)); } function sort_by($block, $sort_flags = null) { - $sorted = $this->inject(new H, ' - $object[$key] = evaluate_block(\''.$block.'\', get_defined_vars()); - $object; - ')->sort($sort_flags); - - $result = $this->new_instance(); + $sorted = $this->inject(new Hash, '$object[$key] = evaluate_block(\''.$block.'\', get_defined_vars()); return $object;')->sort($sort_flags); + $result = call_class_method($this->class, 'new_instance'); foreach ($sorted as $key => $value) $result[$key] = $this[$key]; return $result; } @@ -172,24 +190,18 @@ abstract class EnumerableMethods { function values_at($keys) { $keys = func_get_args(); - $result = new A; + $result = new Arr; foreach ($keys as $key) $result[] = $this[$key]; return $result; } } -abstract class Enumerable extends Enumerator { - static $extended = array(); -} - -extend('Enumerable', 'EnumerableMethods'); -alias_method('Enumerable', 'at', 'offsetGet'); -alias_method('Enumerable', 'fetch', 'offsetGet'); -alias_method('Enumerable', 'length', 'count'); -alias_method('Enumerable', 'map', 'collect'); -alias_method('Enumerable', 'reduce', 'inject'); -alias_method('Enumerable', 'size', 'count'); -alias_method('Enumerable', 'store', 'offsetSet'); +Enumerable::extend('EnumerableMethods'); -?> \ No newline at end of file +Enumerable::alias_method('at', 'offsetGet'); +Enumerable::alias_method('fetch', 'offsetGet'); +Enumerable::alias_method('length', 'count'); +Enumerable::alias_method('map', 'collect'); +Enumerable::alias_method('size', 'count'); +Enumerable::alias_method('store', 'offsetSet'); \ No newline at end of file lib/enumerable.php @@ -1,151 +1,80 @@ <?php -function alias_method($object, $new_name, $old_name) { - extend_method($object, $object, $old_name, $new_name); -} - -function alias_method_chain($object, $method, $with) { - $without = $method.'_without_'.$with; - if (is_object($object)) { - $object->instance_extended_methods[$without] = $object->instance_extended_methods[$method]; - unset($object->instance_extended_methods[$method]); - } else { - $extended = get_static_property($object, 'extended'); - - if (!isset($extended['methods'])) { - $extended['methods'] = array(); - } - - $extended['methods'][$without] = $extended['methods'][$method]; - unset($extended['methods'][$method]); - set_static_property($object, 'extended', $extended); - } - extend_method($object, $object, $method.'_with_'.$with, $method); -} - -function build_function_call($function, $arguments = array(), $variable_name = 'arguments') { - if (!is_array($function)) $function = array($function); - if (is_object($function[0])) $function[0] = get_class($function[0]); - $function_call = join('::', $function).'('; - if (!empty($arguments)) { - $function_call .= '$'.$variable_name.'[0]'; - for ($i = 1; $i < count($arguments); $i++) { - $function_call .= ', $'.$variable_name.'['.$i.']'; +if (!function_exists('get_called_class')) { + function get_called_class() { + $backtrace = debug_backtrace(); + if (preg_match('/eval\(\)\'d code$/', $backtrace[1]['file'])) { + return $backtrace[3]['args'][0]; + } else { + $lines = file($backtrace[1]['file']); + preg_match('/([a-zA-Z0-9\_]+)::'.$backtrace[1]['function'].'/', $lines[$backtrace[1]['line']-1], $matches); + return $matches[1]; } } - return $function_call .= ')'; } -function evaluate_block($block, $arguments = array()) { - # implict return - $lines = explode(';', $block); - $last =& $lines[count($lines)-2]; - if (strpos($last, 'return') === false) $last = 'return '.$last; - $block = join(';', $lines); - if (isset($arguments['this'])) { - $arguments['self'] = $arguments['this']; - unset($arguments['this']); - } - unset($arguments['block']); - extract($arguments); - return eval($block); +# Class related +function get_class_variable($class, $variable) { + return eval('return '.$class.'::$'.$variable.';'); } -function get_ancestors($class) { - for ($classes[] = $class; $class = get_parent_class($class); $classes[] = $class); - return $classes; +function set_class_variable($class, $variable, $value) { + eval($class.'::$'.$variable.' = $value;'); } -function extend($object, $classes) { - if (!is_array($classes)) { - $classes = func_get_args(); - $object = array_shift($classes); - } - - foreach (array_unique($classes) as $class) { - - $class_name = (is_object($class)) ? get_class($class) : $class; - if (!class_exists($class_name)) trigger_error('Undefined class '.$class_name, E_USER_ERROR); - - $methods = get_class_methods($class_name); - foreach ($methods as $method) extend_method($object, $class, $method); - - $properties = (is_object($class)) ? get_object_vars($class) : get_class_vars($class); - foreach ($properties as $property => $value) extend_property($object, $property, $value); - - if (is_object($object)) { - $object->instance_extended_parents[] = $class_name; - } else { - $extended = get_static_property($object, 'extended'); - if (!isset($extended['parents'])) { - $extended['parents'] = array(); - } - $extended['parents'] = array_merge($extended['parents'], array($class_name)); - set_static_property($object, 'extended', $extended); - } - - $arguments = array($object); - if (method_exists($class_name, 'extended')) eval(build_function_call(array($class_name, 'extended'), $arguments).';'); - } +function &call_class_method($class, $method, $arguments = array()) { + eval('$result = &'.build_function_call(array($class, $method), $arguments).';'); + return $result; } -function extend_method($object, $class, $method, $method_name = null) { - $class_name = (is_object($class)) ? get_class($class) : $class; - if (is_null($method_name)) $method_name = $method; - if (is_object($object)) { - if (!isset($object->instance_extended_methods[$method_name])) $object->instance_extended_methods[$method_name] = array(); - $object->instance_extended_methods[$method_name][] = array($class_name, $method); - } else { - $extended = get_static_property($object, 'extended'); - - if (!isset($extended['methods'])) $extended['methods'] = array(); - if (!isset($extended['methods'][$method_name])) $extended['methods'][$method_name] = array(); - - $extended['methods'][$method_name][] = array($class_name, $method); - set_static_property($object, 'extended', $extended); +function phuby_autoload($class) { + $namespaces = split('::', $class); + $file = dirname(__FILE__). DS. '..' . DS . 'lib'; + foreach ($namespaces as $namespace) { + $file .= DS.strtolower(preg_replace('/[^A-Z^a-z^0-9]+/', '_', preg_replace('/([a-z\d])([A-Z])/', '\1_\2', preg_replace('/([A-Z]+)([A-Z][a-z])/', '\1_\2', $namespace)))); } - - $object_class_name = (is_object($object)) ? get_class($object) : $object; - $arguments = array($method_name); - if (method_exists($object_class_name, 'method_added')) eval(build_function_call(array($object_class_name, 'method_added'), $arguments).';'); + require_once $file.'.php'; } -function extend_property($object, $property, $value) { - if (is_object($object)) { - $object->instance_extended_properties[$property] = $value; - } else { - $class_name = (is_object($object)) ? get_class($object) : $object; - - $extended = get_static_property($class_name, 'extended'); - if (!isset($extended['properties'])) $extended['properties'] = array(); - - $extended['properties'] = array_merge($extended['properties'], array($property => $value)); - set_static_property($class_name, 'extended', $extended); - } -} -function get_static_property($class, $property) { - return eval('return '.$class.'::$'.$property.';'); +function proc($block) { + $arguments = func_get_args(); + return eval('return '.build_function_call('new Proc', $arguments).';'); } -function set_static_property($class, $property, $value) { - eval($class.'::$'.$property.' = $value;'); -} -# Convenience functions +function evaluate_block($block, $binding = array()) { + # implict return + $lines = explode(';', $block); + $last =& $lines[count($lines)-2]; + + if (strpos($last, 'return') === false) $last = 'return '.$last; + $block = join(';', $lines); -function a($array = array()) { - $args = func_get_args(); + $parameters = array_merge(array_keys($binding), array($block)); + eval('$proc = '.build_function_call('proc', $parameters, 'parameters').';'); + return $proc->call_array(array_values($binding)); +} - if (count($args) > 1) { - return new A($args); +function build_function_call($function, $arguments = array(), $variable_name = 'arguments') { + if (!is_array($function)) $function = array($function); + if (is_object($function[0])) { + $function[0] = get_class($function[0]); + $join = '->'; } else { - return new A($array); + $join = '::'; } + return join($join, $function).'('.splat($arguments, $variable_name).')'; } -function h($hash = array()) { - return new H($hash); -} -?> \ No newline at end of file +function splat($arguments, $variable_name = 'arguments') { + $result = ''; + if (!empty($arguments)) { + $result .= '$'.$variable_name.'[0]'; + for ($i = 1; $i < count($arguments); $i++) { + $result .= ', $'.$variable_name.'['.$i.']'; + } + } + return $result; +} \ No newline at end of file lib/functions.php @@ -1,22 +1,24 @@ <?php +class Hash extends Enumerable { } + abstract class HashMethods { function invert() { - return $this->new_instance(array_flip($this->array)); + return call_class_method($this->class, 'new_instance', array(array_flip($this->array))); } function merge($hash) { if ($hash instanceof Enumerable) $hash = $hash->array; - return $this->new_instance(array_merge($this->array, $hash)); + return call_class_method($this->class, 'new_instance', array(array_merge($this->array, $hash))); } function shift() { - return (empty($this->array)) ? $this->super() : new A(array($this->keys()->shift(), $this->super())); + return (empty($this->array)) ? $this->super() : new Arr(array($this->keys()->shift(), $this->super())); } function to_a() { - return $this->inject(new A, '$object[] = new A(array($key, $value)); return $object;'); + return $this->inject(new Arr, '$object[] = new A(array($key, $value)); return $object;'); } function update($hash) { @@ -27,11 +29,6 @@ abstract class HashMethods { } -class H extends Enumerable { - static $extended = array(); -} - -extend('H', 'HashMethods'); -alias_method('H', 'flip', 'invert'); +Hash::extend('HashMethods'); -?> \ No newline at end of file +Hash::alias_method('flip', 'invert'); \ No newline at end of file lib/hash.php @@ -1,134 +1,142 @@ <?php -class Object { - - static $extended = array(); +class Object extends Module { + public $class; - public $instance_extended_methods; - public $instance_extended_parents; - public $instance_extended_properties; - + public $instance_variables; + public $superclass; + + function __clone() { + $this->send_array('cloned'); + } + function __construct($arguments = null) { $this->class = get_class($this); - - $extended = get_static_property($this->class, 'extended'); - $extending = array('methods', 'parents', 'properties'); - - foreach($extending as $extend_meta) { - $$extend_meta = isset($extended[$extend_meta]) ? $extended[$extend_meta] :array(); - - foreach(get_ancestors($this->class) as $parent) { - $parent_extended = get_static_property($parent, 'extended'); - if (!empty($parent_extended[$extend_meta])) { - $$extend_meta = array_merge($$extend_meta, $parent_extended[$extend_meta]); - } - } - $this->{"instance_extended_".$extend_meta} = $$extend_meta; - } - + $this->instance_variables = call_class_method($this->class, 'properties'); + $this->superclass = array_pop(class_parents($this->class)); if ($this->respond_to('initialize')) { $arguments = func_get_args(); - $this->call('send', 'initialize', $arguments); + $this->send_array('initialize', $arguments); } } - + function __destruct() { - if ($this->respond_to('finalize')) $this->send('finalize'); - } - - function call($method, $arguments) { - $args = func_get_args(); - $arguments = $this->extract_call_arguments($args); - return call_user_func_array(array($this, $method), $arguments); - } - - function call_extended_method($method_name, $arguments) { - $args = func_get_args(); - $arguments = $this->extract_call_arguments($args); - $callee = array_pop($this->instance_extended_methods[$method_name]); - eval('$result = '.build_function_call($callee, $arguments).';'); - $this->instance_extended_methods[$method_name][] = $callee; - return $result; + if ($this->respond_to('finalize')) $this->send_array('finalize'); } - - function inspect() { - ob_start(); - print_r($this); - return ob_get_clean(); - } - - function is_a($class) { - return $this instanceof $class; - } - - function method_extended($method) { - return isset($this->instance_extended_methods[$method]); - } - - function new_instance($arguments = null) { - $arguments = func_get_args(); - return eval('return new '.build_function_call($this->class, $arguments).';'); - } - + function respond_to($method) { - return isset($this->instance_extended_methods[$method]) || in_array($method, get_class_methods(get_class($this))); + $methods = call_class_method($this->class, 'methods'); + return in_array($method, get_class_methods($this->class)) || (in_array($method, array_keys($methods)) && !empty($methods[$method])); } - - function send($method, $arguments = null) { - $arguments = func_get_args(); - $method = array_shift($arguments); + + function &send_array($method, $arguments = array()) { + $methods = &call_class_method($this->class, 'methods'); if (!$this->respond_to($method)) { - trigger_error('Undefined method '.get_class($this).'::'.$method.'()', E_USER_ERROR); - } else if (isset($this->instance_extended_methods[$method]) && !empty($this->instance_extended_methods[$method])) { - return $this->call_extended_method($method, $arguments); + trigger_error('Undefined method '.$this->class.'::'.$method.'()', E_USER_ERROR); + } else if (!isset($methods[$method]) || empty($methods[$method])) { + $result = call_user_func_array(array($this, $method), $arguments); + return $result; } else { - return $this->call($method, $arguments); + eval('$result = &'.build_function_call($methods[$method][0], $arguments).';'); + return $result; } } - - function super($arguments = null) { + + function &super($arguments = null) { $arguments = func_get_args(); $caller = array_pop(array_slice(debug_backtrace(), 1, 1)); + if (empty($caller)) { - trigger_error(get_class($this).'::super() must be called from inside of an instance method', E_USER_ERROR); - } else if ($this->respond_to($caller['function']) && $caller['class'] != get_class($this)) { - return $this->call('send', $caller['function'], $arguments); + trigger_error($this->class.'::super() must be called from inside of an instance method', E_USER_ERROR); } else { - return eval('return '.build_function_call(array(get_parent_class($this), $caller['function']), $arguments).';'); + $methods = &call_class_method($this->class, 'methods'); + $aliases = call_class_method($this->class, 'aliases'); + $method = $caller['function']; + foreach (array_reverse($aliases) as $alias) { + if ($alias[1] == $method) { + $method = $alias[0]; + break; + } + } + if (isset($methods[$method]) && !empty($methods[$method])) { + $callee = array_shift($methods[$method]); + $result = &$this->send_array($method, $arguments); + array_unshift($methods[$method], $callee); + } else { + eval('$result = &'.build_function_call(array(get_parent_class($this), $method), $arguments).';'); + } + return $result; } } - - protected function __call($method, $arguments = array()) { - return $this->call('send', $method, $arguments); + + protected function &__call($method, $arguments = array()) { + $result = &$this->send_array('method_missing', array($method, $arguments)); + return $result; } - - protected function __get($key) { - if (isset($this->instance_extended_properties[$key])) { - return $this->instance_extended_properties[$key]; + + protected function &__get($property) { + if (isset($this->$property)) { + return $this->instance_variables[$property]; } else { - trigger_error('Undefined property $'.$key, E_USER_ERROR); + $this->instance_variables = array_merge(call_class_method($this->class, 'properties'), $this->instance_variables); + if (isset($this->instance_variables[$property])) { + return $this->instance_variables[$property]; + } else { + trigger_error('Undefined property $'.$property, E_USER_ERROR); + } } } - - protected function __isset($key) { - return isset($this->instance_extended_properties[$key]); + + protected function __isset($property) { + return isset($this->instance_variables[$property]); } - - protected function __set($key, $value) { - if (isset($this->instance_extended_properties[$key])) $this->instance_extended_properties[$key] = $value; + + protected function __set($property, $value) { + $this->instance_variables[$property] = $value; } - - protected function __unset($key) { - unset($this->instance_extended_properties[$key]); + + protected function __unset($property) { + unset($this->instance_variables[$property]); } + +} - protected function extract_call_arguments($args) { - array_shift($args); - $arguments = array_pop($args); - if (!is_array($arguments)) trigger_error('The last argument in '.get_class($this).'::extract_call_arguments() must be an array', E_USER_ERROR); - return array_merge($args, $arguments); +abstract class ObjectMethods { + + function cloned() { } + + function dup() { + return clone $this; } - + + function inspect() { + ob_start(); + print_r($this); + return ob_get_clean(); + } + + function instance_variables() { + return $this->instance_variables; + } + + function is_a($class) { + return $this instanceof $class; + } + + function &method_missing($method, $arguments = array()) { + $result = &$this->send_array($method, $arguments); + return $result; + } + + function &send($method, $arguments = null) { + $arguments = func_get_args(); + $method = array_shift($arguments); + $result = &$this->send_array($method, $arguments); + return $result; + } + } -?> \ No newline at end of file +Object::extend('ObjectMethods', 'Delegator'); + +Object::alias_method('is_an', 'is_a'); \ No newline at end of file lib/object.php @@ -1,5 +1,7 @@ <?php +class Struct extends Object { } + abstract class StructMethods { public $members = array(); @@ -14,9 +16,9 @@ abstract class StructMethods { } function instance($values) { - $instance = $this->new_instance($this->members); + $instance = call_class_method($this->class, 'new_instance', array($this->members)); $values = func_get_args(); - foreach ($this->members as $key => $member) extend_property($instance, $member, $values[$key]); + foreach ($this->members as $key => $member) $instance->$member = $values[$key]; return $instance; } @@ -25,13 +27,13 @@ abstract class StructMethods { } function to_a() { - $result = new A; + $result = new Arr; foreach ($this->members as $member) $result[] = $this->$member; return $result; } function to_h() { - $result = new H; + $result = new Hash; foreach ($this->members as $member) $result[$member] = $this->$member; return $result; } @@ -43,13 +45,8 @@ abstract class StructMethods { } -class Struct extends Object { - static $extended = array(); -} - -extend('Struct', 'StructMethods'); -alias_method('Struct', 'length', 'count'); -alias_method('Struct', 'size', 'count'); -alias_method('Struct', 'values', 'to_a'); +Struct::extend('StructMethods'); -?> \ No newline at end of file +Struct::alias_method('length', 'count'); +Struct::alias_method('size', 'count'); +Struct::alias_method('values', 'to_a'); \ No newline at end of file lib/struct.php @@ -1,10 +1,7 @@ <?php -require_once 'lib/functions.php'; -require_once 'lib/object.php'; -require_once 'lib/enumerable.php'; -require_once 'lib/array.php'; -require_once 'lib/hash.php'; -require_once 'lib/struct.php'; +if (!defined('DS')) define('DS', DIRECTORY_SEPARATOR); -?> \ No newline at end of file +require_once 'lib'.DS.'functions.php'; + +spl_autoload_register('phuby_autoload'); \ No newline at end of file phuby.php @@ -4,12 +4,12 @@ require 'spec_helper.php'; class Describe_Enumerable_Array extends SimpleSpec { function should_instantiate_a_array_object() { - $e = new A(array('ing', 'cool', 'wow')); - expects( $e )->should_be_a('A'); - expects( $e )->should_be_a('Enumerable'); - expects( $e )->should_be_a('Object'); + $e = new Arr(array('ing', 'cool', 'wow')); + expect( $e )->should_be_a('Arr'); + expect( $e )->should_be_a('Enumerable'); + expect( $e )->should_be_a('Object'); - expects($e->array)->should_be(array('ing', 'cool', 'wow')); + expect($e->array)->should_be(array('ing', 'cool', 'wow')); } function should_be_iteratable_with_foreach() { @@ -18,27 +18,30 @@ class Describe_Enumerable_Array extends SimpleSpec { foreach ($e as $k => $v) { $results[] = $v; } - expects($results)->should_be(array('ing', 'cool', 'wow')); + expect($results)->should_be(array('ing', 'cool', 'wow')); } function should_provide_functional_iterators() { $e = a('ing', 'cool', 'wow'); - expects($e->any('$value == "ing";'))->should_be(true); - expects($e->any('$value == "invalid";'))->should_be(false); - expects($e->map('strlen($value);')->array)->should_be(array(3,4,3)); + expect($e->any('$value == "ing";'))->should_be(true); + expect($e->any('$value == "invalid";'))->should_be(false); - $rs = $e->reduce('', '$object .= $value;$object;'); - expects($rs)->should_be('ingcoolwow'); + expect($e->map('strlen($value);')->array)->should_be(array(3,4,3)); + + $rs = $e->inject('', '$object .= $value;$object;'); + expect($rs)->should_be('ingcoolwow'); } function should_provide_enumeration_methods() { - # Enumerable#sort uses asort which maintain index association, make sense here? - expects(a(3,2,1)->sort()->array)->should_be(array(1,2,3)); + //FIXME: uses asort which maintain index association, make sense here? + # Enumerable#sort + expect(array_values(a(3,2,1)->sort()->array))->should_be(array(1,2,3)); $e = a(1, 2, 3, a(4, 5, 6, a(7, 8, 9))); - expects($e->flatten()->array)->should_be(array(1,2,3,4,5,6,7,8,9)); + + expect($e->flatten()->array)->should_be(array(1,2,3,4,5,6,7,8,9)); } } spec/enumerable_spec.php @@ -6,20 +6,20 @@ class Describe_Object extends SimpleSpec { function should_be_able_to_invoke_overloaded_methods() { $t = new Testing; - expects($t->testing())->should_be('Whoa::testing'); + expects($t->testing())->should_be('cooool'); - expects($t->testing2())->should_be('Dude::testing2'); + expects($t->testing2())->should_be('this is a returned value'); } function should_dispatch_message_passing_using_method_send() { $t = new Testing; - expects($t->send('testing'))->should_be('Whoa::testing'); + expects($t->send('testing'))->should_be('cooool'); } function should_respond_to_a_implemented_method() { $t = new Testing; - + expects($t->respond_to('real_method'))->should_be(true); expects($t->respond_to('testing'))->should_be(true); @@ -41,12 +41,12 @@ class Describe_Object extends SimpleSpec { function should_call_parent_method_using_method_super() { $t = new Testing; - expects($t->super_test('sean'))->should_match('/Hello sean from Whoa::super_test/'); + expects($t->super_test('sean'))->should_match('/Hello sean from super/'); } function should_raise_error_when_caller_does_not_exists_for_method_super() { $t = new Testing; - // fixme: this is not working yet + //fixme: this is not working yet // $t->super(); // $this->should_expect_error(); } @@ -55,28 +55,27 @@ class Describe_Object extends SimpleSpec { class Whoa { function super_test($name) { - return "Hello {$name} from ". __METHOD__; + return "Hello {$name} from super"; } function testing() { - return __METHOD__; + return 'cooool'; } } class Dude { public $test_property = 'cool'; - static function extended($object) { - if (is_object($object)) $object = get_class($object); - // echo $object.' extended Dude'."\n"; - } - function super_test($name) { - return __METHOD__ . ' ' . $this->super($name); + return $this->super($name); } function testing2() { - return __METHOD__; + return 'this is a returned value'; + } + + function delegated() { + return 'delegated from Dude'."\n"; } } @@ -88,10 +87,6 @@ class UhOh { class Testing extends Object { - function initialize() { - extend($this, 'Whoa', 'Dude'); - } - function real_method() { return 'real_method'; } @@ -101,3 +96,4 @@ class Testing extends Object { } } +Testing::extend('Whoa', 'Dude'); spec/object_spec.php @@ -131,6 +131,12 @@ function expects($subject) { return $object->expect($subject); } +function expect($subject) { + $trace = debug_backtrace(); + $object = $trace[1]['object']; + return $object->expect($subject); +} + class Have_Matcher { function __construct($subject, $count, $runtime) { $this->subject = $subject; spec/simplespec.php @@ -2,7 +2,14 @@ require_once '../phuby.php'; -$e = new A; +// print_r(Enumerable::methods()); + +// print_r(Module::$mixins); + +$e = new Arr; + +// print_r(Arr::mixins()); +// print_r(Arr::methods()); $e[] = 'ing'; $e[] = 'cool'; @@ -26,18 +33,13 @@ if ($e->any('$key == 1;')) echo "true\n"; if ($e->any('$key == 4;')) echo "true\n"; echo "***INJECT***\n"; -print_r($e->inject(array(), ' - $object["injected_$key"] = $value; - $object; -')); - -$e = new H; +print_r($e->inject(array(), '$object["injected_$key"] = $value;$object;')); +$e = new Hash; $e['short'] = 4; $e['this is a longer one'] = 12; $e['this is long'] = 2; - echo "***ARRAY***\n"; print_r($e->array); @@ -48,11 +50,9 @@ echo "***SORT_BY***\n"; print_r($e->sort_by('strlen($key);')->array); echo "***FLATTEN***\n"; -$e = new A(array(1, 2, 3, new A(array(4, 5, 6, new A(array(7, 8, 9)))))); +$e = new Arr(array(1, 2, 3, new Arr(array(4, 5, 6, new Arr(array(7, 8, 9)))))); print_r($e->flatten()->array); echo "***CHUNK***\n"; -$e = new A(array(1,2,3,4,5,6,7,8)); -print_r($e->chunk(3)->to_native_a()); - -?> \ No newline at end of file +$e = new Arr(array(1,2,3,4,5,6,7,8)); +print_r($e->chunk(3)->to_native_a()); \ No newline at end of file test/enumerable_test.php @@ -15,11 +15,6 @@ class Whoa { class Dude { public $test_property = 'cool'; - static function extended($object) { - if (is_object($object)) $object = get_class($object); - // echo $object.' extended Dude'."\n"; - } - function super_test($name) { echo "I like the name $name\n"; return $this->super($name); @@ -29,6 +24,10 @@ class Dude { echo 'totally'; return 'this is a returned value'; } + + function delegated() { + echo 'delegated from Dude'."\n"; + } } class UhOh { @@ -39,10 +38,6 @@ class UhOh { class Testing extends Object { - function initialize() { - extend($this, 'Whoa', 'Dude'); - } - function real_method() { return 'real_method'; } @@ -52,6 +47,7 @@ class Testing extends Object { } } +Testing::extend('Whoa', 'Dude'); $t = new Testing; @@ -64,7 +60,7 @@ echo "\n"; echo $t->testing2(); echo "\n"; -$t->send('testing'); +echo $t->send('testing').' guy'; echo "\n"; echo $t->respond_to('real_method'); @@ -88,7 +84,11 @@ echo "\n"; echo $t->is_a('Invalid'); echo "\n"; -// print_r($t); +// $dup = $t->dup(); +// print_r($dup); + +Testing::delegate('delegated', 'Dude'); +$t->delegated(); $t->super(); test/object_test.php @@ -2,7 +2,8 @@ require_once '../phuby.php'; -$customer = new Struct('first_name', 'last_name'); +// $customer = new Struct('first_name', 'last_name'); +$customer = Struct::new_instance('first_name', 'last_name'); $sean = $customer->instance('Sean', 'Huber'); test/struct_test.php lib/array.php 224a4421b4915eae88b9e88e3ab77e6133a7ccc4 speedmax subjective@gmail.com http://github.com/shuber/phuby/commit/804b2b936d410d45a393694289e0d0e607899103 804b2b936d410d45a393694289e0d0e607899103 2009-06-11T20:17:53-07:00 2009-06-11T20:17:53-07:00 Getting all spec running again and merge conflicts - cleanup proc unset into single function call - Fixed undefined constant error (DS) in phuby.php - Adding implicit return to evaluate_block bf228044c8d0e00046b44c1349589fc4d5fc7630 speedmax subjective@gmail.com