Changeset 20238 for events/phpframework/sabel

Timestamp:

09/30/08 00:31:41 (5 years ago)

Author:

sabel

Message:

update for Sabel

Location:

events/phpframework/sabel/trunk

Files:

• Sabel/sabel/Functions.php (modified) (1 diff)
• Sabel/sabel/Response.php (modified) (1 diff)
• addon/acl/Processor.php (modified) (1 diff)
• addon/acl/User.php (modified) (1 diff)
• app/helpers/application.php (modified) (3 diffs)
• app/helpers/paginator/Status.php (modified) (1 diff)
• app/index/controllers/Index.php (modified) (3 diffs)
• app/index/controllers/Users.php (modified) (1 diff)
• app/models/Follower.php (modified) (2 diffs)
• lib/Paginator.php (modified) (1 diff)
• lib/processor/Action.php (modified) (2 diffs)
• lib/processor/Request.php (modified) (2 diffs)
• lib/processor/Response.php (modified) (1 diff)
• lib/processor/View.php (modified) (5 diffs)
• public/index.php (modified) (1 diff)
• sabel.php (modified) (2 diffs)
• tests/fixture/test/Status.php (modified) (1 diff)
• tests/unit/models/Follower.php (modified) (1 diff)
• tests/unit/paginators/Status.php (modified) (1 diff)

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

@@ -134 +134 @@
 {
   Sabel_Logger::create()->write($message, $level, $identifier);
-}
-
-function uri($uriParameter, $secure = false, $absolute = false)
-{
-  $context   = Sabel_Context::getContext();
-  $uriPrefix = get_uri_prefix($secure, $absolute);
-  
-  return $uriPrefix . "/" . $context->getCandidate()->uri($uriParameter);
-}
-
-function get_uri_prefix($secure = false, $absolute = false)
-{
-  $uriPrefix = "";
-  
-  if ($secure || $absolute) {
-    $uriPrefix = (($secure) ? "https" : "http") . "://" . $_SERVER["SERVER_NAME"];
-  }
-  
-  if (defined("URI_IGNORE")) {
-    $uriPrefix .= $_SERVER["SCRIPT_NAME"];
-  } elseif (defined("NO_REWRITE")) {
-    $uriPrefix .= "?" . NO_REWRITE_PREFIX . "=";
-  }
-  
-  return $uriPrefix;
 }
 

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

@@ -75 +75 @@
   
   public function getLocation();
-  public function setLocation($to, $host = null);
+  public function setLocation($location);
   
   public function setResponse($name, $value);

events/phpframework/sabel/trunk/addon/acl/Processor.php

@@ -68 +68 @@
       $response->getStatus()->setCode(Sabel_Response::FORBIDDEN);
     } else {
-      $user->login_uri = $response->getRedirector()->to($authUri);
+      $user->login_uri = ltrim($response->getRedirector()->to($authUri), "/");
     }
   }

events/phpframework/sabel/trunk/addon/acl/User.php

@@ -73 +73 @@
     }
     
-    $backUri    = null;
-    $bus        = Sabel_Context::getContext()->getBus();
-    $request    = $bus->get("request");
-    $redirector = $bus->get("response")->getRedirector();
-    
-    if (is_object($request)) {
-      $backUri = $request->getValueWithMethod("back_uri");
-    }
-    
-    if ($backUri === null) {
-      $redirector->to($redirectTo);
-    } else {
-      l("ACL: back to the page before authentication.", SBL_LOG_DEBUG);
-      $redirector->uri($backUri);
+    if ($response = Sabel_Context::getResponse()) {
+      $backUri = null;
+      if ($request = Sabel_Context::getRequest()) {
+        $backUri = $request->getValueWithMethod("back_uri");
+      }
+      
+      if ($backUri === null) {
+        $response->getRedirector()->to($redirectTo);
+      } else {
+        l("ACL: back to the page before authentication.", SBL_LOG_DEBUG);
+        $response->getRedirector()->uri($backUri);
+      }
     }
     

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

@@ -1 +1 @@
 <?php
+
+function h($string, $charset = null)
+{
+  return htmlescape($string, $charset);
+}
 
 function a($uri, $anchor, $uriQuery = "")
@@ -15 +20 @@
 }
 
