fuel 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b67615cb427e46945de0762ec3ae9735da0f67d1
-  data.tar.gz: 9a9cc063605530dc7751ab22caef0843cf6b5da2
+  metadata.gz: 831c1818de7ca969dab85674fc056400e5ac2828
+  data.tar.gz: ce470ab04b2ee4cd54c532beb7f5b08efff8466c
 SHA512:
-  metadata.gz: 7cf3f785993028ecb86a906c635edc6a1745c5881b707a6521539305cdc5d0dfa8552d8637c898a6c01dbb88ee42da0d2d6a9791479bf5742fac1662885cd770
-  data.tar.gz: 97d7fb294adbe1458038d6f47513f6c3d1d3a043cffa55630fd69898378869437368a7009e920faf5032ee0bffd85ff5a753bf17200d12068d14277cb52bae0c
+  metadata.gz: 6bcf4fafa6ccda2b1e50f6719683fe46989db23e4a9e92cf1a3f4013c07e88f18b2623f6b8241b789454bad92a9a4179b5a681d4465fd4022ebbb85c463f7d37
+  data.tar.gz: 5613058dcd2f2de76262ba8c6de9d55dc2990a306dbde85b4138427779cc2852acc72f45e8444d6733d3a2b903ae088b5838055e5b73cff50bf8ea5f0862d7a2

data/app/assets/javascripts/fuel/admin.js.erb

@@ -0,0 +1,17 @@
+$(function() {
+  $(".edit-preview-toggle").click(function(e) {
+    e.preventDefault();
+    var id = $(this).data('id');
+    if (id == "preview") {
+      var content = $("#post_content").serialize();
+      $.ajax({
+        url: 'preview',
+        data: content
+      });
+    }
+    $(".content-area").hide();
+    $("#content-" + id).show();
+    $(".edit-preview-toggle").removeClass("active");
+    $(this).addClass("active");
+  });
+});

data/app/assets/javascripts/fuel/application.js

@@ -10,4 +10,5 @@
 // Read Sprockets README (https://github.com/sstephenson/sprockets#sprockets-directives) for details
 // about supported directives.
 //
-//= require_tree .
+//= require jquery
+//= require fuel/admin

data/app/assets/stylesheets/fuel/admin.css.sass

@@ -0,0 +1,91 @@
+/* ALL FUEL */
+.fuel
+  h1
+    margin-bottom: 10px
+    font-size: 2.5em
+
+/* ADMIN */
+.fuel-admin
+  margin-top: 20px
+  width: 90%
+  float: left
+  margin-left: 4%
+  font-family: sans-serif
+  margin-bottom: 100px
+  input[type="text"]
+    width: 50%
+    height: 2em
+    font-size: 1.2em
+    margin-top: 5px
+    margin-bottom: 20px
+    display: block
+  textarea
+    font-size: 1.2em
+    width: 100%
+    height: 400px
+    margin: 0
+    padding-top: 10px
+    border: none
+  .content-area
+    padding: 0
+    width: 80%
+    min-height: 400px
+    max-height: 500px
+    overflow: auto
+    border: thin solid #ccc
+  .preview-links
+    margin-top: 10px
+    .edit-preview-toggle
+      padding: 10px
+      &.active
+        color: #686868
+        cursor: default
+        text-decoration: none
+        font-weight: bold
+  label
+    font-weight: bold
+    font-size: 1.5em
+  input[type="submit"]
+    font-size: 2em
+    font-weight: bold
+  h1.header
+    margin-top: 40px
+    margin-bottom: 30px
+  .markdown
+    width: 400px
+    float: left
+  tr
+    text-align: left
+    border-bottom: 1px solid #ddd
+  table
+    border: thin solid #ccc
+    margin-top: 20px
+  th
+    padding: 2px 20px
+    border-bottom: 1px solid #444
+    font-size: 1.2em
+    font-weight: bold
+  td
+    padding: 10px 20px
+    &.date
+      width: 140px
+    &.post
+      width: 500px
+  .draft
+    color: green
+  .save
+    margin-left: 40px
+    background-color: #777
+  .post-contact-area
+    margin-top: 50px
+  .twitter-follow-button
+    margin-top: 5px
+  fieldset
+    border: none
+    margin-top: none
+  .markdown-panel
+    padding: 40px
+    background-color: #777
+
+
+

