Changeset 20329 for events

Timestamp:

10/01/08 03:41:41 (2 months ago)

Author:

sabel

Message:

improvement

Location:

events/phpframework/sabel/trunk

Files:

• PHWITTR.TXT (modified) (1 diff)
• Sabel/sabel/Context.php (modified) (2 diffs)
• Sabel/sabel/ValueObject.php (modified) (1 diff)
• addon/renderer/sabel/Replacer.php (modified) (1 diff)
• app/aspects/Transaction.php (modified) (1 diff)
• app/aspects/UserCache.php (added)
• app/controllers/Application.php (modified) (1 diff)
• app/helpers/application.php (modified) (1 diff)
• app/index/controllers/Friendship.php (modified) (2 diffs)
• app/index/controllers/Index.php (modified) (3 diffs)
• app/index/controllers/Status.php (modified) (1 diff)
• app/index/controllers/User.php (modified) (1 diff)
• app/index/controllers/Users.php (modified) (1 diff)
• app/logics/DI.php (modified) (1 diff)
• app/logics/Follow.php (modified) (7 diffs)
• app/logics/Status.php (modified) (2 diffs)
• app/models/Status.php (modified) (2 diffs)
• app/views/Submenu.php (added)
• app/views/layout.tpl (modified) (1 diff)
• app/views/submenu/others.tpl (modified) (1 diff)
• app/views/submenu/user.tpl (modified) (2 diffs)
• cache/user (added)
• config/DI.php (modified) (1 diff)
• config/environment.php (modified) (1 diff)
• lib/AjaxResult.php (modified) (1 diff)
• lib/UserCache.php (added)
• lib/processor/Action.php (modified) (1 diff)
• lib/processor/View.php (modified) (3 diffs)

events/phpframework/sabel/trunk/PHWITTR.TXT

@@ -30 +30 @@
 
   運用時はENVIRONMENTをPRODUCTIONにしてください
+
+  * PRODUCTIONではテンプレートや一部のデータがキャッシュされます
+    テンプレートを修正した場合は'cache/templates/'の下を削除してください
+    データベースのデータを直接変更した場合は'cache/user/'の下を削除してください
 
 ================================================================================

events/phpframework/sabel/trunk/Sabel/sabel/Context.php

@@ -68 +68 @@
   }
   
+  public static function getResponse()
+  {
+    $context = self::getContext();
+    return ($context->bus) ? $context->bus->get("response") : null;
+  }
+  
   public static function getDestination()
   {
@@ -86 +92 @@
   }
   
-  public static function getResponse()
+  public static function getView()
   {
     $context = self::getContext();
-    return ($context->bus) ? $context->bus->get("response") : null;
+    return ($context->bus) ? $context->bus->get("view") : null;
   }
 }

events/phpframework/sabel/trunk/Sabel/sabel/ValueObject.php

@@ -86 +86 @@
       throw new Sabel_Exception_InvalidArgument($message);
     }
+    
+    return $this;
   }
 }

events/phpframework/sabel/trunk/addon/renderer/sabel/Replacer.php