+/**
+ * create uri for css, image, js, etc...
+ */
 function linkto($file)
 {
-  if (defined("URI_IGNORE")) {
-    return dirname($_SERVER["SCRIPT_NAME"]) . "/" . $file;
-  } else {
-    return "/" . $file;
+  if ($bus = Sabel_Context::getContext()->getBus()) {
+    if ($bus->get("NO_VIRTUAL_HOST")) {
+      return dirname($_SERVER["SCRIPT_NAME"]) . "/" . $file;
+    }
   }
+  
+  return "/" . $file;
 }
 
-function h($string, $charset = null)
+function get_uri_prefix($secure = false, $absolute = false)
 {
-  return htmlescape($string, $charset);
+  $prefix = "";
+  
+  if ($secure || $absolute) {
+    $server = (isset($_SERVER["SERVER_NAME"])) ? $_SERVER["SERVER_NAME"] : "localhost";
+    $prefix = (($secure) ? "https" : "http") . "://" . $server;
+  }
+  
+  if ($bus = Sabel_Context::getContext()->getBus()) {
+    if ($bus->get("NO_VIRTUAL_HOST") && isset($_SERVER["SCRIPT_NAME"])) {
+      $prefix .= $_SERVER["SCRIPT_NAME"];
+    }
+    
+    if ($bus->get("NO_REWRITE_MODULE") && defined("NO_REWRITE_PREFIX")) {
+      $prefix .= "?" . NO_REWRITE_PREFIX . "=";
+    }
+  }
+  
+  return $prefix;
 }
 
-function mb_trim($string)
+/**
+ * create uri
+ */
+function uri($param, $secure = false, $absolute = false)
 {
-  $string = new Sabel_Util_String($string);
-  return $string->trim()->toString();
+  $context = Sabel_Context::getContext();
+  $prefix  = get_uri_prefix($secure, $absolute);
+  
+  return $prefix . "/" . $context->getCandidate()->uri($param);
 }
 
+/*
 function to_date($date, $format)
 {
   return Helpers_Date::format($date, constant("Helpers_Date::" . $format));
-}
-
-function datetime($date, $format = "m/d H:i")
-{
-  return date($format, strtotime($date));
 }
 
@@ -50 +78 @@
   $requester->values($values)->withLayout($withLayout);
   return $requester->request($uri)->getResult();
+}
+*/
+
+function datetime($date, $format = "m/d H:i")
+{
+  return date($format, strtotime($date));
+}
+
+function mb_trim($string)
+{
+  $string = new Sabel_Util_String($string);
+  return $string->trim()->toString();
 }
 

events/phpframework/sabel/trunk/app/helpers/paginator/Status.php

@@ -49 +49 @@
     return $paginator->build($limit, $params);
   }
+  
+  public function getPublicStatuses($params, $limit = null)
+  {
+    if ($limit === null) {
+      $limit = self::DEFAULT_ITEM_LIMIT;
+    }
+    
+    $join = new Sabel_Db_Join("Status");
+    $paginator = new Paginator($join->add("User"));
+    $paginator->setCondition("User.private_flag", false);
+    $paginator->setDefaultOrder("Status.created_at", "desc");
+    
+    return $paginator->build($limit, $params);
+  }
 }

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

@@ -16 +16 @@
                    . 'href="http://' . $_SERVER["SERVER_NAME"] . uri("a: rss") . '">';
     
