fuel 0.3.3 → 0.3.20

data/app/controllers/fuel/admin/posts_controller.rb

@@ -1,72 +1,86 @@
 module Fuel
-  class Admin::PostsController < ApplicationController
-    http_basic_authenticate_with name: Fuel.configuration.username, password: Fuel.configuration.password
-    layout "fuel/application"
+  module Admin
+    class PostsController < AdminController
+      layout "fuel/application"
+      before_filter :find_posts
+      before_filter :find_post, only: [:edit, :update, :destroy]
+      before_filter :set_url, only: [:new, :create, :edit, :update]
 
-    def index
-      @posts = Fuel::Post.all
-    end
+      def index
+      end
 
-    def new
-      @post = Fuel::Post.new
-    end
+      def new
+        @post = Fuel::Post.new
+      end
+
+      def create
+        @params_hash = Rails.version[0].to_i < 4 ? params[:fuel_post] : post_params
+        @post = Fuel::Post.new(@params_hash)
+        update_published
 
-    def create
-      @post = Fuel::Post.new
-      @post.tag = post_params["tag"]
-      @post.author = post_params["author"]
-      @post.content = post_params["content"]
-      @post.title = post_params["title"]
-      update_published
-
-      if @post.save
-        redirect_to admin_posts_path, notice: "Your blog post was successfully #{@message}."
-      else
-        render action: "new"
+        if @post.save
+          redirect_to fuel.admin_posts_path, notice: "Your blog post was successfully #{@message}."
+        else
+          render action: "new"
+        end
       end
-    end
 
-    def edit
-      @post = Fuel::Post.find_by_slug(params[:id])
-    end
+      def edit
 
-    def update
-      @post = Fuel::Post.find_by_slug(params[:id])
-      @post.tag = post_params["tag"]
-      @post.author = post_params["author"]
-      @post.content = post_params["content"]
-      @post.title = post_params["title"]
-      update_published
-      if @post.save
-        redirect_to admin_posts_path, notice: "Post was updated and #{@message}"
-      else
-        render action: "edit"
       end
-    end
 
-    def destroy
-      @post = Fuel::Post.find_by_slug(params[:id])
-      @post.destroy
-      redirect_to admin_posts_path, notice: "Post was successfully deleted"
-    end
+      def update
+        @params_hash = Rails.version[0].to_i < 4 ? params[:fuel_post] : post_params
+        @post.attributes = @params_hash
+        update_published
 
-    def preview
-      @content = params[:post][:content]
-      respond_to do |format|
-        format.js
+        if @post.save
+          redirect_to fuel.edit_admin_post_path(@post), notice: "Post was updated and #{@message}"
+        else
+          render "edit"
+        end
       end
-    end
 
-    private
+      def destroy
+        @post.destroy
+        redirect_to fuel.admin_posts_path, notice: "Post was successfully deleted"
+      end
 
-      def post_params
-        params.require(:post).permit(:tag, :author, :content, :title)
+      def preview
+        @content = params[:fuel_post][:content]
+        respond_to do |format|
+          format.js
+        end
       end
 
-      def update_published
-        @post.published = params[:commit] == "Save Draft" ? false : true
-        @message = @post.published ? "posted" : "saved"
+      def show
       end
 
+      private
+
+        def post_params
+          params.require(:fuel_post).permit(:tag, :author_id, :content, :title, :teaser, :featured_image, :published, :published_at)
+        end
+
+        def update_published
+          published_at_string = @params_hash[:published_at]
+          published_at_datetime = DateTime.strptime(published_at_string, "%m/%d/%Y")
+          @post.published_at = published_at_datetime if published_at_datetime
+          @message = @post.published ? "posted" : "saved"
+        end
+
+        def find_post
+          @post = Fuel::Post.find_by_slug(params[:id])
+        end
+
+        def find_posts
+          @posts = Fuel::Post.order("created_at DESC")
+        end
+
+        def set_url
+          @url = ["new", "create"].include?(action_name) ? fuel.admin_posts_path : fuel.admin_post_path(@post)
+        end
+
+    end
   end
-end
+end

data/app/controllers/fuel/fuel_controller.rb

@@ -0,0 +1,5 @@
+module Fuel
+  class FuelController < ::FuelController
+
+  end
+end

