monologue 0.1.3 → 0.2.0.beta3

data/README.md

@@ -4,20 +4,30 @@ Monologue is a basic mountable blogging engine in Rails built to be easily mount
 [![Build Status](https://secure.travis-ci.org/jipiboily/monologue.png)](http://travis-ci.org/jipiboily/monologue)
 
 
-## Features
-- Rails mountable engine (fully named spaced)
+## Questions? Problems? Documentation?
+
+[Questions here please](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)
+
+## Here are a few features
+- 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
+- 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 handled by disqus
-- enforcing [Rails cache](http://edgeguides.rubyonrails.org/caching_with_rails.html) for better performance (only support file store for now)
-- runs on Heroku
+- 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
 
 ### missing features
-- categories
 - UI for posts revisions and to manage user
-- much more…see issues!
+- see [roadmap](https://github.com/jipiboily/monologue/wiki/Roadmap)!
 
 
 ## Installation
@@ -46,36 +56,27 @@ Run these commands:
 2. $`bundle exec rake db:create` (only if this is a new project)
 3. $`bundle exec rake db:migrate`
 
-		
+
 ### 4. Create a user
 Open your development console with `rails c`, then:
 ```ruby
 Monologue::User.create(name: "monologue", email:"monologue@example.com", password:"my-password", password_confirmation: "my-password")
 ```
 
-### 5. Configure Monologue. 
+### 5. Configure Monologue.
 This is all done in an initializer file, say `config/initializers/monologue.rb`. More on this in the [Wiki - Configuration](https://github.com/jipiboily/monologue/wiki/Configuration).
 
 ### 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 
+### Note to Heroku users
 Additionnal step: turn caching off in `config/environments/production.rb`:
 ```ruby
 config.action_controller.perform_caching = false
 ```
 
 ## Enable caching
-Just turn perform_caching to true in your environment config file (`config/environment/{environment}.rb):
-```ruby
-config.action_controller.perform_caching = true
-```
-    
-**IMPORTANT**: if monologue is mounted at root ("/"), you must also add that in your `routes.rb` file, before the monologue mount:
-
-```ruby
-root to: 'monologue/posts#index'
-```
+[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).
@@ -85,4 +86,11 @@ See the [Wiki - Customizations](https://github.com/jipiboily/monologue/wiki/Cust
 - Database: MySQL & Postgres are supported but other databases might work too.
 
 ## Contribute
-Fork it, then pull request. Please add tests for your feature or bug fix.
+Fork it, then pull request. Please add tests for your feature or bug fix.
+
+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)
+
+## Thanks to
+
+Zurb for the "social foundicons".

data/app/assets/javascripts/monologue/blog/twitter.js.coffee

@@ -0,0 +1,32 @@
+class window.TwitterWidget
+  @dom_cache: ->
+    @template = $("#tweet_template")
+    @latest_tweets = $("#latest_tweets")
+  @callback: (data) ->
+    @dom_cache()
+    for tweet in data
+      @add_tweet(tweet)
+  @add_tweet: (tweet) ->
+    tweet.text = tweet.text.parseTwitter()
+    @print(tweet)
+  @print: (tweet) ->
+    el = @template.clone().attr("id","")
+    el.html(el.html().replace("{{text}}", tweet.text)).show()
+    @latest_tweets.append(el)
+
+String::parseUsername = ->
+  @replace /[@]+[A-Za-z0-9-_]+/g, (u) ->
+    username = u.replace("@", "")
+    u.link "http://twitter.com/" + username
+
+String::parseHashtag = ->
+  @replace /[#]+[A-Za-z0-9-_]+/g, (t) ->
+    tag = t.replace("#", "%23")
+    t.link "http://search.twitter.com/search?q=" + tag
+
+String::parseURL = ->
+  @replace /[A-Za-z]+:\/\/[A-Za-z0-9-_]+\.[A-Za-z0-9-_:%&~\?\/.=]+/g, (url) ->
+    url.link url
+
+String::parseTwitter =->
+  @.parseURL().parseHashtag().parseUsername()

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

@@ -6,8 +6,8 @@
  *= require monologue/blog/skeleton/base
  *= require monologue/blog/skeleton/skeleton
  *= require monologue/blog/skeleton/layout
- *= require monologue/blog/custom
+ *= require monologue/foundation_icons/social_foundicons
+ *= require_tree .
  *= require monologue/blog/fonts
- *= require_tree . 
- *= require_self
+ *= require monologue/blog/custom
 */

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

@@ -1,7 +1,41 @@
+/* general */
+a:hover {
+  color: #05C5FF;
+}
+
+ul {
+  list-style: square;
+  margin-left: 30px;
+}
+
+/* header */
 .main-header{
-  margin: 20px 0 30px 0;
+  margin: 20px 0 0 0;
+}
+
+.main-header .social:first-of-type i {
+  float:right;
+  padding: 20px 0 0 0;
+  font-size: 50px;
+  text-decoration: none;
+}
+
+.main-header .social {
+  float: right;
+  margin: 0 2px 0 2px;
+}
+
+a.social {
+  text-decoration: none;
+}
+
+.social i {
+  font-size: 30px;
 }
 
+
+/* pagination */
+
 #pagination {
   margin: 20px 0 0 0;
   border-top: 3px solid #000;
@@ -16,7 +50,10 @@
   float: right;
 }
 
-.content article h2, .content article h3, .content article h4, .content article h5, .content article h6 {
+/* content */
+
+.content article h2, .content article h3, .content article h4, .content article h5, .content article h6,
+.content section h2, .content section h3, .content section h4, .content section h5, .content section h6 {
     font-size: 16px;
     text-transform: uppercase;
     font-weight: bold;
@@ -27,16 +64,122 @@
   font-weight: bold;
 }
 
-section header {
+.content header {
+  border-bottom: solid black 1px;
+  border-top: solid black 1px;
+}
+
+.content header h1 {
+  margin: 0 0 0 10px;
+}
+
+.content header {
   margin: 0 0 5px 0;
   font-size: 12px;
+  text-align: center;
 }
 
-section header h1 {
+.content header h1 {
   margin: 0 0 0 0;
 }
 
-ul {
-  list-style: square;
-  margin-left: 30px;
+.content header .posted {
+  font-size: 12;
+  text-transform: uppercase;
+  font-weight: bold;
+  margin-bottom: 10px
+}
+
+/* tags */
+#tags {
+    margin-top: 20px;
+    margin-bottom: 20px;
+}
+
+.tag {
+    background: #eeeeee;
+    -moz-border-radius: 4px;
+    -webkit-border-radius: 4px;
+    border:1px solid #d4d4d4;
+    border-radius:4px;
+    padding: 4px;
+    margin-right: 2px;
+}
+
+.tag-search,
+.flash-notice {
+    padding:8px 35px 8px 14px;
+    margin-bottom:18px;
+    text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);
+    background-color:#eeeeee;
+    border:1px solid #d4d4d4;
+    -webkit-border-radius:4px;
+    -moz-border-radius:4px;
+    border-radius:4px;
+}
+
+.label-size-1 {
+    font-size: 80%;
+    opacity: .8;
+}
+
+.label-size-2 {
+    font-size: 90%;
+    opacity: .9;
+}
+.label-size-3 {
+    font-size: 100%;
+}
+.label-size-4 {
+    font-size: 130%;
+}
+.label-size-5 {
+    font-size: 160%;
+}
+
+/* sidebar */
+.widget header {
+  padding: 8px 35px 0 14px;
+  margin: 10px 0 10px 0;
+  text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);
+  background-color:#eeeeee;
+  border:1px solid #d4d4d4;
+  -webkit-border-radius:4px;
+  -moz-border-radius:4px;
+  border-radius:4px;
+}
+
+.widget header:first-child {
+  margin-top: 0;
+}
+
+.widget header h1 {
+  font-size: 24px;
+  line-height: 32px;
+  margin-bottom: 4px;
+}
+                                      none
+/* footer */
+
+.content article footer h1 {
+  margin-bottom: 10px;
+  font-size: 16px;
+  text-transform: uppercase;
+  text-align: center;
+}
+
+.monologue-social-sharing {
+  padding: 0 0 0 0;
+  border-top: solid black 1px;
+}
+
+#social-share {
+  /*text-align: center;*/
+  width: 100%;
+}
+
+#facebook, #twitter, #google-plus {
+  display: inline;
+  /*margin: 0 40px 0 40px;*/
+  /*padding: 0 0 0 0;*/
 }

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

@@ -0,0 +1,27 @@
+class Monologue::Admin::CacheController < Monologue::Admin::BaseController
+  before_filter :prepare_file_list
+
+  def show
+    if ActionController::Base.perform_caching && Monologue::PageCache.enabled && Monologue::PageCache.wipe_enabled &&  ActionController::Base.page_cache_directory != Rails.public_path
+      render :show
+    else
+      render :how_to_enable
+    end
+  end
+
+  def destroy
+    Monologue::TotalSweeper.wipe_all
+    flash.notice = I18n.t("monologue.admin.cache.show.cache_wiped")
+    render :show
+  end
+
+  private
+  def prepare_file_list
+    @files = []
+    Dir.glob("#{ActionController::Base.page_cache_directory}/**/*").each do |file|
+      next if File.directory?(file)
+      @files << file.gsub(ActionController::Base.page_cache_directory,"")
+    end
+    @files
+  end
+end

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

@@ -1,26 +1,27 @@
 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]
+
   def index
     @posts = Monologue::Post.default
   end
-  
+
   def new
     @post = Monologue::Post.new
     @revision = @post.posts_revisions.build
   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)
     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
@@ -28,20 +29,19 @@ class Monologue::Admin::PostsController < Monologue::Admin::BaseController
       end
       redirect_to edit_admin_post_path(@post)
     else
-      render :action => "new"
+      render :new
     end
   end
-  
+
   def edit
-    @post = Monologue::Post.includes(:posts_revisions).find(params[:id])
-    @revision = @post.posts_revisions.last
+    @revision = @post.active_revision
   end
-  
+
   def update
-    @post = Monologue::Post.includes(:posts_revisions).find(params[:id])
     @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")
@@ -53,7 +53,7 @@ class Monologue::Admin::PostsController < Monologue::Admin::BaseController
       render :edit
     end
   end
-  
+
   def destroy
     post = Monologue::Post.find(params[:id])
     if post.destroy
@@ -62,4 +62,20 @@ class Monologue::Admin::PostsController < Monologue::Admin::BaseController
       redirect_to admin_posts_path, :alert => I18n.t("monologue.admin.posts.delete.failed")
     end
   end
+
+  private
+  def save_tags(tags)
+    @post.tag!(tags.split(","))
+  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
+  end
+
 end

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

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