-    $this->paginator = $this->getPublicTimeline($this->GET_VARS);
+    $helper = new Helpers_Paginator_Status();
+    $this->paginator = $helper->getPublicStatuses($this->GET_VARS);
     
     if ($this->aclUser->isAuthenticated()) {
@@ -32 +33 @@
     $rss = new Sabel_Rss_Writer();
     $rss->setInfo(array("title" => "Phwittr public timeline", "language" => "ja"));
-    $paginator = $this->getPublicTimeline();
+    
+    $helper = new Helpers_Paginator_Status();
+    $paginator = $helper->getPublicStatuses(array());
     
     if ($paginator->results) {
@@ -70 +73 @@
     
     if ($isSelf) {
-      $this->assignUserSubmenu($aUser->id);
+      $this->assignUserSubmenu();
     } else {
       $this->assignOthersSubmenu($aUser->id, $aUser->name);
     }
   }
-  
-  protected function getPublicTimeline($params = array())
-  {
-    $join = new Sabel_Db_Join("Status");
-    $paginator = new Paginator($join->add("User"));
-    $paginator->setCondition("User.private_flag", false);
-    $paginator->setDefaultOrder("Status.created_at", "desc");
-    
-    return $paginator->build(20, $params);
-  }
 }

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

@@ -36 +36 @@
     }
     
-    if ($protected && $authenticated) {
-      $this->isRequested = Request::isRequested($this->aclUser->id, $this->aUser->id);
+    if ($protected) {
+      if ($authenticated) {
+        $this->isRequested = Request::isRequested($this->aclUser->id, $this->aUser->id);
+      }
+      $this->view->setName("protected");
     } else {
       $helper = new Helpers_Paginator_Status();
       $this->paginator = $helper->getStatuses($this->aUser->id, $this->GET_VARS, 50);
-    }
-    
-    if ($protected) {
-      $this->view->setName("protected");
-    } else {
       $this->view->setName("home");
     }

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

@@ -3 +3 @@
 class Follower extends Sabel_Db_Model
 {
-  public static function getFriends($userId, $limit = 100)
+  public static function getFriends($userId, $limit)
   {
     $join = new Sabel_Db_Join(new self());
@@ -20 +20 @@
     $stmt->projection(array("follow_id"))
          ->where("WHERE user_id = @user_id@")
-         ->constraints(array("order" => array("created_at" => "ASC")))
+         ->constraints(array("order" => array("created_at" => "asc")))
          ->setBindValue("user_id", $userId);
     

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

@@ -175 +175 @@
       $attributes["results"] = $model->{$this->method}();
       
-      if ($this->uri === null) {
-        if ($request = Sabel_Context::getContext()->getBus()->get("request")) {
-          $attributes["uri"] = get_uri_prefix() . "/" . $request->getUri();
-        }
+      if ($this->uri === null && $request = Sabel_Context::getRequest()) {
+        $attributes["uri"] = get_uri_prefix() . "/" . $request->getUri();
       }
     }

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

@@ -24 +24 @@
     $controller->setAction($action);
     
-    if ($isAjax = $bus->get("isAjaxRequest")) {
+    if ($isAjax = $bus->get("AJAX_REQUEST")) {
       $controller->setAttribute("ajax", new AjaxResult());
     }
@@ -60 +60 @@
     
     if ($controller->getAttribute("layout") === false) {
-      $bus->set("noLayout", true);
+      $bus->set("NO_LAYOUT", true);
     }
   }

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

@@ -17 +17 @@
       $request = $bus->get("request");
     } else {
-      $uri = "";
-      if (isset($_SERVER["REQUEST_URI"])) {
-        l("REQUEST URI: " . $_SERVER["REQUEST_URI"]);
-        $uri = normalize_uri($_SERVER["REQUEST_URI"]);
-      }
-      
+      $uri = $this->getRequestUri($bus);
       $request = new Sabel_Request_Object($uri);
       
@@ -48 +43 @@
     }
     
+    l("REQUEST URI: /" . $request->getUri(true));
+    
+    // ajax request.
     if ($request->getHttpHeader("X-Requested-With") === "XMLHttpRequest") {
-      $bus->set("noLayout",      true);
-      $bus->set("isAjaxRequest", true);
+      $bus->set("NO_LAYOUT", true);
+      $bus->set("AJAX_REQUEST", true);
     }
   }
+  
+  protected function getRequestUri($bus)
+  {
+    $uri = (isset($_SERVER["REQUEST_URI"])) ? $_SERVER["REQUEST_URI"] : "/";
+    
+    if (isset($_SERVER["SCRIPT_NAME"]) && strpos($_SERVER["SCRIPT_NAME"], "/index.php") >= 1) {
+      $uri = substr($uri, strlen($_SERVER["SCRIPT_NAME"]));
+      $bus->set("NO_VIRTUAL_HOST", true);
+    }
+    
+    if (defined("NO_REWRITE_PREFIX") && isset($_GET[NO_REWRITE_PREFIX])) {
+      $uri = substr($uri, strlen(NO_REWRITE_PREFIX) + 2);
+      $parsed = parse_url($uri);
+      if (isset($parsed["query"])) {
+        parse_str($parsed["query"], $_GET);
+      }
+      
+      unset($_GET[NO_REWRITE_PREFIX]);
+      $bus->set("NO_REWRITE_MODULE", true);
+    }
+    
+    return normalize_uri($uri);
+  }
 }

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