@@ -174 +174 @@
     } else {
       $fmt = '<?php echo $this->partial("%s", %s) ?>';
-      $assign  = preg_match_replace("/'.+[^\\\\]'/U", ",", "_%CMM%_", $assign);
+      $assign  = preg_match_replace("/'.*[^\\\\]'/U", ",", "_%CMM%_", $assign);
       $assigns = explode(",", $assign);
       if (strpos($assigns[0], ":") === false) {

events/phpframework/sabel/trunk/app/aspects/Transaction.php

@@ -8 +8 @@
     
     try {
+      l("before: transaction");
       $result = $inv->proceed();
+      l("after: transaction");
       Sabel_Db_Transaction::commit();
       return $result;

events/phpframework/sabel/trunk/app/controllers/Application.php

@@ -24 +24 @@
     $aclUser->isProtected = $aUser->isProtected();
   }
-  
-  protected function assignUserSubmenu()
-  {
-    $user = $this->aclUser;
-    $userData = $this->getUserData($user->id);
-    
-    if ($user->isProtected) {
-      $userData->requestCount = Request::getRequestsCount($user->id);
-    }
-    
-    $userData->name  = $user->name;
-    $userData->image = $user->image;
-    $userData->latestComment = Status::getLatestCommentByUserId($user->id);
-    
-    $renderer = $this->view->getRenderer();
-    $contents = file_get_contents(
-      MODULES_DIR_PATH . DS . VIEW_DIR_NAME . DS . "submenu" . DS . "user.tpl"
-    );
-    
-    $this->submenuHtml = $renderer->rendering($contents, array("userData" => $userData));
-  }
-  
-  protected function assignOthersSubmenu($userId, $userName = null)
-  {
-    $userData = $this->getUserData($userId);
-    
-    if ($userName === null) {
-      $aUser = new User($userId);
-      $userData->name = $aUser->user_name;
-    } else {
-      $userData->name = $userName;
-    }
-    
-    $renderer = $this->view->getRenderer();
-    $contents = file_get_contents(
-      MODULES_DIR_PATH . DS . VIEW_DIR_NAME . DS . "submenu" . DS . "others.tpl"
-    );
-    
-    $this->submenuHtml = $renderer->rendering($contents, array("userData" => $userData));
-  }
-  
-  private function getUserData($userId)
-  {
-    return Sabel_ValueObject::fromArray(array(
-      "userId"         => $userId,
-      "friends"        => Follower::getFriends($userId, FRIENDS_ICON_LIMIT + 1),
-      "friendsCount"   => Follower::getFriendsCount($userId),
-      "followersCount" => Follower::getFollowersCount($userId),
-      "statusesCount"  => Status::getCountByUserId($userId)
-    ));
-  }
 }

events/phpframework/sabel/trunk/app/helpers/application.php

@@ -67 +67 @@
 }
 
-/*
-function to_date($date, $format)
-{
-  return Helpers_Date::format($date, constant("Helpers_Date::" . $format));
-}
-
-function __include($uri, $values = array(), $method = Sabel_Request::GET, $withLayout = false)
-{
-  $requester = new Sabel_Request_Internal($method);
-  $requester->values($values)->withLayout($withLayout);
-  return $requester->request($uri)->getResult();
-}
-*/
-
 function datetime($date, $format = "m/d H:i")
 {

events/phpframework/sabel/trunk/app/index/controllers/Friendship.php

@@ -46 +46 @@
     
     if ($success) {
-      $aUser = new User($this->id);
-      $this->redirect->to("n: users, c: {$aUser->user_name}, a: ");
+      if (!$this->isAjaxRequest()) {
+        $aUser = new User($this->id);
+        $this->redirect->to("n: users, c: {$aUser->user_name}, a: ");
+      }
     } else {
       $this->badRequest();
@@ -55 +57 @@
   public function requests()
   {
-    $this->assignUserSubmenu();
+    $this->submenu->setUser($this->aclUser->id);
     $this->requests = Request::getRequestsByUserId($this->aclUser->id);
     

events/phpframework/sabel/trunk/app/index/controllers/Index.php

@@ -12 +12 @@
   public function timeline()
   {
+    // これしょぼす
     $this->rsslink = '<link rel="alternate" type="application/rss+xml" '
                    . 'title="Phwittr public timeline" '
@@ -22 +23 @@
       $this->clientId = $this->session->getClientId();
       $this->isProtected = $this->aclUser->isProtected;
-      $this->assignUserSubmenu();
+      $this->submenu->setUser($this->aclUser->id);
     }
   }
@@ -73 +74 @@
     
     if ($isSelf) {
-      $this->assignUserSubmenu();
+      $this->submenu->setUser($this->aclUser->id);
     } else {
-      $this->assignOthersSubmenu($aUser->id, $aUser->name);
+      $this->submenu->setUser($aUser->id, Views_Submenu::TYPE_OTHERS);
     }
   }

events/phpframework/sabel/trunk/app/index/controllers/Status.php

@@ -45 +45 @@
       $this->badRequest();
     } else {
-      $aStatus = new Status($this->param);
-      if ($aStatus->user_id === $this->aclUser->id) {
-        $aStatus->delete();
-      }
+      $this->getLogic("status")->remove($this->aclUser->id, $this->param);
     }
   }

events/phpframework/sabel/trunk/app/index/controllers/User.php

