monologue 0.2.0 → 0.3.0

data/app/controllers/monologue/application_controller.rb

@@ -9,7 +9,7 @@ class Monologue::ApplicationController < ApplicationController
   end
 
   def all_tags
-    @tags = Monologue::Tag.all(:order => "name").select{|t| t.frequency>0}
+    @tags = Monologue::Tag.all(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
@@ -19,22 +19,22 @@ class Monologue::ApplicationController < ApplicationController
     # fallback to the default 404.html page from main_app.
     file = Rails.root.join('public', '404.html')
     if file.exist?
-      render :file => file.cleanpath.to_s.gsub(%r{#{file.extname}$}, ''),
-         :layout => false, :status => 404, :formats => [:html]
+      render file: file.cleanpath.to_s.gsub(%r{#{file.extname}$}, ''),
+         layout: false, status: 404, formats: [:html]
     else
-      render :action => "404", :status => 404, :formats => [:html]
+      render action: "404", status: 404, formats: [:html]
     end
   end
 
   private
 
-    def current_user
+    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?
-      current_user.nil? && Monologue::PageCache.enabled
+      monologue_current_user.nil? && Monologue::PageCache.enabled
     end
 
-  helper_method :current_user, :monologue_page_cache_enabled?
+  helper_method :monologue_current_user, :monologue_page_cache_enabled?
 end

data/app/controllers/monologue/posts_controller.rb

@@ -1,5 +1,5 @@
 class Monologue::PostsController < Monologue::ApplicationController
-  caches_page :index, :show, :feed , :if => Proc.new { monologue_page_cache_enabled? }
+  caches_page :index, :show, :feed , if: Proc.new { monologue_page_cache_enabled? }
 
   def index
     @page = params[:page].nil? ? 1 : params[:page]
@@ -7,16 +7,14 @@ class Monologue::PostsController < Monologue::ApplicationController
   end
 
   def show
-    if current_user
-      post = Monologue::Post.default.where("monologue_posts_revisions.url = :url", {:url => params[:post_url]}).first
+    if monologue_current_user
+      @post = Monologue::Post.default.where("url = :url", {url: params[:post_url]}).first
     else
-      post = Monologue::Post.published.where("monologue_posts_revisions.url = :url", {:url => params[:post_url]}).first
+      @post = Monologue::Post.published.where("url = :url", {url: params[:post_url]}).first
     end
-    if post.nil?
+    if @post.nil?
       not_found
-      return
     end
-    @revision = post.active_revision
   end
 
   def feed

data/app/controllers/monologue/tags_controller.rb

@@ -1,12 +1,17 @@
 class Monologue::TagsController < Monologue::ApplicationController
-  caches_page :show , :if => Proc.new { monologue_page_cache_enabled? }
+  caches_page :show , if: Proc.new { monologue_page_cache_enabled? }
   def show
-    @tag = Monologue::Tag.find_by_name(params[:tag])
+    @tag = retrieve_tag
     if @tag
       @page = nil
       @posts = @tag.posts_with_tag
     else
-      redirect_to :root ,:notice => "No post found with label \"#{params[:tag]}\""
+      redirect_to :root ,notice: "No post found with label \"#{params[:tag]}\""
     end
   end
+
+  private
+  def retrieve_tag
+    Monologue::Tag.where("lower(name) = ?", params[:tag].downcase).first
+  end
 end

data/app/form_builders/monologue_admin_form_builder.rb

@@ -1,9 +1,9 @@
 class MonologueAdminFormBuilder < ActionView::Helpers::FormBuilder
-  delegate :content_tag, :tag, :to => :@template
+  delegate :content_tag, :tag, to: :@template
   
   %w[text_field text_area password_field collection_select select file_field].each do |method_name|
     define_method(method_name) do |name, *args|
-      content_tag :div, :class =>  "field" do
+      content_tag :div, class:  "field" do
         field_label(name, *args) + super(name, *args)
       end
     end
@@ -12,31 +12,31 @@ class MonologueAdminFormBuilder < ActionView::Helpers::FormBuilder
   def check_box(name, *args)
     options = args.extract_options!
     required = object.class.validators_on(name).any? { |v| v.kind_of? ActiveModel::Validations::PresenceValidator }
-    content_tag :label, :class =>  (required ? "required checkbox inline" : "checkbox inline") do
+    content_tag :label, class:  (required ? "required checkbox inline" : "checkbox inline") do
       super + (options[:label] || name)
     end
   end
 
   def collection_check_boxes(attribute, records, record_id, record_name)
-    content_tag :div, :class =>  "field" do
+    content_tag :div, class:  "field" do
       @template.hidden_field_tag("#{object_name}[#{attribute}][]") +
       records.map do |record|
         element_id = "#{object_name}_#{attribute}_#{record.send(record_id)}"
-        checkbox = @template.check_box_tag("#{object_name}[#{attribute}][]", record.send(record_id),  object.send(attribute).include?(record.send(record_id)), :id => element_id)
+        checkbox = @template.check_box_tag("#{object_name}[#{attribute}][]", record.send(record_id),  object.send(attribute).include?(record.send(record_id)), id: element_id)
         checkbox + " " + @template.label_tag(element_id, record.send(record_name))
       end.join(tag(:br)).html_safe
     end
   end
 
   def submit(*args)
-    content_tag :div, :class =>  "actions" do
+    content_tag :div, class:  "form-actions" do
       super
     end
   end
 
   def error_messages
     if object.errors.full_messages.any?
-      content_tag(:div, :class => "alert alert-error error_messages") do
+      content_tag(:div, class: "alert alert-error error_messages") do
         content_tag(:strong, "Invalid Fields") +
         content_tag(:ul) do
           object.errors.messages.map do |msg|
@@ -52,7 +52,11 @@ class MonologueAdminFormBuilder < ActionView::Helpers::FormBuilder
     def field_label(name, *args)
       options = args.extract_options!
       required = object.class.validators_on(name).any? { |v| v.kind_of? ActiveModel::Validations::PresenceValidator }
-      label(name, options[:label], :class =>  ("required" if required))
+      if options[:id]
+        label(name, options[:label], class:  ("required" if required), for: options[:id])
+      else  
+        label(name, options[:label], class:  ("required" if required))
+      end  
     end
 
     def objectify_options(options)

data/app/helpers/monologue/application_helper.rb

@@ -1,8 +1,9 @@
 module Monologue
   module ApplicationHelper
     include Monologue::Engine.routes.url_helpers if ENV["RAILS_ENV"] == "test" # TODO: try and see why this is needed for specs to pass
-    #Number of sizes defined in the css
-    NUMBER_OF_LABEL_SIZES = 5
+    #Why aren't they loaded by default?
+    include Monologue::HtmlHelper
+    include Monologue::TagsHelper
 
     def monologue_admin_form_for(object, options = {}, &block)
       options[:builder] = MonologueAdminFormBuilder
@@ -13,15 +14,8 @@ module Monologue
       content_for?(:title) ? ((content_for :title) + " | #{Monologue.site_name}") : Monologue.site_name
     end
 
-    def sidebar_section_for(title, &block)
-      content_tag(:section, :class => 'widget') do
-        content_tag(:header, content_tag(:h1, title)) +
-            capture(&block)
-      end
-    end
-
     def rss_head_link
-      tag("link", :href => feed_url, :rel => "alternate", :title => "RSS", :type => "application/rss+xml")
+      tag("link", href: feed_url, rel: "alternate", title: "RSS", type: "application/rss+xml")
     end
 
     def rss_icon
@@ -49,40 +43,16 @@ module Monologue
     end
 
     def absolute_image_url(url)
-       return url if url.starts_with? "http"
-       request.protocol + request.host + url
-    end
-
-    # TODO: That should be move in TagHelper if I manage to get that loaded
-    def tag_url(tag)
-      "#{Monologue::Engine.routes.url_helpers.root_path}tags/#{tag.name.downcase}"
-    end
-
-    def label_for_tag(tag, min, max)
-      "label-size-#{size_for_tag(tag, min, max)}"
+      return url if url.starts_with? "http"
+      request.protocol + request.host + url
     end
 
-    def size_for_tag(tag, min, max)
-      #logarithmic scaling based on the number of occurrences of each tag
-      if min<max && tag.frequency>0
-        1 + ((NUMBER_OF_LABEL_SIZES-1)*(log_distance_to_min(tag.frequency, min))/log_distance_to_min(max, min)).round
-      else
-        1
-      end
-    end
-
-    private
-    def social_icon foundicon, url, setting
+    def social_icon(foundicon, url, setting)
       return if setting.nil? || !setting
-      content_tag :a, :href => url, :class => "social", :target => "_blank" do
-        content_tag :i, :class => "foundicon-#{foundicon}" do # using an empty content tag for foundicons to appear. TODO: try to do otherwise and use only tag method
+      content_tag :a, href: url, class: "social", target: "_blank" do
+        content_tag :i, class: "foundicon-#{foundicon}" do # using an empty content tag for foundicons to appear. TODO: try to do otherwise and use only tag method
         end
       end
     end
-
-    def log_distance_to_min(value, min)
-      Math.log(value)-Math.log(min)
-    end
-
   end
 end

data/app/helpers/monologue/html_helper.rb

@@ -0,0 +1,35 @@
+module Monologue
+  module HtmlHelper
+
+
+    # +li+ tag with the 'active' class added if the url is the current one.
+    # Eg.:
+    #
+    #   <%= activable_li_tag users_path do  %>
+    #     <%= link_to "Users", users_path %>
+    #   <% end %>
+    #
+    def activable_li_tag(*url, &block)
+      content_tag :li, capture(&block), :class => ("active" if url.any?{|u| current_page?(u)})
+    end
+
+    # +li+ tag with the 'active' class added if the url is the current one with a link
+    # inside it pointing to that url.
+    #
+    #   <%= activatable_li_tag_with_link "Users", users_path %>
+    #
+    def activable_li_tag_with_link(title, *url)
+      activable_li_tag *url do
+        link_to(title, url.first)
+      end
+    end
+
+    def sidebar_section_for(title, &block)
+       content_tag(:section, class: 'widget') do
+         content_tag(:header, content_tag(:h1, title)) +
+             capture(&block)
+       end
+     end
+
+  end
+end

data/app/helpers/monologue/tags_helper.rb

@@ -1,5 +1,30 @@
 module Monologue
   module TagsHelper
 
+    #Number of sizes defined in the css
+    NUMBER_OF_LABEL_SIZES = 5
+
+    def tag_url(tag)
+      "#{Monologue::Engine.routes.url_helpers.root_path}tags/#{tag.name.downcase}"
+    end
+
+    def label_for_tag(tag, min, max)
+      "label-size-#{size_for_tag(tag, min, max)}"
+    end
+
+    def size_for_tag(tag, min, max)
+      #logarithmic scaling based on the number of occurrences of each tag
+      if min<max && tag.frequency>0
+        1 + ((NUMBER_OF_LABEL_SIZES-1)*(log_distance_to_min(tag.frequency, min))/log_distance_to_min(max, min)).round
+      else
+        1
+      end
+    end
+
+    private
+
+    def log_distance_to_min(value, min)
+      Math.log(value)-Math.log(min)
+    end
   end
 end

data/app/models/monologue/post.rb

@@ -1,46 +1,48 @@
 class Monologue::Post < ActiveRecord::Base
-  has_many :posts_revisions, :dependent => :destroy
   has_many :taggings
-  has_many :tags, :through => :taggings, :dependent => :destroy
+  has_many :tags, through: :taggings, dependent: :destroy
+  before_validation :generate_url
+  belongs_to :user
 
-  accepts_nested_attributes_for :posts_revisions
-  attr_writer :tag_list
-  attr_accessible :posts_revisions_attributes, :published, :tag_list
+  attr_accessible :title, :content, :url, :published, :published_at, :tag_list
 
-  scope :default, includes(:posts_revisions).where("posts_revision_id = monologue_posts_revisions.id").order("published_at DESC, monologue_posts.created_at DESC, monologue_posts.updated_at DESC")
-  scope :published, lambda { default.where(:published => true).where("published_at <= ?", DateTime.now) }
+  scope :default, order("published_at DESC, monologue_posts.created_at DESC, monologue_posts.updated_at DESC")
+  scope :published, lambda { default.where(published: true).where("published_at <= ?", DateTime.now) }
 
   default_scope includes(:tags)
 
-  validates :posts_revision_id, :uniqueness => true
+  validates :user_id, presence: true
+  validates :title, :content, :url, :published_at, presence: true
+  validates :url, uniqueness: true
+  validate :url_do_not_start_with_slash
 
-  # TODO: move that in a spec helper as it only used by tests
-  def just_the_revision_one_before
-    self.posts_revisions.where("post_id = ?", self.id).order("monologue_posts_revisions.updated_at DESC").offset(1).limit(1).first
+  def tag_list= tags_attr
+    self.tag!(tags_attr.split(","))
   end
 
-  def latest_revision
-    self.posts_revisions.where("post_id = ?", self.id).order("monologue_posts_revisions.updated_at DESC").limit(1).first
+  def tag_list
+    self.tags.map { |tag| tag.name }.join(", ") if self.tags
   end
 
-  def active_revision
-    Monologue::PostsRevision.find(self.posts_revision_id)
+  def tag!(tags_attr)
+    self.tags = tags_attr.map(&:strip).reject(&:blank?).map do |tag|
+      Monologue::Tag.find_or_create_by_name(tag)
+    end
   end
 
-  def tag!(tags)
-    self.tags = tags.select { |t| t.present? }.map do |tag|
-      tag.strip!
-      if tag.present?
-        Monologue::Tag.find_or_create_by_name(tag)
-      end
-    end
+  def full_url
+    "#{Monologue::Engine.routes.url_helpers.root_path}#{self.url}"
+  end
+
+  def published_in_future?
+    self.published && self.published_at > DateTime.now
   end
 
   def self.page p
     per_page = Monologue.posts_per_page || 10
     set_total_pages(per_page)
     p = (p.nil? ? 0 : p.to_i - 1)
-    offset = (p==0 ? 0 : p * per_page)
+    offset = p * per_page
     self.limit(per_page).offset(offset)
   end
 
@@ -51,4 +53,17 @@ class Monologue::Post < ActiveRecord::Base
   def self.set_total_pages per_page
     @number_of_pages = self.count / per_page + (self.count % per_page == 0 ? 0 : 1)
   end
+
+  private
+
+  def generate_url
+    return unless self.url.blank?
+    year = self.published_at.class == ActiveSupport::TimeWithZone ? self.published_at.year : DateTime.now.year
+    self.url = "#{year}/#{self.title.parameterize}"
+  end
+
+  def url_do_not_start_with_slash
+    errors.add(:url, I18n.t("activerecord.errors.models.monologue/post.attributes.url.start_with_slash")) if self.url.start_with?("/")
+  end
+
 end

data/app/models/monologue/tag.rb

@@ -1,9 +1,9 @@
 class Monologue::Tag < ActiveRecord::Base
   attr_accessible :name
 
-  validates :name, :uniqueness => true,:presence => true
+  validates :name, uniqueness: true,presence: true
   has_many :taggings
-  has_many :posts,:through=> :taggings
+  has_many :posts,through: :taggings
 
   def posts_with_tag
     self.posts.published
@@ -12,5 +12,4 @@ class Monologue::Tag < ActiveRecord::Base
   def frequency
     posts_with_tag.size
   end
-
-end
+end

data/app/models/monologue/tagging.rb

@@ -1,4 +1,6 @@
 class Monologue::Tagging < ActiveRecord::Base
   belongs_to :post
   belongs_to :tag
+
+  attr_accessible :tag_id
 end

data/app/models/monologue/user.rb

@@ -1,7 +1,18 @@
 class Monologue::User < ActiveRecord::Base
   has_many :posts
+
   attr_accessible :name, :email, :password, :password_confirmation
+
   has_secure_password
-  validates_presence_of :password, :on => :create
-  validates_presence_of :name, :email
+
+  validates_presence_of :password, on: :create
+  validates_presence_of :name
+  validates :email , presence: true, uniqueness: true
+
+
+  def can_delete?(user)
+    return false if self==user
+    return false if user.posts.any?
+    true
+  end
 end

data/app/sweepers/monologue/posts_sweeper.rb

@@ -15,11 +15,8 @@ class Monologue::PostsSweeper < ActionController::Caching::Sweeper
     page_cache_directory = Rails.public_path if page_cache_directory.nil? # TODO: we should not need this either...
 
     # post
-    if post.posts_revisions.count > 0
-      current_post_path = "#{page_cache_directory}#{root_path}#{post.just_the_revision_one_before.url}.html" unless post.just_the_revision_one_before.nil?
-      current_post_path = "#{page_cache_directory}#{root_path}#{post.posts_revisions.last.url}.html" if post.posts_revisions.count == 1
-      File.delete current_post_path if File.exists? current_post_path
-    end
+    current_post_path = "#{page_cache_directory}#{root_path}#{post.url}.html"
+    File.delete current_post_path if File.exists? current_post_path
 
     # tags
     tags_path = "#{page_cache_directory}#{root_path}tags"

data/app/views/layouts/monologue/admin.html.erb

@@ -7,12 +7,12 @@
   <%= csrf_meta_tags %>
 </head>
 <body> 
-  <% if current_user %>
+  <% if monologue_current_user %>
     <%= render "layouts/monologue/admin/nav_bar" %>
   <% end %>
   <div class="container">
     <% flash.each do |name, msg| %>
-      <%= content_tag :div, msg, :id => "flash_#{name}", :class => (name == :notice ? "alert alert-info" : "alert alert-error") %>
+      <%= content_tag :div, msg, id: "flash_#{name}", class: (name == :notice ? "alert alert-info" : "alert alert-error") %>
     <% end %>
 
     <%= yield %>