monologue 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 40fc2b990c0a8647cd9da84ac89e602fea6d1c3a
-  data.tar.gz: 996f5bd9ffaa0e65c80f9f576dcd1df6566d1141
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NmQ2OTVlOGE1OWU1NjJiOWI0MTU1ZTQzYmU1NDMwNzk1NzMzZmYzMQ==
+  data.tar.gz: !binary |-
+    YTljNzZhNjM0Y2UyYjNlZDM4YTg2YmI0M2IwMWQ5ODdlMjQ2YWRlNA==
 SHA512:
-  metadata.gz: f692ded8634a34d4cb731042b1cf741a102fefb505f9109d87b8b2feb1fc330be72eb3d8d330cf231da1b972027761108c6a6222abec92e9f6d97c50383d69fa
-  data.tar.gz: d4665bf2de9a72f3c0d8a9eaa5c0b168dd9a8b02b7dd93a31f7b488c4febff415cae8ffec62ad865235e90562381398dd8a2f6ec38fe4253b3d4e053335cea41
+  metadata.gz: !binary |-
+    YTdkY2EwN2E1OTM2MmEwMzNhZTEwMGY5ZTY1ODlhNTdiODJiMjZjMjYzOGI4
+    NGZhM2FjNTk4ZDcxNTZjOTMzNWEzOWY4OWQ4MDUwYmMzNDMxZmVkZDYyY2Nh
+    YmJlZWJmOTcxNWIwMTE5NTE5OTg1NTBlNGUwMzI3OTU0ZTM5NGQ=
+  data.tar.gz: !binary |-
+    MzBjMTJkZjkxOGU5Yzc0MjJiYjNiMDJkNDE2ODU3YzhlNjU3MjNmMzQ3ODMw
+    YTE3Zjc5ZTE2MDIzNWIxZTBiZmM5YjQ4M2NmYjUwMTZkZmI3MGY1OTFmMjgw
+    MTE4ZmQzZjgyZjhkM2VlZGRlN2Q1NjZlODM0ZWM1OWNhMjNlMjA=

data/README.md

@@ -1,14 +1,18 @@
 # 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 THE MASTER BRANCH AND REFLECTS THE WORK CURRENTLY EXISTING ON THE MASTER BRANCH. IF YOU ARE WISHING TO USE A NON-MASTER BRANCH OF MONOLOGUE, PLEASE CONSULT THAT BRANCH'S README AND NOT THIS ONE.**
+
+-
+
+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.
 
-This README is for Monologue 0.3.X.
+## Version
+
+This README is for a future Monologue version, that will be 0.4.X and be Rails 4 specific. See other branches for other versions (0-3-stable being the latest stable version).
 
 ## Upgrade and changes
 