data/app/controllers/fuel/posts_controller.rb

@@ -1,7 +1,5 @@
-require_dependency "fuel/application_controller"
-
 module Fuel
-  class PostsController < ApplicationController
+  class PostsController < FuelController
     include ActionView::Helpers::TextHelper
     layout Fuel.configuration.layout if Fuel.configuration.layout
     before_filter :define_title
@@ -12,12 +10,14 @@ module Fuel
 
     def index
       @posts = Fuel::Post.recent_published_posts.page(params[:page])
+      @title = Fuel.configuration.blog_title
+      @description = Fuel.configuration.blog_description
     end
 
     def show
-      # delete || Fuel::Post.find_by_id(params[:id]) once done testing pagination
-      @post = Fuel::Post.find_by_slug(params[:id]) || Fuel::Post.find_by_id(params[:id])
-      @title = truncate_on_space(@post.title, 70)
+      @post = Fuel::Post.find_by_slug(params[:id]) || Fuel::Post.find_by_id(params[:id]) || not_found
+      @title = truncate_on_space(@post.seo_title, 70)
+      @description = @post.seo_description
       @disqus_name = Fuel.configuration.disqus_name
     end
 
@@ -28,10 +28,16 @@ module Fuel
       end
     end
 
+    def redirect
+      post = Fuel::Post.find_by_slug(params[:id]) || Fuel::Post.find_by_id(params[:id])
+      return redirect_to fuel.post_path(post)
+    end
+
     private
 
-      def truncate_on_space(text, length)
+      def truncate_on_space(text = "", length)
         truncate(text, length: length, separator: ' ')
       end
+
   end
 end

data/app/controllers/fuel_controller.rb

@@ -0,0 +1,5 @@
+class FuelController < ApplicationController
+  def not_found
+    raise ActionController::RoutingError.new('Not Found')
+  end
+end

data/app/helpers/fuel/posts_helper.rb

@@ -1,5 +1,32 @@
 module Fuel
   module PostsHelper
+    Fuel.configuration.helpers.each do |helper|
+      include "::#{helper}".constantize
+    end
+
+    def markdown(text)
+      markdown = Redcarpet::Markdown.new(Redcarpet::Render::HTML,
+          :autolink => true, :space_after_headers => true)
+      raw markdown.render(text)
+    end
+
+    def method_missing method, *args, &block
+      fuel.send(method, *args)
+    end
+
+    def embedded_svg filename, options={}
+      file = File.read(Rails.root.join('app', 'assets', 'images', filename))
+      doc = Nokogiri::HTML::DocumentFragment.parse file
+      svg = doc.at_css 'svg'
+      if options[:class].present?
+        svg['class'] = options[:class]
+      end
+      doc.to_html.html_safe
+    end
+
+    def hide_published_at(post)
+      @post.is_published ? '' : 'display:none;'
+    end
 
   end
-end
+end

data/app/models/fuel.rb

@@ -0,0 +1,5 @@
+module Fuel
+  def self.table_name_prefix
+    'fuel_'
+  end
+end

data/app/models/fuel/author.rb

@@ -0,0 +1,18 @@
+module Fuel
+  class Author < ActiveRecord::Base
+
+    has_many :posts
+
+    if Rails.version[0].to_i < 4
+      attr_accessible :first_name, :last_name, :title, :bio, :avatar, :email, :twitter, :github, :dribbble
+    end
+
+    def full_name
+      [first_name, last_name].compact.join(" ")
+    end
+
+    has_attached_file :avatar, :styles => { :medium => Fuel.configuration.avatar_settings[:styles][:medium], :thumb => Fuel.configuration.avatar_settings[:styles][:thumb] }, :default_url => "/images/:style/missing.png"
+    validates_attachment_content_type :avatar, :content_type => /\Aimage\/.*\Z/
+
+  end
+end

data/app/models/fuel/post.rb

@@ -1,16 +1,32 @@
 module Fuel
   class Post < ActiveRecord::Base
+    include ActionView::Helpers::OutputSafetyHelper
+
     extend FriendlyId
     friendly_id :title, use: :slugged
 
+    belongs_to :author
+
     if Rails.version[0].to_i < 4
-      attr_accessible :tag, :author, :content, :title
+      attr_accessible :tag, :author_id, :content, :title, :teaser, :featured_image, :seo_title, :seo_description, :published_at
     end
 
