monologue 0.2.0 → 0.3.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 40fc2b990c0a8647cd9da84ac89e602fea6d1c3a
+  data.tar.gz: 996f5bd9ffaa0e65c80f9f576dcd1df6566d1141
+SHA512:
+  metadata.gz: f692ded8634a34d4cb731042b1cf741a102fefb505f9109d87b8b2feb1fc330be72eb3d8d330cf231da1b972027761108c6a6222abec92e9f6d97c50383d69fa
+  data.tar.gz: d4665bf2de9a72f3c0d8a9eaa5c0b168dd9a8b02b7dd93a31f7b488c4febff415cae8ffec62ad865235e90562381398dd8a2f6ec38fe4253b3d4e053335cea41

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2012 YOURNAME
+Copyright 2012 Jean-Philippe Boily
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -1,8 +1,18 @@
-# MONOLOGUE
+# Monologue
 Monologue is a basic mountable blogging engine in Rails built to be easily mounted in an already existing Rails app, but it can also be used alone.
 
+[![Gem Version](https://badge.fury.io/rb/monologue.png)](http://badge.fury.io/rb/monologue)
 [![Build Status](https://secure.travis-ci.org/jipiboily/monologue.png)](http://travis-ci.org/jipiboily/monologue)
+[![Code Climate](https://codeclimate.com/github/jipiboily/monologue.png)](https://codeclimate.com/github/jipiboily/monologue)
+[![Coverage Status](https://coveralls.io/repos/jipiboily/monologue/badge.png?branch=master)](https://coveralls.io/r/jipiboily/monologue?branch=master)
 
+## IMPORTANT: version
+
+This README is for Monologue 0.3.X.
+
+## Upgrade and changes
+
+To know how to upgrade, see [UPGRADE.md](https://github.com/jipiboily/monologue/blob/master/UPGRADE.md) file. If you want to know what changed since the last versions, see [CHANGELOG.md](https://github.com/jipiboily/monologue/blob/master/CHANGELOG.md).
 
 ## Questions? Problems? Documentation?
 
@@ -14,9 +24,9 @@ Monologue is a basic mountable blogging engine in Rails built to be easily mount
 - Rails mountable engine (fully named spaced and mountable in an already existing app)
 - tested
 - back to basics: few features
-- it has post revisions (no UI to choose published revision yet, but it keeps your modification history)
 - tags (or categories)
 - RSS
+- multiple users
 - support for Google Analytics and Gaug.es tags
 - few external dependencies (no Devise or Sorcery, etc…) so we don't face problem integrating with existing Rails app.([Rails mountable engines: dependency nightmare?](http://jipiboily.com/2012/rails-mountable-engines-dependency-nightmare))
 - comments are handled by [disqus](http://disqus.com/)
@@ -26,7 +36,6 @@ Monologue is a basic mountable blogging engine in Rails built to be easily mount
 - bonus: there is a `[monologue-markdown](https://github.com/jipiboily/monologue-markdown)` extension
 
 ### missing features
-- UI for posts revisions and to manage user
 - see [roadmap](https://github.com/jipiboily/monologue/wiki/Roadmap)!
 
 
@@ -46,8 +55,11 @@ Add this to your route file (`config/route.rb`)
 # If you would like to change where this engine is mounted, simply change the :at option to something different.
 #
 # We ask that you don't use the :as option here, as Monologue relies on it being the default of "monologue"
-mount Monologue::Engine, :at => '/' # or whatever path, be it "/blog" or "/monologue"
+mount Monologue::Engine, at: '/' # or whatever path, be it "/blog" or "/monologue"
 ```
+For example, if you decide to mount it at  `/blog`, the admin section will be available at `/blog/monologue`.
+Here we decide to use monologue as default route mounting it at `/`, it means that the admin section will directly
+be available at `/monologue`.
 
 ### 3. Migrate Monologue's database tables
 Run these commands:
@@ -70,10 +82,16 @@ This is all done in an initializer file, say `config/initializers/monologue.rb`.
 Start your server and head on [http://localhost:3000/monologue](http://localhost:3000/monologue) to log in the admin section.
 
 ### Note to Heroku users
-Additionnal step: turn caching off in `config/environments/production.rb`:
+1. Additionnal step: turn caching off in `config/environments/production.rb`:
 ```ruby
 config.action_controller.perform_caching = false
 ```
+2. If you use compiled assets, I recommend you to add `gem "tinymce-rails"` to your Gemfile otherwise you might not be able to post an article.
+
+### Note to users
+Monologue is using his own tables. If you want to use your own tables with monologue (for example the User table)
+this might help you to monkey patch [Monkey Patch](https://gist.github.com/jipiboily/776d907fc932640ac59a)
+
 
 ## Enable caching
 [See full caching doc here.](https://github.com/jipiboily/monologue/wiki/Configure-Monologue's-cache)
@@ -85,6 +103,10 @@ See the [Wiki - Customizations](https://github.com/jipiboily/monologue/wiki/Cust
 - Rails 3.1 +
 - Database: MySQL & Postgres are supported but other databases might work too.
 
+## Authors
+* Jean-Philippe Boily, [@jipiboily](https://github.com/jipiboily)
+* Michael Sevestre, [@msevestre](https://github.com/msevestre)
+
 ## Contribute
 Fork it, then pull request. Please add tests for your feature or bug fix.
 
@@ -93,4 +115,4 @@ You will need to install this before running the test suite:
 
 ## Thanks to
 
-Zurb for the "social foundicons".
+Zurb for the "social foundicons".

data/app/assets/javascripts/monologue/admin/application.js

@@ -9,5 +9,9 @@
 //= require monologue/bootstrap/bootstrap.min
 //= require monologue/bootstrap/bootstrap-datepicker
 //= require monologue/bootstrap/bootstrap-datepicker-fr
-//= require tinymce-jquery
-//= require_tree .
+//= require monologue/bootstrap/bootstrap-datepicker-pt
+//= require monologue/bootstrap/bootstrap-datepicker-es
+//= require ckeditor/init
+//= require monologue/admin/ckeditor-config
+//= require monologue/admin/posts
+//= require select2

data/app/assets/javascripts/monologue/admin/ckeditor-config.js

@@ -0,0 +1,21 @@
+$(function() {
+
+//    Full configuation can be found under  http://docs.cksource.com/CKEditor_3.x/Developers_Guide/Toolbar
+    CKEDITOR.config.toolbar = 'Basic';
+    CKEDITOR.config.toolbar_Basic =
+    [
+    	{ name: 'document', items : [ 'Source','-','Save','NewPage','DocProps','Preview','Print','-','Templates' ] },
+    	{ name: 'clipboard', items : [ 'Cut','Copy','Paste','PasteText','PasteFromWord','-','Undo','Redo' ] },
+    	{ name: 'editing', items : [ 'Find','Replace','-','SelectAll','-','SpellChecker', 'Scayt' ] },
+    	{ name: 'basicstyles', items : [ 'Bold','Italic','Underline','Strike','Subscript','Superscript','-','RemoveFormat' ] },
+        '/',
+    	{ name: 'paragraph', items : [ 'NumberedList','BulletedList','-','Outdent','Indent','-','Blockquote','CreateDiv',
+    	'-','JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock','-','BidiLtr','BidiRtl' ] },
+    	{ name: 'links', items : [ 'Link','Unlink','Anchor' ] },
+    	{ name: 'insert', items : [ 'Image','Table','HorizontalRule','Smiley','SpecialChar','PageBreak','Iframe' ] },
+    	'/',
+    	{ name: 'styles', items : [ 'Styles','Format','Font','FontSize' ] },
+    	{ name: 'colors', items : [ 'TextColor','BGColor' ] },
+    	{ name: 'tools', items : [ 'Maximize', 'ShowBlocks' ] }
+    ];
+});

data/app/assets/javascripts/monologue/admin/posts.js

@@ -0,0 +1,62 @@
+$(document).ready (function(){
+   
+   var preview = {
+      el: null,
+      
+      // initialize - bind events, etc.
+      init: function(selector) {
+         this.el = $(selector);
+         if (this.el.length == 0) { return;}
+         $(this.el.attr("data-trigger")).click(this, this.open);
+         this.el.find("[data-dismiss='post-preview']").click(this, this.close);
+      },
+      
+      // open preview
+      open: function(e) {
+         var el = e.data.el;
+         var iframe = el.find("iframe")[0];
+         if(iframe.contentDocument){
+            var doc = iframe.contentDocument;
+         }
+         else if(iframe.contentWindow){
+            var doc = iframe.contentWindow.document;
+         } else {
+            var doc = iframe.document;
+         }
+
+         $("#post_content").val(CKEDITOR.instances["post_content"].getData()); // update textarea with CKEDITOR content.
+         $.post(el.attr("data-url"), $("form").serialize(), function(data) {
+            doc.open();
+            doc.writeln(data);
+            doc.close();
+            $(doc).keydown(e.data, e.data.keydown);   
+         });
+
+         // show preview & hide scrollbars
+         el.show();
+         $("body").attr("style", "overflow:hidden;");
+
+         // look for esc
+         $(document).on("keydown.post-preview", e.data, e.data.keydown);
+      },
+      
+      // close preview on esc key.
+      keydown: function(e) {
+         if (e.keyCode==27) {
+            e.data.close();
+         }
+      },
+      
+      // close preview
+      close: function(e) {
+         var el = (e==undefined)? this.el: e.data.el;
+         el.hide();
+         $("body").attr("style", "overflow:auto;");
+         $(document).off("keydown.post-preview");
+      }
+   }
+   
+   
+   // initialize preview.
+   preview.init("[data-toggle='post-preview']");
+})

data/app/assets/stylesheets/monologue/admin/application.css

@@ -6,5 +6,6 @@
  *= require monologue/bootstrap/bootstrap.min
  *= require monologue/bootstrap/bootstrap-responsive.min
  *= require monologue/bootstrap/bootstrap-datepicker
- *= require_tree . 
+ *= require select2
+ *= require monologue/admin/posts
 */

data/app/assets/stylesheets/monologue/admin/posts.sass

@@ -0,0 +1,21 @@
+.post-preview
+  background: #fff
+  opacity: 1
+
+  iframe
+    width: 100%
+    height: 100%
+
+.post-preview-inner
+  position: fixed
+  top: 0
+  opacity: 0.9
+  width: 100%
+  .navbar
+    margin-right: 20px
+
+.select2-search-choice-close
+  background: url("select2.png") right top no-repeat
+
+.select2-container
+  width: 20em

data/app/assets/stylesheets/monologue/blog/application.css

@@ -7,7 +7,7 @@
  *= require monologue/blog/skeleton/skeleton
  *= require monologue/blog/skeleton/layout
  *= require monologue/foundation_icons/social_foundicons
- *= require_tree .
+ *= require monologue/blog/monologue
  *= require monologue/blog/fonts
  *= require monologue/blog/custom
 */

data/app/assets/stylesheets/monologue/blog/monologue.css

@@ -33,7 +33,18 @@ a.social {
   font-size: 30px;
 }
 
+.post-header span {
+    text-transform: uppercase;
+    font-weight: bold;
+}
 
+.post-header span:after{
+    content: "|";
+}
+
+.post-header span:last-child:after {
+    content: "";
+}
 /* pagination */
 
 #pagination {
@@ -91,7 +102,7 @@ a.social {
 }
 
 /* tags */
-#tags {
+.tags {
     margin-top: 20px;
     margin-bottom: 20px;
 }

data/app/controllers/monologue/admin/base_controller.rb

@@ -5,8 +5,8 @@ class Monologue::Admin::BaseController < Monologue::ApplicationController
   layout "layouts/monologue/admin"
   
   def authenticate_user!
-    if current_user.nil?
-      redirect_to admin_login_url, :alert => I18n.t("monologue.admin.login.need_auth")
+    if monologue_current_user.nil?
+      redirect_to admin_login_url, alert: I18n.t("monologue.admin.login.need_auth")
     end
   end
 end

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

@@ -1,54 +1,43 @@
 class Monologue::Admin::PostsController < Monologue::Admin::BaseController
   respond_to :html
-  cache_sweeper Monologue::PostsSweeper, :only => [:create, :update, :destroy]
-  before_filter :load_post_and_revisions, :only => [:edit, :update]
-
+  cache_sweeper Monologue::PostsSweeper, only: [:create, :update, :destroy]
+  before_filter :load_post, only: [:edit, :update]
+  
   def index
     @posts = Monologue::Post.default
   end
 
   def new
     @post = Monologue::Post.new
-    @revision = @post.posts_revisions.build
   end
-
+  
+  ## Preview a post without saving.
+  def preview
+    # mockup our models for preview.
+    @post = Monologue::Post.new(params[:post])
+    @post.user_id = monologue_current_user.id
+    @post.published_at = Time.zone.now
+    
+    # render it exactly as it would display when live.
+    render "/monologue/posts/show", layout: Monologue.layout || "/layouts/monologue/application"
+  end
+  
   def create
-    params[:post][:posts_revisions_attributes] = {}
-    params[:post][:posts_revisions_attributes][0] = params[:post][:posts_revision]
-    params[:post].delete("posts_revision")
-    tags = params[:post].delete(:tag_list)
     @post = Monologue::Post.new(params[:post])
-    @revision = @post.posts_revisions.first
-    @revision.user_id = current_user.id
-    save_tags(tags)
+    @post.user_id = monologue_current_user.id
     if @post.save
-      if @revision.published_at > DateTime.now && @post.published && ActionController::Base.perform_caching
-        flash[:warning] = I18n.t("monologue.admin.posts.create.created_with_future_date_and_cache")
-      else
-        flash[:notice] =  I18n.t("monologue.admin.posts.create.created")
-      end
-      redirect_to edit_admin_post_path(@post)
+      prepare_flash_and_redirect_to_edit()
     else
       render :new
     end
   end
 
   def edit
-    @revision = @post.active_revision
   end
 
   def update
-    @post.published = params[:post][:published]
-    @revision = @post.posts_revisions.build(params[:post][:posts_revision])
-    @revision.user_id = current_user.id
-    save_tags(params[:post][:tag_list])
-    if @post.save
-      if @revision.published_at > DateTime.now && @post.published && ActionController::Base.perform_caching
-        flash[:warning] =  I18n.t("monologue.admin.posts.update.saved_with_future_date_and_cache")
-      else
-        flash[:notice] =  I18n.t("monologue.admin.posts.update.saved")
-      end
-      redirect_to edit_admin_post_path(@post)
+    if @post.update_attributes(params[:post])
+      prepare_flash_and_redirect_to_edit()
     else
       render :edit
     end
@@ -57,25 +46,23 @@ class Monologue::Admin::PostsController < Monologue::Admin::BaseController
   def destroy
     post = Monologue::Post.find(params[:id])
     if post.destroy
-      redirect_to admin_posts_path, :notice =>  I18n.t("monologue.admin.posts.delete.removed")
+      redirect_to admin_posts_path, notice:  I18n.t("monologue.admin.posts.delete.removed")
     else
-      redirect_to admin_posts_path, :alert => I18n.t("monologue.admin.posts.delete.failed")
+      redirect_to admin_posts_path, alert: I18n.t("monologue.admin.posts.delete.failed")
     end
   end
 
-  private
-  def save_tags(tags)
-    @post.tag!(tags.split(","))
+private
+  def load_post
+    @post = Monologue::Post.find(params[:id])
   end
 
-  def load_post_and_revisions
-    @post = Monologue::Post.includes(:posts_revisions).find(params[:id])
-  end
-
-  helper_method :tag_list_for
-
-  def tag_list_for(tags)
-    tags.map { |tag| tag.name }.join(", ") if tags
+  def prepare_flash_and_redirect_to_edit
+    if @post.published_in_future? && ActionController::Base.perform_caching
+      flash[:warning] = I18n.t("monologue.admin.posts.#{params[:action]}.saved_with_future_date_and_cache")
+    else
+      flash[:notice] =  I18n.t("monologue.admin.posts.#{params[:action]}.saved")
+    end
+    redirect_to edit_admin_post_path(@post)
   end
-
 end

data/app/controllers/monologue/admin/sessions_controller.rb

@@ -8,7 +8,7 @@ class Monologue::Admin::SessionsController < Monologue::Admin::BaseController
     user = Monologue::User.find_by_email(params[:email])
     if user && user.authenticate(params[:password])
       session[:monologue_user_id] = user.id
-      redirect_to admin_url, :notice => t("monologue.admin.sessions.messages.logged_in")
+      redirect_to admin_url, notice: t("monologue.admin.sessions.messages.logged_in")
     else
       flash.now.alert = t("monologue.admin.sessions.messages.invalid")
       render "new"
@@ -17,6 +17,6 @@ class Monologue::Admin::SessionsController < Monologue::Admin::BaseController
 
   def destroy
     session[:monologue_user_id] = nil
-    redirect_to admin_url, :notice => t("monologue.admin.sessions.messages.logged_out")
+    redirect_to admin_url, notice: t("monologue.admin.sessions.messages.logged_out")
   end
 end

data/app/controllers/monologue/admin/users_controller.rb

@@ -1,13 +1,49 @@
 class Monologue::Admin::UsersController < Monologue::Admin::BaseController
+
+  before_filter :load_user, except: [:index, :new, :create]
+
   def edit
-    @user = current_user
+
+  end
+
+  def new
+    @user = Monologue::User.new
   end
 
   def update
-    @user = current_user
     if @user.update_attributes(params[:user])
       flash.notice = "User modified"
+      redirect_to admin_users_path
+    else
+      render :edit
     end
-    render :edit
   end
+
+  def destroy
+    if @user.destroy
+      redirect_to admin_users_path, notice:  I18n.t("monologue.admin.users.delete.removed", user: @user.name)
+    else
+      redirect_to admin_users_path, alert: I18n.t("monologue.admin.users.delete.failed", user: @user.name)
+   end
+  end
+
+  def create
+    @user = Monologue::User.new(params[:user])
+    if @user.save
+      flash.notice = I18n.t("monologue.admin.users.create.success")
+      redirect_to admin_users_path
+    else
+      render :new
+    end
+  end
+
+  def index
+    @users = Monologue::User.all
+  end
+
+  private
+    def load_user
+      @user = Monologue::User.find(params[:id])
+    end
+
 end