fuel 0.3.34 → 0.4.1

data/app/assets/stylesheets/fuel/_page-layout.scss

@@ -35,7 +35,6 @@ $page-offset:           0 25px 50px 275px;
   text-transform: uppercase;
 }
 
-
 // Form Area
 .page-area {
   @include rem(margin, $page-offset);

data/app/assets/stylesheets/fuel/base/_base.scss

@@ -2,4 +2,5 @@
 // ========================================
 
 @import "layout";
-@import "typography";
+@import "typography";
+@import "syntax";

data/app/assets/stylesheets/fuel/base/_syntax.scss.erb

@@ -0,0 +1,15 @@
+<%= Rouge::Themes::Github.render(scope: '.highlight') %>
+
+.highlight {
+  background-color: white;
+  border: thin solid $grey-base;
+  padding: 10px 20px;
+  overflow-x: auto;
+  word-break: inherit;
+  word-wrap: inherit;
+  letter-spacing: 0.2px;
+
+  span {
+    line-height: 25px;
+  }
+}

data/app/assets/stylesheets/fuel/components/_editor.scss

@@ -42,4 +42,16 @@ $editor-button-transition: all 0.2s ease-in-out;
     cursor: pointer;
     color: $blue-base;
   }
+}
+
+
+.preview-link-area {
+  @include row();
+  @include rem(margin-top, 10px);
+}
+
+.preview--link {
+  @extend .link-primary;
+  @include font-type($primary-sans-serif, normal, 700);
+  @include rem(margin-top, 15px);
 }

data/app/assets/stylesheets/fuel/components/_forms.scss