-    validates_presence_of :title, :content, :author, if: :is_published
+    has_attached_file :featured_image, :styles => { :medium => Fuel.configuration.featured_image_settings[:styles][:medium], :thumb => Fuel.configuration.featured_image_settings[:styles][:thumb] }, :default_url => "/images/:style/missing.png"
+    validates_attachment_content_type :featured_image, :content_type => /\Aimage\/.*\Z/
+
+    validates_presence_of :title, :content, :author_id, if: :is_published
     paginates_per Fuel.configuration.paginates_per.to_i
 
     scope :recent_published_posts, -> { where(published: true).order("created_at DESC") }
+    scope :recent, -> { order("created_at DESC") }
+
+    def next
+      self.class.recent.where("created_at <= ? AND id != ?", created_at, id).first
+    end
+
+    def previous
+      self.class.recent.where("created_at >= ? AND id != ?", created_at, id).last
+    end
 
     def should_generate_new_friendly_id?
       new_record? #Don't generate new id on edit
@@ -24,5 +40,19 @@ module Fuel
       self.published
     end
 
+    def prioritized_featured_image_url(type = :original)
+      featured_image_file_name.present? ? featured_image.url(type) : featured_image_url
+    end
+
+    def teaser_content
+      teaser.present? ? teaser : content
+    end
+
+    def to_html
+      markdown = Redcarpet::Markdown.new(Redcarpet::Render::HTML,
+          :autolink => true, :space_after_headers => true)
+      raw markdown.render(content)
+    end
+
   end
 end

data/app/views/fuel/admin/authors/_authors.html.erb

@@ -0,0 +1,24 @@
+<aside class="page-sidebar author-sidebar">
+  <header class="page-sidebar--header">
+    <div class="header-container--left">
+      <h5 class="header--title">Authors</h5>
+    </div>
+    <div class="header-container--right">
+      <ul class="header-container--right__actions">
+        <!-- <li><i class="search-icon">Search</i></li> -->
+        <li><%= link_to 'New Author', fuel.new_admin_author_path, class: 'add-icon' %></li>
+      </ul>
+    </div>
+  </header>
+  <ul class="resource-list author-list">
+    <% @authors.each do |author| %>
+      <%= link_to fuel.edit_admin_author_path(author) do %>
+        <li class="resource-item author-item <%= 'active' if @author && @author == author %>">
+          <%= image_tag author.avatar.url, class: 'author-avatar' %>
+          <p class="author-item--title"><%= author.title.html_safe %></p>
+          <h5 class="author-item--name"><%= author.full_name %></h5>
+        </li>
+      <% end %>
+    <% end %>
+  </ul>
+</aside>

data/app/views/fuel/admin/authors/_form.html.erb

@@ -0,0 +1,52 @@
+<%= form_for @author, url: @url, html: { multipart: true } do |f| %>
+  <div class="form-container--left">
+    <fieldset>
+      <div class="form-group-half">
+        <%= f.label :first_name %>
+        <%= f.text_field :first_name %>
+      </div>
+      <div class="form-group-half">
+        <%= f.label :last_name %>
+        <%= f.text_field :last_name %>
+      </div>
+    </fieldset>
+    <fieldset>
+      <%= f.label :title %>
+      <%= f.text_field :title %>
+    </fieldset>
+    <fieldset>
+      <%= f.label :bio, 'Author Bio' %>
+      <%= f.text_area :bio %>
+    </fieldset>
+    <fieldset>
+      <div class="form-group-half">
+        <%= f.label :email %>
+        <%= f.email_field :email, placeholder: "ryan@example.com" %>
+      </div>
+      <div class="form-group-half">
+        <%= f.label :twitter %>
+        <%= f.text_field :twitter, placeholder: "ryan_p_francis" %>
+      </div>
+    </fieldset>
+    <fieldset>
+      <div class="form-group-half">
+        <%= f.label :github %>
+        <%= f.text_field :github, placeholder: "francirp" %>
+      </div>
+      <div class="form-group-half">
+        <%= f.label :dribbble %>
+        <%= f.text_field :dribbble, placeholder: "ryan_p_francis" %>
+      </div>
+    </fieldset>
+    <fieldset class="fieldset">
+      <%= f.submit class: 'button button--secondary' %>
+    </fieldset>
+  </div>
+  <div class="form-container--right card">
+    <%= f.label :avatar, 'Updated Author Picture' %>
+    <div class="card-image card-image--avatar">
+      <%= image_tag @author.avatar.url if @author.avatar.present? %>
+    </div>
+    <%= f.file_field :avatar %>
+  </div>
+<% end %>