@@ -11 +11 @@
   {
     if ($this->response->isSuccess() && $this->action !== "logout") {
-      $this->assignUserSubmenu();
+      $this->submenu->setUser($this->aclUser->id);
     }
   }

events/phpframework/sabel/trunk/app/index/controllers/Users.php

@@ -10 +10 @@
     if ($this->aUser = $this->fetchModel("User", array("user_name" => $parts[0]))) {
       if ($this->aUser->isActive()) {
-        $this->assignOthersSubmenu($this->aUser->id, $this->aUser->name);
+        $this->submenu->setUser($this->aUser->id, Views_Submenu::TYPE_OTHERS);
       } else {
         $this->notFound();

events/phpframework/sabel/trunk/app/logics/DI.php

@@ -11 +11 @@
     }
     
-    $this->aspect("Logics_Base")->annotate(
-      "transaction", array("Aspects_Transaction")
-    );
+    if (ENVIRONMENT === PRODUCTION) {
+      $this->bind("Mail")->to("Mail_Object");
+    } else {
+      $this->bind("Mail")->to("Mail_Mock");
+    }
+    
+    $aspect = $this->aspect("Logics_Base");
+    $aspect->annotate("transaction", array("Aspects_Transaction"));
+    
+    if ((ENVIRONMENT & PRODUCTION) > 0) {
+      $aspect->annotate("userCache", array("Aspects_UserCache"));
+    }
   }
 }

events/phpframework/sabel/trunk/app/logics/Follow.php

@@ -4 +4 @@
 {
   /**
+   * @userCache
+   *
    * @param int $userId   ユーザID
    * @param int $targetId フォローするユーザのID
@@ -23 +25 @@
           "created_at" => now()
         ));
+        
+        $result->addType = "request";
       } else {
         $follower = new Follower();
@@ -30 +34 @@
           "created_at" => now()
         ));
+        
+        $result->addType = "follow";
       }
     } else {
@@ -39 +45 @@
   
   /**
+   * @userCache
+   *
    * @param int $userId   ユーザID
    * @param int $targetId フォロー中ユーザのID
@@ -56 +64 @@
         $request->setCondition("request_id", $targetId);
         $request->delete();
+        $result->removeType = "request";
       } else {
         $follower = new Follower();
@@ -61 +70 @@
         $follower->setCondition("follow_id", $targetId);
         $follower->delete();
+        $result->removeType = "follow";
       }
     } else {
@@ -71 +81 @@
   /**
    * @transaction
+   * @userCache
    *
    * @param int $userId      リクエストされたユーザのID

events/phpframework/sabel/trunk/app/logics/Status.php

@@ -5 +5 @@
   /**
    * @transaction
+   * @userCache
    *
    * @param int    $userId  ユーザID
@@ -34 +35 @@
     return $result;
   }
+  
+  /**
+   * @userCache
+   *
+   * @param int $userId   ユーザID
+   * @param int $statusId ステータスID
+   *
+   * @return Logics_Result
+   */
+  public function remove($userId, $statusId)
+  {
+    $result  = new Logics_Result();
+    $aStatus = new Status($statusId);
+    
+    if ($aStatus->isSelected() && $aStatus->user_id === $userId) {
+      $aStatus->delete();
+    } else {
+      $result->failure();
+    }
+    
+    return $result;
+  }
 }

events/phpframework/sabel/trunk/app/models/Status.php

@@ -8 +8 @@
   {
     $status = new self();
+    $status->setProjection(array("comment"));
     $status->setCondition("user_id", $userId);
     $status->setOrderBy("created_at", "desc");
@@ -13 +14 @@
     
     $statuses = $status->select();
-    return (isset($statuses[0])) ? $statuses[0] : null;
+    return (isset($statuses[0])) ? $statuses[0]->comment : "";
   }
   

events/phpframework/sabel/trunk/app/views/layout.tpl

@@ -42 +42 @@
         
         <div id="subMenu">
-          <if isset="$submenuHtml">
-            <?e $submenuHtml ?>
-          <else />
-            <partial name="submenu/default" />
-          </if>
+          <?e $submenuHtml ?>
           
           <p class="poweredBy">

events/phpframework/sabel/trunk/app/views/submenu/others.tpl