@@ -16,11 +20,12 @@ To know how to upgrade, see [UPGRADE.md](https://github.com/jipiboily/monologue/
 
 ## Questions? Problems? Documentation?
 
-- [Questions here please](http://groups.google.com/forum/#!forum/monologue-rb)
+- [Mailing list for questions](http://groups.google.com/forum/#!forum/monologue-rb)
 - [Issues and bugs](http://github.com/jipiboily/monologue/issues)
 - [Wiki](https://github.com/jipiboily/monologue/wiki/_pages)
+- IRC channel (on Freenode): #monologue.
 
-## Here are a few features
+## Some features
 - Rails mountable engine (fully named spaced and mountable in an already existing app)
 - tested
 - back to basics: few features
@@ -30,19 +35,20 @@ To know how to upgrade, see [UPGRADE.md](https://github.com/jipiboily/monologue/
 - 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/)
-- enforcing [Rails cache](http://edgeguides.rubyonrails.org/caching_with_rails.html) for better performance (only support file store for now). [Read this to enable it](https://github.com/jipiboily/monologue/wiki/Configure-Monologue's-cache).
 - more in the [CHANGELOG](https://github.com/jipiboily/monologue/blob/master/CHANGELOG.md)
 
-- bonus: there is a `[monologue-markdown](https://github.com/jipiboily/monologue-markdown)` extension
+- Available extensions
+  - [monologue-markdown](https://github.com/jipiboily/monologue-markdown)
+  - [monologue_image_upload](https://github.com/msevestre/monologue_image_upload)
 
 ### missing features
 - see [roadmap](https://github.com/jipiboily/monologue/wiki/Roadmap)!
 
 
 ## Installation
-### 1. Add the gem to your `Gemfile`
+### 1. Add the gem to your `Gemfile`. This will get the latest version compatible with Rails 4 until we release a gem
 ```ruby
-gem "monologue"
+gem 'monologue', github: 'jipiboily/monologue'
 ```
 And run `bundle install` to fetch the gem and update your 'Gemfile.lock'.
 
@@ -81,34 +87,48 @@ This is all done in an initializer file, say `config/initializers/monologue.rb`.
 ### 6. Ready
 Start your server and head on [http://localhost:3000/monologue](http://localhost:3000/monologue) to log in the admin section.
 
-### Note to Heroku users
-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)
-
 ## Customization
 See the [Wiki - Customizations](https://github.com/jipiboily/monologue/wiki/Customizations).
 
 ## Requirements
-- Rails 3.1 +
+- Rails 4.0.4 +
 - 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.
+## Contributing
+
+In the spirit of [free software][1], **everyone** is encouraged to help improve this project.
+
+Here are some ways *you* can contribute:
+
+* by using prerelease versions
+* by reporting [bugs][2]
+* by suggesting new features
+* by writing or editing documentation
+* by writing specifications
+* by writing code (*no patch is too small*: fix typos, add comments, clean up inconsistent whitespace)
+* by refactoring code
+* by resolving [issues][2]
+* by reviewing patches
+
+Starting point:
+
+* Fork the repo
+* Clone your repo
+* Run `bundle install`
+* Run `bundle exec rake test_app` to create the test application in `spec/dummy`
+* Make your changes
+* Ensure specs pass by running `bundle exec rspec spec`
+* Submit your pull request
+
 
 You will need to install this before running the test suite:
   - [https://github.com/thoughtbot/capybara-webkit/wiki/Installing-Qt-and-compiling-capybara-webkit](https://github.com/thoughtbot/capybara-webkit/wiki/Installing-Qt-and-compiling-capybara-webkit)
@@ -116,3 +136,7 @@ You will need to install this before running the test suite:
 ## Thanks to
 
 Zurb for the "social foundicons".
+
+
+[1]: http://www.fsf.org/licensing/essays/free-sw.html
+[2]: https://github.com/jipiboily/monologue/issues

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

@@ -11,7 +11,8 @@
 //= require monologue/bootstrap/bootstrap-datepicker-fr
 //= require monologue/bootstrap/bootstrap-datepicker-pt
 //= require monologue/bootstrap/bootstrap-datepicker-es
+//= require ckeditor/override
 //= require ckeditor/init
 //= require monologue/admin/ckeditor-config
 //= require monologue/admin/posts
-//= require select2
+//= require select2

data/app/assets/javascripts/monologue/blog/archive.js

@@ -0,0 +1,11 @@
+$(function() {
+  $('.js-year').on('click', function(){
+    $(this).parent().find('>ul').toggle('fast');
+    $(this).toggleClass('active');
+  });
+
+  $('.js-month').on('click', function(){
+    $(this).parent().find('ul').toggle('fast');
+    $(this).toggleClass('active');
+  });
+});

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

@@ -198,4 +198,31 @@ a.social {
   display: inline;
   /*margin: 0 40px 0 40px;*/
   /*padding: 0 0 0 0;*/
+}
+
+/** archive css **/
+.archive ul {
+  text-align: left;
+  list-style: none;
+  padding: 0;
+  margin: 0;
+}
+
+.archive ul li {
+  padding: 0;
+  margin: 0 0 0 10px;
+  cursor: pointer;
+}
+
+.archive ul.js-posts li {
+  margin-bottom: 10px;
+}
+
+.archive .blog-year:before, .archive .blog-month:before {
+  content: "+";
+  padding-right: 5px;
+}
+
+.archive .blog-year.active:before, .archive .blog-month.active:before {
+  content: "-";
 }

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

@@ -1,12 +1,6 @@
 class Monologue::Admin::BaseController < Monologue::ApplicationController
-  before_filter :authenticate_user!
-  force_ssl if Monologue.admin_force_ssl # TODO: find a way to test that with capybara
+  include Monologue::ControllerHelpers::Auth
+  force_ssl if Monologue::Config.admin_force_ssl # TODO: find a way to test that with capybara
   
   layout "layouts/monologue/admin"
-  
-  def authenticate_user!
-    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,6 +1,5 @@
 class Monologue::Admin::PostsController < Monologue::Admin::BaseController
   respond_to :html
-  cache_sweeper Monologue::PostsSweeper, only: [:create, :update, :destroy]
   before_filter :load_post, only: [:edit, :update]
   
   def index
@@ -10,20 +9,19 @@ class Monologue::Admin::PostsController < Monologue::Admin::BaseController
   def new
     @post = Monologue::Post.new
   end
-  
+
   ## Preview a post without saving.
   def preview
     # mockup our models for preview.
-    @post = Monologue::Post.new(params[:post])
+    @post = Monologue::Post.new post_params
     @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"
+    render "/monologue/posts/show", layout: Monologue::Config.layout || "/layouts/monologue/application"
   end
-  
+
   def create
-    @post = Monologue::Post.new(params[:post])
+    @post = Monologue::Post.new post_params
     @post.user_id = monologue_current_user.id
     if @post.save
       prepare_flash_and_redirect_to_edit()
@@ -36,7 +34,7 @@ class Monologue::Admin::PostsController < Monologue::Admin::BaseController
   end
 
   def update
-    if @post.update_attributes(params[:post])
+    if @post.update(post_params)
       prepare_flash_and_redirect_to_edit()
     else
       render :edit
@@ -65,4 +63,8 @@ private
     end
     redirect_to edit_admin_post_path(@post)
   end
-end
+
+  def post_params
+    params.require(:post).permit(:published, :tag_list,:title,:content,:url,:published_at)
+  end
+end

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

@@ -11,7 +11,7 @@ class Monologue::Admin::UsersController < Monologue::Admin::BaseController
   end
 
   def update
-    if @user.update_attributes(params[:user])
+    if @user.update user_params
       flash.notice = "User modified"
       redirect_to admin_users_path
     else
@@ -28,7 +28,7 @@ class Monologue::Admin::UsersController < Monologue::Admin::BaseController
   end
 
   def create
-    @user = Monologue::User.new(params[:user])
+    @user = Monologue::User.new user_params
     if @user.save
       flash.notice = I18n.t("monologue.admin.users.create.success")
       redirect_to admin_users_path
@@ -46,4 +46,7 @@ class Monologue::Admin::UsersController < Monologue::Admin::BaseController
       @user = Monologue::User.find(params[:id])
     end
 
-end
+    def user_params
+      params.require(:user).permit(:name, :email, :password, :password_confirmation)
+    end
+end

data/app/controllers/monologue/application_controller.rb

@@ -1,15 +1,16 @@
 class Monologue::ApplicationController < ApplicationController
+  include Monologue::ControllerHelpers::User
 
-  layout Monologue.layout if Monologue.layout # TODO: find a way to test that. It was asked in issue #54 (https://github.com/jipiboily/monologue/issues/54)
+  layout Monologue::Config.layout if Monologue::Config.layout # TODO: find a way to test that. It was asked in issue #54 (https://github.com/jipiboily/monologue/issues/54)
 
-  before_filter :recent_posts, :all_tags
+  before_filter :recent_posts, :all_tags, :archive_posts
 
   def recent_posts
     @recent_posts = Monologue::Post.published.limit(3)
   end
 
   def all_tags
-    @tags = Monologue::Tag.all(order: "name").select{|t| t.frequency>0}
+    @tags = Monologue::Tag.order("name").select{|t| t.frequency>0}
     #could use minmax here but it's only supported with ruby > 1.9'
     @tags_frequency_min = @tags.map{|t| t.frequency}.min
     @tags_frequency_max = @tags.map{|t| t.frequency}.max
@@ -26,15 +27,18 @@ class Monologue::ApplicationController < ApplicationController
     end
   end
 
-  private
-
-    def monologue_current_user
-      @monologue_current_user ||= Monologue::User.find(session[:monologue_user_id]) if session[:monologue_user_id]
-    end
-
-    def monologue_page_cache_enabled?
-      monologue_current_user.nil? && Monologue::PageCache.enabled
+  def archive_posts
+    @archive_posts = {}
+    @first_post_year = DateTime.now.year
+
+    # limit to 100 for safety reasons
+    posts = Monologue::Post.published.limit(100)
+    if posts.length > 0
+      @archive_posts = posts.group_by {
+        |post| post.published_at.beginning_of_month.strftime("%Y %-m")
+      }
+      @first_post_year = posts.last.published_at.year
     end
+  end
 
-  helper_method :monologue_current_user, :monologue_page_cache_enabled?
 end

data/app/controllers/monologue/controller_helpers/auth.rb

@@ -0,0 +1,21 @@
+require 'active_support/concern'
+
+module Monologue
+  module ControllerHelpers
+    module Auth
+      extend ActiveSupport::Concern
+      include Monologue::ControllerHelpers::User
+
+      included do
+        before_filter :authenticate_user!
+      end
+
+      private
+      def authenticate_user!
+         if monologue_current_user.nil?
+           redirect_to monologue.admin_login_url, alert: I18n.t("monologue.admin.login.need_auth")
+         end
+      end
+    end
+  end
+end

data/app/controllers/monologue/controller_helpers/user.rb

@@ -0,0 +1,18 @@
+require 'active_support/concern'
+
+module Monologue
+  module ControllerHelpers
+    module User
+      extend ActiveSupport::Concern
+
+      included do
+        helper_method :monologue_current_user
+      end
+
+      private
+      def monologue_current_user
+        @monologue_current_user ||= Monologue::User.find(session[:monologue_user_id]) if session[:monologue_user_id]
+      end
+    end
+  end
+end

data/app/controllers/monologue/posts_controller.rb

@@ -1,6 +1,4 @@
 class Monologue::PostsController < Monologue::ApplicationController
-  caches_page :index, :show, :feed , if: Proc.new { monologue_page_cache_enabled? }
-
   def index
     @page = params[:page].nil? ? 1 : params[:page]
     @posts = Monologue::Post.published.page(@page)
@@ -20,4 +18,4 @@ class Monologue::PostsController < Monologue::ApplicationController
   def feed
     @posts = Monologue::Post.published.limit(25)
   end
-end
+end

data/app/controllers/monologue/tags_controller.rb

@@ -1,5 +1,4 @@
 class Monologue::TagsController < Monologue::ApplicationController
-  caches_page :show , if: Proc.new { monologue_page_cache_enabled? }
   def show
     @tag = retrieve_tag
     if @tag
@@ -12,6 +11,6 @@ class Monologue::TagsController < Monologue::ApplicationController
 
   private
   def retrieve_tag
-    Monologue::Tag.where("lower(name) = ?", params[:tag].downcase).first
+    Monologue::Tag.where("lower(name) = ?", params[:tag].mb_chars.to_s.downcase).first
   end
-end
+end

data/app/helpers/monologue/application_helper.rb

@@ -11,7 +11,7 @@ module Monologue
     end
 
     def monologue_accurate_title
-      content_for?(:title) ? ((content_for :title) + " | #{Monologue.site_name}") : Monologue.site_name
+      content_for?(:title) ? ((content_for :title) + " | #{Monologue::Config.site_name}") : Monologue::Config.site_name
     end
 
     def rss_head_link
@@ -19,27 +19,27 @@ module Monologue
     end
 
     def rss_icon
-      social_icon("rss", feed_url, Monologue.show_rss_icon)
+      social_icon("rss", feed_url, Monologue::Config.show_rss_icon)
     end
 
     def github_icon
-      social_icon("github", "http://github.com/#{Monologue.github_username}", Monologue.github_username)
+      social_icon("github", "http://github.com/#{Monologue::Config.github_username}", Monologue::Config.github_username)
     end
 
     def twitter_icon
-      social_icon("twitter", "http://twitter.com/#{Monologue.twitter_username}", Monologue.twitter_username)
+      social_icon("twitter", "http://twitter.com/#{Monologue::Config.twitter_username}", Monologue::Config.twitter_username)
     end
 
     def linkedin_icon
-      social_icon("linkedin", Monologue.linkedin_url, Monologue.linkedin_url)
+      social_icon("linkedin", Monologue::Config.linkedin_url, Monologue::Config.linkedin_url)
     end
 
     def googleplus_icon
-      social_icon("google-plus", Monologue.google_plus_account_url, Monologue.google_plus_account_url)
+      social_icon("google-plus", Monologue::Config.google_plus_account_url, Monologue::Config.google_plus_account_url)
     end
 
     def facebook_icon
-      social_icon("facebook", Monologue.facebook_url, Monologue.facebook_url)
+      social_icon("facebook", Monologue::Config.facebook_url, Monologue::Config.facebook_url)
     end
 
     def absolute_image_url(url)