@@ -56 +56 @@
         $response->setLocation($url);
       } else {
-        $session   = $bus->get("session");
         $token     = $bus->get("request")->getValueWithMethod("token");
         $hasToken  = !empty($token);
         $hasParams = $redirector->hasParameters();
+        $location  = $redirector->getUri();
         
-        if (!$hasToken) {
-          $to = $redirector->getUri();
-        } elseif ($hasParams) {
-          $to = $redirector->getUri() . "&token={$token}";
-        } else {
-          $to = $redirector->getUri() . "?token={$token}";
+        if ($hasToken) {
+          $glue = ($hasParams) ? "&" : "?";
+          $location .= $glue . "token={$token}";
         }
         
+        $session = $bus->get("session");
         if ($session->isStarted() && !$session->isCookieEnabled()) {
           $glue = ($hasToken || $hasParams) ? "&" : "?";
-          $to  .= $glue . $session->getName() . "=" . $session->getId();
+          $location .= $glue . $session->getName() . "=" . $session->getId();
         }
         
-        $response->setLocation($to, $_SERVER["SERVER_NAME"]);
+        if (function_exists("get_uri_prefix")) {
+          $location = get_uri_prefix() . "/" . ltrim($location, "/");
+        }
+        
+        $response->setLocation($location);
       }
     }

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

@@ -23 +23 @@
     list ($m, $c, $a) = $bus->get("destination")->toArray();
     
-    $controller = new Sabel_View_Location_File($m . DS . VIEW_DIR_NAME . DS . $c . DS);
-    $view = new Sabel_View_Object("controller", $controller);
+    $view = new Sabel_View_Object("controller", new Sabel_View_Location_File(
+      $m . DS . VIEW_DIR_NAME . DS . $c . DS
+    ));
     
