Merge branch '2'

.travis.yml

@@ -1,5 +1,3 @@
-# See https://github.com/silverstripe/silverstripe-travis-support for setup details
-
 sudo: false
 
 language: php

.tx/config

@@ -1,8 +0,0 @@
-[main]
-host = https://www.transifex.com
-
-[silverstripe-blog.master-v2]
-file_filter = lang/<lang>.yml
-source_file = lang/en.yml
-source_lang = en
-type = YML

src/Model/BlogController.php

@@ -8,6 +8,7 @@ use SilverStripe\ORM\ArrayList;
 use SilverStripe\ORM\FieldType\DBDatetime;
 use SilverStripe\ORM\PaginatedList;
 use SilverStripe\Security\Member;
+use SilverStripe\View\Parsers\URLSegmentFilter;
 
 class BlogController extends PageController
 {
@@ -90,8 +91,10 @@ class BlogController extends PageController
         $urlSegment = $this->request->param('URLSegment');
 
         if ($urlSegment) {
+            $filter = URLSegmentFilter::create();
+
             return Member::get()
-                ->filter('URLSegment', $urlSegment)
+                ->filter('URLSegment', $filter->filter($urlSegment))
                 ->first();
         }
 
@@ -242,8 +245,10 @@ class BlogController extends PageController
         $dataRecord = $this->dataRecord;
         $tag = $this->request->param('Tag');
         if ($tag) {
+            $filter = URLSegmentFilter::create();
+
             return $dataRecord->Tags()
-                ->filter('URLSegment', [$tag, rawurlencode($tag)])
+                ->filter('URLSegment', [$tag, $filter->filter($tag)])
                 ->first();
         }
         return null;
@@ -286,8 +291,10 @@ class BlogController extends PageController
         $dataRecord = $this->dataRecord;
         $category = $this->request->param('Category');
         if ($category) {
+            $filter = URLSegmentFilter::create();
+
             return $dataRecord->Categories()
-                ->filter('URLSegment', [$category, rawurlencode($category)])
+                ->filter('URLSegment', [$category, $filter->filter($category)])
                 ->first();
         }
         return null;

src/Model/BlogMemberExtension.php

@@ -24,7 +24,7 @@ class BlogMemberExtension extends DataExtension
      * @var array
      */
     private static $db = [
-        'URLSegment'         => 'Varchar',
+        'URLSegment'         => 'Varchar(255)',
         'BlogProfileSummary' => 'Text'
     ];
 

src/Model/BlogPost.php

@@ -736,6 +736,9 @@ class BlogPost extends Page
      */
     public function getDate()
     {
+        if ($this->hasDatabaseField('Date')) {
+            return $this->getField('Date');
+        }
         return !empty($this->PublishDate) ? $this->PublishDate : null;
     }
 

src/Widgets/BlogArchiveWidget.php

@@ -10,6 +10,13 @@ use SilverStripe\Blog\Model\Blog;
 use SilverStripe\Control\Controller;
 use SilverStripe\Forms\DropdownField;
 use SilverStripe\Forms\NumericField;
+use SilverStripe\ORM\ArrayList;
+use SilverStripe\ORM\DB;
+use SilverStripe\ORM\FieldType\DBDate;
+use SilverStripe\ORM\FieldType\DBDatetime;
+use SilverStripe\ORM\Queries\SQLSelect;
+use SilverStripe\Versioned\Versioned;
+use SilverStripe\View\ArrayData;
 use SilverStripe\Widgets\Model\Widget;
 
 /**
@@ -94,51 +101,46 @@ class BlogArchiveWidget extends Widget
     /**
      * Returns a list of months where blog posts are present.
      *
-     * @return DataList
+     * @return ArrayList
      */
     public function getArchive()
     {
-        $query = $this->Blog()->getBlogPosts()->dataQuery();
+        $format = ($this->ArchiveType == 'Yearly') ? '%Y' : '%Y-%m';
+        $publishDate = DB::get_conn()->formattedDatetimeClause('"PublishDate"', $format);
+        $fields = [
+            'PublishDate' => $publishDate,
+            'Total' => "Count('PublishDate')"
+        ];
 
-        if ($this->ArchiveType == 'Yearly') {
+        $stage = Versioned::get_stage();
-            $query->groupBy('DATE_FORMAT("PublishDate", \'%Y\')');
+        $suffix = ($stage == 'Stage') ? '' : "_{$stage}";
-        } else {
+        $query = SQLSelect::create($fields, "BlogPost{$suffix}")
-            $query->groupBy('DATE_FORMAT("PublishDate", \'%Y-%M\')');
+            ->addGroupBy($publishDate)
-        }
+            ->addOrderBy('PublishDate Desc')
+            ->addWhere(['PublishDate < ?' => DBDatetime::now()->Format('Y-m-d')]);
 
-        $posts = $this->Blog()->getBlogPosts()->setDataQuery($query);
+        $posts = $query->execute();
+        $result = ArrayList::create();
+        while ($next = $posts->next()) {
+            $date = DBDate::create();
+            $date->setValue(strtotime($next['PublishDate']));
+            $year = $date->Format('Y');
 
-        if ($this->NumberToDisplay > 0) {
+            if ($this->ArchiveType == 'Yearly') {
-            $posts = $posts->limit($this->NumberToDisplay);
+                $month = null;
-        }
+                $title = $year;
-
+            } else {
-        $archive = ArrayList::create();
+                $month = $date->Format('m');
-
+                $title = $date->FormatI18N('%B %Y');
-        if ($posts->count() > 0) {
-            foreach ($posts as $post) {
-                /**
-                 * @var BlogPost $post
-                 */
-                $date = Date::create();
-                $date->setValue($post->PublishDate);
-
-                if ($this->ArchiveType == 'Yearly') {
-                    $year = $date->Format("Y");
-                    $month = null;
-                    $title = $year;
-                } else {
-                    $year = $date->Format("Y");
-                    $month = $date->Format("m");
-                    $title = $date->FormatI18N("%B %Y");
-                }
-
-                $archive->push(ArrayData::create([
-                    'Title' => $title,
-                    'Link' => Controller::join_links($this->Blog()->Link('archive'), $year, $month)
-                ]));
             }
+
+            $result->push(ArrayData::create([
+                'Title' => $title,
+                'Link' => Controller::join_links($this->Blog()->Link('archive'), $year, $month)
+            ]));
         }
 
-        return $archive;
+        $this->extend('updateGetArchive', $result);
+        return $result;
     }
 }

tests/BlogFunctionalTest.php

@@ -0,0 +1,40 @@
+<?php
+
+class BlogFunctionalTest extends FunctionalTest
+{
+    protected static $fixture_file = 'BlogFunctionalTest.yml';
+
+    protected static $use_draft_site = true;
+
+    public function setUp()
+    {
+        Config::inst()->update('URLSegmentFilter', 'default_allow_multibyte', true);
+
+        parent::setUp();
+
+        i18n::set_locale('fa_IR');
+    }
+
+    public function testBlogWithMultibyteUrl()
+    {
+        $result = $this->get('آبید');
+
+        $this->assertEquals(200, $result->getStatusCode());
+    }
+
+    public function testMemberProfileWithMultibyteUrlAndName()
+    {
+        $result = $this->get('آبید/profile/عبّاس-آبان');
+
+        $this->assertEquals(200, $result->getStatusCode());
+        $this->assertContains('My Blog Post', $result->getBody());
+    }
+
+    public function testMemberProfileWithMultibyteUrlAndEnglishName()
+    {
+        $result = $this->get('آبید/profile/bob-jones');
+
+        $this->assertEquals(200, $result->getStatusCode());
+        $this->assertContains('My Blog Post', $result->getBody());
+    }
+}

tests/BlogFunctionalTest.yml

@@ -0,0 +1,22 @@
+Member:
+  member_a:
+    FirstName: عبّاس
+    Surname: آبان
+    Email: foo@example.com
+  member_b:
+    FirstName: Bob
+    Surname: Jones
+    Email: bobjones@example.com
+
+Blog:
+  blog_a:
+    URLSegment: آبید
+    Title: My Blog
+
+BlogPost:
+  blogpost_a:
+    Title: My Blog Post
+    URLSegment: آبیدآبید
+    PublishDate: '2017-08-01 00:00:00'
+    Parent: =>Blog.blog_a
+    Authors: =>Member.member_a, =>Member.member_b