data/app/assets/stylesheets/fuel/application.css.scss

@@ -0,0 +1,2 @@
+@import 'posts';
+@import 'admin';

data/app/assets/stylesheets/fuel/posts.css.sass

@@ -0,0 +1,23 @@
+// BLOG
+.fuel-posts
+  .fuel-post-title
+    font-size: 1.8em
+    margin-top: 20px
+  h1, h2, h3, h4, h5, h6
+    font-weight: bold
+  padding: 20px
+  .fuel-post-additional-info
+    margin-top: 5px
+    display: block
+  .fuel-post-author
+    display: inline
+    font-size: 1em
+    color: #999
+
+.fuel-post-date
+  display: inline
+  font-size: 1em
+  color: #999
+
+.fuel-posts .fuel-post-content
+  margin-top: 20px

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

@@ -11,7 +11,6 @@ module Fuel
     end
 
     def create
-      # raise Fuel::Post.new.inspect
       @post = Fuel::Post.new
       @post.tag = post_params["tag"]
       @post.author = post_params["author"]
@@ -20,7 +19,7 @@ module Fuel
       update_published
 
       if @post.save
-        redirect_to @post, notice: "Your blog post was successfully #{@message}."
+        redirect_to admin_posts_path, notice: "Your blog post was successfully #{@message}."
       else
         render action: "new"
       end
@@ -50,6 +49,13 @@ module Fuel
       redirect_to admin_posts_path, notice: "Post was successfully deleted"
     end
 
+    def preview
+      @content = params[:post][:content]
+      respond_to do |format|
+        format.js
+      end
+    end
+
     private
 
       def post_params

data/app/controllers/fuel/posts_controller.rb

@@ -11,7 +11,7 @@ module Fuel
     end
 
     def index
-      @posts = Fuel::Post.where(published: true).order("created_at DESC").page(params[:page])
+      @posts = Fuel::Post.recent_published_posts.page(params[:page])
     end
 
     def show
@@ -21,6 +21,13 @@ module Fuel
       @disqus_name = Fuel.configuration.disqus_name
     end
 
+    def preview
+      @content = params[:content]
+      respond_to do |format|
+        format.js
+      end
+    end
+
     private
 
       def truncate_on_space(text, length)

data/app/models/fuel/post.rb

@@ -8,7 +8,9 @@ module Fuel
     end
 
     validates_presence_of :title, :content, :author, if: :is_published
-    paginates_per 5
+    paginates_per Fuel.configuration.paginates_per.to_i
+
+    scope :recent_published_posts, -> { where(published: true).order("created_at DESC") }
 
     def should_generate_new_friendly_id?
       new_record? #Don't generate new id on edit

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

@@ -0,0 +1,3 @@
+#render-content
+  .fuel-posts
+    = markdown(content || "").try(:html_safe)

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

@@ -0,0 +1,28 @@
+= form_for [:admin, @post] do |f|
+  - if @post.errors.any?
+    #error_explanation
+      h2
+        => pluralize(@post.errors.count, "error")
+        | prohibited this post from being saved:
+      ul
+        - @post.errors.full_messages.each do |msg|
+          li= msg
+  = f.label :title
+  = f.text_field :title
+  = f.label :tag
+  = f.text_field :tag
+  = f.label :author
+  = f.text_field :author
+  = f.label :content
+  br
+  .preview-links
+    = link_to 'Edit', '#', data: { id: "edit" }, class: "edit-preview-toggle active"
+    = link_to 'Preview', '#', data: { id: "preview" }, class: "edit-preview-toggle"
+  #content-edit.content-area
+    = f.text_area :content, cols: "80", rows: "20"
+  #content-preview.content-area style="display:none;"
+    = render 'content', content: @post.content
+  = f.submit 'Publish'
+  = f.submit 'Save Draft'
+= form_tag('preview', method: "post", id: "preview_form") do
+  = hidden_field_tag :content

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

@@ -0,0 +1,4 @@
+.fuel.fuel-admin.edit
+  = link_to "Back to Blog Admin", admin_posts_path
+  h1.header Edit Post
+  = render 'form'

