New version for Laravel 5.

Author: nonoesp

.travis.yml

@@ -1,6 +1,8 @@
 # laravel-writing
 
-A writing system for Laravel 4.
+A writing system for Laravel 5.
+
+*The following notes are deprecated and are for the Laravel 4 version.*
 
 ## Installation
 
@@ -38,7 +40,7 @@ The following command will copy your assets into `/public/packages/vendor/packag
 
 ## License
 
-Thinker is licensed under the MIT license. (http://opensource.org/licenses/MIT)
+Writing is licensed under the MIT license. (http://opensource.org/licenses/MIT)
 
 ## Me
 

LICENSE

@@ -1,25 +1,13 @@
 {
-    "name": "nonoesp/writing",
-    "description": "A writing system for Laravel 4.",
+    "name": "nono/writing",
+    "description": "A Laravel blogging system.",
+    "license": "MIT",
     "authors": [
         {
             "name": "Nono Martínez Alonso",
             "email": "[email protected]"
         }
     ],
-    "require": {
-        "php": ">=5.4.0",
-        "illuminate/support": "4.2.*"        
-    },
-    "autoload": {
-        "classmap": [
-            "src/migrations",
-            "src/controllers",
-            "src/models"
-        ],
-        "psr-0": {
-            "Nonoesp\\Writing\\": "src/"
-        }
-    },
-    "minimum-stability": "stable"
+    "minimum-stability" : "dev",
+    "require": {}
 }

README.md

@@ -15,9 +15,10 @@
     $og_description = 'Description of the blog.';
     $services_typekit = Config::get('services.typekit.writing');
     $header_classes = 'c-header--white';
+    $is_header_static = true;
 
     // 2. Defaults Cover
-    $cover_subtitle = Thinker::array_rand_value(Config::get('settings.slogan'));
+    $cover_subtitle = Thinker::array_rand_value(trans('base.slogan'));
     $cover_classes_title_b = '';
     $cover_image = '';
     $cover_classes = '';
@@ -88,7 +89,7 @@
                           'subtitle' => $cover_subtitle,
                           'classes_title_b' => $cover_classes_title_b,
                           'image' => $cover_image,
-                          'description' => Config::get('settings.description'),
+                          'description' => trans('base.description'),
                           'class' => 'is-header u-background-grey '.$cover_classes)) }}
 
   @endif
@@ -148,8 +149,7 @@
         </script>
     @endif
 
-    <script type="text/javascript" src="/packages/nonoesp/writing/js/writing.js"></script>
-    <script type="text/javascript" src="/js/header.js"></script>
+    <script type="text/javascript" src="/nonoesp/writing/js/writing.js"></script>
 
 @stop
 

composer.json

@@ -23,7 +23,7 @@
     $user_thumbnail = NULL;
     $user = NULL;
     if($article->user_id) {
- 	   $user = User::find($article->user_id);
+ 	   $user = Arma\User::find($article->user_id);
  	   $user_thumbnail = View::make('partial.c-user-picture')->with(["user" => $user,
 	  										     		   			 "size" => 36]);
 	}
@@ -36,7 +36,7 @@
 
 	  {{-- Title --}}
 	  @if (isset($isTitleLinked))
-	    <h1>{{ HTML::link(Config::get('writing::path').'/'.$article->slug, Thinker::title($article->title)) }}</h1>
+	    <h1>{{ HTML::link(Config::get('writing.path').'/'.$article->slug, Thinker::title($article->title)) }}</h1>
 	  @else
 	    <h1>{{ Thinker::title($article->title) }}</h1>
 	  @endif
@@ -92,13 +92,13 @@
 			@if ($article_type == 'SUMMARY_ARTICLE_TYPE')
 				<p>
 					{{ Thinker::limitMarkdownText(Markdown::string($article->text), 275, array('figcaption')) }}
-					{{ HTML::link(Config::get('writing::path').'/'.$article->slug, trans('writing::base.continue-reading')) }}
+					{{ HTML::link(Config::get('writing.path').'/'.$article->slug, trans('writing::base.continue-reading')) }}
 				</p>
 			@endif
 
 		{{-- Tags --}}
 			@if (count($article->tagNames()) > 0)
-				<p class="c-article__tags">{{ Writing::displayArticleTags($article->tagNames(), 'c-article__tag u-case-upper') }}</p>
+				<p class="c-article__tags">{{ Writing::tagListWithArticleAndClass($article, 'c-article__tag u-case-upper') }}</p>
 			@endif
 
     </div><!--

public/.gitkeep renamed to config/.gitkeep

@@ -1,12 +1,12 @@
 @extends('layout.main')
 
-
 <?php
+	use Arma\Article;
 	// Settings
 	$header_classes = 'c-header--relative';
 
 	// User Articles
-	$articles = \Nonoesp\Writing\Article::where('user_id', '=', $user->id)->orderBy('id', 'DESC')->take(5)->get();
+	$articles = Article::where('user_id', '=', $user->id)->orderBy('id', 'DESC')->take(5)->get();
 
 	$user_thumbnail = \View::make('partial.c-user-picture')->with(["user" => $user,
 	         													   "size" => 75,

src/config/config.php renamed to config/config.php

@@ -0,0 +1,12 @@
+<?php
+namespace Nonoesp\Writing\Facades;
+use Illuminate\Support\Facades\Facade;
+class Writing extends Facade {
+    /**
+     * Get the registered name of the component.
+     *
+     * @return string
+     */
+    protected static function getFacadeAccessor() { return 'writing'; }
+    
+}

phpunit.xml

@@ -1,7 +1,8 @@
 <?php namespace Nonoesp\Writing;
- 
+ use Lang;
+
 class Writing {
- 
+
 	public static function articleCategoryClass($tags, $class) {
 
 		$categories = \Config::get('blog.special-tags'); //TODO: lang in package
@@ -16,18 +17,18 @@ public static function articleCategoryClass($tags, $class) {
 		return;
 	}	
 
-	public static function displayArticleTags($tags, $class) {
+	public static function tagListWithArticleAndClass($article, $class) {
 		$result = '';
 		$idx = 0;
-		foreach($tags as $tag) {
-			$result .= Writing::articleTag($tag, $class);
+		foreach($article->tags as $tag) {
+			$result .= Writing::tagWithClass($tag, $class);
 			$idx++;
 		}
 		return $result;
 	}
 
-	public static function articleTag($tag, $class) {
-		return \HTML::link(\Config::get('writing::path').'/tag/'.\Conner\Tagging\TaggingUtil::slug($tag), $tag, array('class' => $class));
+	public static function tagWithClass($tag, $class) {
+		return \HTML::link(\Config::get('writing.path').'/tag/'.$tag->slug, $tag->name, array('class' => $class));
 	}
 
 	public static function userURL($user) {

public/js/writing.js renamed to resources/assets/js/writing.js

@@ -1,23 +1,16 @@
-<?php namespace Nonoesp\Writing;
-
-//use Nonoesp\Writing\Article;
-use Article;
-
-class WritingController extends \BaseController {
-
-	/*
-	|--------------------------------------------------------------------------
-	| Default Home Controller
-	|--------------------------------------------------------------------------
-	|
-	| You may wish to use controllers instead of, or in addition to, Closure
-	| based routes. That's great! Here is an example controller method to
-	| get you started. To route to this controller, just add the route:
-	|
-	|	Route::get('/', 'HomeController@showWelcome');
-	|
-	*/
+<?php
 
+namespace Nonoesp\Writing;
+
+use Illuminate\Http\Request;
+use Arma\Http\Requests;
+use Arma\Http\Controllers\Controller;
+use View;
+use Arma\Article;
+use Arma\User;
+
+class WritingController extends Controller
+{
 	public function showHome() {
 
 		// Get Articles + Articles ids
@@ -34,7 +27,7 @@ public function showHome() {
 		// Get Expected Articles
 		$show_expected = 3;
 		$articles_expected = Article::expected()->orderBy('published_at', 'ASC')->take($show_expected)->get()->reverse();
-		return \View::make('writing::base')->with(array('articles' => $articles,
+		return view('writing::base')->with(array('articles' => $articles,
 													  'ids' => $ids_array,
 													  'articles_expected' => $articles_expected));
 	}
@@ -55,7 +48,7 @@ public function showArticleTag($tag) {
 			}
 		}
 
-		return \View::make('writing::base')->
+		return view('writing::base')->
 		             with(array(
 		             	  'articles' => $articles,
 		             	  'ids' => $ids_array, 
@@ -67,7 +60,7 @@ public function showArticle($slug) {
 		$article = Article::whereSlug($slug)->first();
 		$article->visits++;
 		$article->save();
-		return \View::make('writing::base')->with('article', $article);
+		return view('writing::base')->with('article', $article);
 	}
 
 	public function showArticleWithId($id) {
@@ -82,7 +75,7 @@ public function getArticlesWithIds() {
 
 		// Echo Articles
 		foreach(\Input::get('ids') as $id) {
-			echo \View::make('partial.blog.c-article')->
+			echo view('partial.blog.c-article')->
 			           with(array('article' => Article::find($id),
 			           	  		  'article_type' => $article_type,
 			           	  		  'isTitleLinked' => true));