@@ -30 +30 @@
 </ul>
 
-<? $uri = uri("n: users, c: {$userData->name}, a: friends") ?>
-<partial name="submenu/_friendIcons" assign="userData: $userData, toAllFriends: $uri" />
+<? $_uri = uri("n: users, c: {$userData->name}, a: friends") ?>
+<partial name="submenu/_friendIcons" assign="userData: $userData, toAllFriends: $_uri" />

events/phpframework/sabel/trunk/app/views/submenu/user.tpl

@@ -17 +17 @@
 <p id="latestComment">
   <if expr="$userData->latestComment">
-    <?e $userData->latestComment->comment|showComment ?>
+    <?e $userData->latestComment|showComment ?>
   </if>
 </p>
@@ -38 +38 @@
 </ul>
 
-<? $uri = uri("n: default, c: user, a: friends") ?>
-<partial name="submenu/_friendIcons" assign="userData: $userData, toAllFriends: $uri" />
+<? $_uri = uri("n: default, c: user, a: friends") ?>
+<partial name="submenu/_friendIcons" assign="userData: $userData, toAllFriends: $_uri" />

events/phpframework/sabel/trunk/config/DI.php

@@ -5 +5 @@
   public function configure()
   {
-    if (ENVIRONMENT === PRODUCTION) {
-      $this->bind("Mail")->to("Mail_Object");
-    } else {
-      $this->bind("Mail")->to("Mail_Mock");
-    }
+    
   }
 }

events/phpframework/sabel/trunk/config/environment.php

@@ -4 +4 @@
  * define sabel environment.
  */
-// if (!defined("ENVIRONMENT")) define("ENVIRONMENT", PRODUCTION);
+if (!defined("ENVIRONMENT")) define("ENVIRONMENT", PRODUCTION);
 // if (!defined("ENVIRONMENT")) define("ENVIRONMENT", BENCHMARK);
 // if (!defined("ENVIRONMENT")) define("ENVIRONMENT", TEST);

events/phpframework/sabel/trunk/lib/AjaxResult.php

@@ -6 +6 @@
   {
     $this->success();
+    
+    $this->useTemplate = false;
   }
   

events/phpframework/sabel/trunk/lib/processor/Action.php

@@ -27 +27 @@
       $controller->setAttribute("ajax", new AjaxResult());
     }
+    
+    $controller->setAttribute("submenu", new Views_Submenu());
     
     try {

events/phpframework/sabel/trunk/lib/processor/View.php

@@ -46 +46 @@
     if ($response->isRedirected()) return;
     
-    $controller = $bus->get("controller");
-    $responses  = $response->getResponses();
-    $contents   = (isset($responses["contents"])) ? $responses["contents"] : "";
+    $responses = $response->getResponses();
+    $contents  = (isset($responses["contents"])) ? $responses["contents"] : "";
     
     $isAjax = $bus->get("AJAX_REQUEST");
-    
-    // @todo...
-    if ($isAjax && isset($responses["ajax"])) {
+    if ($isAjax && isset($responses["ajax"]) && !$responses["ajax"]->useTemplate) {
       return $bus->set("result", $responses["ajax"]->toString());
     }
@@ -62 +59 @@
       if ($location = $view->getValidLocation()) {
         $contents = $view->rendering($location, $responses);
-      } elseif (!$controller->isExecuted()) {
+      } elseif (!$bus->get("controller")->isExecuted()) {
         $response->getStatus()->setCode(Sabel_Response::NOT_FOUND);
         if ($location = $view->getValidLocation("notFound")) {
@@ -75 +72 @@
       $bus->set("result", $contents);
     } else {
-      $layout = DEFAULT_LAYOUT_NAME;
       if ($response->isFailure()) {
         $layout = "noColumnLayout";
-      } elseif (isset($responses["layout"])) {
-        $layout = $responses["layout"];
+      } else {
+        $layout = (isset($responses["layout"])) ? $responses["layout"] : DEFAULT_LAYOUT_NAME;
+        if (isset($responses["submenu"])) {
+          $submenu = $responses["submenu"];
+          $responses["submenuHtml"] = $submenu->merge($responses)->rendering($view->getRenderer());;
+        }
       }