@@ -62,7 +62,7 @@ input[type="submit"] {
 // Specific Teaser Heights
 textarea {
   &.tease { @include rem(height, 60px); }
-  &.post { @include rem(height, 250px); }
+  &.post { @include rem(height, 350px); }
 }
 
 select{

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

@@ -50,8 +50,11 @@ module Fuel
 
       def preview
         @content = params[:fuel_post][:content]
+        content = Fuel::Post.new.to_html(@content)
+        html = render_to_string partial: "fuel/admin/posts/content", locals: { content: content }
+
         respond_to do |format|
-          format.js
+          format.json { render json: { html: html } }
         end
       end
 
@@ -62,7 +65,7 @@ module Fuel
       private
 
         def post_params
-          params.require(:fuel_post).permit(:tag, :author_id, :content, :title, :teaser, :featured_image, :published, :published_at)
+          params.require(:fuel_post).permit(:tag, :author_id, :content, :title, :teaser, :featured_image, :published, :published_at, :format)
         end
 
         def update_published_at

data/app/helpers/fuel/posts_helper.rb

@@ -36,5 +36,9 @@ module Fuel
       )
     end
 
+    def format_options
+      Fuel::Post::Formats::DISPLAY.dup.invert
+    end
+
   end
 end

data/app/models/fuel/post.rb

@@ -8,7 +8,7 @@ module Fuel
     belongs_to :author
 
     if Rails.version[0].to_i < 4
-      attr_accessible :tag, :author_id, :content, :title, :teaser, :featured_image, :seo_title, :seo_description, :published_at
+      attr_accessible :tag, :author_id, :content, :title, :teaser, :featured_image, :seo_title, :seo_description, :published_at, :format
     end
 
     if Fuel.configuration.aws_bucket
@@ -25,6 +25,13 @@ module Fuel
     scope :published, -> { where(published: true) }
     scope :recent, -> { order("published_at DESC").order("created_at DESC") }
 
+    module Formats
+      MARKDOWN = "markdown"
+      HTML = "html"
+      DISPLAY = { HTML => "HTML", MARKDOWN => "Markdown" }
+      DEFAULT = HTML
+    end
+
     def s3_credentials
       {:bucket => Fuel.configuration.aws_bucket, :access_key_id => Fuel.configuration.aws_access_key, :secret_access_key => Fuel.configuration.aws_secret_access_key}
     end
@@ -57,11 +64,27 @@ module Fuel
       teaser.present? ? teaser : content
     end
 
-    def to_html
-      markdown = Redcarpet::Markdown.new(Redcarpet::Render::HTML,
-          :autolink => true, :space_after_headers => true)
+    def to_html(content = raw_content)
+      markdown = Redcarpet::Markdown.new(Fuel::Html,
+          :autolink => true, :space_after_headers => true, fenced_code_blocks: true, disable_indented_code_blocks: true)
       raw markdown.render(content)
     end
 
+    def content
+      markdown? ? to_html(raw_content) : raw_content
+    end
+
+    def raw_content
+      attributes["content"]
+    end
+
+    def html?
+      format == Formats::HTML
+    end
+
+    def markdown?
+      format == Formats::MARKDOWN
+    end
+
   end
 end

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

@@ -2,14 +2,14 @@
   $(function() {
     $body = $("body");
 
-    var editorId = "fuel_post_content";
+    var editorId = "fuel_post_content_html";
     var editorStylesheetPath = "<%= stylesheet_path('fuel/wysihtml') %>";
     var editorSubmitUrl = '<%= s3_direct_post.url %>';
     var editorFormData = JSON.parse('<%= s3_direct_post.fields.to_json.html_safe %>');
     var editorHostUrl = '//<%= @s3_direct_post.url.host %>/';
 
     if ($("body").hasClass("posts-controller")){
-      var editor = new wysihtml5.Editor(editorId, { // id of textarea element
+      wysihtml5Editor = new wysihtml5.Editor(editorId, { // id of textarea element
         toolbar:      "editor", // id of toolbar element
         parserRules:  wysihtml5ParserRules,
         stylesheets: editorStylesheetPath
@@ -67,6 +67,8 @@
         });
       });
       <% end %>
+
+      setCorrectEditor();
     };
 
   });

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

@@ -36,6 +36,12 @@
       <%= f.label :teaser, 'Post Tease' %>
       <%= f.text_area :teaser, class: 'tease' %>
     </fieldset>
+    <fieldset>
+      <div class="form-group-half">
+        <%= f.label :format %>
+        <%= f.select :format, options_for_select(format_options, selected: f.object.format) %>
+      </div>
+    </fieldset>
   </div>
   <div class="form-container--right card">
     <%= f.label :featured_image, 'Featured Image' %>
@@ -45,7 +51,7 @@
     <%= f.file_field :featured_image %>
   </div>
   <div class="form-container--full">
-    <fieldset>
+    <fieldset class="editor-area" data-format="html">
       <%= f.label :content, 'Your Post' %>
       <ul id="editor" style="display: none;">
         <li class="editor-button" data-wysihtml5-command="bold" title="CTRL+B"><i class="fa fa-bold"></i></li>
@@ -96,7 +102,14 @@
           </fieldset>
         </div>
       </ul>
-      <%= f.text_area :content, class: 'post' %>
+      <%= f.text_area :content, class: 'post', id: "fuel_post_content_html" %>
+    </fieldset>
+    <fieldset class="editor-area" data-format="markdown">
+      <%= f.label :content, 'Your Post' %>
+      <%= f.text_area :content, value: f.object.raw_content, class: 'post', id: "fuel_post_content_markdown" %>
+      <div class="preview-link-area">
+        <%= link_to 'Preview Post', '#', class: "trigger-preview preview--link", data: { url: fuel.admin_posts_preview_path } %>
+      </div>
     </fieldset>
     <fieldset>
       <%= f.submit (action_name == "edit" ? "Update Post" : "Create Post"), class: 'button button--secondary' %>
@@ -105,4 +118,5 @@
       <% end %>
     </fieldset>
   </div>
-<% end %>
+<% end %>
+<%= render partial: 'post_preview' %>

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

@@ -2,10 +2,9 @@
 <section class="page">
   <header class="page-header">
     <h5 class="page-header--title"><span>Post</span>: <%= @post.title %></h5>
-    <%= link_to 'Preview Post', '#', class: "js-menu-trigger page-header--link" %>
+    <%= link_to 'View Post', post_path(@post), class: "page-header--link", target: "_blank" %>
   </header>
   <div class="page-area">
     <%= render 'form' %>
-    <%= render partial: 'post_preview' %>
   </div>
 </section>

data/config/routes.rb

@@ -6,7 +6,7 @@ Fuel::Engine.routes.draw do
     # admin namespace is listed first intentionally
     namespace :admin do
       root to: 'posts#index'
-      get "posts/preview" => 'posts#preview'
+      post "posts/preview" => 'posts#preview'
       get "posts/:slug/posts/preview" => 'posts#preview'
       resources :posts do
         member do

data/db/migrate/20151014140731_add_format_to_fuel_posts.rb

@@ -0,0 +1,5 @@
+class AddFormatToFuelPosts < ActiveRecord::Migration
+  def change
+    add_column :fuel_posts, :format, :string, default: "html"
+  end
+end

data/lib/fuel.rb

@@ -14,6 +14,10 @@ require "pickadate-rails"
 require "aws-sdk"
 require "jquery-fileupload-rails"
 require "fuel/aws"
+require "github/markup"
+require "rouge"
+require "rouge/plugins/redcarpet"
+require "fuel/html"
 
 module Fuel
 

data/lib/fuel/html.rb

@@ -0,0 +1,3 @@
+class Fuel::Html < Redcarpet::Render::HTML
+  include Rouge::Plugins::Redcarpet # yep, that's it.
+end

data/lib/fuel/version.rb

@@ -1,3 +1,3 @@
 module Fuel
-  VERSION = "0.3.34"
+  VERSION = "0.4.1"
 end

data/lib/tasks/fuel_tasks.rake

@@ -28,7 +28,7 @@ namespace :fuel do
   desc "Markdown to HTML"
   task :markdown_to_html => :environment do
     Fuel::Post.all.each do |post|
-      post.content = post.to_html
+      post.content = post.content
       post.save
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fuel
 version: !ruby/object:Gem::Version
-  version: 0.3.34
+  version: 0.4.1
 platform: ruby
 authors:
 - Ryan Francis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-27 00:00:00.000000000 Z
+date: 2015-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -192,6 +192,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: github-markup
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rouge
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -425,7 +453,9 @@ files:
 - app/assets/javascripts/fuel/facebook.js
 - app/assets/javascripts/fuel/pickadate-datepicker.js
 - app/assets/javascripts/fuel/posts.js.erb
+- app/assets/javascripts/fuel/showdown.js
 - app/assets/javascripts/fuel/sliding-panel.js
+- app/assets/javascripts/fuel/to-markdown.js
 - app/assets/javascripts/fuel/wysihtml5x-toolbar.min.js
 - app/assets/stylesheets/fuel/_page-layout.scss
 - app/assets/stylesheets/fuel/_post-editor.scss
@@ -433,6 +463,7 @@ files:
 - app/assets/stylesheets/fuel/application.css.scss
 - app/assets/stylesheets/fuel/base/_base.scss
 - app/assets/stylesheets/fuel/base/_layout.scss
+- app/assets/stylesheets/fuel/base/_syntax.scss.erb
 - app/assets/stylesheets/fuel/base/_typography.scss
 - app/assets/stylesheets/fuel/components/_alerts.scss
 - app/assets/stylesheets/fuel/components/_animations.scss
@@ -502,6 +533,7 @@ files:
 - db/migrate/20150604155028_add_published_at_to_fuel_posts.rb
 - db/migrate/20150604161900_remove_posted_at_from_fuel_posts.rb
 - db/migrate/20150608221309_add_start_date_to_authors.rb
+- db/migrate/20151014140731_add_format_to_fuel_posts.rb
 - lib/blog_importer.rb
 - lib/example_author.rb
 - lib/fuel.rb
@@ -509,6 +541,7 @@ files:
 - lib/fuel/aws.rb
 - lib/fuel/configuration.rb
 - lib/fuel/engine.rb
+- lib/fuel/html.rb
 - lib/fuel/version.rb
 - lib/generators/fuel/install_generator.rb
 - lib/generators/fuel/views_generator.rb
@@ -598,7 +631,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Fuel is a dead simple blogging gem (mountable engine)