4.1

.gitignore

@@ -1,3 +1,6 @@
 data/config*
 scripts/miao.php
-modules/Env/data/*
+modules/Env/data/*
+/tmp/
+composer.lock
+/vendor/

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Miao
 
+## 4.0
+ * Namespace support
+ * Rename TemplateEngine to Template
+ * [30] Autoload. Fatal error if did not find class with namespace
+ * [29] Autoload, need method classExists()
+ * [15] Autoload doesn't work with namespaces
+
 ## 3.3 (master)
  * [22]
  * [18] Miao_Router

README.asciidoc

@@ -1,4 +1,4 @@
-== Maio
+== Miao
 PHP фреймоворк
 
 == Installing/Configuring
@@ -18,15 +18,13 @@ http://www.phpunit.de/manual/current/en/installation.html
 
 -----
 pear config-set auto_discover 1; 
-pear install --alldeps pear.phpunit.de/PHPUnit
+pear install pear.phpunit.de/PHPUnit --alldeps
+pear install phpunit/PHPUnit_Selenium
+pear install phpunit/PHPUnit_Story
 -----
 
 === Test
 Убеждаемся в том что все необходимое установлено, запускаем тесты.
 -----
-php scripts/test.php -d Miao
------
-
-=== TODO
-
-Merge with trunk
+phpunit
+-----

composer.json

@@ -0,0 +1,22 @@
+{
+    "name" : "theratg/miao",
+    "description": "PHP framework",
+    "version" : "4.1.0",
+    "authors" : [
+        {
+            "name" : "Vladimir",
+            "email" : "TheRatW@gmail.com"
+        }
+    ],
+    "license": "MIT",
+    "minimum-stability" : "stable",
+    "require" : {
+        "symfony/console" : "2.3",
+        "monolog/monolog" : ">=1.6"
+    },
+    "autoload" : {
+        "classmap" : [
+            "modules"
+        ]
+    }
+}

modules/Acl/classes/Acl.php

@@ -0,0 +1,92 @@
+<?php
+/**
+ * @author vpak
+ * @date 2013-09-26 10:14:09
+ */
+
+namespace Miao;
+
+class Acl
+{
+    /**
+     * @var \Miao\Acl\Adapter\AdapterInterface
+     */
+    protected $_adapter;
+
+    /**
+     * @param \Miao\Acl\Adapter\AdapterInterface $adapter
+     */
+    public function __construct( \Miao\Acl\Adapter\AdapterInterface $adapter )
+    {
+        $this->_adapter = $adapter;
+    }
+
+    /**
+     * @param string $group
+     * @param $resource
+     * @param string $privilege
+     * @return bool
+     */
+    public function isAllowed( $group, $resource, $privilege = null )
+    {
+        return $this->_adapter->isAllowed( $group, $resource, $privilege );
+    }
+
+    /**
+     * @param string $group
+     * @return \Miao\Acl\Adapter\AdapterInterface
+     */
+    public function addGroup( $group )
+    {
+        return $this->_adapter->addGroup( $group );
+    }
+
+    /**
+     * @param string $group
+     * @return \Miao\Acl\Adapter\AdapterInterface
+     */
+    public function deleteGroup( $group )
+    {
+        return $this->_adapter->deleteGroup( $group );
+    }
+
+    /**
+     * @param $resource
+     * @return \Miao\Acl\Adapter\AdapterInterface
+     */
+    public function addResource( $resource )
+    {
+        return $this->_adapter->addResource( $resource );
+    }
+
+    /**
+     * @param string $resource
+     * @return \Miao\Acl\Adapter\AdapterInterface
+     */
+    public function delete( $resource )
+    {
+        return $this->_adapter->delete( $resource );
+    }
+
+    /**
+     * @param string $group
+     * @param string $resource
+     * @param array $privileges
+     * @return \Miao\Acl\Adapter\AdapterInterface
+     */
+    public function allow( $group = null, $resource = null, array $privileges = array() )
+    {
+        return $this->_adapter->allow( $group, $resource, $privileges );
+    }
+
+    /**
+     * @param string $group
+     * @param string $resource
+     * @param array $privileges
+     * @return \Miao\Acl\Adapter\AdapterInterface
+     */
+    public function deny( $group = null, $resource = null, array $privileges = array() )
+    {
+        return $this->_adapter->deny( $group, $resource, $privileges );
+    }
+}

modules/Acl/classes/AclInterface.php

@@ -0,0 +1,27 @@
+<?php
+/**
+ * User: vpak
+ * Date: 26.09.13
+ * Time: 10:33
+ */
+
+namespace Miao;
+
+interface AclInterface
+{
+    /**
+     * @param string $group
+     * @param string $resource
+     * @param string $privilege
+     * @return bool
+     */
+    public function isAllowed( $group = null, $resource = null, $privilege = '' );
+
+    public function allow( $group = null, $resource = null, array $privileges = array() );
+
+    public function deny( $group = null, $resource = null, array $privileges = array() );
+
+    public function addResource( $resource );
+
+    public function addGroup( $group );
+}