data/app/views/fuel/admin/posts/index.html.slim

@@ -0,0 +1,18 @@
+.fuel.fuel-admin.index
+  h1 Blog Admin Panel
+  => link_to 'New Blog Post', new_admin_post_path
+  | | #{link_to 'View Blog', posts_path}
+  table.table
+    thead
+      tr
+        th Published On
+        th Title
+        th
+        th
+    tbody
+      - @posts.each do |post|
+        tr
+          td= post.published ? post.created_at.strftime('%m/%d/%Y') : 'Draft'
+          td= link_to post.title, post_path(post)
+          td= link_to "Edit", edit_admin_post_path(post)
+          td= link_to "Delete", admin_post_path(post), method: :delete, data: { confirm: "Are you sure you want to delete this post?" }

data/app/views/fuel/admin/posts/new.html.slim

@@ -0,0 +1,4 @@
+.fuel.fuel-admin.new
+  = link_to "Back to Blog Admin", admin_posts_path
+  h1.header New Post
+  = render 'form'

data/app/views/fuel/admin/posts/preview.js.erb

@@ -0,0 +1 @@
+$("#render-content").replaceWith("<%= j render('content.html.slim', content: @content) %>")

data/config/routes.rb

@@ -5,7 +5,13 @@ Fuel::Engine.routes.draw do
 
   namespace :admin do
     root to: 'posts#index'
-    resources :posts
+    get "posts/preview" => 'posts#preview'
+    get "posts/:slug/preview" => 'posts#preview'
+    resources :posts do
+      member do
+        get 'content'
+      end
+    end
   end
 
 end

data/lib/fuel.rb

@@ -3,6 +3,9 @@ require "redcarpet"
 require "kaminari"
 require "fuel/configuration"
 require "friendly_id"
+require "jquery-rails"
+require "sass-rails"
+require "slim"
 
 module Fuel
 

data/lib/fuel/configuration.rb

@@ -2,7 +2,7 @@ module Fuel
   class Configuration
 
     # What kind of comments do you want to add to your blog ? (:active_record, :disqus or :no)
-    attr_accessor :layout, :blog_title, :disqus_name, :twitter, :username, :password, :helpers
+    attr_accessor :layout, :blog_title, :disqus_name, :twitter, :username, :password, :helpers, :paginates_per
 
     def initialize
       @layout = "application"
@@ -12,6 +12,7 @@ module Fuel
       @username = "admin"
       @password = "password"
       @helpers = ["ApplicationHelper"]
+      @paginates_per = 5
     end
 
   end

data/lib/fuel/version.rb

@@ -1,3 +1,3 @@
 module Fuel
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

data/lib/generators/fuel/install_generator.rb

@@ -3,8 +3,14 @@ module Fuel
     class InstallGenerator < Rails::Generators::Base
 
       source_root File.expand_path('../../templates', __FILE__)
+      desc "Creates a Fuel initializer in config/initializers, adds/migrates Fuel migration files and migrates the files, and adds the appropriate route to config/routes"
 
-      desc "Creates a Fuel initializer in config/initializers"
+      def install
+        run 'bundle install'
+        route "mount Fuel::Engine => '/blog'"
+        rake 'fuel:install:migrations'
+        rake 'db:migrate'
+      end
 
       def copy_initializer
         template "fuel.rb", "config/initializers/fuel.rb"

data/lib/generators/templates/fuel.rb

@@ -11,7 +11,10 @@ Fuel.configure do |config|
   config.username = "admin"
 
   # Change admin password