-    $module = new Sabel_View_Location_File($m . DS . VIEW_DIR_NAME . DS);
-    $view->addLocation("module", $module);
-    
-    $app = new Sabel_View_Location_File(VIEW_DIR_NAME . DS);
-    $view->addLocation("app", $app);
+    $view->addLocation("module", new Sabel_View_Location_File($m . DS . VIEW_DIR_NAME . DS));
+    $view->addLocation("app", new Sabel_View_Location_File(VIEW_DIR_NAME . DS));
     
     if ($renderer = $bus->get("renderer")) {
@@ -39 +37 @@
     
     $this->view = $view;
-    
     $bus->set("view", $view);
     $bus->get("controller")->setAttribute("view", $view);
@@ -52 +49 @@
     $responses  = $response->getResponses();
     $contents   = (isset($responses["contents"])) ? $responses["contents"] : "";
-    $isAjax     = $bus->get("isAjaxRequest");
     
+    $isAjax = $bus->get("AJAX_REQUEST");
+    
+    // @todo...
     if ($isAjax && isset($responses["ajax"])) {
       return $bus->set("result", $responses["ajax"]->toString());
@@ -59 +58 @@
     
     $view = $this->getView($response->getStatus(), $bus->get("destination")->getAction(), $isAjax);
-    
-    if (isset($responses["renderText"]) && $responses["renderText"]) {
-      $renderer = $view->getRenderer();
-      return $bus->set("result", $renderer->rendering($contents, $responses));
-    }
     
     if ($contents === "") {
@@ -78 +72 @@
     }
     
-    if ($bus->get("noLayout")) {
+    if ($bus->get("NO_LAYOUT")) {
       $bus->set("result", $contents);
     } else {

events/phpframework/sabel/trunk/public/index.php

@@ -15 +15 @@
 }
 
-if (strpos($_SERVER["SCRIPT_NAME"], "/index.php") >= 1) {
-  $ignore = str_replace($_SERVER["SCRIPT_NAME"], "", $_SERVER["REQUEST_URI"]);
-  $_SERVER["REQUEST_URI"] = ltrim($ignore, "/");
-  define("URI_IGNORE", $ignore);
-} elseif (isset($_GET[NO_REWRITE_PREFIX])) {
-  $_uri = substr(ltrim($_SERVER["REQUEST_URI"], "/"), strlen(NO_REWRITE_PREFIX) + 2);
-  $_SERVER["REQUEST_URI"] = $_uri;
-  $parsed = parse_url($_SERVER["REQUEST_URI"]);
-  if (isset($parsed["query"])) {
-    parse_str($parsed["query"], $_GET);
-  }
-  
-  unset($_GET[NO_REWRITE_PREFIX]);
-  define("NO_REWRITE", true);
-}
-
 if ((ENVIRONMENT & PRODUCTION) > 0) {
   Sabel::init();

events/phpframework/sabel/trunk/sabel.php

@@ -16 +16 @@
 $_SERVER["HTTP_HOST"]   = "localhost";
 $_SERVER["SERVER_NAME"] = "localhost";
+$_SERVER["REQUEST_URI"] = "/";
 
 if (isset($_SERVER["argv"][2])) {
@@ -34 +35 @@
     }
   }
-} else {
-  $_SERVER["REQUEST_URI"] = "/";
 }
 

events/phpframework/sabel/trunk/tests/fixture/test/Status.php

@@ -45 +45 @@
       ));
     }
+    
+    for ($i = 1; $i < 10; $i++) {
+      $this->insert(array(
+        "user_id"       => $user2->id,
+        "comment"       => "comment{$i}",
+        "created_at"    => "2008-01-0{$i} 23:59:59",
+      ));
+    }
   }
   

events/phpframework/sabel/trunk/tests/unit/models/Follower.php

@@ -12 +12 @@
   {
     $user2 = $this->getUser("test2");
-    $friends = Follower::getFriends($user2->id);
+    $friends = Follower::getFriends($user2->id, 100);
     
     $this->eq(2, count($friends));

events/phpframework/sabel/trunk/tests/unit/paginators/Status.php

@@ -130 +130 @@
     $this->eq("2008-01-01 18:00:00", $items[3]->created_at);
   }
+  
+  /**
+   * @test
+   */
+  public function getPublicStatuses()
+  {
+    $user1 = $this->getUser("test1");
+    $user2 = $this->getUser("test2");
+    $user3 = $this->getUser("test3");
+    
+    $helper = new Helpers_Paginator_Status();
+    
+    $paginator = $helper->getPublicStatuses(array(), 5);
+    $this->eq(36, $paginator->count);
+    
+    $user2->private_flag = false;
+    $user2->save();
+    
+    $paginator = $helper->getPublicStatuses(array(), 5);
+    $this->eq(45, $paginator->count);
+    
+    $user2->private_flag = true;
+    $user2->save();
+  }
 }