0
@@ -33,57 +33,12 @@ function chipi($file = NULL, $namespace = NULL) {
0
 function chippino_config() {
0
     static $chip;
0
     if (!isset($chip)) {
0
-        $chip = new Chippino_Container();
0
+        $chip = new Grok_Container();
0
     }
0
     return $chip;
0
 }
0
 
0
 /**
0
- * Underlying container class of Chippino, bringing Grok with it.
0
- *
0
- * Not recommended to use this directly.
0
- * Keeping the container class separate from Grok allows us to ensure that internal variables don't
0
- * collide with the variables used in writing to a Grok in an include file.
0
- * The Chippino Container adds iteration functions.
0
- **/
0
-class Chippino_Container extends Grok_Container implements Iterator {
0
-    /**
0
-     * @see http://www.php.net/manual/en/language.oop5.iterations.php
0
-     **/
0
-    public function current() {
0
-        return current($this->__data);
0
-    }
0
-    
0
-    /**
0
-     * @see http://www.php.net/manual/en/language.oop5.iterations.php
0
-     **/
0
-    public function key() {
0
-        return key($this->__data);
0
-    }
0
-    
0
-    /**
0
-     * @see http://www.php.net/manual/en/language.oop5.iterations.php
0
-     **/
0
-    public function next() {
0
-        return next($this->__data);
0
-    }
0
-    
0
-    /**
0
-     * @see http://www.php.net/manual/en/language.oop5.iterations.php
0
-     **/
0
-    public function valid() {
0
-        return ($this->current() !== false);
0
-    }
0
-    
0
-    /**
0
-     * @see http://www.php.net/manual/en/language.oop5.iterations.php
0
-     **/
0
-    public function rewind() {
0
-        reset($this->__data);
0
-    }
0
-}
0
-
0
-/**
0
  * Here is the actual Grok Class. Enjoy!
0
  **/
0
 class Chippino_Dispatcher {
0
@@ -145,7 +100,6 @@ class Chippino_Dispatcher {
0
       $this->getSingleton()
0
     ));
0
     
0
-		$grok->import($input);
0
         return $grok->dispatch($this->getFilePath());
0
     }
0
 }
0
@@ -180,7 +134,7 @@ class Chippino_Factory {
0
             $chips[$key] = grok($file);
0
         }
0
         
0
-        $chips[$key]->import($input);
0
+        $chips[$key]->__construct($input);
0
         
0
         return $chips[$key];
0
     }

0
@@ -37,5 +37,5 @@ while (FALSE !== ($file = readdir($handle))) {
0
 }
0
 
0
 // wrap into a Chippino_Container
0
-$this->config_results = new Chippino_Container($config);
0
+$this->config_results = new Grok_Container($config);
0
 return $this->config_results;

0
@@ -11,7 +11,7 @@
0
  **/
0
 
0
 $output = array();
0
-foreach ($this->export() as $key => $params) {
0
+foreach ($this as $key => $params) {
0
     if (!is_array($params)) {
0
         $params = array('as' => $params);
0
     }