-  config.username = "password"
+  config.password = "password"
+
+  # Change number of posts to show per page on blog
+  config.paginates_per = 5
 
   config.helpers = ["ApplicationHelper",
                     #"another_helper",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fuel
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Ryan Francis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-16 00:00:00.000000000 Z
+date: 2014-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -66,6 +66,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: jquery-rails
+  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: sass-rails
+  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: slim
+  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
@@ -108,6 +150,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: codeclimate-test-reporter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: database_cleaner
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Fuel's goal is to be a simple yet customizable blogging gem.
 email:
 - ryan.p.francis@gmail.com
@@ -118,21 +188,23 @@ files:
 - MIT-LICENSE
 - README.rdoc
 - Rakefile
+- app/assets/javascripts/fuel/admin.js.erb
 - app/assets/javascripts/fuel/application.js
-- app/assets/javascripts/fuel/posts.js
-- app/assets/stylesheets/fuel/application.css
-- app/assets/stylesheets/fuel/posts.css
-- app/assets/stylesheets/fuel/reset.css
+- app/assets/stylesheets/fuel/admin.css.sass
+- app/assets/stylesheets/fuel/application.css.scss
+- app/assets/stylesheets/fuel/posts.css.sass
 - app/controllers/fuel/admin/posts_controller.rb
 - app/controllers/fuel/application_controller.rb
 - app/controllers/fuel/posts_controller.rb
 - app/helpers/fuel/application_helper.rb
 - app/helpers/fuel/posts_helper.rb
 - app/models/fuel/post.rb
-- app/views/fuel/admin/posts/_form.html.erb
-- app/views/fuel/admin/posts/edit.html.erb
-- app/views/fuel/admin/posts/index.html.erb
-- app/views/fuel/admin/posts/new.html.erb
+- app/views/fuel/admin/posts/_content.html.slim
+- app/views/fuel/admin/posts/_form.html.slim
+- app/views/fuel/admin/posts/edit.html.slim
+- app/views/fuel/admin/posts/index.html.slim
+- app/views/fuel/admin/posts/new.html.slim
+- app/views/fuel/admin/posts/preview.js.erb
 - app/views/fuel/posts/_disqus.html.erb
 - app/views/fuel/posts/_post.html.erb
 - app/views/fuel/posts/_tweet.html.erb

data/app/assets/javascripts/fuel/posts.js

@@ -1,2 +0,0 @@
-// Place all the behaviors and hooks related to the matching controller here.
-// All this logic will automatically be available in application.js.

data/app/assets/stylesheets/fuel/application.css

@@ -1,57 +0,0 @@
-/*
- * This is a manifest file that'll be compiled into application.css, which will include all the files
- * listed below.
- *
- * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
- * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
- *
- * You're free to add application-wide styles to this file and they'll appear at the top of the
- * compiled file, but it's generally better to create a new file per style scope.
- *
- *= require_self
- *# require_posts
- */
-/* ALL FUEL */
-.fuel h1 { margin-bottom: 10px; font-size: 2.5em; }
-
-/* ADMIN */
-.fuel-admin { margin-top: 20px; width: 90%; float: left; margin-left: 4%; font-family: sans-serif; margin-bottom: 100px;}
-.fuel-admin input[type="text"], textarea {
-  width: 50%;
-  height: 2em;
-  font-size: 1.2em;
-  margin-top: 5px;
-  margin-bottom: 20px;
-  display: block;
-}
-.fuel-admin textarea {
-  width: 100%;
-  height: 400px;
-}
-.fuel-admin label {
-  font-weight: bold;
-  font-size: 1.5em;
-}
-.fuel-admin input[type="submit"] { font-size: 2em; font-weight: bold; }
-.fuel-admin h1 { margin-top: 40px; margin-bottom: 30px;}
-.fuel-admin .markdown{ width: 400px; float: left; }
-.fuel-admin tr { text-align: left; border-bottom: 1px solid #ddd; }
-.fuel-admin table { border: thin solid #ccc; margin-top: 20px;}
-.fuel-admin th { padding: 2px 20px; border-bottom: 1px solid #444; font-size: 1.2em; font-weight: bold;}
-.fuel-admin td { padding: 10px 20px; }
-.fuel-admin td.date { width: 140px; }
-.fuel-admin td.post { width: 500px; }
-.fuel-admin .draft { color: green; }
-.fuel-admin .save{ margin-left: 40px; background-color: #777; }
-.fuel-admin .post-contact-area{ margin-top: 50px; }
-.fuel-admin .twitter-follow-button{ margin-top: 5px; }
-.fuel-admin fieldset { border: none; margin-top: none; }
-
-/* Blog */
-.fuel-posts .fuel-post-title { font-size: 1.8em; margin-top: 20px; }
-
-.fuel-posts h1, .fuel-posts h2, .fuel-posts h3, .fuel-posts h4, .fuel-posts h5, .fuel-posts h6 { font-weight: bold; }
-.fuel-posts { padding: 20px; }
-.fuel-posts .fuel-post-additional-info { margin-top: 5px; display: block; }
-.fuel-posts .fuel-post-author, .fuel-post-date { display: inline; font-size: 1em; color: #999;}
-.fuel-posts .fuel-post-content { margin-top: 20px; }

data/app/assets/stylesheets/fuel/reset.css

@@ -1,48 +0,0 @@
-/* http://meyerweb.com/eric/tools/css/reset/
-   v2.0 | 20110126
-   License: none (public domain)
-*/
-
-html, body, div, span, applet, object, iframe,
-h1, h2, h3, h4, h5, h6, p, blockquote, pre,
-a, abbr, acronym, address, big, cite, code,
-del, dfn, em, img, ins, kbd, q, s, samp,
-small, strike, strong, sub, sup, tt, var,
-b, u, i, center,
-dl, dt, dd, ol, ul, li,
-fieldset, form, label, legend,
-table, caption, tbody, tfoot, thead, tr, th, td,
-article, aside, canvas, details, embed,
-figure, figcaption, footer, header, hgroup,
-menu, nav, output, ruby, section, summary,
-time, mark, audio, video {
-  margin: 0;
-  padding: 0;
-  border: 0;
-  font-size: 100%;
-  font: inherit;
-  vertical-align: baseline;
-}
-/* HTML5 display-role reset for older browsers */
-article, aside, details, figcaption, figure,
-footer, header, hgroup, menu, nav, section {
-  display: block;
-}
-body {
-  line-height: 1;
-}
-ol, ul {
-  list-style: none;
-}
-blockquote, q {
-  quotes: none;
-}
-blockquote:before, blockquote:after,
-q:before, q:after {
-  content: '';
-  content: none;
-}
-table {
-  border-collapse: collapse;
-  border-spacing: 0;
-}

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

@@ -1,23 +0,0 @@
-<%= form_for [:admin, @post] do |f| %>
-  <% if @post.errors.any? %>
-    <div id="error_explanation">
-      <h2><%= pluralize(@post.errors.count, "error") %> prohibited this post from being saved:</h2>
-
-      <ul>
-      <% @post.errors.full_messages.each do |msg| %>
-        <li><%= msg %></li>
-      <% end %>
-      </ul>
-    </div>
-  <% end %>
-  <%= f.label :title %>
-  <%= f.text_field :title %>
-  <%= f.label :tag %>
-  <%= f.text_field :tag %>
-  <%= f.label :author %>
-  <%= f.text_field :author %>
-  <%= f.label :content %>
-  <%= f.text_area :content %>
-  <%= f.submit 'Publish' %>
-  <%= f.submit 'Save Draft' %>
-<% end %>

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

@@ -1,5 +0,0 @@
-<div class="fuel fuel-admin edit">
-  <%= link_to "Back to Blog Admin", admin_posts_path %>
-  <h1>Edit Post</h1>
-  <%= render 'form' %>
-</div>

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

@@ -1,25 +0,0 @@
-<div class="fuel fuel-admin index">
-  <h1>Blog Admin Panel</h1>
-
-  <%= link_to 'New Post', new_admin_post_path %> | <%= link_to 'View Blog', posts_path %>
-  <table class="table">
-    <thead>
-      <tr>
-        <th>Published On</th>
-        <th>Title</th>
-        <th></th>
-        <th></th>
-      </tr>
-    </thead>
-    <tbody>
-      <% @posts.each do |post| %>
-        <tr>
-          <td><%= post.published ? post.created_at.strftime('%m/%d/%Y') : 'Draft' %></td>
-          <td><%= link_to post.title, post_path(post) %></td>
-          <td><%= link_to "Edit", edit_admin_post_path(post) %></td>
-          <td><%= link_to "Delete", admin_post_path(post), method: :delete, data: { confirm: "Are you sure you want to delete this post?" } %></td>
-        </tr>
-      <% end %>
-    </tbody>
-  </table>
-</div>

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

@@ -1,5 +0,0 @@
-<div class="fuel fuel-admin new">
-  <%= link_to "Back to Blog Admin", admin_posts_path %>
-  <h1>New Post</h1>
-  <%= render 'form' %>
-</div>