data/app/views/fuel/admin/authors/edit.html.erb

@@ -0,0 +1,9 @@
+<%= render "authors" %>
+<section class="page">
+  <header class="page-header">
+    <h5 class="page-header--title"><span>Author</span>: <%= @author.full_name %></h5>
+  </header>
+  <div class="page-area">
+    <%= render "form" %>
+  </div>
+</section>

data/app/views/fuel/admin/authors/index.html.erb

@@ -0,0 +1,7 @@
+<%= render "authors" %>
+<section class="page-area">
+  <div class="no-content-container">
+    <p class="no-content-message">Select an author from the list on the left or <%= link_to 'add', new_admin_author_path, class: 'link-primary' %> a new author.</p>
+  </div>
+  <p></p>
+</section>

data/app/views/fuel/admin/authors/new.html.erb

@@ -0,0 +1,6 @@
+<%= render "authors" %>
+
+<div class="page-area">
+  <h2>New Author</h2>
+  <%= render "form" %>
+</div>

data/app/views/fuel/admin/posts/_content.html.erb

@@ -0,0 +1,5 @@
+<div id="render-content">
+  <div class="fuel-posts">
+    <%= (content || "").try(:html_safe) %>
+  </div>
+</div>

data/app/views/fuel/admin/posts/_form.html.erb

@@ -0,0 +1,56 @@
+<%= form_for @post, url: @url, html: { multipart: true } do |f| %>
+  <% if @post.errors.any? %>
+    <div class="alert alert--warning">
+      <p class="alert--content"><%= @post.errors.full_messages.to_sentence %></h2></p>
+      <%= link_to '#', class: 'alert--trigger' do %>
+        <%= embedded_svg 'icons/alert-icon.svg', class: 'alert--close-icon' %>
+      <% end %>
+    </div>
+  <% end %>
+  <div class="form-container--left">
+    <fieldset>
+      <%= f.label :title %>
+      <%= f.text_field :title %>
+    </fieldset>
+    <fieldset>
+      <div class="form-group-half">
+        <%= f.label :author_id %>
+        <%= f.select :author_id, options_from_collection_for_select(Fuel::Author.all, :id, :full_name, @post.author_id) %>
+      </div>
+      <div class="form-group-half">
+        <%= f.label :tag %>
+        <%= f.select :tag, options_for_select(Fuel.configuration.tags, @post.tag) %>
+      </div>
+    </fieldset>
+    <fieldset>
+      <div class="half-group">
+        <%= f.label :published, 'Published' %>
+        <%= f.select :published, options_for_select({"Yes" => true, "No" => false}, @post.is_published) %>
+      </div>
+      <div class="half-group" id="publishedAtGroup" style="<%= hide_published_at(@post) %>">
+        <%= f.label :published_at, 'Published At' %>
+        <%= f.text_field :published_at, data: { value: (@post.published_at || DateTime.now).strftime("%m/%d/%Y") }, class: 'datepicker', disabled: !@post.is_published %>
+      </div>
+    </fieldset>
+    <fieldset>
+      <%= f.label :teaser, 'Post Tease' %>
+      <%= f.text_area :teaser, class: 'tease' %>
+    </fieldset>
+  </div>
+  <div class="form-container--right card">
+    <%= f.label :featured_image, 'Featured Image' %>
+    <div class="card-image card-image--featured_image">
+      <%= image_tag @post.featured_image.url(:medium) if @post.featured_image.present? %>
+    </div>
+    <%= f.file_field :featured_image %>
+  </div>
+  <div class="form-container--full">
+    <fieldset>
+      <%= f.label :content, 'Your Post' %>
+      <%= f.text_area :content, class: 'post' %>
+    </fieldset>
+    <fieldset>
+      <%= f.submit (action_name == "edit" ? "Update Post" : "Create Post"), class: 'button button--secondary' %>
+    </fieldset>
+  </div>
+<% end %>