Changeset 13490

Timestamp:

06/08/08 17:59:58 (5 years ago)

Author:

kumatch

Message:

Refactored.

Location:

events/phpframework/piece_framework/trunk

Files:

• libs/Phwittr/Service.php (modified) (4 diffs)
• specs/Phwittr/AuthenticationSpec.php (modified) (4 diffs)

events/phpframework/piece_framework/trunk/libs/Phwittr/Service.php

@@ -13 +13 @@
 require_once 'Phwittr/Config.php';
 require_once 'Phwittr/Service/Exception.php';
+require_once 'Piece/Right/Validator/Email.php';
 
 // {{{ Phwittr
@@ -117 +118 @@
     public function isAvailableUserName($userName)
     {
-        $mapper = Piece_ORM::getMapper('Users');
+        Phwittr_Config::configurePieceORM();
+        $mapper = Piece_ORM::getMapper('Users');
+
         $user = $mapper->findByUserName($userName);
         if (is_null($user)) {
@@ -126 +129 @@
     }
 
+    // }}}
+    // {{{ authenticate
+
+    /**
+     * 認証を行う
+     * 
+     * @param string $user
+     * @param string $password
+     * @return boolean
+     */
+    public function authenticate($name, $password)
+    {
+        Phwittr_Config::configurePieceORM();
+        $mapper = Piece_ORM::getMapper('Users');
+
+        if (Phwittr_Service::isEmailString($name)) {
+            $criteria->email = $name;
+            $criteria->password = $password;
+            $user = $mapper->findByEmailAndPassword($criteria);
+        } else {
+            $criteria->userName = $name;
+            $criteria->password = $password;
+            $user = $mapper->findByUserNameAndPassword($criteria);
+        }
+
+        if (!$user) {
+            return false;
+        }
+
+        return $user;
+    }
+
     /**#@-*/
 
@@ -131 +166 @@
      * @access private
      */
+
+    // }}}
+    // {{{ _isEmailString
+
+    /**
+     * メールアドレス値かどうかを確認する
+     * 
+     * @param string $email
+     * @return boolean
+     */
+    public function isEmailString($email)
+    {
+        $validator = &new Piece_Right_Validator_Email();
+        $validator->setRules(array('allowDotBeforeAtmark' => true));
+
+        return $validator->validate($email);
+    }
 
     /**#@-*/

events/phpframework/piece_framework/trunk/specs/Phwittr/AuthenticationSpec.php

@@ -12 +12 @@
 
 require_once dirname(__FILE__) . '/SpecCommon.php';
-require_once 'Phwittr/Config.php';
-require_once 'Phwittr/Authentication.php';
+require_once 'Phwittr/Service.php';
 
 // {{{ DescribeSigninout
@@ -52 +51 @@
      */
 
-    public function it認証はユーザ名とパスワードで行う()
+    public function it認証はユーザ名とパスワードで行い、成功するとユーザ情報が得られる()
     {
         $this->_createUserRecord($this->_foo);
 
-        $authenticator = new Phwittr_Authentication();
-        $result = $authenticator->authenticate($this->_foo->userName,
-                                               $this->_foo->password
-                                               );
+        $user = Phwittr_Service::authenticate($this->_foo->userName,
+                                              $this->_foo->password
+                                              );
 
-        $this->spec($result)->should->beTrue();
+        $this->spec($user->userName)->should->be($this->_foo->userName);
+        $this->spec($user->email)->should->be($this->_foo->email);
     }
 
-    public function it認証はメールアドレスとパスワードでも行える()
+    public function it認証はメールアドレスとパスワードでも行え、成功するとユーザ情報が得られる()
     {
         $this->_createUserRecord($this->_foo);
 
-        $authenticator = new Phwittr_Authentication();
-        $result = $authenticator->authenticate($this->_foo->email,
-                                               $this->_foo->password
-                                               );
+        $user = Phwittr_Service::authenticate($this->_foo->email,
+                                              $this->_foo->password
+                                              );
 
-        $this->spec($result)->should->beTrue();
+        $this->spec($user->userName)->should->be($this->_foo->userName);
+        $this->spec($user->email)->should->be($this->_foo->email);
     }
 
@@ -80 +79 @@
         $this->_createUserRecord($this->_foo);
 
-        $authenticator = new Phwittr_Authentication();
-
-        $this->spec($authenticator->authenticate('dummy', 'dummy'))->should->beFalse();
-        $this->spec($authenticator->authenticate('dummy@example.com', 'dummy'))->should->beFalse();
-        $this->spec($authenticator->authenticate($this->_foo->userName, 'dummy'))->should->beFalse();
-        $this->spec($authenticator->authenticate($this->_foo->email, 'dummy'))->should->beFalse();
-        $this->spec($authenticator->authenticate('dummy', $this->_foo->password))->should->beFalse();
-        $this->spec($authenticator->authenticate('dummy@example.com', $this->_foo->password))->should->beFalse();
+        $this->spec(Phwittr_Service::authenticate('dummy', 'dummy'))->should->beFalse();
+        $this->spec(Phwittr_Service::authenticate('dummy@example.com', 'dummy'))->should->beFalse();
+        $this->spec(Phwittr_Service::authenticate($this->_foo->userName, 'dummy'))->should->beFalse();
+        $this->spec(Phwittr_Service::authenticate($this->_foo->email, 'dummy'))->should->beFalse();
+        $this->spec(Phwittr_Service::authenticate('dummy', $this->_foo->password))->should->beFalse();
+        $this->spec(Phwittr_Service::authenticate('dummy@example.com', $this->_foo->password))->should->beFalse();
     }
 
@@ -96 +93 @@
         $this->_foo->flag = 1;
 
-        $authenticator = new Phwittr_Authentication();
-        $result1 = $authenticator->authenticate($this->_foo->userName,
-                                                $this->_foo->password
-                                                );
-        $result2 = $authenticator->authenticate($this->_foo->email,
-                                                $this->_foo->password
-                                                );
+        $result1 = Phwittr_Service::authenticate($this->_foo->userName,
+                                                 $this->_foo->password
+                                                 );
+        $result2 = Phwittr_Service::authenticate($this->_foo->email,
+                                                 $this->_foo->password
+                                                 );
 
         $this->spec($result1)->should->beFalse();
         $this->spec($result2)->should->beFalse();
-    }
-
-    public function it認証後にユーザ情報が取得できる()
-    {
-        $this->_createUserRecord($this->_foo);
-
-        $authenticator = new Phwittr_Authentication();
-        $authenticator->authenticate($this->_foo->userName,
-                                     $this->_foo->password
-                                     );
-        $user = $authenticator->getAuthenticatedUser();
-
-        $this->spec($user->userName)->should->be($this->_foo->userName);
-        $this->spec($user->email)->should->be($this->_foo->email);
-    }
-
-    public function it認証前にユーザ情報を取得しても空()
-    {
-        $this->_createUserRecord($this->_foo);
-
-        $authenticator = new Phwittr_Authentication();
-        $user = $authenticator->getAuthenticatedUser();
-
-        $this->spec($user)->should->beNull();
-    }
-
-    public function it認証に失敗した後にユーザ情報を取得しても空()
-    {
-        $this->_createUserRecord($this->_foo);
-
-        $authenticator = new Phwittr_Authentication();
-        $this->spec($authenticator->authenticate('dummy', 'dummy'))->should->beFalse();
-        $user = $authenticator->getAuthenticatedUser();
-
-        $this->spec($user)->should->beNull();
     }